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

Commit d5c6770d authored by Borislav Petkov's avatar Borislav Petkov Committed by Borislav Petkov
Browse files

MCE, AMD: Dump error status 



Dump error status after decoding the error which describes the error
disposition.

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

drivers/edac/mce_amd.c

+20 −2
Original line number Diff line number Diff line
@@ -667,6 +667,22 @@ static bool amd_filter_mce(struct mce *m) 
	return false;

}



static const char *decode_error_status(struct mce *m)

{

	if (m->status & MCI_STATUS_UC) {

		if (m->status & MCI_STATUS_PCC)

			return "System Fatal error.";

		if (m->mcgstatus & MCG_STATUS_RIPV)

			return "Uncorrected, software restartable error.";

		return "Uncorrected, software containable error.";

	}



	if (m->status & MCI_STATUS_DEFERRED)

		return "Deferred error.";



	return "Corrected error, no action required.";

}



int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)

{

	struct mce *m = (struct mce *)data;
@@ -712,6 +728,8 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) 
		break;

	}



	pr_emerg(HW_ERR "Error Status: %s\n", decode_error_status(m));



	pr_emerg(HW_ERR "CPU:%d (%x:%x:%x) MC%d_STATUS[%s|%s|%s|%s|%s",

		m->extcpu,

		c->x86, c->x86_model, c->x86_mask,
@@ -724,8 +742,8 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) 


	if (c->x86 == 0x15)

		pr_cont("|%s|%s",

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

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

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

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



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

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

drivers/edac/mce_amd.h

+2 −4
Original line number Diff line number Diff line
@@ -29,10 +29,8 @@ 
#define R4(x)				(((x) >> 4) & 0xf)

#define R4_MSG(x)			((R4(x) < 9) ?  rrrr_msgs[R4(x)] : "Wrong R4!")



/*

 * F3x4C bits (MCi_STATUS' high half)

 */

#define NBSH_ERR_CPU_VAL		BIT(24)

#define MCI_STATUS_DEFERRED		BIT_64(44)

#define MCI_STATUS_POISON		BIT_64(43)



enum tt_ids {

	TT_INSTR = 0,