This erratum is fixed in later steppings.
Instead of including the fixed steppings in the table in a way that will
unconditionally cause apic_validate_deadline_timer() to decide "not
vulnerable", simply omit the row.
No functional change.
Reviewed-by: Sohil Mehta <sohil.mehta@intel.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Ingo Molnar <mingo@redhat.com>
CC: Borislav Petkov <bp@alien8.de>
CC: Dave Hansen <dave.hansen@linux.intel.com>
CC: x86@kernel.org
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Sohil Mehta <sohil.mehta@intel.com>
CC: Yuntao Wang <yuntao.wang@linux.dev>
CC: Zhang Rui <rui.zhang@intel.com>
CC: linux-kernel@vger.kernel.org
v2:
* Adjust the commit message.
Strictly speaking, this is:
Fixes: 66abf2388331 ("x86/apic: Convert the TSC deadline timer matching to steppings macro")
but I really don't think it's interesting to backport.
---
arch/x86/kernel/apic/apic.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index d93f87f29d03..829c8efce1c1 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -524,7 +524,6 @@ static const struct x86_cpu_id deadline_match[] __initconst = {
X86_MATCH_VFM_STEPS(INTEL_SKYLAKE_X, 0x3, 0x3, 0x01000136),
X86_MATCH_VFM_STEPS(INTEL_SKYLAKE_X, 0x4, 0x4, 0x02000014),
- X86_MATCH_VFM_STEPS(INTEL_SKYLAKE_X, 0x5, 0xf, 0),
X86_MATCH_VFM(INTEL_HASWELL, 0x22),
X86_MATCH_VFM(INTEL_HASWELL_L, 0x20),
base-commit: 7f98ab9da046865d57c102fd3ca9669a29845f67
--
2.39.5