EDAC, {sb,skx}_edac: Use Intel model macros instead of open-coding them

We now have symbolic names for a bunch of Intel CPU models via
asm/intel-family.h. The original conversion missed the EDAC drivers.
Convert them.

Signed-off-by: Dave Hansen <dave.hansen@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20160929204321.9FAE5F84@viggo.jf.intel.com
[ Remove comment, macro name is descriptive enough. ]
Signed-off-by: Borislav Petkov <bp@suse.de>

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 54775221a01fbe73d6a184ac903ccafc7e76c50c..843ac6c351fd81ed6da2cef8a76a0563d0b641da 100644 (file)
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -23,6 +23,7 @@
 #include <linux/math64.h>
 #include <linux/mod_devicetable.h>
 #include <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
 #include <asm/processor.h>
 #include <asm/mce.h>
 
@@ -3365,12 +3366,12 @@ fail0:
        { X86_VENDOR_INTEL, 6, model, 0, (unsigned long)&table }
 
 static const struct x86_cpu_id sbridge_cpuids[] = {
-       ICPU(0x2d, pci_dev_descr_sbridge_table),        /* SANDY_BRIDGE */
-       ICPU(0x3e, pci_dev_descr_ibridge_table),        /* IVY_BRIDGE */
-       ICPU(0x3f, pci_dev_descr_haswell_table),        /* HASWELL */
-       ICPU(0x4f, pci_dev_descr_broadwell_table),      /* BROADWELL */
-       ICPU(0x56, pci_dev_descr_broadwell_table),      /* BROADWELL-DE */
-       ICPU(0x57, pci_dev_descr_knl_table),            /* KNIGHTS_LANDING */
+       ICPU(INTEL_FAM6_SANDYBRIDGE_X,    pci_dev_descr_sbridge_table),
+       ICPU(INTEL_FAM6_IVYBRIDGE_X,      pci_dev_descr_ibridge_table),
+       ICPU(INTEL_FAM6_HASWELL_X,        pci_dev_descr_haswell_table),
+       ICPU(INTEL_FAM6_BROADWELL_X,      pci_dev_descr_broadwell_table),
+       ICPU(INTEL_FAM6_BROADWELL_XEON_D, pci_dev_descr_broadwell_table),
+       ICPU(INTEL_FAM6_XEON_PHI_KNL,     pci_dev_descr_knl_table),
        { }
 };
 MODULE_DEVICE_TABLE(x86cpu, sbridge_cpuids);

diff --git a/drivers/edac/skx_edac.c b/drivers/edac/skx_edac.c
index 0ff4878c2aa18b77bc437167a6dedfe7bac7a141..f3b3d3be1e845eac35df0f41e97b3ac644baa282 100644 (file)
--- a/drivers/edac/skx_edac.c
+++ b/drivers/edac/skx_edac.c
@@ -25,6 +25,7 @@
 #include <linux/math64.h>
 #include <linux/mod_devicetable.h>
 #include <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
 #include <asm/processor.h>
 #include <asm/mce.h>
 
@@ -263,7 +264,7 @@ fail:
 }
 
 const struct x86_cpu_id skx_cpuids[] = {
-       { X86_VENDOR_INTEL, 6, 0x55, 0, 0 },    /* Skylake */
+       { X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_X, 0, 0 },
        { }
 };
 MODULE_DEVICE_TABLE(x86cpu, skx_cpuids);