Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Do not report error overflow as a separate error
MCE, AMD: Limit MCE decoding to current families for now
+10
-17
-10
drivers/edac/amd64_edac.c
-10
drivers/edac/amd64_edac.c
···
2071
2071
amd64_handle_ce(mci, info);
2072
2072
else if (ecc_type == 1)
2073
2073
amd64_handle_ue(mci, info);
2074
-
2075
-
/*
2076
-
* If main error is CE then overflow must be CE. If main error is UE
2077
-
* then overflow is unknown. We'll call the overflow a CE - if
2078
-
* panic_on_ue is set then we're already panic'ed and won't arrive
2079
-
* here. Else, then apparently someone doesn't think that UE's are
2080
-
* catastrophic.
2081
-
*/
2082
-
if (info->nbsh & K8_NBSH_OVERFLOW)
2083
-
edac_mc_handle_ce_no_info(mci, EDAC_MOD_STR " Error Overflow");
2084
2074
}
2085
2075
2086
2076
void amd64_decode_bus_error(int node_id, struct err_regs *regs)
+10
-7
drivers/edac/edac_mce_amd.c
+10
-7
drivers/edac/edac_mce_amd.c
···
365
365
366
366
pr_emerg("MC%d_STATUS: ", m->bank);
367
367
368
-
pr_cont("%sorrected error, report: %s, MiscV: %svalid, "
368
+
pr_cont("%sorrected error, other errors lost: %s, "
369
369
"CPU context corrupt: %s",
370
370
((m->status & MCI_STATUS_UC) ? "Unc" : "C"),
371
-
((m->status & MCI_STATUS_EN) ? "yes" : "no"),
372
-
((m->status & MCI_STATUS_MISCV) ? "" : "in"),
371
+
((m->status & MCI_STATUS_OVER) ? "yes" : "no"),
373
372
((m->status & MCI_STATUS_PCC) ? "yes" : "no"));
374
373
375
374
/* do the two bits[14:13] together */
···
425
426
static int __init mce_amd_init(void)
426
427
{
427
428
/*
428
-
* We can decode MCEs for Opteron and later CPUs:
429
+
* We can decode MCEs for K8, F10h and F11h CPUs:
429
430
*/
430
-
if ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) &&
431
-
(boot_cpu_data.x86 >= 0xf))
432
-
atomic_notifier_chain_register(&x86_mce_decoder_chain, &amd_mce_dec_nb);
431
+
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
432
+
return 0;
433
+
434
+
if (boot_cpu_data.x86 < 0xf || boot_cpu_data.x86 > 0x11)
435
+
return 0;
436
+
437
+
atomic_notifier_chain_register(&x86_mce_decoder_chain, &amd_mce_dec_nb);
433
438
434
439
return 0;
435
440
}