Message ID | 20241002195300.25591-1-michael.reed@canonical.com |
---|---|
State | New |
Headers | show |
Acked-by: Ivan Hu <ivan.hu@canonical.com> On 10/3/24 03:52, Michael Reed wrote: > From: Michael Reed <Michael.Reed@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/2077861 > > SRU Justification: > > [Impact] > Add Arrow Lake-U/H SoC compute die IDs for EDAC support. > > > [Test Plan] > > [Fix] > According to https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=88150cd9501b9498e377cc4440325267c6921f90, Intel Arrow Lake IBECC(In-Band ECC)) feature is already added in upstream. > > """"" > author Qiuxu Zhuo <qiuxu.zhuo@intel.com> 2024-06-14 11:03:54 +0800 > committer Tony Luck <tony.luck@intel.com> 2024-06-14 08:08:12 -0700 > commit 88150cd9501b9498e377cc4440325267c6921f90 (patch) > tree fc574a0966af4f31dcc7247ff3fbbdcccffb1089 > parent 123b158635505c89ed0d3ef45c5845ff9030a466 (diff) > download linux-88150cd9501b9498e377cc4440325267c6921f90.tar.gz > EDAC/igen6: Add Intel Arrow Lake-U/H SoCs support > Arrow Lake-U/H SoCs share same IBECC registers with Meteor Lake-P > SoCs. Add Arrow Lake-U/H SoC compute die IDs for EDAC support. > > Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> > Signed-off-by: Tony Luck <tony.luck@intel.com> > Link: https://lore.kernel.org/r/20240614030354.69180-1-qiuxu.zhuo@intel.com > Diffstat > -rw-r--r-- drivers/edac/igen6_edac.c 8 > 1 files changed, 8 insertions, 0 deletions > diff --git a/drivers/edac/igen6_edac.c b/drivers/edac/igen6_edac.c > index cdd8480e736877..c9fc1e64069e33 100644 > --- a/drivers/edac/igen6_edac.c > +++ b/drivers/edac/igen6_edac.c > @@ -258,6 +258,11 @@ static struct work_struct ecclog_work; > #define DID_MTL_P_SKU2 0x7d02 > #define DID_MTL_P_SKU3 0x7d14 > > +/* Compute die IDs for Arrow Lake-UH with IBECC */ > +#define DID_ARL_UH_SKU1 0x7d06 > +#define DID_ARL_UH_SKU2 0x7d20 > +#define DID_ARL_UH_SKU3 0x7d30 > + > static int get_mchbar(struct pci_dev *pdev, u64 *mchbar) > { > union { > @@ -597,6 +602,9 @@ static const struct pci_device_id igen6_pci_tbl[] = { > { PCI_VDEVICE(INTEL, DID_MTL_P_SKU1), (kernel_ulong_t)&mtl_p_cfg }, > { PCI_VDEVICE(INTEL, DID_MTL_P_SKU2), (kernel_ulong_t)&mtl_p_cfg }, > { PCI_VDEVICE(INTEL, DID_MTL_P_SKU3), (kernel_ulong_t)&mtl_p_cfg }, > + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU1), (kernel_ulong_t)&mtl_p_cfg }, > + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU2), (kernel_ulong_t)&mtl_p_cfg }, > + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU3), (kernel_ulong_t)&mtl_p_cfg }, > { }, > }; > MODULE_DEVICE_TABLE(pci, igen6_pci_tbl); > > """"" > > [Where problems could occur] > > [Other Info] > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/noble/+ref/lp_2077861_intel_arrowlake_ibecc > > > Qiuxu Zhuo (1): > EDAC/igen6: Add Intel Arrow Lake-U/H SoCs support > > drivers/edac/igen6_edac.c | 8 ++++++++ > 1 file changed, 8 insertions(+) >
On Thu, Oct 3, 2024 at 3:54 AM Michael Reed <michael.reed@canonical.com> wrote: > > From: Michael Reed <Michael.Reed@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/2077861 > > SRU Justification: > > [Impact] > Add Arrow Lake-U/H SoC compute die IDs for EDAC support. > > > [Test Plan] > > [Fix] > According to https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=88150cd9501b9498e377cc4440325267c6921f90, Intel Arrow Lake IBECC(In-Band ECC)) feature is already added in upstream. > > """"" > author Qiuxu Zhuo <qiuxu.zhuo@intel.com> 2024-06-14 11:03:54 +0800 > committer Tony Luck <tony.luck@intel.com> 2024-06-14 08:08:12 -0700 > commit 88150cd9501b9498e377cc4440325267c6921f90 (patch) > tree fc574a0966af4f31dcc7247ff3fbbdcccffb1089 > parent 123b158635505c89ed0d3ef45c5845ff9030a466 (diff) > download linux-88150cd9501b9498e377cc4440325267c6921f90.tar.gz > EDAC/igen6: Add Intel Arrow Lake-U/H SoCs support > Arrow Lake-U/H SoCs share same IBECC registers with Meteor Lake-P > SoCs. Add Arrow Lake-U/H SoC compute die IDs for EDAC support. > > Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> > Signed-off-by: Tony Luck <tony.luck@intel.com> > Link: https://lore.kernel.org/r/20240614030354.69180-1-qiuxu.zhuo@intel.com > Diffstat > -rw-r--r-- drivers/edac/igen6_edac.c 8 > 1 files changed, 8 insertions, 0 deletions > diff --git a/drivers/edac/igen6_edac.c b/drivers/edac/igen6_edac.c > index cdd8480e736877..c9fc1e64069e33 100644 > --- a/drivers/edac/igen6_edac.c > +++ b/drivers/edac/igen6_edac.c > @@ -258,6 +258,11 @@ static struct work_struct ecclog_work; > #define DID_MTL_P_SKU2 0x7d02 > #define DID_MTL_P_SKU3 0x7d14 > > +/* Compute die IDs for Arrow Lake-UH with IBECC */ > +#define DID_ARL_UH_SKU1 0x7d06 > +#define DID_ARL_UH_SKU2 0x7d20 > +#define DID_ARL_UH_SKU3 0x7d30 > + > static int get_mchbar(struct pci_dev *pdev, u64 *mchbar) > { > union { > @@ -597,6 +602,9 @@ static const struct pci_device_id igen6_pci_tbl[] = { > { PCI_VDEVICE(INTEL, DID_MTL_P_SKU1), (kernel_ulong_t)&mtl_p_cfg }, > { PCI_VDEVICE(INTEL, DID_MTL_P_SKU2), (kernel_ulong_t)&mtl_p_cfg }, > { PCI_VDEVICE(INTEL, DID_MTL_P_SKU3), (kernel_ulong_t)&mtl_p_cfg }, > + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU1), (kernel_ulong_t)&mtl_p_cfg }, > + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU2), (kernel_ulong_t)&mtl_p_cfg }, > + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU3), (kernel_ulong_t)&mtl_p_cfg }, > { }, > }; > MODULE_DEVICE_TABLE(pci, igen6_pci_tbl); > > """"" > > [Where problems could occur] > > [Other Info] > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/noble/+ref/lp_2077861_intel_arrowlake_ibecc > > > Qiuxu Zhuo (1): > EDAC/igen6: Add Intel Arrow Lake-U/H SoCs support > > drivers/edac/igen6_edac.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > -- > 2.34.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team Acked-by: Chris Chiu <chris.chiu@canonical.com>
On 02/10/2024 21:52, Michael Reed wrote: > From: Michael Reed <Michael.Reed@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/2077861 > > SRU Justification: > > [Impact] > Add Arrow Lake-U/H SoC compute die IDs for EDAC support. > > > [Test Plan] > > [Fix] > According to https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=88150cd9501b9498e377cc4440325267c6921f90, Intel Arrow Lake IBECC(In-Band ECC)) feature is already added in upstream. > > """"" > author Qiuxu Zhuo <qiuxu.zhuo@intel.com> 2024-06-14 11:03:54 +0800 > committer Tony Luck <tony.luck@intel.com> 2024-06-14 08:08:12 -0700 > commit 88150cd9501b9498e377cc4440325267c6921f90 (patch) > tree fc574a0966af4f31dcc7247ff3fbbdcccffb1089 > parent 123b158635505c89ed0d3ef45c5845ff9030a466 (diff) > download linux-88150cd9501b9498e377cc4440325267c6921f90.tar.gz > EDAC/igen6: Add Intel Arrow Lake-U/H SoCs support > Arrow Lake-U/H SoCs share same IBECC registers with Meteor Lake-P > SoCs. Add Arrow Lake-U/H SoC compute die IDs for EDAC support. > > Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> > Signed-off-by: Tony Luck <tony.luck@intel.com> > Link: https://lore.kernel.org/r/20240614030354.69180-1-qiuxu.zhuo@intel.com > Diffstat > -rw-r--r-- drivers/edac/igen6_edac.c 8 > 1 files changed, 8 insertions, 0 deletions > diff --git a/drivers/edac/igen6_edac.c b/drivers/edac/igen6_edac.c > index cdd8480e736877..c9fc1e64069e33 100644 > --- a/drivers/edac/igen6_edac.c > +++ b/drivers/edac/igen6_edac.c > @@ -258,6 +258,11 @@ static struct work_struct ecclog_work; > #define DID_MTL_P_SKU2 0x7d02 > #define DID_MTL_P_SKU3 0x7d14 > > +/* Compute die IDs for Arrow Lake-UH with IBECC */ > +#define DID_ARL_UH_SKU1 0x7d06 > +#define DID_ARL_UH_SKU2 0x7d20 > +#define DID_ARL_UH_SKU3 0x7d30 > + > static int get_mchbar(struct pci_dev *pdev, u64 *mchbar) > { > union { > @@ -597,6 +602,9 @@ static const struct pci_device_id igen6_pci_tbl[] = { > { PCI_VDEVICE(INTEL, DID_MTL_P_SKU1), (kernel_ulong_t)&mtl_p_cfg }, > { PCI_VDEVICE(INTEL, DID_MTL_P_SKU2), (kernel_ulong_t)&mtl_p_cfg }, > { PCI_VDEVICE(INTEL, DID_MTL_P_SKU3), (kernel_ulong_t)&mtl_p_cfg }, > + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU1), (kernel_ulong_t)&mtl_p_cfg }, > + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU2), (kernel_ulong_t)&mtl_p_cfg }, > + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU3), (kernel_ulong_t)&mtl_p_cfg }, > { }, > }; > MODULE_DEVICE_TABLE(pci, igen6_pci_tbl); > > """"" > > [Where problems could occur] > > [Other Info] > https://code.launchpad.net/~mreed8855/ubuntu/+source/linux/+git/noble/+ref/lp_2077861_intel_arrowlake_ibecc > > > Qiuxu Zhuo (1): > EDAC/igen6: Add Intel Arrow Lake-U/H SoCs support > > drivers/edac/igen6_edac.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > Applied to noble:linux master-next branch. Thanks!
diff --git a/drivers/edac/igen6_edac.c b/drivers/edac/igen6_edac.c index cdd8480e736877..c9fc1e64069e33 100644 --- a/drivers/edac/igen6_edac.c +++ b/drivers/edac/igen6_edac.c @@ -258,6 +258,11 @@ static struct work_struct ecclog_work; #define DID_MTL_P_SKU2 0x7d02 #define DID_MTL_P_SKU3 0x7d14 +/* Compute die IDs for Arrow Lake-UH with IBECC */ +#define DID_ARL_UH_SKU1 0x7d06 +#define DID_ARL_UH_SKU2 0x7d20 +#define DID_ARL_UH_SKU3 0x7d30 + static int get_mchbar(struct pci_dev *pdev, u64 *mchbar) { union { @@ -597,6 +602,9 @@ static const struct pci_device_id igen6_pci_tbl[] = { { PCI_VDEVICE(INTEL, DID_MTL_P_SKU1), (kernel_ulong_t)&mtl_p_cfg }, { PCI_VDEVICE(INTEL, DID_MTL_P_SKU2), (kernel_ulong_t)&mtl_p_cfg }, { PCI_VDEVICE(INTEL, DID_MTL_P_SKU3), (kernel_ulong_t)&mtl_p_cfg }, + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU1), (kernel_ulong_t)&mtl_p_cfg }, + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU2), (kernel_ulong_t)&mtl_p_cfg }, + { PCI_VDEVICE(INTEL, DID_ARL_UH_SKU3), (kernel_ulong_t)&mtl_p_cfg }, { }, }; MODULE_DEVICE_TABLE(pci, igen6_pci_tbl);