Commit 7c6582b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mce: Use mce_sysdev_ prefix to group functions
  x86, mce: Use mce_chrdev_ prefix to group functions
  x86, mce: Cleanup mce_read()
  x86, mce: Cleanup mce_create()/remove_device()
  x86, mce: Check the result of ancient_init()
  x86, mce: Introduce mce_gather_info()
  x86, mce: Replace MCM_ with MCI_MISC_
  x86, mce: Replace MCE_SELF_VECTOR by irq_work
  x86, mce, severity: Clean up trivial coding style problems
  x86, mce, severity: Cleanup severity table
  x86, mce, severity: Make formatting a bit more readable
  x86, mce, severity: Fix two severities table signatures
parents 227ad9bc c7cece89

arch/x86/include/asm/entry_arch.h

+0 −4
Original line number Diff line number Diff line
@@ -53,8 +53,4 @@ BUILD_INTERRUPT(thermal_interrupt,THERMAL_APIC_VECTOR) 
BUILD_INTERRUPT(threshold_interrupt,THRESHOLD_APIC_VECTOR)

#endif



#ifdef CONFIG_X86_MCE

BUILD_INTERRUPT(mce_self_interrupt,MCE_SELF_VECTOR)

#endif



#endif

arch/x86/include/asm/hw_irq.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ extern void irq_work_interrupt(void); 
extern void spurious_interrupt(void);

extern void thermal_interrupt(void);

extern void reschedule_interrupt(void);

extern void mce_self_interrupt(void);



extern void invalidate_interrupt(void);

extern void invalidate_interrupt0(void);

arch/x86/include/asm/irq_vectors.h

+0 −5
Original line number Diff line number Diff line
@@ -109,11 +109,6 @@ 


#define UV_BAU_MESSAGE			0xf5



/*

 * Self IPI vector for machine checks

 */

#define MCE_SELF_VECTOR			0xf4



/* Xen vector callback to receive events in a HVM domain */

#define XEN_HVM_EVTCHN_CALLBACK		0xf3

arch/x86/include/asm/mce.h

+12 −7
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Machine Check support for x86

 */



/* MCG_CAP register defines */

#define MCG_BANKCNT_MASK	0xff         /* Number of Banks */

#define MCG_CTL_P		(1ULL<<8)    /* MCG_CTL register available */

#define MCG_EXT_P		(1ULL<<9)    /* Extended registers available */
@@ -17,10 +18,12 @@ 
#define MCG_EXT_CNT(c)		(((c) & MCG_EXT_CNT_MASK) >> MCG_EXT_CNT_SHIFT)

#define MCG_SER_P	 	(1ULL<<24)   /* MCA recovery/new status bits */



/* MCG_STATUS register defines */

#define MCG_STATUS_RIPV  (1ULL<<0)   /* restart ip valid */

#define MCG_STATUS_EIPV  (1ULL<<1)   /* ip points to correct instruction */

#define MCG_STATUS_MCIP  (1ULL<<2)   /* machine check in progress */



/* MCi_STATUS register defines */

#define MCI_STATUS_VAL   (1ULL<<63)  /* valid error */

#define MCI_STATUS_OVER  (1ULL<<62)  /* previous errors lost */

#define MCI_STATUS_UC    (1ULL<<61)  /* uncorrected error */
@@ -31,12 +34,14 @@ 
#define MCI_STATUS_S	 (1ULL<<56)  /* Signaled machine check */

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



/* MISC register defines */

#define MCM_ADDR_SEGOFF  0	/* segment offset */

#define MCM_ADDR_LINEAR  1	/* linear address */

#define MCM_ADDR_PHYS	 2	/* physical address */

#define MCM_ADDR_MEM	 3	/* memory address */

#define MCM_ADDR_GENERIC 7	/* generic */

/* MCi_MISC register defines */

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

#define MCI_MISC_ADDR_MODE(m)	(((m) >> 6) & 7)

#define  MCI_MISC_ADDR_SEGOFF	0	/* segment offset */

#define  MCI_MISC_ADDR_LINEAR	1	/* linear address */

#define  MCI_MISC_ADDR_PHYS	2	/* physical address */

#define  MCI_MISC_ADDR_MEM	3	/* memory address */

