I was expecting that the GHES register call would happen only once, but it is registered once per-cpu. So, we need to create several memory controllers, one by cpu.
Signed-off-by: Mauro Carvalho Chehab <[email protected]> --- drivers/edac/ghes_edac.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index 6952bdf..1badac6 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -5,6 +5,9 @@ #define GHES_PFX "ghes_edac: " #define GHES_EDAC_REVISION " Ver: 1.0.0" +static DEFINE_MUTEX(ghes_edac_lock); +static int ghes_edac_mc_num; + void ghes_edac_report_mem_error(struct ghes *ghes, int sev, struct cper_sec_mem_err *mem_err) { @@ -22,9 +25,16 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev) layers[0].type = EDAC_MC_LAYER_ALL_MEM; layers[0].size = 1; layers[0].is_virt_csrow = true; - mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0); + + /* + * We need to serialize edac_mc_alloc() and edac_mc_add_mc(), + * to avoid duplicated memory controller numbers + */ + mutex_lock(&ghes_edac_lock); + mci = edac_mc_alloc(ghes_edac_mc_num, ARRAY_SIZE(layers), layers, 0); if (!mci) { pr_info(GHES_PFX "Can't allocate memory for EDAC data\n"); + mutex_unlock(&ghes_edac_lock); return -ENOMEM; } @@ -53,11 +63,14 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev) if (rc < 0) { pr_info(GHES_PFX "Can't register at EDAC core\n"); edac_mc_free(mci); - + mutex_unlock(&ghes_edac_lock); return -ENODEV; } + ghes->mci = mci; + ghes_edac_mc_num++; + mutex_unlock(&ghes_edac_lock); return 0; } EXPORT_SYMBOL_GPL(ghes_edac_register); -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
