powerpc/interrupt: Interchange prep_irq_for_{kernel_enabled/user}_exit()

prep_irq_for_user_exit() is a superset of
prep_irq_for_kernel_enabled_exit(). In order to allow refactoring in
following patch, interchange the two. This will allow
prep_irq_for_user_exit() to call a renamed version of
prep_irq_for_kernel_enabled_exit().

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210617155116.2167984-16-npiggin@gmail.com

diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c
index 33efa01..58c7466 100644 (file)
--- a/arch/powerpc/kernel/interrupt.c
+++ b/arch/powerpc/kernel/interrupt.c
@@ -46,27 +46,28 @@ static inline bool exit_must_hard_disable(void)
  * This should be called with local irqs disabled, but if they were previously
  * enabled when the interrupt handler returns (indicating a process-context /
  * synchronous interrupt) then irqs_enabled should be true.
+ *
+ * restartable is true then EE/RI can be left on because interrupts are handled
+ * with a restart sequence.
  */
-static notrace __always_inline bool prep_irq_for_user_exit(void)
+static notrace __always_inline bool prep_irq_for_kernel_enabled_exit(bool restartable)
 {
-       user_enter_irqoff();
        /* This must be done with RI=1 because tracing may touch vmaps */
        trace_hardirqs_on();
 
 #ifdef CONFIG_PPC32
        __hard_EE_RI_disable();
 #else
-       if (exit_must_hard_disable())
+       if (exit_must_hard_disable() || !restartable)
                __hard_EE_RI_disable();
 
        /* This pattern matches prep_irq_for_idle */
        if (unlikely(lazy_irq_pending_nocheck())) {
-               if (exit_must_hard_disable()) {
+               if (exit_must_hard_disable() || !restartable) {
                        local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
                        __hard_RI_enable();
                }
                trace_hardirqs_off();
-               user_exit_irqoff();
 
                return false;
        }
@@ -74,28 +75,26 @@ static notrace __always_inline bool prep_irq_for_user_exit(void)
        return true;
 }
 
-/*
- * restartable is true then EE/RI can be left on because interrupts are handled
- * with a restart sequence.
- */
-static notrace __always_inline bool prep_irq_for_kernel_enabled_exit(bool restartable)
+static notrace __always_inline bool prep_irq_for_user_exit(void)
 {
+       user_enter_irqoff();
        /* This must be done with RI=1 because tracing may touch vmaps */
        trace_hardirqs_on();
 
 #ifdef CONFIG_PPC32
        __hard_EE_RI_disable();
 #else
-       if (exit_must_hard_disable() || !restartable)
+       if (exit_must_hard_disable())
                __hard_EE_RI_disable();
 
        /* This pattern matches prep_irq_for_idle */
        if (unlikely(lazy_irq_pending_nocheck())) {
-               if (exit_must_hard_disable() || !restartable) {
+               if (exit_must_hard_disable()) {
                        local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
                        __hard_RI_enable();
                }
                trace_hardirqs_off();
+               user_exit_irqoff();
 
                return false;
        }