powerpc: handle irq_enter/irq_exit in interrupt handler wrappers

Move irq_enter/irq_exit into asynchronous interrupt handler wrappers.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210130130852.2952424-35-npiggin@gmail.com

diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
index f7f64c3c514d11a4f9f29ce85843cd3ad789a058..5a13954995080013d95022bb7d32e6f2bfaf3e18 100644 (file)
--- a/arch/powerpc/include/asm/interrupt.h
+++ b/arch/powerpc/include/asm/interrupt.h
@@ -43,10 +43,12 @@ static inline void interrupt_exit_prepare(struct pt_regs *regs, struct interrupt
 static inline void interrupt_async_enter_prepare(struct pt_regs *regs, struct interrupt_state *state)
 {
        interrupt_enter_prepare(regs, state);
+       irq_enter();
 }
 
 static inline void interrupt_async_exit_prepare(struct pt_regs *regs, struct interrupt_state *state)
 {
+       irq_exit();
        interrupt_exit_prepare(regs, state);
 }
 

diff --git a/arch/powerpc/kernel/dbell.c b/arch/powerpc/kernel/dbell.c
index 6a7ecfca5c3be6e206320a9ae649682a37e098e9..5545c9cd17c1c9ae088e379db0760a48506dde78 100644 (file)
--- a/arch/powerpc/kernel/dbell.c
+++ b/arch/powerpc/kernel/dbell.c
@@ -23,7 +23,6 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(doorbell_exception)
 {
        struct pt_regs *old_regs = set_irq_regs(regs);
 
-       irq_enter();
        trace_doorbell_entry(regs);
 
        ppc_msgsync();
@@ -36,7 +35,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(doorbell_exception)
        smp_ipi_demux_relaxed(); /* already performed the barrier */
 
        trace_doorbell_exit(regs);
-       irq_exit();
+
        set_irq_regs(old_regs);
 }
 #else /* CONFIG_SMP */

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 2055d204d08edd0921fe6c834bc51672cf7193db..681abb7c05071b8f73e2d27b55b5e5bd36798080 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -641,8 +641,6 @@ void __do_irq(struct pt_regs *regs)
 {
        unsigned int irq;
 
-       irq_enter();
-
        trace_irq_entry(regs);
 
        /*
@@ -662,8 +660,6 @@ void __do_irq(struct pt_regs *regs)
                generic_handle_irq(irq);
 
        trace_irq_exit(regs);
-
-       irq_exit();
 }
 
 DEFINE_INTERRUPT_HANDLER_ASYNC(do_IRQ)

diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c
index 3f300eccc09e79d8c9f6d4a9b8608494c73293e6..6c31af7f4fa82a77fdf1cf87c9e8b3a5a77ea93e 100644 (file)
--- a/arch/powerpc/kernel/tau_6xx.c
+++ b/arch/powerpc/kernel/tau_6xx.c
@@ -105,12 +105,9 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(TAUException)
 {
        int cpu = smp_processor_id();
 
-       irq_enter();
        tau[cpu].interrupts++;
 
        TAUupdate(cpu);
-
-       irq_exit();
 }
 #endif /* CONFIG_TAU_INT */
 

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 7636773b028f6f34e22054807ce26cf87b2ead5e..b67d93a609a2d6e331b4a06f696e6ee80d5796de 100644 (file)
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -611,7 +611,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(timer_interrupt)
 #endif
 
        old_regs = set_irq_regs(regs);
-       irq_enter();
+
        trace_timer_interrupt_entry(regs);
 
        if (test_irq_work_pending()) {
@@ -636,7 +636,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(timer_interrupt)
        }
 
        trace_timer_interrupt_exit(regs);
-       irq_exit();
+
        set_irq_regs(old_regs);
 }
 EXPORT_SYMBOL(timer_interrupt);

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 9c26fb41b27587c4c261ddf922e739e8651cbc6f..13fb93a59556b01d16905d0574a7c4dc71d68ad6 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -801,7 +801,9 @@ void die_mce(const char *str, struct pt_regs *regs, long err)
         * do_exit() checks for in_interrupt() and panics in that case, so
         * exit the irq/nmi before calling die.
         */
-       if (!IS_ENABLED(CONFIG_PPC_BOOK3S_64))
+       if (IS_ENABLED(CONFIG_PPC_BOOK3S_64))
+               irq_exit();
+       else
                nmi_exit();
        die(str, regs, err);
 }
@@ -1061,7 +1063,6 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(handle_hmi_exception)
        struct pt_regs *old_regs;
 
        old_regs = set_irq_regs(regs);
-       irq_enter();
 
 #ifdef CONFIG_VSX
        /* Real mode flagged P9 special emu is needed */
@@ -1081,7 +1082,6 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(handle_hmi_exception)
        if (ppc_md.handle_hmi_exception)
                ppc_md.handle_hmi_exception(regs);
 
-       irq_exit();
        set_irq_regs(old_regs);
 }
 
@@ -1907,13 +1907,9 @@ DEFINE_INTERRUPT_HANDLER_NMI(performance_monitor_exception_nmi)
 DECLARE_INTERRUPT_HANDLER_ASYNC(performance_monitor_exception_async);
 DEFINE_INTERRUPT_HANDLER_ASYNC(performance_monitor_exception_async)
 {
-       irq_enter();
-
        __this_cpu_inc(irq_stat.pmu_irqs);
 
        perf_irq(regs);
-
-       irq_exit();
 }
 
 DEFINE_INTERRUPT_HANDLER_RAW(performance_monitor_exception)