Skip to content

Backport EDAC support for DMR #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhang-rui wants to merge 11 commits into
base: 6.6-velinux
Choose a base branch
from
Open

Backport EDAC support for DMR #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
76239f4
EDAC/{skx_common,skx}: Use configuration data, not global macros
qzhuo2 Jul 31, 2025
88cf6f3
EDAC/skx_common: Move mc_mapping to be a field inside struct skx_imc
qzhuo2 Jul 31, 2025
9b29352
EDAC/skx_common: Swap memory controller index mapping
qzhuo2 Jul 31, 2025
7c8adb7
EDAC/skx_common: Make skx_dev->imc[] a flexible array
qzhuo2 Jul 31, 2025
38a3a68
EDAC/{skx_common,skx,i10nm}: Make skx_register_mci() independent of p…
qzhuo2 Nov 19, 2025
878af15
EDAC/skx_common: Prepare for skx_get_edac_list()
qzhuo2 Nov 19, 2025
27666c8
EDAC/skx_common: Prepare for skx_set_hi_lo()
qzhuo2 Nov 19, 2025
bf4a949
EDAC/{skx_common,imh}: Add EDAC driver for Intel Diamond Rapids servers
qzhuo2 Nov 19, 2025
7f44b87
EDAC/skx_common: Extend the maximum number of DRAM chip row bits
qzhuo2 Nov 19, 2025
cc44e58
EDAC/{skx_comm,imh}: Detect 2-level memory configuration
qzhuo2 Nov 19, 2025
7c142fc
EDAC/imh: Setup 'imh_test' debugfs testing node
qzhuo2 Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions drivers/edac/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,18 @@ config EDAC_I10NM
system has non-volatile DIMMs you should also manually
select CONFIG_ACPI_NFIT.

config EDAC_IMH
tristate "Intel Integrated Memory/IO Hub MC"
depends on X86_64 && X86_MCE_INTEL && ACPI
depends on ACPI_NFIT || !ACPI_NFIT # if ACPI_NFIT=m, EDAC_IMH can't be y
select DMI
select ACPI_ADXL
help
Support for error detection and correction the Intel
Integrated Memory/IO Hub Memory Controller. This MC IP is
first used on the Diamond Rapids servers but may appear on
others in the future.

config EDAC_PND2
tristate "Intel Pondicherry2"
depends on PCI && X86_64 && X86_MCE_INTEL
Expand Down
3 changes: 3 additions & 0 deletions drivers/edac/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ obj-$(CONFIG_EDAC_PPC4XX) += ppc4xx_edac.o
obj-$(CONFIG_EDAC_AMD8111) += amd8111_edac.o
obj-$(CONFIG_EDAC_AMD8131) += amd8131_edac.o

imh_edac-y := imh_base.o
obj-$(CONFIG_EDAC_IMH) += imh_edac.o skx_edac_common.o

obj-$(CONFIG_EDAC_HIGHBANK_MC) += highbank_mc_edac.o
obj-$(CONFIG_EDAC_HIGHBANK_L2) += highbank_l2_edac.o

Expand Down
3 changes: 2 additions & 1 deletion drivers/edac/i10nm_base.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,8 @@ static int __init i10nm_init(void)
d->imc[i].num_dimms = cfg->ddr_dimm_num;
}

rc = skx_register_mci(&d->imc[i], d->imc[i].mdev,
rc = skx_register_mci(&d->imc[i], &d->imc[i].mdev->dev,
pci_name(d->imc[i].mdev),
"Intel_10nm Socket", EDAC_MOD_STR,
i10nm_get_dimm_config, cfg);
if (rc < 0)
Expand Down
Loading