From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31A304C77CB for ; Thu, 6 Aug 2026 23:36:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786059408; cv=none; b=PFeMNnlVaHrz1c76Wn9TOenDW/jH8e/m6Ee9J8oQiPqTYDBQ1wlPxE+mEtyTOPHUdfUvm42zuTVwuORjVNayPUfrLYzpDWGw8Mla6CEfeUZ8ob6Ya6gGbpSGz+/nN1tKYmdn/93WK56y3veCWX/P4UJylAqpDXuByatEFXf6GtA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786059408; c=relaxed/simple; bh=zUwj/tUghTiTEVoKSWMsQNbnRAFLb6fHDZIqhxq4ECM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uuECdd9XNx8+559nZb/X8mFalesi0kdSxWXiubAPKp088cG3AcGKOpoBK924S25mVPkLu3VL6m0F+OdFDmQsSRmcs8SQT2y8iM25a6nXS3c54gmLdmDNXrx2hgU4rYPdY/rqdOb9/ALOUMgXYnuzOMrafvLUFhx9da+NX7W3i9Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=QOGCG0tu; arc=none smtp.client-ip=209.85.214.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QOGCG0tu" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2cea6a46766so46521955ad.0 for ; Thu, 06 Aug 2026 16:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786059405; x=1786664205; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:from:to:cc:subject:date:message-id :reply-to:content-type; bh=as+YzjPRM0DAZztxhbx3Raa/ax9+dW0ZzZ4Dw8q0B68=; b=QOGCG0tu18x7UqhQoq1sTMznk6mLlwZxmrn25kI8bEQeaG+rcZAQfVqGtCQLmPJ1Ng PbVxhpEyFQf1Tt5Zd1HTSNTJtlx5oBdidjECPfcZPBpNhGFhkUL2OYveXfIt3ciRE+bJ SznTi/Y5UaBJ8LuoeC90gWrqyy2kk4xwJIH31gKxFaRO2XBQ7/FV2nL5uvRvxCM/sT61 dFyWn/ZIg4wbGWaLo4wzuUB3GuV1cBCwbt4ol25c9nD9GlsYZm071zNhKl2LatVK6rS+ Ic5MAksOk+nRjSJK8EsovnvRkzqJs47qe6U9XEdTa7kH9bZJDv7v8o87HqJqArWbciL2 pCGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786059405; x=1786664205; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=as+YzjPRM0DAZztxhbx3Raa/ax9+dW0ZzZ4Dw8q0B68=; b=Qlm+a0GDkESy3uS0lWsFIz/ukNuvgRAaaTHb2vmAwdgIITmQ1sPG9UKkveFWnbxjPc g+NxQx/HN8Z92gU0jdkP+bjBYnMQ5VbZyMxReL0+Jn8U6fiikH7o2G+byzXntsiXiObK HVNfxPbCBmV3TCxtBP4h4mWPTWlM0C0v4bFZ5XtrCmCJIqWdhi04K5c5gNiEBooy0rod uVBxCPoVeJkw6+WzKrXJ/2VYMQ1QdDRdvtKvqlq0HHs/Mtbwxdj6Q4vThM8yTqQd9Gzf mHwPO0+nr3tC6lm7Dafmg3D9hEpfZ2ESzvt6Xghlo4waJRsKWzFL/3tW4hY4X2Ej/vB6 wX/Q== X-Forwarded-Encrypted: i=1; AHgh+Rrvl4cUr0BPHzv7RQkninEEOiR8nUCAr0nfluZuiBCkqcPRGcNhS9xSw6jBCTuQoV8fr8ZvB+E0qUMC46o=@vger.kernel.org X-Gm-Message-State: AOJu0YzxIPvzvCP/8wapd9fc9UeOnI7+I7nAoMvUc0WWY+LERiJ97tQs IQYMbbAWju6IzZ8kV3PI71Io4PdLKcjCt+kOU0at4ZVDGxfz+wHew4Fyqg1x/kSJglxxWUULcA5 NAMOYPA== X-Received: from plblh12.prod.google.com ([2002:a17:903:290c:b0:2cf:277e:c60c]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f708:b0:2ba:6518:a6d4 with SMTP id d9443c01a7336-2d0ca9624bdmr224800085ad.20.1786059405010; Thu, 06 Aug 2026 16:36:45 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 6 Aug 2026 16:35:34 -0700 In-Reply-To: <20260806233609.212337-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260806233609.212337-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.679.g6767b8d81c-goog Message-ID: <20260806233609.212337-18-seanjc@google.com> Subject: [PATCH v6 17/51] x86/tsc: Fold native_calibrate_cpu() into recalibrate_cpu_khz() From: Sean Christopherson To: Kiryl Shutsemau , Rick Edgecombe , Sean Christopherson , Paolo Bonzini , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Ajay Kaher , Alexey Makhalov , Jan Kiszka , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Juergen Gross , Daniel Lezcano , Thomas Gleixner , John Stultz Cc: Vitaly Kuznetsov , Broadcom internal kernel review list , Boris Ostrovsky , Stephen Boyd , Miroslav Lichvar , x86@kernel.org, linux-coco@lists.linux.dev, kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, Michael Kelley , Tom Lendacky , Nikunj A Dadhania , David Woodhouse , David Woodhouse , Thomas Gleixner Content-Type: text/plain; charset="UTF-8" Fold the guts of native_calibrate_cpu() into its sole remaining caller, recalibrate_cpu_khz() to eliminate the extra SMP=n #ifdef, and so that it's more obvious that directly invoking the early vs. late calibration routines in determine_cpu_tsc_frequencies() is intentional. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kernel/tsc.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index dd9e04e325d6..d95e4f059f17 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -918,21 +918,6 @@ static unsigned long native_calibrate_cpu_early(void) return fast_calibrate; } -#ifndef CONFIG_SMP -/** - * native_calibrate_cpu - calibrate the cpu - */ -static unsigned long native_calibrate_cpu(void) -{ - unsigned long tsc_freq = native_calibrate_cpu_early(); - - if (!tsc_freq) - tsc_freq = native_calibrate_cpu_late(); - - return tsc_freq; -} -#endif - void recalibrate_cpu_khz(void) { #ifndef CONFIG_SMP @@ -944,7 +929,9 @@ void recalibrate_cpu_khz(void) if (WARN_ON_ONCE(cpu_feature_enabled(X86_FEATURE_TSC_KNOWN_FREQ))) return; - cpu_khz = native_calibrate_cpu(); + cpu_khz = native_calibrate_cpu_early(); + if (!cpu_khz) + cpu_khz = native_calibrate_cpu_late(); tsc_khz = native_calibrate_tsc(); if (tsc_khz == 0) tsc_khz = cpu_khz; -- 2.55.0.679.g6767b8d81c-goog