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
This commit is contained in:
Коммит
0a3b6e452b
|
@ -2071,16 +2071,6 @@ static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci,
|
|||
amd64_handle_ce(mci, info);
|
||||
else if (ecc_type == 1)
|
||||
amd64_handle_ue(mci, info);
|
||||
|
||||
/*
|
||||
* If main error is CE then overflow must be CE. If main error is UE
|
||||
* then overflow is unknown. We'll call the overflow a CE - if
|
||||
* panic_on_ue is set then we're already panic'ed and won't arrive
|
||||
* here. Else, then apparently someone doesn't think that UE's are
|
||||
* catastrophic.
|
||||
*/
|
||||
if (info->nbsh & K8_NBSH_OVERFLOW)
|
||||
edac_mc_handle_ce_no_info(mci, EDAC_MOD_STR " Error Overflow");
|
||||
}
|
||||
|
||||
void amd64_decode_bus_error(int node_id, struct err_regs *regs)
|
||||
|
|
|
@ -365,11 +365,10 @@ static int amd_decode_mce(struct notifier_block *nb, unsigned long val,
|
|||
|
||||
pr_emerg("MC%d_STATUS: ", m->bank);
|
||||
|
||||
pr_cont("%sorrected error, report: %s, MiscV: %svalid, "
|
||||
pr_cont("%sorrected error, other errors lost: %s, "
|
||||
"CPU context corrupt: %s",
|
||||
((m->status & MCI_STATUS_UC) ? "Unc" : "C"),
|
||||
((m->status & MCI_STATUS_EN) ? "yes" : "no"),
|
||||
((m->status & MCI_STATUS_MISCV) ? "" : "in"),
|
||||
((m->status & MCI_STATUS_OVER) ? "yes" : "no"),
|
||||
((m->status & MCI_STATUS_PCC) ? "yes" : "no"));
|
||||
|
||||
/* do the two bits[14:13] together */
|
||||
|
@ -426,11 +425,15 @@ static struct notifier_block amd_mce_dec_nb = {
|
|||
static int __init mce_amd_init(void)
|
||||
{
|
||||
/*
|
||||
* We can decode MCEs for Opteron and later CPUs:
|
||||
* We can decode MCEs for K8, F10h and F11h CPUs:
|
||||
*/
|
||||
if ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) &&
|
||||
(boot_cpu_data.x86 >= 0xf))
|
||||
atomic_notifier_chain_register(&x86_mce_decoder_chain, &amd_mce_dec_nb);
|
||||
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
|
||||
return 0;
|
||||
|
||||
if (boot_cpu_data.x86 < 0xf || boot_cpu_data.x86 > 0x11)
|
||||
return 0;
|
||||
|
||||
atomic_notifier_chain_register(&x86_mce_decoder_chain, &amd_mce_dec_nb);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче