diff mbox

[Yakkety] UBUNTU: [Config] Enable EDAC_GHES for ARM64

Message ID 1ffa36a5-7c98-a6b3-25ca-fe0e4823f1a9@canonical.com
State New
Headers show

Commit Message

Tim Gardner Sept. 27, 2016, 3:25 p.m. UTC
Is this patch sufficient ?

Comments

Manoj Iyer Sept. 27, 2016, 5:08 p.m. UTC | #1
Tim,

Looks like 4.8-rc8 is missing https://lkml.org/lkml/2016/8/10/231
[PATCH v12] acpi, apei, arm64: APEI initial support for aarch64. When I 
submitted the patch to you, I had an earlier version of this patch 
applied to my tree hence the mix-up.

Your alternate config option change will be sufficient when this patch 
lands. But you will also need CONFIG_EDAC_GHES=y in config.common.ubuntu 
to enable EDAC_GHES. Would it be ok with you committing your alternate 
patch so that the dependency CONFIG_EDAC_MM_EDAC=y is satisfied? Although 
it is not going to fix the bug 
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1628111 because it is 
missing the supporting patch.

The cert target for the arm64 system that needs this enabled is 16.04.03. 
So, I think this can wait... I can submit the SRU for "CONFIG_EDAC_GHES=y 
in config.common.ubuntu" once this patch 
https://lkml.org/lkml/2016/8/10/231 lands in Y+ kernel.

*OR* you can NACK the whole thing, and we can deal with it for 16.04.03.

Any thoughts ?

--
============================
Manoj Iyer
Ubuntu/Canonical
ARM Servers - Cloud
============================

On Tue, 27 Sep 2016, Tim Gardner wrote:

> Is this patch sufficient ?
>
> -- 
> Tim Gardner tim.gardner@canonical.com
>
Tim Gardner Sept. 27, 2016, 6:50 p.m. UTC | #2
On 09/27/2016 11:08 AM, Manoj Iyer wrote:
> 
> Tim,
> 
> Looks like 4.8-rc8 is missing https://lkml.org/lkml/2016/8/10/231
> [PATCH v12] acpi, apei, arm64: APEI initial support for aarch64. When I
> submitted the patch to you, I had an earlier version of this patch
> applied to my tree hence the mix-up.
> 
> Your alternate config option change will be sufficient when this patch
> lands. But you will also need CONFIG_EDAC_GHES=y in config.common.ubuntu
> to enable EDAC_GHES. Would it be ok with you committing your alternate
> patch so that the dependency CONFIG_EDAC_MM_EDAC=y is satisfied?
> Although it is not going to fix the bug
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1628111 because it
> is missing the supporting patch.
> 
> The cert target for the arm64 system that needs this enabled is
> 16.04.03. So, I think this can wait... I can submit the SRU for
> "CONFIG_EDAC_GHES=y in config.common.ubuntu" once this patch
> https://lkml.org/lkml/2016/8/10/231 lands in Y+ kernel.
> 
> *OR* you can NACK the whole thing, and we can deal with it for 16.04.03.
> 
> Any thoughts ?
> 
>

If none of this is even germane until 16.04.3, then lets just wait until
we get 17.04 started. You'll want to submit a patch against unstable
after I rebase against the first 4.9 rc candidate.

rtg
diff mbox

Patch

From 2c0814a59a400fbe80d0e66fea93b8b7981be3ac Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 27 Sep 2016 09:08:19 -0600
Subject: [PATCH Yakkety] UBUNTU: [Config] CONFIG_EDAC_MM_EDAC=y for arm64

BugLink: http://bugs.launchpad.net/bugs/1628111

Signed-off-by: Tim Gardner <tim.gardner@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          | 1 -
 debian.master/config/i386/config.common.i386       | 1 +
 debian.master/config/powerpc/config.common.powerpc | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 +
 8 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 16f8892..671839e 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -130,6 +130,7 @@  CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index fff3a4c..b425b61 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -937,7 +937,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', 'powerpc': 'm', 'ppc64el': 'm'}>
+CONFIG_EDAC_MM_EDAC                             policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'i386': 'm', 'powerpc': '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'}>
@@ -965,6 +965,8 @@  CONFIG_EDAC_CPC925                              policy<{'powerpc-powerpc64-emb':
 CONFIG_EDAC_HIGHBANK_MC                         policy<{'armhf': 'm'}>
 CONFIG_EDAC_HIGHBANK_L2                         policy<{'armhf': 'm'}>
 CONFIG_EDAC_XGENE                               policy<{'arm64': 'm'}>
+#
+CONFIG_EDAC_MM_EDAC				mark<ENFORCED> note<LP: #1628111>
 
 # Menu: Device Drivers >> External Connector Class (extcon) support
 CONFIG_EXTCON                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 0353360..29eb79d 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -144,6 +144,7 @@  CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=y
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index b616cb6..dd8bb8a 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -138,6 +138,7 @@  CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 931e150..7e4ff72 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2326,7 +2326,6 @@  CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
 # CONFIG_EDAC_LEGACY_SYSFS is not set
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_MPC85XX=m
 CONFIG_EDAC_PASEMI=m
 CONFIG_EDAC_R82600=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 0a12f17..6e3d450 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -127,6 +127,7 @@  CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 4654613..25020e9 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -115,6 +115,7 @@  CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index ac5bad9..f169b63 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -128,6 +128,7 @@  CONFIG_DS1682=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+CONFIG_EDAC_MM_EDAC=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m
-- 
2.7.4