Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'edac_urgent_for_v5.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fix from Borislav Petkov:
"A single fix correcting a reversed error severity determination check
which lead to a recoverable error getting marked as fatal, by Tony
Luck"
* tag 'edac_urgent_for_v5.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
EDAC/{i7core,sb,pnd2,skx}: Fix error event severity
+7
-7
+2
-2
drivers/edac/i7core_edac.c
+2
-2
drivers/edac/i7core_edac.c
···
1710
1710
if (uncorrected_error) {
1711
1711
core_err_cnt = 1;
1712
1712
if (ripv)
1713
-
tp_event = HW_EVENT_ERR_FATAL;
1714
-
else
1715
1713
tp_event = HW_EVENT_ERR_UNCORRECTED;
1714
+
else
1715
+
tp_event = HW_EVENT_ERR_FATAL;
1716
1716
} else {
1717
1717
tp_event = HW_EVENT_ERR_CORRECTED;
1718
1718
}
+1
-1
drivers/edac/pnd2_edac.c
+1
-1
drivers/edac/pnd2_edac.c
···
1155
1155
u32 optypenum = GET_BITFIELD(m->status, 4, 6);
1156
1156
int rc;
1157
1157
1158
-
tp_event = uc_err ? (ripv ? HW_EVENT_ERR_FATAL : HW_EVENT_ERR_UNCORRECTED) :
1158
+
tp_event = uc_err ? (ripv ? HW_EVENT_ERR_UNCORRECTED : HW_EVENT_ERR_FATAL) :
1159
1159
HW_EVENT_ERR_CORRECTED;
1160
1160
1161
1161
/*
+2
-2
drivers/edac/sb_edac.c
+2
-2
drivers/edac/sb_edac.c
···
2982
2982
if (uncorrected_error) {
2983
2983
core_err_cnt = 1;
2984
2984
if (ripv) {
2985
-
tp_event = HW_EVENT_ERR_FATAL;
2986
-
} else {
2987
2985
tp_event = HW_EVENT_ERR_UNCORRECTED;
2986
+
} else {
2987
+
tp_event = HW_EVENT_ERR_FATAL;
2988
2988
}
2989
2989
} else {
2990
2990
tp_event = HW_EVENT_ERR_CORRECTED;
+2
-2
drivers/edac/skx_common.c
+2
-2
drivers/edac/skx_common.c
···
493
493
if (uncorrected_error) {
494
494
core_err_cnt = 1;
495
495
if (ripv) {
496
-
tp_event = HW_EVENT_ERR_FATAL;
497
-
} else {
498
496
tp_event = HW_EVENT_ERR_UNCORRECTED;
497
+
} else {
498
+
tp_event = HW_EVENT_ERR_FATAL;
499
499
}
500
500
} else {
501
501
tp_event = HW_EVENT_ERR_CORRECTED;