From nobody Sun Feb 8 18:01:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70B01C4167B for ; Wed, 29 Nov 2023 11:22:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232704AbjK2LWk (ORCPT ); Wed, 29 Nov 2023 06:22:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231634AbjK2LWY (ORCPT ); Wed, 29 Nov 2023 06:22:24 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE3EB172E; Wed, 29 Nov 2023 03:22:30 -0800 (PST) Date: Wed, 29 Nov 2023 11:22:28 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1701256949; 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=uA9vhfzIXaSAQHK/BcA4eWekW0YPp/eISi/VhG2VkNA=; b=EoTMIsMBgj7Wpx9u+wILiOSRQHWZ9GRYZbpXVRmKhdGP3a+AqIeDerx+mGeYMU/tfhjIDD 7Pt/3iThUpOLbtb+sp7h1e9Xd5LVzzHznGjy2+rlgCwqV72jU4xkpQBYhopktkgicB3yMF BnvCPU3Df+LuLEm4OhrYvWtIQ2BxBxtDzHWnS+djpPDP7UN7yyAdR2BfzCrGye5VHscmJN qqpD5M976dhi2sJqJeJHA1PHIyZ7AFqxQMl2SwRUt2vCQSkWOOzuePUqOh3fgKGWMqT74H hCj8A/kSgtzt77I0CQBwiKpNhEHg0ngfIvMDSqvc3XxQr6ekS+UQkLNA+PCVnA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1701256949; 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=uA9vhfzIXaSAQHK/BcA4eWekW0YPp/eISi/VhG2VkNA=; b=UbDpVCQZ8XDC8ftB9/j82ytUOF0ztjCWGNpDDnFQeLxcDgscX2Sk/jWHXWUUVkuBHHOy01 w6p8RWngBYB6FCAQ== From: "tip-bot2 for Borislav Petkov (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/CPU/AMD: Move the DIV0 bug detection to the Zen1 init function Cc: "Borislav Petkov (AMD)" , Nikolay Borisov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231120104152.13740-9-bp@alien8.de> References: <20231120104152.13740-9-bp@alien8.de> MIME-Version: 1.0 Message-ID: <170125694868.398.10343927971091524715.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/cpu branch of tip: Commit-ID: bfff3c6692ce64fa9d86eb829d18229c307a0855 Gitweb: https://git.kernel.org/tip/bfff3c6692ce64fa9d86eb829d18229c3= 07a0855 Author: Borislav Petkov (AMD) AuthorDate: Wed, 01 Nov 2023 12:52:01 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Wed, 29 Nov 2023 12:12:42 +01:00 x86/CPU/AMD: Move the DIV0 bug detection to the Zen1 init function No functional changes. Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Nikolay Borisov Link: http://lore.kernel.org/r/20231120104152.13740-9-bp@alien8.de --- arch/x86/kernel/cpu/amd.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 3c3b4c1..13ad44b 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -70,10 +70,6 @@ static const int amd_erratum_383[] =3D static const int amd_erratum_1054[] =3D AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0, 0, 0x2f, 0xf)); =20 -static const int amd_div0[] =3D - AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf), - AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf)); - static const int amd_erratum_1485[] =3D AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf), AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf)); @@ -1030,6 +1026,9 @@ static void init_amd_zen(struct cpuinfo_x86 *c) if (!cpu_has(c, X86_FEATURE_CPB)) set_cpu_cap(c, X86_FEATURE_CPB); } + + pr_notice_once("AMD Zen1 DIV0 bug detected. Disable SMT for full protecti= on.\n"); + setup_force_cpu_bug(X86_BUG_DIV0); } =20 static bool cpu_has_zenbleed_microcode(void) @@ -1067,7 +1066,6 @@ static void zen2_zenbleed_check(struct cpuinfo_x86 *c) } else { msr_clear_bit(MSR_AMD64_DE_CFG, MSR_AMD64_DE_CFG_ZEN2_FP_BACKUP_FIX_BIT); } - } =20 static void init_amd_zen2(struct cpuinfo_x86 *c) @@ -1219,11 +1217,6 @@ static void init_amd(struct cpuinfo_x86 *c) cpu_has(c, X86_FEATURE_AUTOIBRS)) WARN_ON_ONCE(msr_set_bit(MSR_EFER, _EFER_AUTOIBRS)); =20 - if (cpu_has_amd_erratum(c, amd_div0)) { - pr_notice_once("AMD Zen1 DIV0 bug detected. Disable SMT for full protect= ion.\n"); - setup_force_cpu_bug(X86_BUG_DIV0); - } - if (!cpu_has(c, X86_FEATURE_HYPERVISOR) && cpu_has_amd_erratum(c, amd_erratum_1485)) msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT);