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

Commit c2f9b0af authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/ras' into x86/core, to fix conflicts 



Conflicts:
	arch/x86/include/asm/irq_vectors.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c8e56d20 243d657e

Documentation/x86/x86_64/boot-options.txt

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ Machine check 
		(e.g. BIOS or hardware monitoring applications), conflicting

		with OS's error handling, and you cannot deactivate the agent,

		then this option will be a help.

   mce=no_lmce

		Do not opt-in to Local MCE delivery. Use legacy method

		to broadcast MCEs.

   mce=bootlog

		Enable logging of machine checks left over from booting.

		Disabled by default on AMD because some BIOS leave bogus ones.

arch/x86/include/asm/entry_arch.h

+3 −0
Original line number Diff line number Diff line
@@ -52,4 +52,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
@@ -34,6 +34,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
@@ -40,6 +40,7 @@ extern asmlinkage void reschedule_interrupt(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);
@@ -54,6 +55,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
@@ -83,22 +83,23 @@ 
 */

#define X86_PLATFORM_IPI_VECTOR		0xf7



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

#ifdef CONFIG_HAVE_KVM

#define POSTED_INTR_VECTOR		0xf2

#define POSTED_INTR_WAKEUP_VECTOR	0xf1

#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