RAS, extlog: Adjust init flow

Unless the platform has eMCA related capability, don't
need to check if there is conflict with EDAC driver.

Signed-off-by: Chen, Gong <gong.chen@linux.intel.com>
Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c
index a99d4a6156dc..0ad6f389d922 100644
--- a/drivers/acpi/acpi_extlog.c
+++ b/drivers/acpi/acpi_extlog.c
@@ -223,19 +223,16 @@ static int __init extlog_init(void)
         u64 cap;
         int rc;
 
+        rdmsrl(MSR_IA32_MCG_CAP, cap);
+
+        if (!(cap & MCG_ELOG_P) || !extlog_get_l1addr())
+                return -ENODEV;
+
         if (get_edac_report_status() == EDAC_REPORTING_FORCE) {
                 pr_warn("Not loading eMCA, error reporting force-enabled through EDAC.\n");
                 return -EPERM;
         }
 
-        rc = -ENODEV;
-        rdmsrl(MSR_IA32_MCG_CAP, cap);
-        if (!(cap & MCG_ELOG_P))
-                return rc;
-
-        if (!extlog_get_l1addr())
-                return rc;
-
         rc = -EINVAL;
         /* get L1 header to fetch necessary information */
         l1_hdr_size = sizeof(struct extlog_l1_head);