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

Commit 0ca06c08 authored by Tony Luck's avatar Tony Luck
Browse files

x86/mce: Pay no attention to 'F' bit in MCACOD when parsing 'UC' errors 



The 0x1000 bit of the MCACOD field of machine check MCi_STATUS
registers is only defined for corrected errors (where it means
that hardware may be filtering errors see SDM section 15.9.2.1).

For uncorrected errors it may, or may not be set - so we should mask
it out when checking for the architecturaly defined recoverable
error signatures (see SDM 15.9.3.1 and 15.9.3.2)

Acked-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent c095ba72

arch/x86/include/asm/mce.h

+11 −2
Original line number Original line Diff line number Diff line
@@ -32,11 +32,20 @@ 
#define MCI_STATUS_PCC   (1ULL<<57)  /* processor context corrupt */

#define MCI_STATUS_PCC   (1ULL<<57)  /* processor context corrupt */

#define MCI_STATUS_S	 (1ULL<<56)  /* Signaled machine check */

#define MCI_STATUS_S	 (1ULL<<56)  /* Signaled machine check */

#define MCI_STATUS_AR	 (1ULL<<55)  /* Action required */

#define MCI_STATUS_AR	 (1ULL<<55)  /* Action required */

#define MCACOD		  0xffff     /* MCA Error Code */



/*

 * Note that the full MCACOD field of IA32_MCi_STATUS MSR is

 * bits 15:0.  But bit 12 is the 'F' bit, defined for corrected

 * errors to indicate that errors are being filtered by hardware.

 * We should mask out bit 12 when looking for specific signatures

 * of uncorrected errors - so the F bit is deliberately skipped

 * in this #define.

 */

#define MCACOD		  0xefff     /* MCA Error Code */





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

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

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

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

#define MCACOD_SCRUBMSK	0xfff0

#define MCACOD_SCRUBMSK	0xeff0	/* Skip bit 12 ('F' bit) */

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

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

#define MCACOD_DATA	0x0134	/* Data Load */

#define MCACOD_DATA	0x0134	/* Data Load */

#define MCACOD_INSTR	0x0150	/* Instruction Fetch */

#define MCACOD_INSTR	0x0150	/* Instruction Fetch */