Merge tag 'clk-for-linus-3.15' of git://git.linaro.org/people/mike.turquette/linux

[firefly-linux-kernel-4.4.55.git] / drivers / edac / sb_edac.c

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 54e2abe671f70acef2965ec5f74cd8b877ac7089..deea0dc9999bf1bb54d58fd2d43d4c98036d690e 100644 (file)
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -7,7 +7,7 @@
  * GNU General Public License version 2 only.
  *
  * Copyright (c) 2011 by:
- *      Mauro Carvalho Chehab <mchehab@redhat.com>
+ *      Mauro Carvalho Chehab
  */
 
 #include <linux/module.h>
@@ -1263,7 +1263,7 @@ static int sbridge_get_onedevice(struct pci_dev **prev,
        struct pci_dev *pdev = NULL;
        u8 bus = 0;
 
-       sbridge_printk(KERN_INFO,
+       sbridge_printk(KERN_DEBUG,
                "Seeking for: dev %02x.%d PCI ID %04x:%04x\n",
                dev_descr->dev, dev_descr->func,
                PCI_VENDOR_ID_INTEL, dev_descr->dev_id);
@@ -1828,6 +1828,7 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,
        struct mce *mce = (struct mce *)data;
        struct mem_ctl_info *mci;
        struct sbridge_pvt *pvt;
+       char *type;
 
        if (get_edac_report_status() == EDAC_REPORTING_DISABLED)
                return NOTIFY_DONE;
@@ -1846,17 +1847,23 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,
        if ((mce->status & 0xefff) >> 7 != 1)
                return NOTIFY_DONE;
 
-       printk("sbridge: HANDLING MCE MEMORY ERROR\n");
+       if (mce->mcgstatus & MCG_STATUS_MCIP)
+               type = "Exception";
+       else
+               type = "Event";
+
+       sbridge_mc_printk(mci, KERN_DEBUG, "HANDLING MCE MEMORY ERROR\n");
 
-       printk("CPU %d: Machine Check Exception: %Lx Bank %d: %016Lx\n",
-              mce->extcpu, mce->mcgstatus, mce->bank, mce->status);
-       printk("TSC %llx ", mce->tsc);
-       printk("ADDR %llx ", mce->addr);
-       printk("MISC %llx ", mce->misc);
+       sbridge_mc_printk(mci, KERN_DEBUG, "CPU %d: Machine Check %s: %Lx "
+                         "Bank %d: %016Lx\n", mce->extcpu, type,
+                         mce->mcgstatus, mce->bank, mce->status);
+       sbridge_mc_printk(mci, KERN_DEBUG, "TSC %llx ", mce->tsc);
+       sbridge_mc_printk(mci, KERN_DEBUG, "ADDR %llx ", mce->addr);
+       sbridge_mc_printk(mci, KERN_DEBUG, "MISC %llx ", mce->misc);
 
-       printk("PROCESSOR %u:%x TIME %llu SOCKET %u APIC %x\n",
-               mce->cpuvendor, mce->cpuid, mce->time,
-               mce->socketid, mce->apicid);
+       sbridge_mc_printk(mci, KERN_DEBUG, "PROCESSOR %u:%x TIME %llu SOCKET "
+                         "%u APIC %x\n", mce->cpuvendor, mce->cpuid,
+                         mce->time, mce->socketid, mce->apicid);
 
        /* Only handle if it is the right mc controller */
        if (cpu_data(mce->cpu).phys_proc_id != pvt->sbridge_dev->mc)
@@ -2176,7 +2183,7 @@ module_param(edac_op_state, int, 0444);
 MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
+MODULE_AUTHOR("Mauro Carvalho Chehab");
 MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
 MODULE_DESCRIPTION("MC Driver for Intel Sandy Bridge and Ivy Bridge memory controllers - "
                   SBRIDGE_REVISION);