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

Commit fa7ae8cc authored by Borislav Petkov's avatar Borislav Petkov
Browse files

EDAC, MCE: Shorten error report formatting 



Shorten up MCi_STATUS flags and add BD's new deferred and poison types.
Also, simplify formatting.

Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
parent 62452882

drivers/edac/mce_amd.c

+32 −22
Original line number Diff line number Diff line
@@ -723,19 +723,22 @@ static void amd_decode_fp_mce(struct mce *m) 


static inline void amd_decode_err_code(u16 ec)

{

	if (TLB_ERROR(ec)) {

		pr_emerg(HW_ERR "Transaction: %s, Cache Level: %s\n",

			 TT_MSG(ec), LL_MSG(ec));

	} else if (MEM_ERROR(ec)) {

		pr_emerg(HW_ERR "Transaction: %s, Type: %s, Cache Level: %s\n",

			 R4_MSG(ec), TT_MSG(ec), LL_MSG(ec));

	} else if (BUS_ERROR(ec)) {

		pr_emerg(HW_ERR "Transaction: %s (%s), %s, Cache Level: %s, "

			 "Participating Processor: %s\n",

			  R4_MSG(ec), II_MSG(ec), TO_MSG(ec), LL_MSG(ec),

			  PP_MSG(ec));

	} else

		pr_emerg(HW_ERR "Huh? Unknown MCE error 0x%x\n", ec);



	pr_emerg(HW_ERR "cache level: %s", LL_MSG(ec));



	if (BUS_ERROR(ec))

		pr_cont(", mem/io: %s", II_MSG(ec));

	else

		pr_cont(", tx: %s", TT_MSG(ec));



	if (MEM_ERROR(ec) || BUS_ERROR(ec)) {

		pr_cont(", mem-tx: %s", R4_MSG(ec));



		if (BUS_ERROR(ec))

			pr_cont(", part-proc: %s (%s)", PP_MSG(ec), TO_MSG(ec));

	}



	pr_cont("\n");

}



/*
@@ -757,25 +760,32 @@ static bool amd_filter_mce(struct mce *m) 
int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)

{

	struct mce *m = (struct mce *)data;

	struct cpuinfo_x86 *c = &boot_cpu_data;

	int node, ecc;



	if (amd_filter_mce(m))

		return NOTIFY_STOP;



	pr_emerg(HW_ERR "MC%d_STATUS: ", m->bank);

	pr_emerg(HW_ERR "MC%d_STATUS[%s|%s|%s|%s|%s",

		m->bank,

		((m->status & MCI_STATUS_OVER)	? "Over"  : "-"),

		((m->status & MCI_STATUS_UC)	? "UE"	  : "CE"),

		((m->status & MCI_STATUS_MISCV)	? "MiscV" : "-"),

		((m->status & MCI_STATUS_PCC)	? "PCC"	  : "-"),

		((m->status & MCI_STATUS_ADDRV)	? "AddrV" : "-"));



	pr_cont("%sorrected error, other errors lost: %s, "

		 "CPU context corrupt: %s",

		 ((m->status & MCI_STATUS_UC) ? "Unc"  : "C"),

		 ((m->status & MCI_STATUS_OVER) ? "yes"  : "no"),

		 ((m->status & MCI_STATUS_PCC) ? "yes" : "no"));

	if (c->x86 == 0x15)

		pr_cont("|%s|%s",

			((m->status & BIT(44))	? "Deferred" : "-"),

			((m->status & BIT(43))	? "Poison"   : "-"));



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

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

	if (ecc)

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

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



	pr_cont("]: 0x%016llx\n", m->status);



	pr_cont("\n");



	switch (m->bank) {

	case 0:
@@ -787,7 +797,7 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) 
		break;



	case 2:

		if (boot_cpu_data.x86 == 0x15)

		if (c->x86 == 0x15)

			amd_decode_cu_mce(m);

		else

			amd_decode_bu_mce(m);