diff options
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-severity.c | 16 | 
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-severity.c b/arch/x86/kernel/cpu/mcheck/mce-severity.c index 7395d5f4272..f6c92f99efa 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-severity.c +++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c @@ -54,6 +54,7 @@ static struct severity {  #define  MASK(x, y)	.mask = x, .result = y  #define MCI_UC_S (MCI_STATUS_UC|MCI_STATUS_S)  #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  	MCESEV( @@ -102,11 +103,24 @@ static struct severity {  		SER, BITCLR(MCI_STATUS_S)  		), -	/* AR add known MCACODs here */  	MCESEV(  		PANIC, "Action required with lost events",  		SER, BITSET(MCI_STATUS_OVER|MCI_UC_SAR)  		), + +	/* known AR MCACODs: */ +#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), +		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), +		USER +		), +#endif  	MCESEV(  		PANIC, "Action required: unknown MCACOD",  		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_SAR)  |