Commit 45bc6098 authored by Tony Luck's avatar Tony Luck Committed by Borislav Petkov
Browse files

EDAC/{i7core,sb,pnd2,skx}: Fix error event severity 



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: default avatarGabriele Paoloni <gabriele.paoloni@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20200707194324.14884-1-tony.luck@intel.com
parent 9123e3a7

drivers/edac/i7core_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -1710,9 +1710,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
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -2982,9 +2982,9 @@ static void sbridge_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/skx_common.c

+2 −2
Original line number Diff line number Diff line
@@ -493,9 +493,9 @@ static void skx_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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE