From: Ben Hutchings <benh@debian.org>
Date: Tue, 5 May 2020 01:09:56 +0000 (+0100)
Subject: x86/speculation: Do not match steppings
X-Git-Tag: archive/raspbian/5.7.6-1+rpi1^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e726d610d6105f61426d11b6e6a93674a3453f7b;p=linux.git

x86/speculation: Do not match steppings

Forwarded: not-needed

Adding the x86_cpu_id::steppings field is an ABI change.  It doesn't
seem worth the trouble of another ABI bump just to be able to report
some potential future CPU steppings as invulnerable.  Until we have
other change that require an ABI bump, match the affected models
regardless of stepping.


Gbp-Pq: Topic debian/abi
Gbp-Pq: Name x86-speculation-do-not-match-steppings.patch
---

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 0567448124e..9b747e5f164 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1075,10 +1075,8 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {
 	{}
 };
 
-#define VULNBL_INTEL_STEPPINGS(model, steppings, issues)		   \
-	X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(INTEL, 6,		   \
-					    INTEL_FAM6_##model, steppings, \
-					    X86_FEATURE_ANY, issues)
+#define VULNBL_INTEL_STEPPINGS(model, steppings, issues)     \
+	VULNWL_INTEL(model, issues)
 
 #define SRBDS		BIT(0)