[PATCH] UBUNTU: [Config] set EDAC_MM_EDAC=y for ARM64

[Manoj Iyer]

Setting EDAC_MM_EDAC=y automatically enables EDAC_GHES on ARM64. ARMv8.0
systems lack standard RAS architecture (or machine check architecture
equivalent).

EDAC_GHES is essential for ARMv8.0 Servers, it enables firmware-first
error handling of memory and CPU errors. APEI/GHES is the only mechanism
available for reporting hardware errors (e.g. memory and CPU errors),
and helps enable memory fault recovery mechanisms to extend the life of
the system by offlining pages when recoverable uncorrected errors are
encountered.

BugLink: https://launchpad.net/bugs/1706141

Signed-off-by: Manoj Iyer <manoj.iyer at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 +
 debian.master/config/annotations                   | 4 +++-
 debian.master/config/arm64/config.common.arm64     | 1 +
 debian.master/config/armhf/config.common.armhf     | 1 +
 debian.master/config/config.common.ubuntu          | 2 +-
 debian.master/config/i386/config.common.i386       | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 +
 7 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index f8efb586115e..eeb9f34e50f8 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -81,6 +81,7 @@ CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI=y
 CONFIG_EFI_DEV_PATH_PARSER=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f2d3a99e849d..c99da6276389 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1065,7 +1065,7 @@ CONFIG_EDAC_DEBUG                               policy<{'amd64': 'n', 'arm64': '
 CONFIG_EDAC_DECODE_MCE                          policy<{'amd64': 'm', 'i386': 'm'}>
 
 # Menu: Device Drivers >> EDAC (Error Detection And Correction) reporting >> Main Memory EDAC (Error Detection And Correction) reporting
-CONFIG_EDAC_MM_EDAC                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
+CONFIG_EDAC_MM_EDAC                             policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_EDAC_AMD64                               policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_EDAC_AMD64_ERROR_INJECTION               policy<{'amd64': 'n', 'i386': 'n'}>
 CONFIG_EDAC_AMD76X                              policy<{'i386': 'm'}>
@@ -1091,6 +1091,8 @@ CONFIG_EDAC_CPC925                              policy<{'ppc64el': 'm'}>
 CONFIG_EDAC_HIGHBANK_MC                         policy<{'armhf': 'm'}>
 CONFIG_EDAC_HIGHBANK_L2                         policy<{'armhf': 'm'}>
 CONFIG_EDAC_XGENE                               policy<{'arm64': 'm'}>
+#
+CONFIG_EDAC_MM_EDAC                             note<LP:1706141>
 
 # Menu: Device Drivers >> EDAC (Error Detection And Correction) reporting >> Main Memory EDAC (Error Detection And Correction) reporting >> Altera SOCFPGA ECC
 
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 72034ab3d898..0d6b52e5f95b 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -92,6 +92,7 @@ CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=y
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI=y
 # CONFIG_EFI_DEV_PATH_PARSER is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 2f817ac68808..d04a8eace3ca 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -84,6 +84,7 @@ CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=m
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EFI is not set
 CONFIG_EFS_FS=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 57780e030658..57aacb217664 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2421,6 +2421,7 @@ CONFIG_EDAC_CPC925=m
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC_GHES=y
 CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_I3000=m
@@ -2436,7 +2437,6 @@ CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
 CONFIG_EDAC_LAYERSCAPE=m
 # CONFIG_EDAC_LEGACY_SYSFS is not set
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_SBRIDGE=m
 CONFIG_EDAC_SKX=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 4efc75aa06b2..b643ab7910d2 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -78,6 +78,7 @@ CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI=y
 CONFIG_EFI_DEV_PATH_PARSER=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 95c05e67133a..9dee9c971980 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -78,6 +78,7 @@ CONFIG_DRM=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFS_FS=m
 # CONFIG_EM_TIMER_STI is not set
-- 
2.11.0