Commit ebbe914b9e0cd37fed65959e778f3e557506c951
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
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
Showing 4 changed files Side-by-side Diff
drivers/edac/cpc925_edac.c
| ... | ... | @@ -562,7 +562,7 @@ |
| 562 | 562 | |
| 563 | 563 | if (apiexcp & UECC_EXCP_DETECTED) { |
| 564 | 564 | cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n"); |
| 565 | - edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, | |
| 565 | + edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, | |
| 566 | 566 | pfn, offset, 0, |
| 567 | 567 | csrow, -1, -1, |
| 568 | 568 | mci->ctl_name, ""); |
drivers/edac/e7xxx_edac.c
| ... | ... | @@ -226,7 +226,7 @@ |
| 226 | 226 | static void process_ce_no_info(struct mem_ctl_info *mci) |
| 227 | 227 | { |
| 228 | 228 | edac_dbg(3, "\n"); |
| 229 | - edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0, -1, -1, -1, | |
| 229 | + edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, 0, 0, 0, -1, -1, -1, | |
| 230 | 230 | "e7xxx CE log register overflow", ""); |
| 231 | 231 | } |
| 232 | 232 |
drivers/edac/i3200_edac.c
| ... | ... | @@ -242,11 +242,11 @@ |
| 242 | 242 | -1, -1, |
| 243 | 243 | "i3000 UE", ""); |
| 244 | 244 | } else if (log & I3200_ECCERRLOG_CE) { |
| 245 | - edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, | |
| 245 | + edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, | |
| 246 | 246 | 0, 0, eccerrlog_syndrome(log), |
| 247 | 247 | eccerrlog_row(channel, log), |
| 248 | 248 | -1, -1, |
| 249 | - "i3000 UE", ""); | |
| 249 | + "i3000 CE", ""); | |
| 250 | 250 | } |
| 251 | 251 | } |
| 252 | 252 | } |
drivers/edac/i82860_edac.c
| ... | ... | @@ -124,7 +124,7 @@ |
| 124 | 124 | dimm->location[0], dimm->location[1], -1, |
| 125 | 125 | "i82860 UE", ""); |
| 126 | 126 | else |
| 127 | - edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, | |
| 127 | + edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, | |
| 128 | 128 | info->eap, 0, info->derrsyn, |
| 129 | 129 | dimm->location[0], dimm->location[1], -1, |
| 130 | 130 | "i82860 CE", ""); |