EDAC: Check for GHES preference in the chipset-specific EDAC drivers

Call ghes_get_devices() to check whether ghes_edac should be used on the
platform where it is preferred over the corresponding chipset-specific
EDAC driver.

Unlike the existing edac_get_owner() check, the ghes_get_devices() check
works independent to the module_init ordering.

  [ bp: Massage. ]

Suggested-by: Toshi Kani <toshi.kani@hpe.com>
Signed-off-by: Jia He <justin.he@arm.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20221010023559.69655-6-justin.he@arm.com

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 2f854fe..e3318e5 100644 (file)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -4329,6 +4329,9 @@ static int __init amd64_edac_init(void)
        int err = -ENODEV;
        int i;
 
+       if (ghes_get_devices())
+               return -EBUSY;
+
        owner = edac_get_owner();
        if (owner && strncmp(owner, EDAC_MOD_STR, sizeof(EDAC_MOD_STR)))
                return -EBUSY;

diff --git a/drivers/edac/armada_xp_edac.c b/drivers/edac/armada_xp_edac.c
index 038abbb..c4bd2fb 100644 (file)
--- a/drivers/edac/armada_xp_edac.c
+++ b/drivers/edac/armada_xp_edac.c
@@ -599,6 +599,9 @@ static int __init armada_xp_edac_init(void)
 {
        int res;
 
+       if (ghes_get_devices())
+               return -EBUSY;
+
        /* only polling is supported */
        edac_op_state = EDAC_OPSTATE_POLL;
 

diff --git a/drivers/edac/edac_module.h b/drivers/edac/edac_module.h
index 50ed9f2..763c076 100644 (file)
--- a/drivers/edac/edac_module.h
+++ b/drivers/edac/edac_module.h
@@ -11,6 +11,7 @@
 #ifndef        __EDAC_MODULE_H__
 #define        __EDAC_MODULE_H__
 
+#include <acpi/ghes.h>
 #include "edac_mc.h"
 #include "edac_pci.h"
 #include "edac_device.h"

diff --git a/drivers/edac/i10nm_base.c b/drivers/edac/i10nm_base.c
index a22ea05..ba77c79 100644 (file)
--- a/drivers/edac/i10nm_base.c
+++ b/drivers/edac/i10nm_base.c
@@ -756,6 +756,9 @@ static int __init i10nm_init(void)
 
        edac_dbg(2, "\n");
 
+       if (ghes_get_devices())
+               return -EBUSY;
+
        owner = edac_get_owner();
        if (owner && strncmp(owner, EDAC_MOD_STR, sizeof(EDAC_MOD_STR)))
                return -EBUSY;

diff --git a/drivers/edac/igen6_edac.c b/drivers/edac/igen6_edac.c
index a07bbfd..d33c666 100644 (file)
--- a/drivers/edac/igen6_edac.c
+++ b/drivers/edac/igen6_edac.c
@@ -1271,6 +1271,9 @@ static int __init igen6_init(void)
 
        edac_dbg(2, "\n");
 
+       if (ghes_get_devices())
+               return -EBUSY;
+
        owner = edac_get_owner();
        if (owner && strncmp(owner, EDAC_MOD_STR, sizeof(EDAC_MOD_STR)))
                return -ENODEV;

diff --git a/drivers/edac/layerscape_edac.c b/drivers/edac/layerscape_edac.c
index 94cac76..35ceaca 100644 (file)
--- a/drivers/edac/layerscape_edac.c
+++ b/drivers/edac/layerscape_edac.c
@@ -38,6 +38,9 @@ static int __init fsl_ddr_mc_init(void)
 {
        int res;
 
+       if (ghes_get_devices())
+               return -EBUSY;
+
        /* make sure error reporting method is sane */
        switch (edac_op_state) {
        case EDAC_OPSTATE_POLL:

diff --git a/drivers/edac/pnd2_edac.c b/drivers/edac/pnd2_edac.c
index a20b299..2b306f2 100644 (file)
--- a/drivers/edac/pnd2_edac.c
+++ b/drivers/edac/pnd2_edac.c
@@ -1528,6 +1528,9 @@ static int __init pnd2_init(void)
 
        edac_dbg(2, "\n");
 
+       if (ghes_get_devices())
+               return -EBUSY;
+
        owner = edac_get_owner();
        if (owner && strncmp(owner, EDAC_MOD_STR, sizeof(EDAC_MOD_STR)))
                return -EBUSY;

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 8e39370..0c779a0 100644 (file)
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -3634,6 +3634,9 @@ static int __init sbridge_init(void)
 
        edac_dbg(2, "\n");
 
+       if (ghes_get_devices())
+               return -EBUSY;
+
        owner = edac_get_owner();
        if (owner && strncmp(owner, EDAC_MOD_STR, sizeof(EDAC_MOD_STR)))
                return -EBUSY;

diff --git a/drivers/edac/skx_base.c b/drivers/edac/skx_base.c
index 7e2762f..9397abb 100644 (file)
--- a/drivers/edac/skx_base.c
+++ b/drivers/edac/skx_base.c
@@ -653,6 +653,9 @@ static int __init skx_init(void)
 
        edac_dbg(2, "\n");
 
+       if (ghes_get_devices())
+               return -EBUSY;
+
        owner = edac_get_owner();
        if (owner && strncmp(owner, EDAC_MOD_STR, sizeof(EDAC_MOD_STR)))
                return -EBUSY;

diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c
index f136740..0bcd9f0 100644 (file)
--- a/drivers/edac/thunderx_edac.c
+++ b/drivers/edac/thunderx_edac.c
@@ -2114,6 +2114,9 @@ static int __init thunderx_edac_init(void)
 {
        int rc = 0;
 
+       if (ghes_get_devices())
+               return -EBUSY;
+
        rc = pci_register_driver(&thunderx_lmc_driver);
        if (rc)
                return rc;

diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c
index 5408140..c52b9dd 100644 (file)
--- a/drivers/edac/xgene_edac.c
+++ b/drivers/edac/xgene_edac.c
@@ -2004,6 +2004,9 @@ static int __init xgene_edac_init(void)
 {
        int rc;
 
+       if (ghes_get_devices())
+               return -EBUSY;
+
        /* Make sure error reporting method is sane */
        switch (edac_op_state) {
        case EDAC_OPSTATE_POLL: