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

Commit 736edce5 authored by Tony Luck's avatar Tony Luck Committed by Ingo Molnar
Browse files

x86/mce: Move MCACOD defines from mce-severity.c to <asm/mce.h> 



We will need some of these values in mce.c. Move them to the
appropriate header file so they are available.

Acked-by: default avatarBorislav Petkov <bp@amd64.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Cc: Chen Gong <gong.chen@linux.intel.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Link: http://lkml.kernel.org/r/0ccfb1af5fe35e537b7cd8e4d448bf7d851dbfb9.1343078495.git.tony.luck@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1d44b30f

arch/x86/include/asm/mce.h

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@ 
#define MCI_STATUS_PCC   (1ULL<<57)  /* processor context corrupt */

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

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

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



/* 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 */



/* MCi_MISC register defines */

#define MCI_MISC_ADDR_LSB(m)	((m) & 0x3f)

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

+0 −7
Original line number Diff line number Diff line
@@ -55,13 +55,6 @@ static struct severity { 
#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

/* 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",