Commit 3a96570f authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc: convert interrupt handlers to use wrappers 



Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210130130852.2952424-29-npiggin@gmail.com
parent fd3f1e0f

arch/powerpc/include/asm/asm-prototypes.h

+0 −29
Original line number Diff line number Diff line
@@ -56,35 +56,6 @@ int exit_vmx_usercopy(void); 
int enter_vmx_ops(void);

void *exit_vmx_ops(void *dest);



/* Traps */

long machine_check_early(struct pt_regs *regs);

long hmi_exception_realmode(struct pt_regs *regs);

void SMIException(struct pt_regs *regs);

void handle_hmi_exception(struct pt_regs *regs);

void instruction_breakpoint_exception(struct pt_regs *regs);

void RunModeException(struct pt_regs *regs);

void single_step_exception(struct pt_regs *regs);

void program_check_exception(struct pt_regs *regs);

void alignment_exception(struct pt_regs *regs);

void StackOverflow(struct pt_regs *regs);

void stack_overflow_exception(struct pt_regs *regs);

void kernel_fp_unavailable_exception(struct pt_regs *regs);

void altivec_unavailable_exception(struct pt_regs *regs);

void vsx_unavailable_exception(struct pt_regs *regs);

void fp_unavailable_tm(struct pt_regs *regs);

void altivec_unavailable_tm(struct pt_regs *regs);

void vsx_unavailable_tm(struct pt_regs *regs);

void facility_unavailable_exception(struct pt_regs *regs);

void TAUException(struct pt_regs *regs);

void altivec_assist_exception(struct pt_regs *regs);

void unrecoverable_exception(struct pt_regs *regs);

void kernel_bad_stack(struct pt_regs *regs);

void system_reset_exception(struct pt_regs *regs);

void machine_check_exception(struct pt_regs *regs);

void emulation_assist_interrupt(struct pt_regs *regs);

long do_slb_fault(struct pt_regs *regs);

void do_bad_slb_fault(struct pt_regs *regs);



/* signals, syscalls and interrupts */

long sys_swapcontext(struct ucontext __user *old_ctx,

		    struct ucontext __user *new_ctx,

arch/powerpc/include/asm/book3s/64/mmu-hash.h

+0 −1
Original line number Diff line number Diff line
@@ -456,7 +456,6 @@ static inline unsigned long hpt_hash(unsigned long vpn, 


long hpte_insert_repeating(unsigned long hash, unsigned long vpn, unsigned long pa,

			   unsigned long rlags, unsigned long vflags, int psize, int ssize);

long do_hash_fault(struct pt_regs *regs);

extern int __hash_page_4K(unsigned long ea, unsigned long access,

			  unsigned long vsid, pte_t *ptep, unsigned long trap,

			  unsigned long flags, int ssize, int subpage_prot);

arch/powerpc/include/asm/debug.h

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ bool ppc_breakpoint_available(void); 
#ifdef CONFIG_PPC_ADV_DEBUG_REGS

extern void do_send_trap(struct pt_regs *regs, unsigned long address,

			 unsigned long error_code, int brkpt);

#else



void do_break(struct pt_regs *regs);

#endif



#endif /* _ASM_POWERPC_DEBUG_H */

arch/powerpc/include/asm/hw_irq.h

+0 −9
Original line number Diff line number Diff line
@@ -50,15 +50,6 @@ 


#ifndef __ASSEMBLY__



extern void replay_system_reset(void);

extern void replay_soft_interrupts(void);



extern void timer_interrupt(struct pt_regs *);

extern void performance_monitor_exception(struct pt_regs *regs);

extern void WatchdogException(struct pt_regs *regs);

extern void unknown_exception(struct pt_regs *regs);

void unknown_async_exception(struct pt_regs *regs);



#ifdef CONFIG_PPC64

#include <asm/paca.h>

arch/powerpc/include/asm/interrupt.h

+66 −0
Original line number Diff line number Diff line
@@ -232,4 +232,70 @@ __visible noinstr long func(struct pt_regs *regs) \ 
									\

static __always_inline long ____##func(struct pt_regs *regs)





/* Interrupt handlers */

/* kernel/traps.c */

DECLARE_INTERRUPT_HANDLER_NMI(system_reset_exception);

#ifdef CONFIG_PPC_BOOK3S_64

DECLARE_INTERRUPT_HANDLER_ASYNC(machine_check_exception);

#else

DECLARE_INTERRUPT_HANDLER_NMI(machine_check_exception);

#endif

DECLARE_INTERRUPT_HANDLER(SMIException);

DECLARE_INTERRUPT_HANDLER(handle_hmi_exception);

DECLARE_INTERRUPT_HANDLER(unknown_exception);

DECLARE_INTERRUPT_HANDLER_ASYNC(unknown_async_exception);

DECLARE_INTERRUPT_HANDLER(instruction_breakpoint_exception);

DECLARE_INTERRUPT_HANDLER(RunModeException);

DECLARE_INTERRUPT_HANDLER(single_step_exception);

DECLARE_INTERRUPT_HANDLER(program_check_exception);

DECLARE_INTERRUPT_HANDLER(emulation_assist_interrupt);

DECLARE_INTERRUPT_HANDLER(alignment_exception);

DECLARE_INTERRUPT_HANDLER(StackOverflow);

DECLARE_INTERRUPT_HANDLER(stack_overflow_exception);

DECLARE_INTERRUPT_HANDLER(kernel_fp_unavailable_exception);

DECLARE_INTERRUPT_HANDLER(altivec_unavailable_exception);

DECLARE_INTERRUPT_HANDLER(vsx_unavailable_exception);

DECLARE_INTERRUPT_HANDLER(facility_unavailable_exception);

DECLARE_INTERRUPT_HANDLER(fp_unavailable_tm);

DECLARE_INTERRUPT_HANDLER(altivec_unavailable_tm);

DECLARE_INTERRUPT_HANDLER(vsx_unavailable_tm);

DECLARE_INTERRUPT_HANDLER_NMI(performance_monitor_exception_nmi);

DECLARE_INTERRUPT_HANDLER_ASYNC(performance_monitor_exception_async);

DECLARE_INTERRUPT_HANDLER_RAW(performance_monitor_exception);

DECLARE_INTERRUPT_HANDLER(DebugException);

DECLARE_INTERRUPT_HANDLER(altivec_assist_exception);

DECLARE_INTERRUPT_HANDLER(CacheLockingException);

DECLARE_INTERRUPT_HANDLER(SPEFloatingPointException);

DECLARE_INTERRUPT_HANDLER(SPEFloatingPointRoundException);

DECLARE_INTERRUPT_HANDLER(unrecoverable_exception);

DECLARE_INTERRUPT_HANDLER(WatchdogException);

DECLARE_INTERRUPT_HANDLER(kernel_bad_stack);



/* slb.c */

DECLARE_INTERRUPT_HANDLER_RAW(do_slb_fault);

DECLARE_INTERRUPT_HANDLER(do_bad_slb_fault);



/* hash_utils.c */

DECLARE_INTERRUPT_HANDLER_RAW(do_hash_fault);



/* fault.c */

DECLARE_INTERRUPT_HANDLER_RET(do_page_fault);

DECLARE_INTERRUPT_HANDLER(do_bad_page_fault_segv);



/* process.c */

DECLARE_INTERRUPT_HANDLER(do_break);



/* time.c */

DECLARE_INTERRUPT_HANDLER_ASYNC(timer_interrupt);



/* mce.c */

DECLARE_INTERRUPT_HANDLER_NMI(machine_check_early);

DECLARE_INTERRUPT_HANDLER_NMI(hmi_exception_realmode);



DECLARE_INTERRUPT_HANDLER_ASYNC(TAUException);



void replay_system_reset(void);

void replay_soft_interrupts(void);



#endif /* _ASM_POWERPC_INTERRUPT_H */