From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 B256642BE99 for ; Thu, 6 Aug 2026 23:36:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.198 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786059398; cv=none; b=TkKR5Hvmc3yI7TPzDdOx4Wsh2J36isxZSt7O/6O25R88lJVwV9E/vBgcRMjlh/W45zAdwJRSymhjZVZQyLVKLNiSLVrpsKi1p21mRdfd9F3PYaREbp4pSejKhDHiuh0tMjd0WaO1shZeawVU5OeYuCrqtL4zjKzPkwkjcydi03M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786059398; c=relaxed/simple; bh=uHCr+aGd0IVIljQJaBiD1XMjX+0uHia3XbUwy11kdUQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WsFWzIjoYbuqUTVqMzODW9QDVI6/h+5NfCUe/62X3Zs617trcC8jpGvLp3Lo5KNAc4wfrEPCaqOPg2tr4u7dP1HUyhz1fh985h/a+0Vf4/ioUdMcVGBAkiGQIy+oWypgOSCozTOCql1jbAb52vbEDh6hr+SMNI9IkRs8k1D8TaU= 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=d6Doxy7y; arc=none smtp.client-ip=209.85.214.198 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="d6Doxy7y" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2cee1ec30f2so33068785ad.3 for ; Thu, 06 Aug 2026 16:36:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786059393; x=1786664193; darn=lists.linux.dev; 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=AA+qmVUXq1UZoUYGqhY11Guml9As0mrU+L3gWPkVgC8=; b=d6Doxy7yoP+Dqx8hPPQIMQ25koEFuFkpP/P8OlGA/EwZd2NDSx8v+JDiEs4Wo9bQlg 1AHJWVmBf3G8yfOjNXiGwj75Hg+xlHfFcJo1W3TTWzRZ1IEPQMHTIZ9g+GqBmPBw3s3W BNX3v5+b0UDE0TGpOzvI5xqG3kEvtlFncDL+r/KW2x3cMXQnYFrHlZYIUvo6RCZd/DCX hasK7vFQE0+nP4gQ5FJmVQCBsJ1fKvJmlfZTjji+AK2yRGmBfo62Xg3HjBaIWZLGsrZW ww1mMbEqND8zYut5/Cww4p4QfOadv8PSeAI9mm9Rdj5Nuv5datK85f0EpGPR3qJ6sPjG 0OCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786059393; x=1786664193; 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=AA+qmVUXq1UZoUYGqhY11Guml9As0mrU+L3gWPkVgC8=; b=aVqNMPFLSeK9dfmiFkvsurcBaWjWBwU7cEFej5huvSiHJ7Z4SL0T0D5uqeK1J9ixam Go97CSvEPTGGv3N3wZ3lyZRiOrpfco2MLnmWs/JjaMRqE5D1SKQuDdFy9u6TQRl9ffkr AGZq9AKcHafRzOAHvSNygP6swLSaPp+uTKphREoKOC0rR4NviHVHozhLwhVd07RHSAy5 DAMpFM7Yi/oGQuu2jpfgV2nRJulLdg/wheMX1Ph4UHzKUt1mfdyEG3mnDgSNhs2OCslL lrJ0U90m1i0tjeBPs1ug0jdqJo0GzkjwVR3L2MJy5hZSOvZLdi7h88cRj5WSFOdXmqUp 26vQ== X-Forwarded-Encrypted: i=1; AHgh+RoKuR8wPRBRfPBxy5fMmkF1eiW43weBLNvxYyVWSUZgUSqhd3CT4XKe519a25ZEfNJBiUyJk4ZZOqhuOVoijQ==@lists.linux.dev X-Gm-Message-State: AOJu0Ywo6L411OiwkgPTzV5ulUmEcibHKTTiy0Ug8EV1XWrdrh+0El8G SwaemskN54e9frQe3sJU0Y+gnOcJXQO5uG9pdv9yjIXEkkXsOi5HO10s0KFV4q5CEU8WxPvBsws URIf2bw== X-Received: from plbjc21.prod.google.com ([2002:a17:903:25d5:b0:2ca:d66c:97b2]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ef0a:b0:2c9:c517:d070 with SMTP id d9443c01a7336-2d0ca7afebcmr224927325ad.3.1786059392825; Thu, 06 Aug 2026 16:36:32 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 6 Aug 2026 16:35:24 -0700 In-Reply-To: <20260806233609.212337-1-seanjc@google.com> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev 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-8-seanjc@google.com> Subject: [PATCH v6 07/51] x86/sev: Move check for SNP Secure TSC support to tsc_early_init() 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" 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 09bf10f322ba..c710c71a1bdf 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.679.g6767b8d81c-goog