powerpc/irq: Refactor irq_soft_mask_{set,or}_return()

This partialy reapply commit ef5b570d3700 ("powerpc/irq: Don't
open code irq_soft_mask helpers") which was reverted by
commit 684c68d92e2e ("Revert "powerpc/irq: Don't open code
irq_soft_mask helpers"")

irq_soft_mask_set_return() and irq_soft_mask_or_return()
are overset of irq_soft_mask_set().

Have them use irq_soft_mask_set() instead of duplicating it.

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

diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 983551859891a9525551ae477630b7eee21ef3f6..e8de249339d8534c0a1d389987ea044a4c3e7a9b 100644 (file)
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -157,36 +157,18 @@ static inline notrace void irq_soft_mask_set(unsigned long mask)
 
 static inline notrace unsigned long irq_soft_mask_set_return(unsigned long mask)
 {
-       unsigned long flags;
-
-#ifdef CONFIG_PPC_IRQ_SOFT_MASK_DEBUG
-       WARN_ON(mask && !(mask & IRQS_DISABLED));
-#endif
+       unsigned long flags = irq_soft_mask_return();
 
-       asm volatile(
-               "lbz %0,%1(13); stb %2,%1(13)"
-               : "=&r" (flags)
-               : "i" (offsetof(struct paca_struct, irq_soft_mask)),
-                 "r" (mask)
-               : "memory");
+       irq_soft_mask_set(mask);
 
        return flags;
 }
 
 static inline notrace unsigned long irq_soft_mask_or_return(unsigned long mask)
 {
-       unsigned long flags, tmp;
+       unsigned long flags = irq_soft_mask_return();
 
-       asm volatile(
-               "lbz %0,%2(13); or %1,%0,%3; stb %1,%2(13)"
-               : "=&r" (flags), "=r" (tmp)
-               : "i" (offsetof(struct paca_struct, irq_soft_mask)),
-                 "r" (mask)
-               : "memory");
-
-#ifdef CONFIG_PPC_IRQ_SOFT_MASK_DEBUG
-       WARN_ON((mask | flags) && !((mask | flags) & IRQS_DISABLED));
-#endif
+       irq_soft_mask_set(flags | mask);
 
        return flags;
 }