From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 32D354CA268 for ; Wed, 1 Jul 2026 19:32:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782934358; cv=none; b=BThlA+EhdQwsVItdRVFpIr/MI9LdGpb/KezIMkOOoXw9+B0JADrCiWqj19GR/9Y9xzUmL2N1LjciaqT2rZHF/8Uy/YaYLJMPVkc92LuIkrehWe1WFjWD7C3AGqBDrsbUuKoAQ+GYORTHBfqtpBfaIpTAf1hm7eI0phtxXJDtriE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782934358; c=relaxed/simple; bh=T5bF1Z/GMWtlvXOwBd1i/KRQmfJQmniOO2jcbAhz2Ng=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=n1tIGjLjhSiTNgZdc+fOv5PeZn+oETeTGAfKyzsD879a8YomTr9MlQfu2TsCDlktbXOxezD3YvopLw8W+mznh6wdvXA50/V59CWJm+WbMVVlnZEf5r5VX7fIXW2A+kU+HXXlUqM/8xYfPII0Rb3WOYvX2uWY4ByyQ2UW86fBI+k= 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=KplWUzCW; arc=none smtp.client-ip=209.85.215.201 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="KplWUzCW" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c96b4f58ddcso763905a12.3 for ; Wed, 01 Jul 2026 12:32:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782934355; x=1783539155; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=IPCn9toL5FYXOHslttK0Lqj/45O4+f3kFotppLV6+ls=; b=KplWUzCWtVvkvc7gbwo34zHBFIH7Ib4VrMYrFBnx9ab4YlNQwOHKj/O6ya1gwD/SF0 kJ+T0Jc52CRZvwGUthUp1HT0gFAU2gQ/ZTMKEh3Zl/2Dt67UySn8Q/hWsdaU0HT9/1RD Ur59pssyV9mXHIOs6fZZxAE3CGX2a9j8wHKN4Fhn8Pqv2ovGcBJhsTd/L8gtZxdC9jfc XUu+PtYtYSaWBIVDGJYE8jLCzo4RbZqK3hwvM2RZtxWPY1uxydEChHCZYXQ8wAtltGN/ CsDF2z9ddkKD5ky+mEODGZYJEn5SJgVZHnHlBcFnPsxib++erqR2mQtdCXHbxqnDtal3 qaMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782934355; x=1783539155; h=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; bh=IPCn9toL5FYXOHslttK0Lqj/45O4+f3kFotppLV6+ls=; b=S7jvE6Bo8l2D6YzkA20CVN0YXPosiuaIK893+VN2M+i9aPECNWtsqLGSwlN1gWnw6m LKODHaHO9gnEaBJoXBiDd6Od4/AmKWO9O9zz7IGG9Wd3AHQ8akTkk/6S4Dzvtcc9mx5u of+W9Hm4boB32d0xb5GM+71dba7uakGZNy4dEJXos/TCLnRnmyKysuKDHwBnloln4ilp 4+tZn64lcYZHd2ujB7kh03BxzcLqnIJ4MqBVbBPDUm1z4GTpnHhlu/+e4R4JMC2TTvaY cvw92gaTq6aiO0ZKb3Hz/4iczLuN0S18SmQHHXM7x0FofU9iHxHECgHd7Aq2BgNbtAI+ CCOA== X-Forwarded-Encrypted: i=1; AFNElJ/LzQYCbfCXducQUk73k3t1i/KlEFGeL/OchoAJHiaSJjh5Anm3ORj9u/kUckhTjde2iXSxVI+M6M3Z/hw=@vger.kernel.org X-Gm-Message-State: AOJu0YwF/5TfJNyHvM845vLE7gRfat1PihUqQl+j69Dm2pdxIP11Fb++ U6d4Dp2K6yjJ0Gdg2rIN1mwjsW5vJvV4ADbu1hG5YDdilGageW9DI8mhHA0M2tM1zmcc4WfsuyH hPisydg== X-Received: from pgll126.prod.google.com ([2002:a63:2584:0:b0:c85:1159:ffb2]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6300:6705:b0:3bf:7bf7:7913 with SMTP id adf61e73a8af0-3bff40c93d7mr2592804637.14.1782934354816; Wed, 01 Jul 2026 12:32:34 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 1 Jul 2026 12:31:28 -0700 In-Reply-To: <20260701193212.749551-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-hyperv@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260701193212.749551-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260701193212.749551-8-seanjc@google.com> Subject: [PATCH v5 07/51] x86/sev: Move check for SNP Secure TSC support to tsc_early_init() From: Sean Christopherson To: Jonathan Corbet , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Kiryl Shutsemau , Rick Edgecombe , Sean Christopherson , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Ajay Kaher , Alexey Makhalov , Jan Kiszka , Andy Lutomirski , Peter Zijlstra , Juergen Gross , Daniel Lezcano , John Stultz Cc: Shuah Khan , "H. Peter Anvin" , Vitaly Kuznetsov , Broadcom internal kernel review list , Boris Ostrovsky , Stephen Boyd , linux-doc@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, linux-hyperv@vger.kernel.org, virtualization@lists.linux.dev, xen-devel@lists.xenproject.org, Tom Lendacky , Nikunj A Dadhania , David Woodhouse , David Woodhouse , Michael Kelley , Thomas Gleixner Content-Type: text/plain; charset="UTF-8" Move the check on having a Secure TSC to the common tsc_early_init() so that it's obvious that having a Secure TSC is conditional, and to prepare for adding TDX to the mix (blindly initializing *both* SNP and TDX TSC logic looks especially weird). No functional change intended. Cc: Tom Lendacky Reviewed-by: Nikunj A Dadhania Reviewed-by: David Woodhouse Signed-off-by: Sean Christopherson --- arch/x86/coco/sev/core.c | 3 --- arch/x86/kernel/tsc.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index 665de1aea0ee..403dcea86452 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -2025,9 +2025,6 @@ void __init snp_secure_tsc_init(void) unsigned long tsc_freq_mhz; void *mem; - if (!cc_platform_has(CC_ATTR_GUEST_SNP_SECURE_TSC)) - return; - mem = early_memremap_encrypted(sev_secrets_pa, PAGE_SIZE); if (!mem) { pr_err("Unable to get TSC_FACTOR: failed to map the SNP secrets page.\n"); diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 482cc3a8999a..8f1604ffe986 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -1509,7 +1509,8 @@ void __init tsc_early_init(void) if (is_early_uv_system()) return; - snp_secure_tsc_init(); + if (cc_platform_has(CC_ATTR_GUEST_SNP_SECURE_TSC)) + snp_secure_tsc_init(); if (!determine_cpu_tsc_frequencies(true)) return; -- 2.55.0.rc0.799.gd6f94ed593-goog