Skip to content

Commit

Permalink
powerpc/64: Implement and use soft_enabled_set_return API
Browse files Browse the repository at this point in the history
Add a new wrapper function, soft_enabled_set_return(), added to do the
paca->soft_enabled updates requiring a set-return.

Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Madhavan Srinivasan authored and Michael Ellerman committed Jan 19, 2018
1 parent e0b5687 commit a67c543
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions arch/powerpc/include/asm/hw_irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,20 @@ static inline notrace void soft_enabled_set(unsigned long enable)
: "memory");
}

static inline notrace unsigned long soft_enabled_set_return(unsigned long enable)
{
unsigned long flags;

asm volatile(
"lbz %0,%1(13); stb %2,%1(13)"
: "=&r" (flags)
: "i" (offsetof(struct paca_struct, soft_enabled)),
"r" (enable)
: "memory");

return flags;
}

static inline unsigned long arch_local_save_flags(void)
{
return soft_enabled_return();
Expand All @@ -95,16 +109,7 @@ static inline void arch_local_irq_enable(void)

static inline unsigned long arch_local_irq_save(void)
{
unsigned long flags;

asm volatile(
"lbz %0,%1(13); stb %2,%1(13)"
: "=&r" (flags)
: "i" (offsetof(struct paca_struct, soft_enabled)),
"r" (IRQS_DISABLED)
: "memory");

return flags;
return soft_enabled_set_return(IRQS_DISABLED);
}

static inline bool arch_irqs_disabled_flags(unsigned long flags)
Expand Down

0 comments on commit a67c543

Please sign in to comment.