| Message ID | 1473944523-624-4-git-send-email-maddy@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, 15 Sep 2016 18:31:53 +0530 Madhavan Srinivasan <maddy@linux.vnet.ibm.com> wrote: > Move set_soft_enabled() from powerpc/kernel/irq.c to > asm/hw_irq.c. and rename it soft_enabled_set(). > THis way paca->soft_enabled updates can be forced. Could you just tidy up the changelog a little? You are renaming it I assume because you are going to introduce more soft_enabled_x() functions, and that the namespace works better as a prefix than a postfix. You are moving it so all paca->soft_enabled updates can be done via these access functions rather than open coded. Did I get that right? Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
On Friday 16 September 2016 03:20 PM, Nicholas Piggin wrote: > On Thu, 15 Sep 2016 18:31:53 +0530 > Madhavan Srinivasan <maddy@linux.vnet.ibm.com> wrote: > >> Move set_soft_enabled() from powerpc/kernel/irq.c to >> asm/hw_irq.c. and rename it soft_enabled_set(). >> THis way paca->soft_enabled updates can be forced. > Could you just tidy up the changelog a little? > > You are renaming it I assume because you are going to introduce more > soft_enabled_x() functions, and that the namespace works better as a > prefix than a postfix. > > You are moving it so all paca->soft_enabled updates can be done via > these access functions rather than open coded. > > Did I get that right? Yes. That is right. My bad. Will fix the commit message and changelog. > > Reviewed-by: Nicholas Piggin <npiggin@gmail.com> >
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h index 1fcc2fd7275a..8fad8c24760b 100644 --- a/arch/powerpc/include/asm/hw_irq.h +++ b/arch/powerpc/include/asm/hw_irq.h @@ -47,6 +47,12 @@ extern void unknown_exception(struct pt_regs *regs); #ifdef CONFIG_PPC64 #include <asm/paca.h> +static inline notrace void soft_enabled_set(unsigned long enable) +{ + __asm__ __volatile__("stb %0,%1(13)" + : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled))); +} + static inline unsigned long arch_local_save_flags(void) { unsigned long flags; diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index ed1123125063..5a926ea5bd0b 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -107,12 +107,6 @@ static inline notrace unsigned long get_irq_happened(void) return happened; } -static inline notrace void set_soft_enabled(unsigned long enable) -{ - __asm__ __volatile__("stb %0,%1(13)" - : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled))); -} - static inline notrace int decrementer_check_overflow(void) { u64 now = get_tb_or_rtc(); @@ -208,7 +202,7 @@ notrace void arch_local_irq_restore(unsigned long en) unsigned int replay; /* Write the new soft-enabled value */ - set_soft_enabled(en); + soft_enabled_set(en); if (en == IRQ_DISABLE_MASK_LINUX) return; /* @@ -254,7 +248,7 @@ notrace void arch_local_irq_restore(unsigned long en) } #endif /* CONFIG_TRACE_IRQFLAGS */ - set_soft_enabled(IRQ_DISABLE_MASK_LINUX); + soft_enabled_set(IRQ_DISABLE_MASK_LINUX); /* * Check if anything needs to be re-emitted. We haven't @@ -264,7 +258,7 @@ notrace void arch_local_irq_restore(unsigned long en) replay = __check_irq_replay(); /* We can soft-enable now */ - set_soft_enabled(IRQ_DISABLE_MASK_NONE); + soft_enabled_set(IRQ_DISABLE_MASK_NONE); /* * And replay if we have to. This will return with interrupts
Move set_soft_enabled() from powerpc/kernel/irq.c to asm/hw_irq.c. and rename it soft_enabled_set(). THis way paca->soft_enabled updates can be forced. Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> --- arch/powerpc/include/asm/hw_irq.h | 6 ++++++ arch/powerpc/kernel/irq.c | 12 +++--------- 2 files changed, 9 insertions(+), 9 deletions(-)