diff options
| author | Justin Ernst <justin.ernst@hpe.com> | 2018-09-25 09:34:49 -0500 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2018-09-27 07:52:05 +0200 |
| commit | 6b58859419554fb824e09cfdd73151a195473cbc (patch) | |
| tree | 1ec1904dea7cbeaa2537ae3c49824e5d92e168d2 | |
| parent | 6b2da9ff0559b4cbd095f0c5fdc131b873343d7b (diff) | |
| download | op-kernel-dev-6b58859419554fb824e09cfdd73151a195473cbc.zip op-kernel-dev-6b58859419554fb824e09cfdd73151a195473cbc.tar.gz | |
EDAC: Raise the maximum number of memory controllers
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
| -rw-r--r-- | include/linux/edac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/edac.h b/include/linux/edac.h index a45ce1f..1d0c9ea 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 |
