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

Commit 11b91d6f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'mce-recovery-for-tip' of... 

Merge tag 'mce-recovery-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce

Add symbolic defines for architectural MCACOD constants
parents 4e9f44ba 08dda402

arch/x86/kernel/cpu/mcheck/mce-severity.c

+10 −4
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ static struct severity { 
#define MCI_UC_SAR (MCI_STATUS_UC|MCI_STATUS_S|MCI_STATUS_AR)

#define	MCI_ADDR (MCI_STATUS_ADDRV|MCI_STATUS_MISCV)

#define MCACOD 0xffff

/* Architecturally defined codes from SDM Vol. 3B Chapter 15 */

#define MCACOD_SCRUB	0x00C0	/* 0xC0-0xCF Memory Scrubbing */

#define MCACOD_SCRUBMSK	0xfff0

#define MCACOD_L3WB	0x017A	/* L3 Explicit Writeback */

#define MCACOD_DATA	0x0134	/* Data Load */

#define MCACOD_INSTR	0x0150	/* Instruction Fetch */



	MCESEV(

		NO, "Invalid",
@@ -112,12 +118,12 @@ static struct severity { 
#ifdef	CONFIG_MEMORY_FAILURE

	MCESEV(

		KEEP, "HT thread notices Action required: data load error",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|0x0134),

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_DATA),

		MCGMASK(MCG_STATUS_EIPV, 0)

		),

	MCESEV(

		AR, "Action required: data load error",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|0x0134),

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_DATA),

		USER

		),

#endif
@@ -129,11 +135,11 @@ static struct severity { 
	/* known AO MCACODs: */

	MCESEV(

		AO, "Action optional: memory scrubbing error",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|0xfff0, MCI_UC_S|0x00c0)

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCACOD_SCRUBMSK, MCI_UC_S|MCACOD_SCRUB)

		),

	MCESEV(

		AO, "Action optional: last level cache writeback error",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCACOD, MCI_UC_S|0x017a)

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCACOD, MCI_UC_S|MCACOD_L3WB)

		),

	MCESEV(

		SOME, "Action optional: unknown MCACOD",