Received-SPF: pass (google.com: domain of linux-kernel+bounces-161679-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Tony Luck <tony.luck@intel.com>
To: bp@alien8.de
Cc: dave.hansen@linux.intel.com,
	linux-kernel@vger.kernel.org,
	linux-tip-commits@vger.kernel.org,
	tony.luck@intel.com,
	x86@kernel.org
Subject: [PATCH] x86/cpu: Fix thinko comparing x86_vfm with x86_model
Date: Sun, 28 Apr 2024 19:20:51 -0700
Message-ID: <20240429022051.63360-1-tony.luck@intel.com>
In-Reply-To: <20240428183142.GHZi6WDu5nbmJJ_BcH@fat_crate.local>
References: <20240428183142.GHZi6WDu5nbmJJ_BcH@fat_crate.local>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

This is obviously nonsense. Fix it.

Fixes: 68b4c6d168c5 ("x86/mce: Switch to new Intel CPU model defines")
Reported-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

Boris: Do you rebase x86/cpu branch in TIP? If so this could be merged
into the broken patch. If not then slap it on top. Risk of bisection
breakage is tiny as this only affects a quirk handling patrol scrub
errors on Skylake and Cascade lake systems.

 arch/x86/kernel/cpu/mce/severity.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c
index 7293a1c49050..e7892f11c70f 100644
--- a/arch/x86/kernel/cpu/mce/severity.c
+++ b/arch/x86/kernel/cpu/mce/severity.c
@@ -398,7 +398,7 @@ static noinstr int mce_severity_intel(struct mce *m, struct pt_regs *regs, char
 			continue;
 		if (s->excp && excp != s->excp)
 			continue;
-		if (s->cpu_vfm && boot_cpu_data.x86_model != s->cpu_vfm)
+		if (s->cpu_vfm && boot_cpu_data.x86_vfm != s->cpu_vfm)
 			continue;
 		if (s->cpu_minstepping && boot_cpu_data.x86_stepping < s->cpu_minstepping)
 			continue;
-- 
2.44.0