Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 15:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

EDAC, MCE, AMD: Add MCE decoding for F15h M60h

Browse Source 
Add decoding logic for new Fam15h model 60h.

Tested using mce_amd_inj module and works fine.

Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Link: http://lkml.kernel.org/r/1405098795-4678-1-git-send-email-Aravind.Gopalakrishnan@amd.com
[ Boris: simplify a bit. ]
Signed-off-by: Borislav Petkov <bp@suse.de>
This commit is contained in:
Aravind Gopalakrishnan 2014-07-14 16:58:19 +02:00 committed by Borislav Petkov
parent 791b470684
commit eba4bfb34d
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/edac/mce_amd.c
View File

@ -78,7 +78,8 @@ static const char * const f15h_mc1_mce_desc[] = {
"uop queue", "uop queue",
"insn buffer", "insn buffer",
"predecode buffer", "predecode buffer",
"fetch address FIFO" "fetch address FIFO",
"dispatch uop queue"
}; };
static const char * const f15h_mc2_mce_desc[] = { static const char * const f15h_mc2_mce_desc[] = {
@ -267,6 +268,12 @@ static bool f15h_mc0_mce(u16 ec, u8 xec)
pr_cont("System Read Data Error.\n"); pr_cont("System Read Data Error.\n");
else else
pr_cont(" Internal error condition type %d.\n", xec); pr_cont(" Internal error condition type %d.\n", xec);
} else if (INT_ERROR(ec)) {
if (xec <= 0x1f)
pr_cont("Hardware Assert.\n");
else
ret = false;
} else } else
ret = false; ret = false;
@ -373,7 +380,7 @@ static bool f15h_mc1_mce(u16 ec, u8 xec)
pr_cont("%s.\n", f15h_mc1_mce_desc[xec-4]); pr_cont("%s.\n", f15h_mc1_mce_desc[xec-4]);
break; break;
case 0x11 ... 0x14: case 0x11 ... 0x15:
pr_cont("Decoder %s parity error.\n", f15h_mc1_mce_desc[xec-4]); pr_cont("Decoder %s parity error.\n", f15h_mc1_mce_desc[xec-4]);
break; break;
@ -397,10 +404,20 @@ static void decode_mc1_mce(struct mce *m)
bool k8 = (boot_cpu_data.x86 == 0xf && (m->status & BIT_64(58))); bool k8 = (boot_cpu_data.x86 == 0xf && (m->status & BIT_64(58)));
pr_cont("during %s.\n", (k8 ? "system linefill" : "NB data read")); pr_cont("during %s.\n", (k8 ? "system linefill" : "NB data read"));
} else if (INT_ERROR(ec)) {
if (xec <= 0x3f)
pr_cont("Hardware Assert.\n");
else
goto wrong_mc1_mce;
} else if (fam_ops->mc1_mce(ec, xec)) } else if (fam_ops->mc1_mce(ec, xec))
; ;
else else
pr_emerg(HW_ERR "Corrupted MC1 MCE info?\n"); goto wrong_mc1_mce;
return;
wrong_mc1_mce:
pr_emerg(HW_ERR "Corrupted MC1 MCE info?\n");
} }
static bool k8_mc2_mce(u16 ec, u8 xec) static bool k8_mc2_mce(u16 ec, u8 xec)
@ -468,6 +485,11 @@ static bool f15h_mc2_mce(u16 ec, u8 xec)
default: default:
ret = false; ret = false;
} }
} else if (INT_ERROR(ec)) {
if (xec <= 0x3f)
pr_cont("Hardware Assert.\n");
else
ret = false;
} }
return ret; return ret;
@ -615,6 +637,7 @@ static void decode_mc4_mce(struct mce *m)
static void decode_mc5_mce(struct mce *m) static void decode_mc5_mce(struct mce *m)
{ {
struct cpuinfo_x86 *c = &boot_cpu_data; struct cpuinfo_x86 *c = &boot_cpu_data;
u16 ec = EC(m->status);
u8 xec = XEC(m->status, xec_mask); u8 xec = XEC(m->status, xec_mask);
if (c->x86 == 0xf || c->x86 == 0x11) if (c->x86 == 0xf || c->x86 == 0x11)
@ -622,6 +645,14 @@ static void decode_mc5_mce(struct mce *m)
pr_emerg(HW_ERR "MC5 Error: "); pr_emerg(HW_ERR "MC5 Error: ");
if (INT_ERROR(ec)) {
if (xec <= 0x1f) {
pr_cont("Hardware Assert.\n");
return;
} else
goto wrong_mc5_mce;
}
if (xec == 0x0 || xec == 0xc) if (xec == 0x0 || xec == 0xc)
pr_cont("%s.\n", mc5_mce_desc[xec]); pr_cont("%s.\n", mc5_mce_desc[xec]);
else if (xec <= 0xd) else if (xec <= 0xd)
@ -642,6 +673,10 @@ static void decode_mc6_mce(struct mce *m)
pr_emerg(HW_ERR "MC6 Error: "); pr_emerg(HW_ERR "MC6 Error: ");
switch (xec) { switch (xec) {
case 0x0:
pr_cont("Hardware Assertion");
break;
case 0x1: case 0x1:
pr_cont("Free List"); pr_cont("Free List");
break; break;
@ -857,7 +892,8 @@ static int __init mce_amd_init(void)
break; break;
case 0x15: case 0x15:
xec_mask = 0x1f; xec_mask = c->x86_model == 0x60 ? 0x3f : 0x1f;
fam_ops->mc0_mce = f15h_mc0_mce; fam_ops->mc0_mce = f15h_mc0_mce;
fam_ops->mc1_mce = f15h_mc1_mce; fam_ops->mc1_mce = f15h_mc1_mce;
fam_ops->mc2_mce = f15h_mc2_mce; fam_ops->mc2_mce = f15h_mc2_mce;