#define  MCI_MISC_ADDR_GENERIC	7	/* generic */



/* CTL2 register defines */

#define MCI_CTL2_CMCI_EN		(1ULL << 30)
@@ -144,7 +149,7 @@ static inline void enable_p5_mce(void) {} 


void mce_setup(struct mce *m);

void mce_log(struct mce *m);

DECLARE_PER_CPU(struct sys_device, mce_dev);

DECLARE_PER_CPU(struct sys_device, mce_sysdev);



/*

 * Maximum banks number.

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

+98 −54
Original line number Diff line number Diff line
@@ -43,61 +43,105 @@ static struct severity { 
	unsigned char covered;

	char *msg;

} severities[] = {

#define MCESEV(s, m, c...) { .sev = MCE_ ## s ## _SEVERITY, .msg = m, ## c }

#define  KERNEL		.context = IN_KERNEL

#define  USER		.context = IN_USER

#define  SER		.ser = SER_REQUIRED

#define  NOSER		.ser = NO_SER

#define SEV(s) .sev = MCE_ ## s ## _SEVERITY

#define BITCLR(x, s, m, r...) { .mask = x, .result = 0, SEV(s), .msg = m, ## r }

#define BITSET(x, s, m, r...) { .mask = x, .result = x, SEV(s), .msg = m, ## r }

#define MCGMASK(x, res, s, m, r...) \

	{ .mcgmask = x, .mcgres = res, SEV(s), .msg = m, ## r }

#define MASK(x, y, s, m, r...) \

	{ .mask = x, .result = y, SEV(s), .msg = m, ## r }

#define  BITCLR(x)	.mask = x, .result = 0

#define  BITSET(x)	.mask = x, .result = x

#define  MCGMASK(x, y)	.mcgmask = x, .mcgres = y

#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 MCACOD 0xffff



	BITCLR(MCI_STATUS_VAL, NO, "Invalid"),

	BITCLR(MCI_STATUS_EN, NO, "Not enabled"),

	BITSET(MCI_STATUS_PCC, PANIC, "Processor context corrupt"),

	MCESEV(

		NO, "Invalid",

		BITCLR(MCI_STATUS_VAL)

		),

	MCESEV(

		NO, "Not enabled",

		BITCLR(MCI_STATUS_EN)

		),

	MCESEV(

		PANIC, "Processor context corrupt",

		BITSET(MCI_STATUS_PCC)

		),

	/* When MCIP is not set something is very confused */

	MCGMASK(MCG_STATUS_MCIP, 0, PANIC, "MCIP not set in MCA handler"),

	MCESEV(

		PANIC, "MCIP not set in MCA handler",

		MCGMASK(MCG_STATUS_MCIP, 0)

		),

	/* Neither return not error IP -- no chance to recover -> PANIC */

	MCGMASK(MCG_STATUS_RIPV|MCG_STATUS_EIPV, 0, PANIC,

		"Neither restart nor error IP"),

	MCGMASK(MCG_STATUS_RIPV, 0, PANIC, "In kernel and no restart IP",

		KERNEL),

	BITCLR(MCI_STATUS_UC, KEEP, "Corrected error", NOSER),

	MASK(MCI_STATUS_OVER|MCI_STATUS_UC|MCI_STATUS_EN, MCI_STATUS_UC, SOME,

	     "Spurious not enabled", SER),

	MCESEV(

		PANIC, "Neither restart nor error IP",

		MCGMASK(MCG_STATUS_RIPV|MCG_STATUS_EIPV, 0)

		),

	MCESEV(

		PANIC, "In kernel and no restart IP",

		KERNEL, MCGMASK(MCG_STATUS_RIPV, 0)

		),

	MCESEV(

		KEEP, "Corrected error",

		NOSER, BITCLR(MCI_STATUS_UC)

		),



	/* ignore OVER for UCNA */

	MASK(MCI_UC_SAR, MCI_STATUS_UC, KEEP,

	     "Uncorrected no action required", SER),

	MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_STATUS_UC|MCI_STATUS_AR, PANIC,

	     "Illegal combination (UCNA with AR=1)", SER),

	MASK(MCI_STATUS_S, 0, KEEP, "Non signalled machine check", SER),

	MCESEV(

		KEEP, "Uncorrected no action required",

		SER, MASK(MCI_UC_SAR, MCI_STATUS_UC)

		),

	MCESEV(

		PANIC, "Illegal combination (UCNA with AR=1)",

		SER,

		MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_STATUS_UC|MCI_STATUS_AR)

		),

	MCESEV(

		KEEP, "Non signalled machine check",

		SER, BITCLR(MCI_STATUS_S)

		),



	/* AR add known MCACODs here */

	MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_STATUS_OVER|MCI_UC_SAR, PANIC,

	     "Action required with lost events", SER),

	MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCACOD, MCI_UC_SAR, PANIC,

	     "Action required; unknown MCACOD", SER),

	MCESEV(

		PANIC, "Action required with lost events",

		SER, BITSET(MCI_STATUS_OVER|MCI_UC_SAR)

		),

	MCESEV(

		PANIC, "Action required: unknown MCACOD",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_SAR)

		),



	/* known AO MCACODs: */

	MASK(MCI_UC_SAR|MCI_STATUS_OVER|0xfff0, MCI_UC_S|0xc0, AO,

	     "Action optional: memory scrubbing error", SER),

	MASK(MCI_UC_SAR|MCI_STATUS_OVER|MCACOD, MCI_UC_S|0x17a, AO,

	     "Action optional: last level cache writeback error", SER),



	MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_S, SOME,

	     "Action optional unknown MCACOD", SER),

	MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_S|MCI_STATUS_OVER, SOME,

	     "Action optional with lost events", SER),

	BITSET(MCI_STATUS_UC|MCI_STATUS_OVER, PANIC, "Overflowed uncorrected"),

	BITSET(MCI_STATUS_UC, UC, "Uncorrected"),

	BITSET(0, SOME, "No match")	/* always matches. keep at end */

	MCESEV(

		AO, "Action optional: memory scrubbing error",

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

		),

	MCESEV(

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

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

		),

	MCESEV(

		SOME, "Action optional: unknown MCACOD",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR, MCI_UC_S)

		),

	MCESEV(

		SOME, "Action optional with lost events",

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

		),



	MCESEV(

		PANIC, "Overflowed uncorrected",

		BITSET(MCI_STATUS_OVER|MCI_STATUS_UC)

		),

	MCESEV(

		UC, "Uncorrected",

		BITSET(MCI_STATUS_UC)

		),

	MCESEV(

		SOME, "No match",

		BITSET(0)

		)	/* always matches. keep at end */

};



