Received-SPF: pass (google.com: domain of linux-kernel+bounces-100135-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
HMM_SOURCE_IP:192.168.139.44:63786.1870684316
HMM_ATTACHE_NUM:0000
HMM_SOURCE_TYPE:SMTP
Received: from clientip-124.127.58.150 (unknown [192.168.139.44])
	by chinatelecom.cn (HERMES) with SMTP id 7579290322CA;
	Tue, 12 Mar 2024 18:35:46 +0800 (CST)
X-189-SAVE-TO-SEND: +sibs@chinatelecom.cn
Received: from  ([124.127.58.150])
	by gateway-ssl-dep-77bc75f6c8-x5lfc with ESMTP id c6fa781bcd40441ca0a54af00e4aa89d for kai.huang@intel.com;
	Tue, 12 Mar 2024 18:35:56 CST
X-Transaction-ID: c6fa781bcd40441ca0a54af00e4aa89d
X-Real-From: sibs@chinatelecom.cn
X-Receive-IP: 124.127.58.150
X-MEDUSA-Status: 0
Sender: sibs@chinatelecom.cn
From: Bingsong Si <sibs@chinatelecom.cn>
To: kai.huang@intel.com,
	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: linux-kernel@vger.kernel.org,
	sibs@chinatelecom.cn
Subject: [PATCH v3] x86/cpu: Clear TME feature flag if TME is not enabled by BIOS
Date: Tue, 12 Mar 2024 18:35:34 +0800
Message-Id: <20240312103534.9037-1-sibs@chinatelecom.cn>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <b909cb856eb625f00402472d3f3153db2294f259.camel@intel.com>
References: <b909cb856eb625f00402472d3f3153db2294f259.camel@intel.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

When TME is disabled by BIOS, dmesg output is "x86/tme: not 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 40dec9b56f87..119ae291573b 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -228,6 +228,7 @@ static void detect_tme_early(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