Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35d824b2 authored by Borislav Petkov's avatar Borislav Petkov Committed by Linus Torvalds
Browse files

edac, mce: Fix wrong mask and macro usage 



Correct two mishaps which prevented reporting error type (CECC vs UECC)
and extended error description.

Cc: <stable@kernel.org> # 32.x,  33.x
Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 12b1b321

drivers/edac/edac_mce_amd.c

+2 −3
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ wrong_ls_mce: 
void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)

{

	u32 ec  = ERROR_CODE(regs->nbsl);

	u32 xec = EXT_ERROR_CODE(regs->nbsl);



	if (!handle_errors)

		return;
@@ -324,7 +323,7 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors) 
		pr_cont("\n");

	}



	pr_emerg("%s.\n", EXT_ERR_MSG(xec));

	pr_emerg("%s.\n", EXT_ERR_MSG(regs->nbsl));



	if (BUS_ERROR(ec) && nb_bus_decoder)

		nb_bus_decoder(node_id, regs);
@@ -374,7 +373,7 @@ static int amd_decode_mce(struct notifier_block *nb, unsigned long val, 
		 ((m->status & MCI_STATUS_PCC) ? "yes" : "no"));



	/* do the two bits[14:13] together */

	ecc = m->status & (3ULL << 45);

	ecc = (m->status >> 45) & 0x3;

	if (ecc)

		pr_cont(", %sECC Error", ((ecc == 2) ? "C" : "U"));