aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2011-08-24 11:47:11 -0400
committerBorislav Petkov <borislav.petkov@amd.com>2011-10-06 06:34:03 -0400
commit295d8cda2689a74ae88bcece7b4cfe0bf8bf9a91 (patch)
tree11d3af802f505f6e2198d87fcefffc8cccd2bd07 /drivers
parent086be786ca10af7a9783ab06a9b5594c2c6facbf (diff)
EDAC, MCE, AMD: Drop local coreid reporting
MCE decoding code is reporting the core which encountered the error unconditionally now so drop this piece. Besides, it reported the coreid in the local processor package which is not that valuable as a datapoint. Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/edac/mce_amd.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index a6d25dac8a88..b81c5da542c0 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -597,26 +597,8 @@ void amd_decode_nb_mce(int node_id, struct mce *m, u32 nbcfg)
597 struct cpuinfo_x86 *c = &boot_cpu_data; 597 struct cpuinfo_x86 *c = &boot_cpu_data;
598 u16 ec = EC(m->status); 598 u16 ec = EC(m->status);
599 u8 xec = XEC(m->status, 0x1f); 599 u8 xec = XEC(m->status, 0x1f);
600 u32 nbsh = (u32)(m->status >> 32);
601 int core = -1;
602 600
603 pr_emerg(HW_ERR "Northbridge Error (node %d", node_id); 601 pr_emerg(HW_ERR "Northbridge Error (node %d): ", node_id);
604
605 /* F10h, revD can disable ErrCpu[3:0] through ErrCpuVal */
606 if (c->x86 == 0x10 && c->x86_model > 7) {
607 if (nbsh & NBSH_ERR_CPU_VAL)
608 core = nbsh & nb_err_cpumask;
609 } else {
610 u8 assoc_cpus = nbsh & nb_err_cpumask;
611
612 if (assoc_cpus > 0)
613 core = fls(assoc_cpus) - 1;
614 }
615
616 if (core >= 0)
617 pr_cont(", core %d): ", core);
618 else
619 pr_cont("): ");
620 602
621 switch (xec) { 603 switch (xec) {
622 case 0x2: 604 case 0x2: