summaryrefslogtreecommitdiffstats
path: root/drivers/edac/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds2018-04-05 23:21:13 +0200
committerLinus Torvalds2018-04-05 23:21:13 +0200
commitdd972f924df6bdbc0ab185a38d5d2361dbc26311 (patch)
tree181c24478ae55284f7baee88c3cf794794467aa2 /drivers/edac/Kconfig
parentkernel.h: Retain constant expression output for max()/min() (diff)
parentEDAC, sb_edac: Remove variable length array usage (diff)
downloadkernel-qcow2-linux-dd972f924df6bdbc0ab185a38d5d2361dbc26311.tar.gz
kernel-qcow2-linux-dd972f924df6bdbc0ab185a38d5d2361dbc26311.tar.xz
kernel-qcow2-linux-dd972f924df6bdbc0ab185a38d5d2361dbc26311.zip
Merge tag 'edac_for_4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC updates from Borislav Petkov: "Noteworthy is the NVDIMM support: - NVDIMM support to EDAC (Tony Luck) - misc fixes" * tag 'edac_for_4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC, sb_edac: Remove variable length array usage EDAC, skx_edac: Detect non-volatile DIMMs firmware, DMI: Add function to look up a handle and return DIMM size acpi, nfit: Add function to look up nvdimm device and provide SMBIOS handle EDAC: Add new memory type for non-volatile DIMMs EDAC: Drop duplicated array of strings for memory type names EDAC, layerscape: Allow building for LS1021A
Diffstat (limited to 'drivers/edac/Kconfig')
-rw-r--r--drivers/edac/Kconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index cfcb91056f23..da2da53bca6d 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -232,9 +232,12 @@ config EDAC_SBRIDGE
config EDAC_SKX
tristate "Intel Skylake server Integrated MC"
depends on PCI && X86_64 && X86_MCE_INTEL && PCI_MMCONFIG
+ select DMI
help
Support for error detection and correction the Intel
- Skylake server Integrated Memory Controllers.
+ Skylake server Integrated Memory Controllers. If your
+ system has non-volatile DIMMs you should also manually
+ select CONFIG_ACPI_NFIT.
config EDAC_PND2
tristate "Intel Pondicherry2"
@@ -254,7 +257,7 @@ config EDAC_MPC85XX
config EDAC_LAYERSCAPE
tristate "Freescale Layerscape DDR"
- depends on ARCH_LAYERSCAPE
+ depends on ARCH_LAYERSCAPE || SOC_LS1021A
help
Support for error detection and correction on Freescale memory
controllers on Layerscape SoCs.