/*
@@ -112,15 +156,15 @@ static int error_context(struct mce *m) 
	return IN_KERNEL;

}



int mce_severity(struct mce *a, int tolerant, char **msg)

int mce_severity(struct mce *m, int tolerant, char **msg)

{

	enum context ctx = error_context(a);

	enum context ctx = error_context(m);

	struct severity *s;



	for (s = severities;; s++) {

		if ((a->status & s->mask) != s->result)

		if ((m->status & s->mask) != s->result)

			continue;

		if ((a->mcgstatus & s->mcgmask) != s->mcgres)

		if ((m->mcgstatus & s->mcgmask) != s->mcgres)

			continue;

		if (s->ser == SER_REQUIRED && !mce_ser)

			continue;
@@ -197,15 +241,15 @@ static const struct file_operations severities_coverage_fops = { 


static int __init severities_debugfs_init(void)

{

	struct dentry *dmce = NULL, *fseverities_coverage = NULL;

	struct dentry *dmce, *fsev;



	dmce = mce_get_debugfs_dir();

	if (dmce == NULL)

	if (!dmce)

		goto err_out;

	fseverities_coverage = debugfs_create_file("severities-coverage",

						   0444, dmce, NULL,



	fsev = debugfs_create_file("severities-coverage", 0444, dmce, NULL,

				   &severities_coverage_fops);

	if (fseverities_coverage == NULL)

	if (!fsev)

		goto err_out;



	return 0;
@@ -214,4 +258,4 @@ err_out: 
	return -ENOMEM;

}

late_initcall(severities_debugfs_init);

#endif
 
#endif /* CONFIG_DEBUG_FS */

CRA Git | Maintained and supported by SUSTech CRA and CCSE