Correct severity of reported errors in several EDAC drivers. From Jason
Baron. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUTlYbAAoJEBLB8Bhh3lVKB8QP/iL4O/Wn3yIlowvDfvJc/G+L E1ShY0aIs+/aNhp4jb6+pr5VJ2PgQwEu1JWxxJ9wNox9l925demaQ4DDfFpmC4px BVu7nlTYsiGH6tuouswbvQgYZt4VCmGV1U7hmMCp4VJFvtNlRMWVBsxVCXdwm2hI h1AnwSCcVrpUZbZKSLIths2zpQZurB3AsRdWc8L4EW+HoXGWLsg9E0NamqZ+ZESX zSyA63kuuXpwjtByQbHC4zElrdUwJuVsaNF893RwrhCcfWB4uc7VVMWVw7NsvNL4 OSPY/lIUfZXQlzT6AF4d68hsoIhSdlb2GVU7dInOXXxoCPpB+m7fdkbDEnJbaxIa aeLZM1Ztt340JpmwSGfP1wW8KcC6bm2RGpRm3pUBrQ6+Mrh1OEUC0BYCkrIt74G2 3Vir3hG4XhWrvgCtWgq39KUlmQ3qYr9jfVKCqE4NgHL5ie7I6boxX+ZJGqIdz6dV KD7MWULvsgO1C71cPjyciadN9r1uLP5aCNeVtKVm2P5wIZ0p/bDZZ/mPpYj4+0G0 uenZ0rj/MXSYg+wPJaslpcm3NMiiW9Z0FEtTnEP0zL1/uwPd61Wj9s8A1c0DRF5H ttWbwNwoajNGjVBPWF/+aFteHGqyJvwgHTqxilVm3joUIeNMEQtI43SHcNrh5AhC CgZuyjD9oCz0Z1F/fjnM =upJs -----END PGP SIGNATURE----- Merge tag 'edac_fixes_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp Pull EDAC fixes from Borislav Petkov: "Correct severity of reported errors in several EDAC drivers. From Jason Baron" * tag 'edac_fixes_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: e7xxx_edac: Report CE events properly cpc925_edac: Report UE events properly i82860_edac: Report CE events properly i3200_edac: Report CE events properly
This commit is contained in:
Коммит
ebbe914b9e
|
@ -562,7 +562,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci)
|
||||||
|
|
||||||
if (apiexcp & UECC_EXCP_DETECTED) {
|
if (apiexcp & UECC_EXCP_DETECTED) {
|
||||||
cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n");
|
cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n");
|
||||||
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
|
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
|
||||||
pfn, offset, 0,
|
pfn, offset, 0,
|
||||||
csrow, -1, -1,
|
csrow, -1, -1,
|
||||||
mci->ctl_name, "");
|
mci->ctl_name, "");
|
||||||
|
|
|
@ -226,7 +226,7 @@ static void process_ce(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
|
||||||
static void process_ce_no_info(struct mem_ctl_info *mci)
|
static void process_ce_no_info(struct mem_ctl_info *mci)
|
||||||
{
|
{
|
||||||
edac_dbg(3, "\n");
|
edac_dbg(3, "\n");
|
||||||
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0, -1, -1, -1,
|
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, 0, 0, 0, -1, -1, -1,
|
||||||
"e7xxx CE log register overflow", "");
|
"e7xxx CE log register overflow", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -242,11 +242,11 @@ static void i3200_process_error_info(struct mem_ctl_info *mci,
|
||||||
-1, -1,
|
-1, -1,
|
||||||
"i3000 UE", "");
|
"i3000 UE", "");
|
||||||
} else if (log & I3200_ECCERRLOG_CE) {
|
} else if (log & I3200_ECCERRLOG_CE) {
|
||||||
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
|
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
|
||||||
0, 0, eccerrlog_syndrome(log),
|
0, 0, eccerrlog_syndrome(log),
|
||||||
eccerrlog_row(channel, log),
|
eccerrlog_row(channel, log),
|
||||||
-1, -1,
|
-1, -1,
|
||||||
"i3000 UE", "");
|
"i3000 CE", "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -124,7 +124,7 @@ static int i82860_process_error_info(struct mem_ctl_info *mci,
|
||||||
dimm->location[0], dimm->location[1], -1,
|
dimm->location[0], dimm->location[1], -1,
|
||||||
"i82860 UE", "");
|
"i82860 UE", "");
|
||||||
else
|
else
|
||||||
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
|
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
|
||||||
info->eap, 0, info->derrsyn,
|
info->eap, 0, info->derrsyn,
|
||||||
dimm->location[0], dimm->location[1], -1,
|
dimm->location[0], dimm->location[1], -1,
|
||||||
"i82860 CE", "");
|
"i82860 CE", "");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче