powerpc: rename arch_irq_disabled_regs

Rename arch_irq_disabled_regs() to regs_irqs_disabled() to align with the
naming used in the generic irqentry framework. This makes the function
available for use both in the PowerPC architecture code and in the
common entry/exit paths shared with other architectures.

This is a preparatory change for enabling the generic irqentry framework
on PowerPC.

Signed-off-by: Mukesh Kumar Chaurasiya <mchauras@linux.ibm.com>
Tested-by: Samir M <samir@linux.ibm.com>
Tested-by: David Gow <davidgow@google.com>
Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Reviewed-by: Shrikanth Hegde <sshegde@linux.ibm.com>
Reviewed-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20260427122742.210074-2-mkchauras@gmail.com

diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 9cd945f2acafa948c80bb3e07c1408eb7fa838f4..b7eee6385ae5c623b054e6caa97047a6d70a3f92 100644 (file)
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -393,7 +393,7 @@ static inline void do_hard_irq_enable(void)
        __hard_irq_enable();
 }
 
-static inline bool arch_irq_disabled_regs(struct pt_regs *regs)
+static inline bool regs_irqs_disabled(struct pt_regs *regs)
 {
        return (regs->softe & IRQS_DISABLED);
 }
@@ -466,7 +466,7 @@ static inline bool arch_irqs_disabled(void)
 
 #define hard_irq_disable()             arch_local_irq_disable()
 
-static inline bool arch_irq_disabled_regs(struct pt_regs *regs)
+static inline bool regs_irqs_disabled(struct pt_regs *regs)
 {
        return !(regs->msr & MSR_EE);
 }

diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
index eb0e4a20b81883b9238adc31301410246d9c9e1e..0e2cddf8bd21f2335aee74f3d1d2a0188be604f1 100644 (file)
--- a/arch/powerpc/include/asm/interrupt.h
+++ b/arch/powerpc/include/asm/interrupt.h
@@ -172,7 +172,7 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs)
        /* Enable MSR[RI] early, to support kernel SLB and hash faults */
 #endif
 
-       if (!arch_irq_disabled_regs(regs))
+       if (!regs_irqs_disabled(regs))
                trace_hardirqs_off();
 
        if (user_mode(regs)) {
@@ -192,11 +192,11 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs)
                        CT_WARN_ON(ct_state() != CT_STATE_KERNEL &&
                                   ct_state() != CT_STATE_IDLE);
                INT_SOFT_MASK_BUG_ON(regs, is_implicit_soft_masked(regs));
-               INT_SOFT_MASK_BUG_ON(regs, arch_irq_disabled_regs(regs) &&
-                                          search_kernel_restart_table(regs->nip));
+               INT_SOFT_MASK_BUG_ON(regs, regs_irqs_disabled(regs) &&
+                                    search_kernel_restart_table(regs->nip));
        }
-       INT_SOFT_MASK_BUG_ON(regs, !arch_irq_disabled_regs(regs) &&
-                                  !(regs->msr & MSR_EE));
+       INT_SOFT_MASK_BUG_ON(regs, !regs_irqs_disabled(regs) &&
+                            !(regs->msr & MSR_EE));
 
        booke_restore_dbcr0();
 }
