Commit 3959df1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull RAS updates from Ingo Molnar:
 "MCE handling updates, but also some generic drivers/edac/ changes to
  better organize the Kconfig space"

* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ras: Move AMD MCE injector to arch/x86/ras/
  x86/mce: Add a wrapper around mce_log() for injection
  x86/mce: Rename rcu_dereference_check_mce() to mce_log_get_idx_check()
  RAS: Add a menuconfig option with descriptive text
  x86/mce: Reenable CMCI banks when swiching back to interrupt mode
  x86/mce: Clear Local MCE opt-in before kexec
  x86/mce: Remove unused function declarations
  x86/mce: Kill drain_mcelog_buffer()
  x86/mce: Avoid potential deadlock due to printk() in MCE context
  x86/mce: Remove the MCE ring for Action Optional errors
  x86/mce: Don't use percpu workqueues
  x86/mce: Provide a lockless memory pool to save error records
  x86/mce: Reuse one of the u16 padding fields in 'struct mce'
parents 41d859a8 6c36dfe9

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -955,6 +955,7 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS 


config X86_MCE

	bool "Machine Check / overheating reporting"

	select GENERIC_ALLOCATOR

	default y

	---help---

	  Machine Check support allows the processor to notify the

arch/x86/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ drivers-$(CONFIG_PM) += arch/x86/power/ 


drivers-$(CONFIG_FB) += arch/x86/video/



drivers-$(CONFIG_RAS) += arch/x86/ras/



####

# boot loader support. Several targets are kept for legacy purposes

arch/x86/include/asm/mce.h

+4 −4
Original line number Diff line number Diff line
@@ -151,10 +151,12 @@ extern int mce_p5_enabled; 
#ifdef CONFIG_X86_MCE

int mcheck_init(void);

void mcheck_cpu_init(struct cpuinfo_x86 *c);

void mcheck_cpu_clear(struct cpuinfo_x86 *c);

void mcheck_vendor_init_severity(void);

#else

static inline int mcheck_init(void) { return 0; }

static inline void mcheck_cpu_init(struct cpuinfo_x86 *c) {}

static inline void mcheck_cpu_clear(struct cpuinfo_x86 *c) {}

static inline void mcheck_vendor_init_severity(void) {}

#endif
@@ -181,20 +183,18 @@ DECLARE_PER_CPU(struct device *, mce_device); 


#ifdef CONFIG_X86_MCE_INTEL

void mce_intel_feature_init(struct cpuinfo_x86 *c);

void mce_intel_feature_clear(struct cpuinfo_x86 *c);

void cmci_clear(void);

void cmci_reenable(void);

void cmci_rediscover(void);

void cmci_recheck(void);

void lmce_clear(void);

void lmce_enable(void);

#else

static inline void mce_intel_feature_init(struct cpuinfo_x86 *c) { }

static inline void mce_intel_feature_clear(struct cpuinfo_x86 *c) { }

static inline void cmci_clear(void) {}

static inline void cmci_reenable(void) {}

static inline void cmci_rediscover(void) {}

static inline void cmci_recheck(void) {}

static inline void lmce_clear(void) {}

static inline void lmce_enable(void) {}

#endif



#ifdef CONFIG_X86_MCE_AMD

arch/x86/include/uapi/asm/mce.h

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ struct mce { 
	__u64 time;	/* wall time_t when error was detected */

	__u8  cpuvendor;	/* cpu vendor as encoded in system.h */

	__u8  inject_flags;	/* software inject flags */

	__u16  pad;

	__u8  severity;

	__u8  usable_addr;

	__u32 cpuid;	/* CPUID 1 EAX */

	__u8  cs;		/* code segment */

	__u8  bank;	/* machine check bank */

arch/x86/kernel/cpu/mcheck/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y				=  mce.o mce-severity.o

obj-y				=  mce.o mce-severity.o mce-genpool.o



obj-$(CONFIG_X86_ANCIENT_MCE)	+= winchip.o p5.o

obj-$(CONFIG_X86_MCE_INTEL)	+= mce_intel.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE