Commit 0237d7f3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/mce' into x86/ras 



Pursue a single RAS/MCE topic branch on x86.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents bf6c2162 cf870c70

Documentation/x86/x86_64/boot-options.txt

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


  acpi=noirq	Don't route interrupts



  acpi=nocmcff	Disable firmware first mode for corrected errors. This

		disables parsing the HEST CMC error source to check if

		firmware has set the FF flag. This may result in

		duplicate corrected error reports.



PCI



  pci=off		Don't use PCI

arch/x86/include/asm/acpi.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ extern int acpi_pci_disabled; 
extern int acpi_skip_timer_override;

extern int acpi_use_timer_override;

extern int acpi_fix_pin2_polarity;

extern int acpi_disable_cmcff;



extern u8 acpi_sci_flags;

extern int acpi_sci_override_gsi;
@@ -168,6 +169,7 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf) 


#define acpi_lapic 0

#define acpi_ioapic 0

#define acpi_disable_cmcff 0

static inline void acpi_noirq_set(void) { }

static inline void acpi_disable_pci(void) { }

static inline void disable_acpi(void) { }

arch/x86/include/asm/mce.h

+3 −0
Original line number Diff line number Diff line
@@ -188,6 +188,9 @@ extern void register_mce_write_callback(ssize_t (*)(struct file *filp, 
				    const char __user *ubuf,

				    size_t usize, loff_t *off));



/* Disable CMCI/polling for MCA bank claimed by firmware */

extern void mce_disable_bank(int bank);



/*

 * Exception handler

 */

arch/x86/kernel/acpi/boot.c

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ EXPORT_SYMBOL(acpi_pci_disabled); 
int acpi_lapic;

int acpi_ioapic;

int acpi_strict;

int acpi_disable_cmcff;



u8 acpi_sci_flags __initdata;

int acpi_sci_override_gsi __initdata;
@@ -1626,6 +1627,10 @@ static int __init parse_acpi(char *arg) 
	/* "acpi=copy_dsdt" copys DSDT */

	else if (strcmp(arg, "copy_dsdt") == 0) {

		acpi_gbl_copy_dsdt_locally = 1;

	}

	/* "acpi=nocmcff" disables FF mode for corrected errors */

	else if (strcmp(arg, "nocmcff") == 0) {

		acpi_disable_cmcff = 1;

	} else {

		/* Core will printk when we return error. */

		return -EINVAL;

arch/x86/kernel/cpu/mcheck/mce-internal.h

+3 −0
Original line number Diff line number Diff line
@@ -25,15 +25,18 @@ int mce_severity(struct mce *a, int tolerant, char **msg); 
struct dentry *mce_get_debugfs_dir(void);



extern struct mce_bank *mce_banks;

extern mce_banks_t mce_banks_ce_disabled;



#ifdef CONFIG_X86_MCE_INTEL

unsigned long mce_intel_adjust_timer(unsigned long interval);

void mce_intel_cmci_poll(void);

void mce_intel_hcpu_update(unsigned long cpu);

void cmci_disable_bank(int bank);

#else

# define mce_intel_adjust_timer mce_adjust_timer_default

static inline void mce_intel_cmci_poll(void) { }

static inline void mce_intel_hcpu_update(unsigned long cpu) { }

static inline void cmci_disable_bank(int bank) { }

#endif



void mce_timer_kick(unsigned long interval);