Received-SPF: pass (google.com: domain of linux-kernel+bounces-97011-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
HMM_SOURCE_IP:192.168.138.117:1741.1211802803
HMM_ATTACHE_NUM:0000
HMM_SOURCE_TYPE:SMTP
Received: from clientip-10.133.8.31 (unknown [192.168.138.117])
	by chinatelecom.cn (HERMES) with SMTP id F158E111064AF;
	Fri,  8 Mar 2024 20:27:59 +0800 (CST)
X-189-SAVE-TO-SEND: +sibs@chinatelecom.cn
Received: from  ([10.133.8.31])
	by gateway-ssl-dep-77bc75f6c8-sfvft with ESMTP id 9439230eb9e0458b890b8d3a43501b50 for tglx@linutronix.de;
	Fri, 08 Mar 2024 20:28:11 CST
X-Transaction-ID: 9439230eb9e0458b890b8d3a43501b50
X-Real-From: sibs@chinatelecom.cn
X-Receive-IP: 10.133.8.31
X-MEDUSA-Status: 0
Sender: sibs@chinatelecom.cn
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] x86/cpu: Clear TME feature flag if TME is not enabled by BIOS
Date: Fri,  8 Mar 2024 20:27:52 +0800
Message-Id: <20240308122752.3342-1-sibs@chinatelecom.cn>
X-Mailer: git-send-email 2.34.1
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

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