@@ -298,7 +298,7 @@ static inline void interrupt_nmi_enter_prepare(struct pt_regs *regs, struct inte
                 * Adjust regs->softe to be soft-masked if it had not been
                 * reconcied (e.g., interrupt entry with MSR[EE]=0 but softe
                 * not yet set disabled), or if it was in an implicit soft
-                * masked state. This makes arch_irq_disabled_regs(regs)
+                * masked state. This makes regs_irqs_disabled(regs)
                 * behave as expected.
                 */
                regs->softe = IRQS_ALL_DISABLED;
@@ -372,7 +372,7 @@ static inline void interrupt_nmi_exit_prepare(struct pt_regs *regs, struct inter
 
 #ifdef CONFIG_PPC64
 #ifdef CONFIG_PPC_BOOK3S
-       if (arch_irq_disabled_regs(regs)) {
+       if (regs_irqs_disabled(regs)) {
                unsigned long rst = search_kernel_restart_table(regs->nip);
                if (rst)
                        regs_set_return_ip(regs, rst);
@@ -661,7 +661,7 @@ void replay_soft_interrupts(void);
 
 static inline void interrupt_cond_local_irq_enable(struct pt_regs *regs)
 {
-       if (!arch_irq_disabled_regs(regs))
+       if (!regs_irqs_disabled(regs))
                local_irq_enable();
 }
 

diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c
index e63bfde13e03167beb5b25aa43332e91b5fd17e0..666eadb589a5c70398453d8078fad4762d0c0956 100644 (file)
--- a/arch/powerpc/kernel/interrupt.c
+++ b/arch/powerpc/kernel/interrupt.c
@@ -347,7 +347,7 @@ notrace unsigned long interrupt_exit_user_prepare(struct pt_regs *regs)
        unsigned long ret;
 
        BUG_ON(regs_is_unrecoverable(regs));
-       BUG_ON(arch_irq_disabled_regs(regs));
+       BUG_ON(regs_irqs_disabled(regs));
        CT_WARN_ON(ct_state() == CT_STATE_USER);
 
        /*
@@ -396,7 +396,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs)
 
        local_irq_disable();
 
-       if (!arch_irq_disabled_regs(regs)) {
+       if (!regs_irqs_disabled(regs)) {
                /* Returning to a kernel context with local irqs enabled. */
                WARN_ON_ONCE(!(regs->msr & MSR_EE));
 again:

diff --git a/arch/powerpc/kernel/syscall.c b/arch/powerpc/kernel/syscall.c
index b762677f8737151537128f4ba026c0a622059599..52d6e10eab22e379f978b3ae9801f9faaf5fb75e 100644 (file)
--- a/arch/powerpc/kernel/syscall.c
+++ b/arch/powerpc/kernel/syscall.c
@@ -32,7 +32,7 @@ notrace long system_call_exception(struct pt_regs *regs, unsigned long r0)
 
        BUG_ON(regs_is_unrecoverable(regs));
        BUG_ON(!user_mode(regs));
-       BUG_ON(arch_irq_disabled_regs(regs));
+       BUG_ON(regs_irqs_disabled(regs));
 
 #ifdef CONFIG_PPC_PKEY
        if (mmu_has_feature(MMU_FTR_PKEY)) {

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index cb8e9357383e9f961a7f39dadb2fc9961a1eb986..629f2a2d4780e390a61b946fd6e65cfb925b088b 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1956,7 +1956,7 @@ DEFINE_INTERRUPT_HANDLER_RAW(performance_monitor_exception)
         * prevent hash faults on user addresses when reading callchains (and
         * looks better from an irq tracing perspective).
         */
-       if (IS_ENABLED(CONFIG_PPC64) && unlikely(arch_irq_disabled_regs(regs)))
+       if (IS_ENABLED(CONFIG_PPC64) && unlikely(regs_irqs_disabled(regs)))
                performance_monitor_exception_nmi(regs);
        else
                performance_monitor_exception_async(regs);

diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c
index 764001deb0605fa5d34ac09575086f8f796562ce..c40c693684764c4ce04cd5b2fdc20805c2c1416e 100644 (file)
--- a/arch/powerpc/kernel/watchdog.c
+++ b/arch/powerpc/kernel/watchdog.c
@@ -376,7 +376,7 @@ DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt)
        u64 tb;
 
        /* should only arrive from kernel, with irqs disabled */
-       WARN_ON_ONCE(!arch_irq_disabled_regs(regs));
+       WARN_ON_ONCE(!regs_irqs_disabled(regs));
 
        if (!cpumask_test_cpu(cpu, &wd_cpus_enabled))
                return 0;

diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 2e6adf5b95c4040477e916ea3f8053dc36b8b31f..802bc9b7ef6fad944d5f9f3d5ac0a27629c0ff64 100644 (file)
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -2483,7 +2483,7 @@ static void __perf_event_interrupt(struct pt_regs *regs)
         * will trigger a PMI after waking up from idle. Since counter values are _not_
         * saved/restored in idle path, can lead to below "Can't find PMC" message.
         */
-       if (unlikely(!found) && !arch_irq_disabled_regs(regs))
+       if (unlikely(!found) && !regs_irqs_disabled(regs))
                printk_ratelimited(KERN_WARNING "Can't find PMC that caused IRQ\n");
 
        /*