From nobody Fri Dec 19 16:20:43 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB5711EA91; Sun, 25 Aug 2024 12:46:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724589969; cv=none; b=fW+UkBb/TAncZ0m4omEp/VhCxwiAV0Rwv54N/DYL4lZk1QYIa6OuhnqY1BpOlRepNGuw73iXRXqAmQSg4nGhEDDm5v9XmIMRDY5EcZ4gWRRtyrt4z6jOCswJ8CGX1dJNy4gzeWZcaKTDF9jPQugiAkTFtKSQixZx1w/1mCoryDw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724589969; c=relaxed/simple; bh=FsGnRDGdE/0ravs4XT6aMWLFeMBBzTtZnq9iKBBCa/s=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Azzz1aLhWWnN27qmayFr3BsgWS5rIOYR/6gsHfMGP7pq9j7iAIHkUO2Sweq+QWwYPuVTDwwnU5XDGjLH5JLhMcCIKAa0XmTzemQxxTI2uAZzpq6w3haQIr2n3izSCkOiWYG8FIu35Clr6Y23TI60dnuUNBfel5Ak/47RWtYXmtY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=QQIRRkeS; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=AD5O39m5; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="QQIRRkeS"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="AD5O39m5" Date: Sun, 25 Aug 2024 12:46:04 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1724589965; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qGi8FLGlP7XvwD8pd9L+Njy/xDDsWwz2eJre/dtlghQ=; b=QQIRRkeStz5fXgA+0FrWa/KxBxCvEv/b4uif6kFkdwiHIAakUkEeyxycMtV2dwJH9UPhth +J4a2A6khgzA2Uou5+C4UtQZf520PeGkssYGMBW3DkmSOt/AwYfKVkQwSXOM7vjV+Hc4wQ YzSHs8e5Bms2gBCST9YSxNrajdk/1UN05YuwkZr1PWfk1mvUFOW7nkcFlzcrgypznYiHTD RuL21ZizUPvTwb67n6bjjTFYOk1KjnY0YWBmr0Vv/UhsSnxK3Af/6g+UUmj0bCCfjGSQSW zypXyvnmI4NqxRGgoR2SI3BpY0f5zf1rhwxsi4gKHzyXc12aSuEU32YFt942IA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1724589965; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qGi8FLGlP7XvwD8pd9L+Njy/xDDsWwz2eJre/dtlghQ=; b=AD5O39m5fKcZWsTY3RvxdgpfuE2VI86kaMDj5PgnvoMCnEvBqE3j9YWKRMmRHt3Wh0zfWJ VRTU8oaAxCXyASAQ== From: "tip-bot2 for WangYuli" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/cpu: Clarify the error message when BIOS does not support SGX Cc: Bo Wu , Zelong Xiang , WangYuli , Thomas Gleixner , Kai Huang , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <172458996487.2215.5672971101697733211.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 7678a53a1688e3d03337ca884b284c6e7b060ec5 Gitweb: https://git.kernel.org/tip/7678a53a1688e3d03337ca884b284c6e7= b060ec5 Author: WangYuli AuthorDate: Sun, 25 Aug 2024 18:46:53 +08:00 Committer: Thomas Gleixner CommitterDate: Sun, 25 Aug 2024 14:41:19 +02:00 x86/cpu: Clarify the error message when BIOS does not support SGX When SGX is not supported by the BIOS, the kernel log contains the error 'SGX disabled by BIOS', which can be confusing since there might not be an SGX-related option in the BIOS settings. For the kernel it's difficult to distinguish between the BIOS not supporting SGX and the BIOS supporting SGX but having it disabled. Therefore, update the error message to 'SGX disabled or unsupported by BIOS' to make it easier for those reading kernel logs to understand what's happening. Reported-by: Bo Wu Co-developed-by: Zelong Xiang Signed-off-by: Zelong Xiang Signed-off-by: WangYuli Signed-off-by: Thomas Gleixner Acked-by: Kai Huang Link: https://lore.kernel.org/all/F8D977CB368423F3+20240825104653.1294624-1= -wangyuli@uniontech.com Closes: https://github.com/linuxdeepin/developer-center/issues/10032 --- arch/x86/kernel/cpu/feat_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/feat_ctl.c b/arch/x86/kernel/cpu/feat_ctl.c index 1640ae7..4a41187 100644 --- a/arch/x86/kernel/cpu/feat_ctl.c +++ b/arch/x86/kernel/cpu/feat_ctl.c @@ -188,7 +188,7 @@ update_caps: update_sgx: if (!(msr & FEAT_CTL_SGX_ENABLED)) { if (enable_sgx_kvm || enable_sgx_driver) - pr_err_once("SGX disabled by BIOS.\n"); + pr_err_once("SGX disabled or unsupported by BIOS.\n"); clear_cpu_cap(c, X86_FEATURE_SGX); return; }