Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-11-01 08:15:09 +0100
committerTakashi Iwai <tiwai@suse.de>2018-11-01 08:15:09 +0100
commitad55b3696a576584e3b87e5a22c8f5678d0617ec (patch)
treeacd4f7c5294fdd9def8a6f0894ca8b45084f30c0
parent6d8bf1dc9761777d8312056a0d3f3f6cea50a5c3 (diff)
parent6e99f0fae264b5898dc7957699dd18786e0bb23b (diff)
Merge branch 'users/bpetkov/SLE15/for-next' into SLE15
Pull EDAC fix from Borislav Petkov
-rw-r--r--patches.drivers/edac-raise-the-maximum-number-of-memory-controllers.patch58
-rw-r--r--series.conf1
2 files changed, 59 insertions, 0 deletions
diff --git a/patches.drivers/edac-raise-the-maximum-number-of-memory-controllers.patch b/patches.drivers/edac-raise-the-maximum-number-of-memory-controllers.patch
new file mode 100644
index 0000000000..d3f053d96b
--- /dev/null
+++ b/patches.drivers/edac-raise-the-maximum-number-of-memory-controllers.patch
@@ -0,0 +1,58 @@
+From: Justin Ernst <justin.ernst@hpe.com>
+Date: Tue, 25 Sep 2018 09:34:49 -0500
+Subject: EDAC: Raise the maximum number of memory controllers
+Git-commit: 6b58859419554fb824e09cfdd73151a195473cbc
+Patch-mainline: v4.20-rc1
+References: bsc#1113780
+
+We observe an oops in the skx_edac module during boot:
+
+ EDAC MC0: Giving out device to module skx_edac controller Skylake Socket#0 IMC#0
+ EDAC MC1: Giving out device to module skx_edac controller Skylake Socket#0 IMC#1
+ EDAC MC2: Giving out device to module skx_edac controller Skylake Socket#1 IMC#0
+ ...
+ EDAC MC13: Giving out device to module skx_edac controller Skylake Socket#0 IMC#1
+ EDAC MC14: Giving out device to module skx_edac controller Skylake Socket#1 IMC#0
+ EDAC MC15: Giving out device to module skx_edac controller Skylake Socket#1 IMC#1
+ Too many memory controllers: 16
+ EDAC MC: Removed device 0 for skx_edac Skylake Socket#0 IMC#0
+
+We observe there are two memory controllers per socket, with a limit
+of 16. Raise the maximum number of memory controllers from 16 to 2 *
+MAX_NUMNODES (1024).
+
+[ bp: This is just a band-aid fix until we've sorted out the whole issue
+ with the bus_type association and handling in EDAC and can get rid of
+ this arbitrary limit. ]
+
+Signed-off-by: Justin Ernst <justin.ernst@hpe.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Acked-by: Russ Anderson <russ.anderson@hpe.com>
+Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
+Cc: linux-edac@vger.kernel.org
+Link: https://lkml.kernel.org/r/20180925143449.284634-1-justin.ernst@hpe.com
+---
+ include/linux/edac.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/include/linux/edac.h b/include/linux/edac.h
+index a45ce1f84bfc..1d0c9ea8825d 100644
+--- a/include/linux/edac.h
++++ b/include/linux/edac.h
+@@ -17,6 +17,7 @@
+ #include <linux/completion.h>
+ #include <linux/workqueue.h>
+ #include <linux/debugfs.h>
++#include <linux/numa.h>
+
+ #define EDAC_DEVICE_NAME_LEN 31
+
+@@ -672,6 +673,6 @@ struct mem_ctl_info {
+ /*
+ * Maximum number of memory controllers in the coherent fabric.
+ */
+-#define EDAC_MAX_MCS 16
++#define EDAC_MAX_MCS 2 * MAX_NUMNODES
+
+ #endif
+
diff --git a/series.conf b/series.conf
index 211d70f348..57375b760a 100644
--- a/series.conf
+++ b/series.conf
@@ -18231,6 +18231,7 @@
patches.fixes/nvdimm-split-label-init-out-from-the-logic-for-getting-config-data.patch
patches.fixes/nvdimm-use-namespace-index-data-to-reduce-number-of-label-reads-needed.patch
patches.fixes/libnvdimm-label-fix-sparse-warning.patch
+ patches.drivers/edac-raise-the-maximum-number-of-memory-controllers.patch
patches.drivers/PCI-ASPM-Fix-link_state-teardown-on-device-removal.patch
patches.drivers/scsi-qla2xxx-Fix-process-response-queue-for-ISP26XX-.patch
patches.drivers/scsi-qla2xxx-Fix-incorrect-port-speed-being-set-for-.patch