Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[~andy/linux] / drivers / acpi / acpi_extlog.c

diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c
index a6869e110ce5650a86b6f666bc28347031c16275..c4a5d87ede7e81cb16ada28d6bf896351b42e79b 100644 (file)
--- a/drivers/acpi/acpi_extlog.c
+++ b/drivers/acpi/acpi_extlog.c
@@ -9,9 +9,9 @@
 
 #include <linux/module.h>
 #include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
 #include <linux/cper.h>
 #include <linux/ratelimit.h>
+#include <linux/edac.h>
 #include <asm/cpu.h>
 #include <asm/mce.h>
 
@@ -20,11 +20,9 @@
 #define EXT_ELOG_ENTRY_MASK    GENMASK_ULL(51, 0) /* elog entry address mask */
 
 #define EXTLOG_DSM_REV         0x0
-#define        EXTLOG_FN_QUERY         0x0
 #define        EXTLOG_FN_ADDR          0x1
 
 #define FLAG_OS_OPTIN          BIT(0)
-#define EXTLOG_QUERY_L1_EXIST  BIT(1)
 #define ELOG_ENTRY_VALID       (1ULL<<63)
 #define ELOG_ENTRY_LEN         0x1000
 
@@ -43,7 +41,9 @@ struct extlog_l1_head {
        u8  rev1[12];
 };
 
-static u8 extlog_dsm_uuid[] = "663E35AF-CC10-41A4-88EA-5470AF055295";
+static int old_edac_report_status;
+
+static u8 extlog_dsm_uuid[] __initdata = "663E35AF-CC10-41A4-88EA-5470AF055295";
 
 /* L1 table related physical address */
 static u64 elog_base;
@@ -150,65 +150,30 @@ static int extlog_print(struct notifier_block *nb, unsigned long val,
 
        rc = print_extlog_rcd(NULL, (struct acpi_generic_status *)elog_buf, cpu);
 
-       return NOTIFY_DONE;
+       return NOTIFY_STOP;
 }
 
-static int extlog_get_dsm(acpi_handle handle, int rev, int func, u64 *ret)
+static bool __init extlog_get_l1addr(void)
 {
-       struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
-       struct acpi_object_list input;
-       union acpi_object params[4], *obj;
        u8 uuid[16];
-       int i;
+       acpi_handle handle;
+       union acpi_object *obj;
 
        acpi_str_to_uuid(extlog_dsm_uuid, uuid);
-       input.count = 4;
-       input.pointer = params;
-       params[0].type = ACPI_TYPE_BUFFER;
-       params[0].buffer.length = 16;
-       params[0].buffer.pointer = uuid;
-       params[1].type = ACPI_TYPE_INTEGER;
-       params[1].integer.value = rev;
-       params[2].type = ACPI_TYPE_INTEGER;
-       params[2].integer.value = func;
-       params[3].type = ACPI_TYPE_PACKAGE;
-       params[3].package.count = 0;
-       params[3].package.elements = NULL;
-
-       if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DSM", &input, &buf)))
-               return -1;
-
-       *ret = 0;
-       obj = (union acpi_object *)buf.pointer;
-       if (obj->type == ACPI_TYPE_INTEGER) {
-               *ret = obj->integer.value;
-       } else if (obj->type == ACPI_TYPE_BUFFER) {
-               if (obj->buffer.length <= 8) {
-                       for (i = 0; i < obj->buffer.length; i++)
-                               *ret |= (obj->buffer.pointer[i] << (i * 8));
-               }
-       }
-       kfree(buf.pointer);
-
-       return 0;
-}
-
-static bool extlog_get_l1addr(void)
-{
-       acpi_handle handle;
-       u64 ret;
 
        if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
                return false;
-
-       if (extlog_get_dsm(handle, EXTLOG_DSM_REV, EXTLOG_FN_QUERY, &ret) ||
-           !(ret & EXTLOG_QUERY_L1_EXIST))
+       if (!acpi_check_dsm(handle, uuid, EXTLOG_DSM_REV, 1 << EXTLOG_FN_ADDR))
                return false;
-
-       if (extlog_get_dsm(handle, EXTLOG_DSM_REV, EXTLOG_FN_ADDR, &ret))
+       obj = acpi_evaluate_dsm_typed(handle, uuid, EXTLOG_DSM_REV,
+                                     EXTLOG_FN_ADDR, NULL, ACPI_TYPE_INTEGER);
+       if (!obj) {
                return false;
+       } else {
+               l1_dirbase = obj->integer.value;
+               ACPI_FREE(obj);
+       }
 
-       l1_dirbase = ret;
        /* Spec says L1 directory must be 4K aligned, bail out if it isn't */
        if (l1_dirbase & ((1 << 12) - 1)) {
                pr_warn(FW_BUG "L1 Directory is invalid at physical %llx\n",
@@ -231,8 +196,12 @@ static int __init extlog_init(void)
        u64 cap;
        int rc;
 
-       rc = -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;
@@ -287,6 +256,12 @@ static int __init extlog_init(void)
        if (elog_buf == NULL)
                goto err_release_elog;
 
+       /*
+        * eMCA event report method has higher priority than EDAC method,
+        * unless EDAC event report method is mandatory.
+        */
+       old_edac_report_status = get_edac_report_status();
+       set_edac_report_status(EDAC_REPORTING_DISABLED);
        mce_register_decode_chain(&extlog_mce_dec);
        /* enable OS to be involved to take over management from BIOS */
        ((struct extlog_l1_head *)extlog_l1_addr)->flags |= FLAG_OS_OPTIN;
@@ -308,6 +283,7 @@ err:
 
 static void __exit extlog_exit(void)
 {
+       set_edac_report_status(old_edac_report_status);
        mce_unregister_decode_chain(&extlog_mce_dec);
        ((struct extlog_l1_head *)extlog_l1_addr)->flags &= ~FLAG_OS_OPTIN;
        if (extlog_l1_addr)