Commit d2415e2e authored by Qiuxu Zhuo's avatar Qiuxu Zhuo Committed by Tony Luck
Browse files

EDAC/skx_common: Delete duplicated and unreachable code 



skx_mce_check_error() returns early if the error isn't from memory.
So when skx_mce_output_error() is invoked from skx_mce_check_error(),
it doesn't need to re-check whether the error is from memory. Delete
the duplicated and unreachable code from skx_mce_output_error().

Signed-off-by: default avatarQiuxu Zhuo <qiuxu.zhuo@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/all/20230113032802.41752-1-qiuxu.zhuo@intel.com
parent 6e8746cb

drivers/edac/skx_common.c

+21 −37
Original line number Diff line number Diff line
@@ -560,22 +560,6 @@ static void skx_mce_output_error(struct mem_ctl_info *mci, 
		tp_event = HW_EVENT_ERR_CORRECTED;

	}



	/*

	 * According to Intel Architecture spec vol 3B,

	 * Table 15-10 "IA32_MCi_Status [15:0] Compound Error Code Encoding"

	 * memory errors should fit one of these masks:

	 *	000f 0000 1mmm cccc (binary)

	 *	000f 0010 1mmm cccc (binary)	[RAM used as cache]

	 * where:

	 *	f = Correction Report Filtering Bit. If 1, subsequent errors

	 *	    won't be shown

	 *	mmm = error type

	 *	cccc = channel

	 * If the mask doesn't match, report an error to the parsing logic

	 */

	if (!((errcode & 0xef80) == 0x80 || (errcode & 0xef80) == 0x280)) {

		optype = "Can't parse: it is not a mem";

	} else {

	switch (optypenum) {

	case 0:

		optype = "generic undef request error";
@@ -597,7 +581,7 @@ static void skx_mce_output_error(struct mem_ctl_info *mci, 
		optype = "reserved";

		break;

	}

	}



	if (res->decoded_by_adxl) {

		len = snprintf(skx_msg, MSG_SIZE, "%s%s err_code:0x%04x:0x%04x %s",

			 overflow ? " OVERFLOW" : "",