EDAC/{i7core,sb,pnd2,skx}: Fix error event severity
Subsystems (6)
Tony Luck
maintainerPATCH 1/1 EDAC/{i7core,sb,pnd2,skx}: Fix error event severity
commit 45bc6098a3e279d8e391d22428396687562797e2 upstream
IA32_MCG_STATUS.RIPV indicates whether the return RIP value pushed onto the stack as part of machine check delivery is valid or not.
Various drivers copied a code fragment that uses the RIPV bit to determine the severity of the error as either HW_EVENT_ERR_UNCORRECTED or HW_EVENT_ERR_FATAL, but this check is reversed (marking errors where RIPV is set as "FATAL").
Reverse the tests so that the error is marked fatal when RIPV is not set.
Reported-by Gabriele Paoloni <[email protected]>
Signed-off-by Tony Luck <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
--- drivers/edac/i7core_edac.c | 4 ++-- drivers/edac/pnd2_edac.c | 2 +- drivers/edac/sb_edac.c | 6 +++--- drivers/edac/skx_common.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-)
drivers/edac/i7core_edac.c +2 -2
@@ -1711,9 +1711,9 @@ static void i7core_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) - tp_event =HW_EVENT_ERR_FATAL ; -else tp_event =HW_EVENT_ERR_UNCORRECTED ; +else + tp_event =HW_EVENT_ERR_FATAL ; }else { tp_event =HW_EVENT_ERR_CORRECTED ; }
drivers/edac/pnd2_edac.c +1 -1
@@ -1155,7 +1155,7 @@ static void pnd2_mce_output_error(struct mem_ctl_info *mci, const struct mce *m,u32 optypenum =GET_BITFIELD (m->status,4 ,6 );int rc; - tp_event = uc_err ? (ripv ?HW_EVENT_ERR_FATAL :HW_EVENT_ERR_UNCORRECTED ) : + tp_event = uc_err ? (ripv ?HW_EVENT_ERR_UNCORRECTED :HW_EVENT_ERR_FATAL ) :HW_EVENT_ERR_CORRECTED ;/*
drivers/edac/sb_edac.c +3 -3
@@ -2981,11 +2981,11 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) { - type ="FATAL" ; - tp_event =HW_EVENT_ERR_FATAL ; - }else { type ="NON_FATAL" ; tp_event =HW_EVENT_ERR_UNCORRECTED ; + }else { + type ="FATAL" ; + tp_event =HW_EVENT_ERR_FATAL ; } }else { type ="CORRECTED" ;
drivers/edac/skx_common.c +3 -3
@@ -490,11 +490,11 @@ static void skx_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) { - type ="FATAL" ; - tp_event =HW_EVENT_ERR_FATAL ; - }else { type ="NON_FATAL" ; tp_event =HW_EVENT_ERR_UNCORRECTED ; + }else { + type ="FATAL" ; + tp_event =HW_EVENT_ERR_FATAL ; } }else { type ="CORRECTED" ;
Signature · 1 line
2.21.1