Commit 4ddf2a17 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'ras_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras 



Pull RAS updates from Borislav Petkov:

  - RAS: Add support for deferred errors on AMD (Aravind Gopalakrishnan)

    This is an important RAS feature which adds hardware support for
    poisoned data. That means roughly that the hardware marks data which it
    has detected as corrupted but wasn't able to correct, as poisoned data
    and raises an APIC interrupt to signal that in the form of a deferred
    error. It is the OS's responsibility then to take proper recovery action
    and thus prolonge system lifetime as far as possible.

  - Misc cleanups ontop. (Borislav Petkov)"

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 030bbdbf 3490c0e4

arch/x86/include/asm/entry_arch.h

+3 −0
Original line number Diff line number Diff line
@@ -50,4 +50,7 @@ BUILD_INTERRUPT(thermal_interrupt,THERMAL_APIC_VECTOR) 
BUILD_INTERRUPT(threshold_interrupt,THRESHOLD_APIC_VECTOR)

#endif



#ifdef CONFIG_X86_MCE_AMD

BUILD_INTERRUPT(deferred_error_interrupt, DEFERRED_ERROR_VECTOR)

#endif

#endif

arch/x86/include/asm/hardirq.h

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ typedef struct { 
#ifdef CONFIG_X86_MCE_THRESHOLD

	unsigned int irq_threshold_count;

#endif

#ifdef CONFIG_X86_MCE_AMD

	unsigned int irq_deferred_error_count;

#endif

#if IS_ENABLED(CONFIG_HYPERV) || defined(CONFIG_XEN)

	unsigned int irq_hv_callback_count;

#endif

arch/x86/include/asm/hw_irq.h

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ extern asmlinkage void invalidate_interrupt31(void); 
extern asmlinkage void irq_move_cleanup_interrupt(void);

extern asmlinkage void reboot_interrupt(void);

extern asmlinkage void threshold_interrupt(void);

extern asmlinkage void deferred_error_interrupt(void);



extern asmlinkage void call_function_interrupt(void);

extern asmlinkage void call_function_single_interrupt(void);
@@ -87,6 +88,7 @@ extern void trace_spurious_interrupt(void); 
extern void trace_thermal_interrupt(void);

extern void trace_reschedule_interrupt(void);

extern void trace_threshold_interrupt(void);

extern void trace_deferred_error_interrupt(void);

extern void trace_call_function_interrupt(void);

extern void trace_call_function_single_interrupt(void);

#define trace_irq_move_cleanup_interrupt  irq_move_cleanup_interrupt

arch/x86/include/asm/irq_vectors.h

+6 −5
Original line number Diff line number Diff line
@@ -102,21 +102,22 @@ 
 */

#define X86_PLATFORM_IPI_VECTOR		0xf7



/* Vector for KVM to deliver posted interrupt IPI */

#ifdef CONFIG_HAVE_KVM

#define POSTED_INTR_VECTOR		0xf2

#endif



/*

 * IRQ work vector:

 */

#define IRQ_WORK_VECTOR			0xf6



#define UV_BAU_MESSAGE			0xf5

#define DEFERRED_ERROR_VECTOR		0xf4



/* Vector on which hypervisor callbacks will be delivered */

#define HYPERVISOR_CALLBACK_VECTOR	0xf3



/* Vector for KVM to deliver posted interrupt IPI */

#ifdef CONFIG_HAVE_KVM

#define POSTED_INTR_VECTOR		0xf2

#endif



/*

 * Local APIC timer IRQ vector is on a different priority level,

 * to work around the 'lost local interrupt if more than 2 IRQ

arch/x86/include/asm/mce.h

+16 −2
Original line number Diff line number Diff line
@@ -117,8 +117,19 @@ struct mca_config { 
};



struct mce_vendor_flags {

	__u64		overflow_recov	: 1, /* cpuid_ebx(80000007) */

			__reserved_0	: 63;

			/*

			 * overflow recovery cpuid bit indicates that overflow

			 * conditions are not fatal

			 */

	__u64		overflow_recov	: 1,



			/*

			 * SUCCOR stands for S/W UnCorrectable error COntainment

			 * and Recovery. It indicates support for data poisoning

			 * in HW and deferred error interrupts.

			 */

			succor		: 1,

			__reserved_0	: 62;

};

extern struct mce_vendor_flags mce_flags;
@@ -223,6 +234,9 @@ void do_machine_check(struct pt_regs *, long); 
extern void (*mce_threshold_vector)(void);

extern void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);



/* Deferred error interrupt handler */

extern void (*deferred_error_int_vector)(void);



/*

 * Thermal handler

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE