Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1411706 > unrolled thread

[PATCH 12/20] x86, edac: use Intel family name macros for edac driver

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 12/20] x86, edac: use Intel family name macros for edac driver Dave Hansen <dave@sr71.net> - 2016-06-02 02:20 +0200
    RE: [PATCH 12/20] x86, edac: use Intel family name macros for edac  driver "Luck, Tony" <tony.luck@intel.com> - 2016-06-02 18:20 +0200
    RE: [PATCH 12/20] x86, edac: use Intel family name macros for edac  driver "Luck, Tony" <tony.luck@intel.com> - 2016-06-02 19:30 +0200

#1411706 — [PATCH 12/20] x86, edac: use Intel family name macros for edac driver

From: Dave Hansen <dave.hansen@linux.intel.com>

Another straightforward replacement of magic numbers.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac@vger.kernel.org
---

 b/drivers/edac/sb_edac.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff -puN drivers/edac/sb_edac.c~x86-intel-familites-edac drivers/edac/sb_edac.c
--- a/drivers/edac/sb_edac.c~x86-intel-familites-edac	2016-06-01 15:45:07.657102586 -0700
+++ b/drivers/edac/sb_edac.c	2016-06-01 15:45:07.661102769 -0700
@@ -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>
 
@@ -3359,11 +3360,11 @@ fail0:
 
 /* Order here must match "enum type" */
 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(0x57, pci_dev_descr_knl_table),		/* KNIGHTS_LANDING */
+	ICPU(INTEL_FAM6_MODEL_SANDYBRIDGE_X,	pci_dev_descr_sbridge_table),
+	ICPU(INTEL_FAM6_MODEL_IVYBRIDGE_X,	pci_dev_descr_ibridge_table),
+	ICPU(INTEL_FAM6_MODEL_HASWELL_X,	pci_dev_descr_haswell_table),
+	ICPU(INTEL_FAM6_MODEL_BROADWELL_X,	pci_dev_descr_broadwell_table),
+	ICPU(INTEL_FAM6_MODEL_XEON_PHI_KNL,	pci_dev_descr_knl_table),
 	{ }
 };
 MODULE_DEVICE_TABLE(x86cpu, sbridge_cpuids);
_

[toc] | [next] | [standalone]

#1412413 — RE: [PATCH 12/20] x86, edac: use Intel family name macros for edac driver

>  Another straightforward replacement of magic numbers.

It would be if I hadn't forgotten that INTEL_FAM6_MODEL_BROADWELL_XEON_D had
a separate model number from the other Broadwell Xeons when I switched the driver
from PCI device lookup to cpu model number.

This needs to add an entry for BDX-DE (use the same table initializer). Probably as
a separate patch before/after this.

-Tony

[The name INTEL_FAM6_MODEL_BROADWELL_XEON_D is so long it will spoil the
line-up of this code ... +1 vote on Boris' suggestion to drop the "MODEL_" bit from all these
names]

[toc] | [prev] | [next] | [standalone]

#1412447 — RE: [PATCH 12/20] x86, edac: use Intel family name macros for edac driver

> This needs to add an entry for BDX-DE (use the same table initializer). Probably as
> a separate patch before/after this.

Oops ... a bit worse than that. I assumed that index into the array matches the
enum ... (with a comment!) ... having two entries for the same "type" would break
that. I'll have to add a type field to something.

If your patch is on a fast-track, then go ahead with it:

Acked-by: Tony Luck <tony.luck@intel.com>

I'll work on fixing the other mess independently

-Tony

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web