summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/irq.c
diff options
context:
space:
mode:
authorMadhavan Srinivasan <maddy@linux.vnet.ibm.com>2017-12-20 09:25:45 +0530
committerMichael Ellerman <mpe@ellerman.id.au>2018-01-19 22:36:58 +1100
commit0b63acf4a0eb8843f83954ea1bd29ccdfcbaa778 (patch)
treeab57cd5ff8e1e7fa0ed976d16fdfa04ed7f03bab /arch/powerpc/kernel/irq.c
parentb5c1bd62c054f3cff1a672f9bf1dddefafadffec (diff)
downloadlinux-0b63acf4a0eb8843f83954ea1bd29ccdfcbaa778.tar.gz
linux-0b63acf4a0eb8843f83954ea1bd29ccdfcbaa778.tar.bz2
linux-0b63acf4a0eb8843f83954ea1bd29ccdfcbaa778.zip
powerpc/64: Move set_soft_enabled() and rename
Move set_soft_enabled() from powerpc/kernel/irq.c to asm/hw_irq.c, to encourage updates to paca->soft_enabled done via these access function. Add "memory" clobber to hint compiler since paca->soft_enabled memory is the target here. Renaming it as soft_enabled_set() will make namespaces works better as prefix than a postfix when new soft_enabled manipulation functions are introduced. Reviewed-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r--arch/powerpc/kernel/irq.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 483a9206554f..6c04e465caf5 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();
@@ -231,7 +225,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 == IRQS_DISABLED)
return;
/*
@@ -277,7 +271,7 @@ notrace void arch_local_irq_restore(unsigned long en)
}
#endif /* CONFIG_TRACE_IRQFLAGS */
- set_soft_enabled(IRQS_DISABLED);
+ soft_enabled_set(IRQS_DISABLED);
trace_hardirqs_off();
/*
@@ -289,7 +283,7 @@ notrace void arch_local_irq_restore(unsigned long en)
/* We can soft-enable now */
trace_hardirqs_on();
- set_soft_enabled(IRQS_ENABLED);
+ soft_enabled_set(IRQS_ENABLED);
/*
* And replay if we have to. This will return with interrupts
@@ -364,7 +358,7 @@ bool prep_irq_for_idle(void)
* of entering the low power state.
*/
local_paca->irq_happened &= ~PACA_IRQ_HARD_DIS;
- local_paca->soft_enabled = IRQS_ENABLED;
+ soft_enabled_set(IRQS_ENABLED);
/* Tell the caller to enter the low power state */
return true;