Commit d9232cb7 authored Aug 23, 2020 by Linus Torvalds

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

parents 9d045ed1 45bc6098

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;