EDAC/mce_amd: Always load on SMCA systems

MCA error decoding on SMCA systems is not dependent on family. Return
success early if the system supports the SMCA feature.

Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200110015651.14887-3-Yazen.Ghannam@amd.com

diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index aa6ea53f7d14c1f1e513b639416623555e36b461..524c63fdad42cfafbe6698cfc4e3f7b07b46ff06 100644 (file)
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -1189,6 +1189,11 @@ static int __init mce_amd_init(void)
        if (!fam_ops)
                return -ENOMEM;
 
+       if (boot_cpu_has(X86_FEATURE_SMCA)) {
+               xec_mask = 0x3f;
+               goto out;
+       }
+
        switch (c->x86) {
        case 0xf:
                fam_ops->mc0_mce = k8_mc0_mce;
@@ -1237,11 +1242,8 @@ static int __init mce_amd_init(void)
 
        case 0x17:
        case 0x18:
-               xec_mask = 0x3f;
-               if (!boot_cpu_has(X86_FEATURE_SMCA)) {
-                       printk(KERN_WARNING "Decoding supported only on Scalable MCA processors.\n");
-                       goto err_out;
-               }
+               pr_warn("Decoding supported only on Scalable MCA processors.\n");
+               goto err_out;
                break;
 
        default:
@@ -1249,6 +1251,7 @@ static int __init mce_amd_init(void)
                goto err_out;
        }
 
+out:
        pr_info("MCE: In-kernel MCE decoding enabled.\n");
 
        mce_register_decode_chain(&amd_mce_dec_nb);