EDAC, ie31200: Add Intel Coffee Lake CPU support
Subsystems (2)
PATCH v2 1/2 EDAC, ie31200: Add Intel Coffee Lake CPU support
Coffee Lake seems to work like Skylake and Kaby Lake. This patch adds all device IDs for Coffee Lake-S CPUs according to datasheet.
---
v2:
- Reverted formatting existing pci_tbl entries.
Tested with a Xeon E-2124G.
--- drivers/edac/ie31200_edac.c | 58 +++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 3 deletions(-)
drivers/edac/ie31200_edac.c +55 -3
@@ -20,11 +20,13 @@* 0c08: Xeon E3-1200 v3 Processor DRAM Controller * 1918: Xeon E3-1200 v5 Skylake Host Bridge/DRAM Registers * 5918: Xeon E3-1200 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers +* 3e..: 8th/9th Gen Core Processor Host Bridge/DRAM Registers * * Based on Intel specification: * http://www.intel.com/content/dam/www/public/us/en/documents/datasheets/xeon-e3-1200v3-vol-2-datasheet.pdf * http://www.intel.com/content/www/us/en/processors/xeon/xeon-e3-1200-family-vol-2-datasheet.html * http://www.intel.com/content/www/us/en/processors/core/7th-gen-core-family-mobile-h-processor-lines-datasheet-vol-2.html +* https://www.intel.com/content/www/us/en/products/docs/processors/core/8th-gen-core-family-datasheet-vol-2.html * * According to the above datasheet (p.16): * "
@@ -61,6 +63,26 @@#define PCI_DEVICE_ID_INTEL_IE31200_HB_8 0x1918#define PCI_DEVICE_ID_INTEL_IE31200_HB_9 0x5918 +/* Coffee Lake-S */ +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_MASK 0x3e00 +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_1 0x3e0f +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_2 0x3e18 +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_3 0x3e1f +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_4 0x3e30 +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_5 0x3e31 +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_6 0x3e32 +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_7 0x3e33 +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_8 0x3ec2 +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_9 0x3ec6 +#define PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_10 0x3eca + +/* Helper macro to test if HB is for Skylake or later. */ +#define DEVICE_ID_SKYLAKE_OR_LATER (did) \ + (((did) == PCI_DEVICE_ID_INTEL_IE31200_HB_8) || \ + ((did) == PCI_DEVICE_ID_INTEL_IE31200_HB_9) || \ + (((did)&PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_MASK) == \ + PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_MASK)) +#define IE31200_DIMMS 4#define IE31200_RANKS 8#define IE31200_RANKS_PER_CHANNEL 4
@@ -381,10 +403,10 @@ static int ie31200_probe1(struct pci_dev *pdev, int dev_idx)u32 addr_decode, mad_offset;/* -* Kaby Lake seems to work like Skylake. Please re-visit this logic -* when adding new CPU support. +* Kaby Lake, Coffee Lake seem to work like Skylake. Please re-visit +* this logic when adding new CPU support. */ -bool skl = (pdev->device >=PCI_DEVICE_ID_INTEL_IE31200_HB_8 ); +bool skl =DEVICE_ID_SKYLAKE_OR_LATER (pdev->device);edac_dbg (0 ,"MC:\n" );
@@ -569,6 +591,36 @@ static const struct pci_device_id ie31200_pci_tbl[] = { {PCI_VEND_DEV (INTEL ,IE31200_HB_9 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , IE31200}, + { +PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_1 ),PCI_ANY_ID ,PCI_ANY_ID , + 0, 0, IE31200}, + { +PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_2 ),PCI_ANY_ID ,PCI_ANY_ID , + 0, 0, IE31200}, + { +PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_3 ),PCI_ANY_ID ,PCI_ANY_ID , + 0, 0, IE31200}, + { +PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_4 ),PCI_ANY_ID ,PCI_ANY_ID , + 0, 0, IE31200}, + { +PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_5 ),PCI_ANY_ID ,PCI_ANY_ID , + 0, 0, IE31200}, + { +PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_6 ),PCI_ANY_ID ,PCI_ANY_ID , + 0, 0, IE31200}, + { +PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_7 ),PCI_ANY_ID ,PCI_ANY_ID , + 0, 0, IE31200}, + { +PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_8 ),PCI_ANY_ID ,PCI_ANY_ID , + 0, 0, IE31200}, + { +PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_9 ),PCI_ANY_ID ,PCI_ANY_ID , + 0, 0, IE31200}, + { +PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_10 ),PCI_ANY_ID ,PCI_ANY_ID , + 0, 0, IE31200}, { 0, } /* 0 terminated list. */
Signature · 1 line
2.22.0.rc2.383.gf4fbbf30c2-goog
PATCH v2 2/2 EDAC, ie31200: Reformat PCI device table
Reformat device table after Coffee Lake additions to be more readable.
No functional change.
--- drivers/edac/ie31200_edac.c | 80 ++++++++++--------------------------- 1 file changed, 20 insertions(+), 60 deletions(-)
drivers/edac/ie31200_edac.c +20 -60
@@ -564,66 +564,26 @@ static void ie31200_remove_one(struct pci_dev *pdev) }static const struct pci_device_id ie31200_pci_tbl[] = { - { -PCI_VEND_DEV (INTEL ,IE31200_HB_1 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , -IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_2 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , -IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_3 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , -IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_4 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , -IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_5 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , -IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_6 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , -IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_7 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , -IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_8 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , -IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_9 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , -IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_1 ),PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 ,IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_2 ),PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 ,IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_3 ),PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 ,IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_4 ),PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 ,IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_5 ),PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 ,IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_6 ),PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 ,IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_7 ),PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 ,IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_8 ),PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 ,IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_9 ),PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 ,IE31200 }, - { -PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_10 ),PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 ,IE31200 }, - { -0 , - }/* 0 terminated list. */ + {PCI_VEND_DEV (INTEL ,IE31200_HB_1 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_2 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_3 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_4 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_5 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_6 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_7 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_8 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_9 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_1 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_2 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_3 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_4 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_5 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_6 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_7 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_8 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_9 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {PCI_VEND_DEV (INTEL ,IE31200_HB_CFL_10 ),PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,IE31200 }, + {0 , }/* 0 terminated list. */ };MODULE_DEVICE_TABLE (pci, ie31200_pci_tbl);
Signature · 1 line
2.22.0.rc2.383.gf4fbbf30c2-goog
RE: [PATCH v2 2/2] EDAC, ie31200: Reformat PCI device table
Quoted 1 line
Reformat device table after Coffee Lake additions to be more readable.
I like that you put the reformat second ... if some old version needs a backport to get Coffee Lake support they can just take part 1 to get the functionality and then decide whether or not to take part 2.
Both parts:
Re: [PATCH v2 2/2] EDAC, ie31200: Reformat PCI device table
Quoted 9 lines · Tony
Quoted 1 line
Reformat device table after Coffee Lake additions to be more readable.
I like that you put the reformat second ... if some old version needs a backport to get Coffee Lake support they can just take part 1 to get the functionality and then decide whether or not to take part 2.
Both parts:
Acked-by Tony Luck <[email protected]>
Queued, thanks.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.