[PATCH v2] x86/cpu: Clear TME feature flag if TME is not enabled by BIOS

From: Bingsong Si <sibs@chinatelecom.cn>
To: Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>
Cc: Bingsong Si <sibs@chinatelecom.cn>, linux-kernel@vger.kernel.org
Subject: [PATCH v2] x86/cpu: Clear TME feature flag if TME is not enabled by BIOS
Date: Mon, 11 Mar 2024 15:19:37 +0800	[thread overview]
Message-ID: <20240311071938.13247-1-sibs@chinatelecom.cn> (raw)
In-Reply-To: <20240308122752.3342-1-sibs@chinatelecom.cn>

When TME is disabled by BIOS, dmesg output is "x86/mktme: enabled by
BIOS" but the TME feature is still shown in the output of/proc/cpuinfo.

Signed-off-by: Bingsong Si <sibs@chinatelecom.cn>
---
 arch/x86/kernel/cpu/intel.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index a927a8fc9624..22f0c829784d 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -526,6 +526,7 @@ static void detect_tme(struct cpuinfo_x86 *c)
 	if (!TME_ACTIVATE_LOCKED(tme_activate) || !TME_ACTIVATE_ENABLED(tme_activate)) {
 		pr_info_once("x86/tme: not enabled by BIOS\n");
 		mktme_status = MKTME_DISABLED;
+		clear_cpu_cap(c, X86_FEATURE_TME);
 		return;
 	}
 
-- 
2.34.1

