Commit db0338ee authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/entry: Convert APIC interrupts to IDTENTRY_SYSVEC 



Convert APIC interrupts to IDTENTRY_SYSVEC:

  - Implement the C entry point with DEFINE_IDTENTRY_SYSVEC
  - Emit the ASM stub with DECLARE_IDTENTRY_SYSVEC
  - Remove the ASM idtentries in 64-bit
  - Remove the BUILD_INTERRUPT entries in 32-bit
  - Remove the old prototypes

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/20200521202119.280728850@linutronix.de
parent 6368558c

arch/x86/entry/entry_64.S

+0 −6
Original line number Diff line number Diff line
@@ -965,9 +965,6 @@ apicinterrupt3 REBOOT_VECTOR reboot_interrupt smp_reboot_interrupt 
apicinterrupt3 UV_BAU_MESSAGE			uv_bau_message_intr1		uv_bau_message_interrupt

#endif



apicinterrupt LOCAL_TIMER_VECTOR		apic_timer_interrupt		smp_apic_timer_interrupt

apicinterrupt X86_PLATFORM_IPI_VECTOR		x86_platform_ipi		smp_x86_platform_ipi



#ifdef CONFIG_HAVE_KVM

apicinterrupt3 POSTED_INTR_VECTOR		kvm_posted_intr_ipi		smp_kvm_posted_intr_ipi

apicinterrupt3 POSTED_INTR_WAKEUP_VECTOR	kvm_posted_intr_wakeup_ipi	smp_kvm_posted_intr_wakeup_ipi
@@ -992,9 +989,6 @@ apicinterrupt CALL_FUNCTION_VECTOR call_function_interrupt smp_call_function_i 
apicinterrupt RESCHEDULE_VECTOR			reschedule_interrupt		smp_reschedule_interrupt

#endif



apicinterrupt ERROR_APIC_VECTOR			error_interrupt			smp_error_interrupt

apicinterrupt SPURIOUS_APIC_VECTOR		spurious_apic_interrupt		smp_spurious_apic_interrupt



#ifdef CONFIG_IRQ_WORK

apicinterrupt IRQ_WORK_VECTOR			irq_work_interrupt		smp_irq_work_interrupt

#endif

arch/x86/include/asm/entry_arch.h

+0 −5
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ BUILD_INTERRUPT(kvm_posted_intr_nested_ipi, POSTED_INTR_NESTED_VECTOR) 
 */

#ifdef CONFIG_X86_LOCAL_APIC



BUILD_INTERRUPT(apic_timer_interrupt,LOCAL_TIMER_VECTOR)

BUILD_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR)

BUILD_INTERRUPT(spurious_apic_interrupt,SPURIOUS_APIC_VECTOR)

BUILD_INTERRUPT(x86_platform_ipi, X86_PLATFORM_IPI_VECTOR)



#ifdef CONFIG_IRQ_WORK

BUILD_INTERRUPT(irq_work_interrupt, IRQ_WORK_VECTOR)

#endif

arch/x86/include/asm/hw_irq.h

+0 −4
Original line number Diff line number Diff line
@@ -29,16 +29,12 @@ 
#include <asm/sections.h>



/* Interrupt handlers registered during init_IRQ */

extern asmlinkage void apic_timer_interrupt(void);

extern asmlinkage void x86_platform_ipi(void);

extern asmlinkage void kvm_posted_intr_ipi(void);

extern asmlinkage void kvm_posted_intr_wakeup_ipi(void);

extern asmlinkage void kvm_posted_intr_nested_ipi(void);

extern asmlinkage void error_interrupt(void);

extern asmlinkage void irq_work_interrupt(void);

extern asmlinkage void uv_bau_message_intr1(void);



extern asmlinkage void spurious_apic_interrupt(void);

extern asmlinkage void thermal_interrupt(void);

extern asmlinkage void reschedule_interrupt(void);

arch/x86/include/asm/idtentry.h

+8 −0
Original line number Diff line number Diff line
@@ -591,6 +591,14 @@ DECLARE_IDTENTRY_IRQ(X86_TRAP_OTHER, common_interrupt); 
DECLARE_IDTENTRY_IRQ(X86_TRAP_OTHER,	spurious_interrupt);

#endif



/* System vector entry points */

#ifdef CONFIG_X86_LOCAL_APIC

DECLARE_IDTENTRY_SYSVEC(ERROR_APIC_VECTOR,		sysvec_error_interrupt);

DECLARE_IDTENTRY_SYSVEC(SPURIOUS_APIC_VECTOR,		sysvec_spurious_apic_interrupt);

DECLARE_IDTENTRY_SYSVEC(LOCAL_TIMER_VECTOR,		sysvec_apic_timer_interrupt);

DECLARE_IDTENTRY_SYSVEC(X86_PLATFORM_IPI_VECTOR,	sysvec_x86_platform_ipi);

#endif



#undef X86_TRAP_OTHER



#endif

arch/x86/include/asm/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ extern void __init init_IRQ(void); 
void arch_trigger_cpumask_backtrace(const struct cpumask *mask,

				    bool exclude_self);



extern __visible void smp_x86_platform_ipi(struct pt_regs *regs);

#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE