diff mbox

UBUNTU: [Config] Enable EDAC_GHES for ARM64

Message ID 1474988979-10343-1-git-send-email-manoj.iyer@canonical.com
State New
Headers show

Commit Message

Manoj Iyer Sept. 27, 2016, 3:09 p.m. UTC 
From: Manoj Iyer <manoj.iyer@canonical.com>

EDAC_GHES is essential for ARMv8.0 Server systems, as it enables
firmware-first error handling of memory and CPU errors.

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1628111
---
 arch/arm64/Kconfig                                 | 1 +
 debian.master/config/amd64/config.common.amd64     | 2 +-
 debian.master/config/arm64/config.common.arm64     | 2 +-
 debian.master/config/config.common.ubuntu          | 3 ++-
 debian.master/config/i386/config.common.i386       | 2 +-
 debian.master/config/powerpc/config.common.powerpc | 1 +
 6 files changed, 7 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 91fe53a..3bee3be 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -51,6 +51,7 @@  config ARM64
 	select GENERIC_TIME_VSYSCALL
 	select HANDLE_DOMAIN_IRQ
 	select HARDIRQS_SW_RESEND
+	select HAVE_ACPI_APEI if ACPI
 	select HAVE_ALIGNED_STRUCT_PAGE if SLUB
 	select HAVE_ARCH_AUDITSYSCALL
 	select HAVE_ARCH_BITREVERSE
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index f31cd53..c95a69b 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -19,7 +19,6 @@  CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_FAN=m
-CONFIG_ACPI_HED=y
 CONFIG_ACPI_PCI_SLOT=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 CONFIG_ACPI_THERMAL=m
@@ -327,6 +326,7 @@  CONFIG_E100=m
 # CONFIG_ECHO is not set
 CONFIG_EDAC=y
 CONFIG_EDAC_LEGACY_SYSFS=y
+CONFIG_EDAC_MM_EDAC=m
 # CONFIG_EEPROM_93XX46 is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index ea0cf8d..ceb11b5 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -18,7 +18,6 @@  CONFIG_ACCESSIBILITY=y
 CONFIG_ACPI_BUTTON=y
 # CONFIG_ACPI_DOCK is not set
 CONFIG_ACPI_FAN=y
-# CONFIG_ACPI_HED is not set
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
 CONFIG_ACPI_THERMAL=y
@@ -343,6 +342,7 @@  CONFIG_E100=m
 # CONFIG_ECHO is not set
 CONFIG_EDAC=y
 # CONFIG_EDAC_LEGACY_SYSFS is not set
+CONFIG_EDAC_MM_EDAC=y
 # CONFIG_EEPROM_93XX46 is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 360f0df..b901d6a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -66,6 +66,7 @@  CONFIG_ACPI_CPU_FREQ_PSS=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_EXTLOG=y
 CONFIG_ACPI_GENERIC_GSI=y
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_HOTPLUG_MEMORY=y
@@ -2055,6 +2056,7 @@  CONFIG_EDAC_CPC925=m
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC_GHES=y
 CONFIG_EDAC_I3000=m
 CONFIG_EDAC_I3200=m
 CONFIG_EDAC_I5000=m
@@ -2066,7 +2068,6 @@  CONFIG_EDAC_I82860=m
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_MPC85XX=m
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_SBRIDGE=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 16cc362..d015fe7 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -19,7 +19,6 @@  CONFIG_ACORN_PARTITION=y
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_FAN=m
-CONFIG_ACPI_HED=y
 CONFIG_ACPI_PCI_SLOT=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 CONFIG_ACPI_THERMAL=m
@@ -344,6 +343,7 @@  CONFIG_E100=m
 # CONFIG_ECHO is not set
 CONFIG_EDAC=y
 CONFIG_EDAC_LEGACY_SYSFS=y
+CONFIG_EDAC_MM_EDAC=m
 # CONFIG_EEPROM_93XX46 is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 72449f6..3218ffa 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -112,6 +112,7 @@  CONFIG_DVB_CORE=m
 CONFIG_DVB_CXD2099=m
 CONFIG_E100=m
 # CONFIG_EDAC_LEGACY_SYSFS is not set
+CONFIG_EDAC_MM_EDAC=m
 CONFIG_EPIC100=m
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m