EDAC/sb_edac: 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>
Link: https://lore.kernel.org/r/20240520224620.9480-38-tony.luck@intel.com

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 26cca5a9322da142cccef16ddeecb9d897c438bc..cbc92d3683e65c7d8600bfba10ba30de403f4307 100644 (file)
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -3546,13 +3546,13 @@ fail0:
 }
 
 static const struct x86_cpu_id sbridge_cpuids[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &pci_dev_descr_sbridge_table),
-       X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X,   &pci_dev_descr_ibridge_table),
-       X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X,     &pci_dev_descr_haswell_table),
-       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X,   &pci_dev_descr_broadwell_table),
-       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D,   &pci_dev_descr_broadwell_table),
-       X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL,  &pci_dev_descr_knl_table),
-       X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM,  &pci_dev_descr_knl_table),
+       X86_MATCH_VFM(INTEL_SANDYBRIDGE_X,      &pci_dev_descr_sbridge_table),
+       X86_MATCH_VFM(INTEL_IVYBRIDGE_X,        &pci_dev_descr_ibridge_table),
+       X86_MATCH_VFM(INTEL_HASWELL_X,          &pci_dev_descr_haswell_table),
+       X86_MATCH_VFM(INTEL_BROADWELL_X,        &pci_dev_descr_broadwell_table),
+       X86_MATCH_VFM(INTEL_BROADWELL_D,        &pci_dev_descr_broadwell_table),
+       X86_MATCH_VFM(INTEL_XEON_PHI_KNL,       &pci_dev_descr_knl_table),
+       X86_MATCH_VFM(INTEL_XEON_PHI_KNM,       &pci_dev_descr_knl_table),
        { }
 };
 MODULE_DEVICE_TABLE(x86cpu, sbridge_cpuids);