Message ID | 20161013153105.2517-2-piotr.luc@intel.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On Thu, Oct 13, 2016 at 05:30:55PM +0200, Piotr Luc wrote: > Use macros of Intel processor families instead of raw numbers. > > Signed-off-by: Piotr Luc <piotr.luc@intel.com> > Reviewed-by: Dave Hansen <dave.hansen@intel.com> > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Cc: Doug Thompson <dougthompson@xmission.com> > Cc: Borislav Petkov <bp@alien8.de> > Cc: linux-edac@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: "Luck, Tony" <tony.luck@intel.com> > Cc: "Shevchenko, Andriy" <andriy.shevchenko@intel.com> > --- > drivers/edac/sb_edac.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c > index ce0067b..90564bc 100644 > --- 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> > > @@ -3366,12 +3367,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); > -- I took Dave's patch here, instead: https://lkml.kernel.org/r/20160929204321.9FAE5F84@viggo.jf.intel.com
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index ce0067b..90564bc 100644 --- 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> @@ -3366,12 +3367,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);