x86/apic: Switch to new Intel CPU model defines

New CPU #defines encode vendor and family as well as model.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/all/20240424181504.41634-1-tony.luck%40intel.com

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index c342c4aa9c6848c607238dad1ff07105737d5873..f76aaf5216f3dcf241abb48f461e2624c31ae0cf 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -497,32 +497,32 @@ static struct clock_event_device lapic_clockevent = {
 static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
 
 static const struct x86_cpu_id deadline_match[] __initconst = {
-       X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(HASWELL_X, X86_STEPPINGS(0x2, 0x2), 0x3a), /* EP */
-       X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(HASWELL_X, X86_STEPPINGS(0x4, 0x4), 0x0f), /* EX */
+       X86_MATCH_VFM_STEPPINGS(INTEL_HASWELL_X, X86_STEPPINGS(0x2, 0x2), 0x3a), /* EP */
+       X86_MATCH_VFM_STEPPINGS(INTEL_HASWELL_X, X86_STEPPINGS(0x4, 0x4), 0x0f), /* EX */
 
-       X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_X,        0x0b000020),
+       X86_MATCH_VFM(INTEL_BROADWELL_X,        0x0b000020),
 
-       X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x2, 0x2), 0x00000011),
-       X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x3, 0x3), 0x0700000e),
-       X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x4, 0x4), 0x0f00000c),
-       X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x5, 0x5), 0x0e000003),
+       X86_MATCH_VFM_STEPPINGS(INTEL_BROADWELL_D, X86_STEPPINGS(0x2, 0x2), 0x00000011),
+       X86_MATCH_VFM_STEPPINGS(INTEL_BROADWELL_D, X86_STEPPINGS(0x3, 0x3), 0x0700000e),
+       X86_MATCH_VFM_STEPPINGS(INTEL_BROADWELL_D, X86_STEPPINGS(0x4, 0x4), 0x0f00000c),
+       X86_MATCH_VFM_STEPPINGS(INTEL_BROADWELL_D, X86_STEPPINGS(0x5, 0x5), 0x0e000003),
 
-       X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x3, 0x3), 0x01000136),
-       X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x4, 0x4), 0x02000014),
-       X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x5, 0xf), 0),
+       X86_MATCH_VFM_STEPPINGS(INTEL_SKYLAKE_X, X86_STEPPINGS(0x3, 0x3), 0x01000136),
+       X86_MATCH_VFM_STEPPINGS(INTEL_SKYLAKE_X, X86_STEPPINGS(0x4, 0x4), 0x02000014),
+       X86_MATCH_VFM_STEPPINGS(INTEL_SKYLAKE_X, X86_STEPPINGS(0x5, 0xf), 0),
 
-       X86_MATCH_INTEL_FAM6_MODEL( HASWELL,            0x22),
-       X86_MATCH_INTEL_FAM6_MODEL( HASWELL_L,          0x20),
-       X86_MATCH_INTEL_FAM6_MODEL( HASWELL_G,          0x17),
+       X86_MATCH_VFM(INTEL_HASWELL,            0x22),
+       X86_MATCH_VFM(INTEL_HASWELL_L,          0x20),
+       X86_MATCH_VFM(INTEL_HASWELL_G,          0x17),
 
-       X86_MATCH_INTEL_FAM6_MODEL( BROADWELL,          0x25),
-       X86_MATCH_INTEL_FAM6_MODEL( BROADWELL_G,        0x17),
+       X86_MATCH_VFM(INTEL_BROADWELL,          0x25),
+       X86_MATCH_VFM(INTEL_BROADWELL_G,        0x17),
 
-       X86_MATCH_INTEL_FAM6_MODEL( SKYLAKE_L,          0xb2),
-       X86_MATCH_INTEL_FAM6_MODEL( SKYLAKE,            0xb2),
+       X86_MATCH_VFM(INTEL_SKYLAKE_L,          0xb2),
+       X86_MATCH_VFM(INTEL_SKYLAKE,            0xb2),
 
-       X86_MATCH_INTEL_FAM6_MODEL( KABYLAKE_L,         0x52),
-       X86_MATCH_INTEL_FAM6_MODEL( KABYLAKE,           0x52),
+       X86_MATCH_VFM(INTEL_KABYLAKE_L,         0x52),
+       X86_MATCH_VFM(INTEL_KABYLAKE,           0x52),
 
        {},
 };