Skip to content

Commit

Permalink
powerpc/irq64: Remove get_irq_happened()
Browse files Browse the repository at this point in the history
No need to open code the read of local_paca->irq_happened in
assembly, we have READ_ONCE() for doing the same.

Replace get_irq_happened() by READ_ONCE(local_paca->irq_happened).

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/af511b53e4eb51f8fbc51eda7f5597175e68dce6.1652859593.git.christophe.leroy@csgroup.eu
  • Loading branch information
Christophe Leroy authored and Michael Ellerman committed Jun 29, 2022
1 parent 7d7b28b commit 9855230
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions arch/powerpc/kernel/irq_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,6 @@

int distribute_irqs = 1;

static inline notrace unsigned long get_irq_happened(void)
{
unsigned long happened;

__asm__ __volatile__("lbz %0,%1(13)"
: "=r" (happened) : "i" (offsetof(struct paca_struct, irq_happened)));

return happened;
}

void replay_soft_interrupts(void)
{
struct pt_regs regs;
Expand Down Expand Up @@ -234,7 +224,7 @@ notrace void arch_local_irq_restore(unsigned long mask)
return;

happened:
irq_happened = get_irq_happened();
irq_happened = READ_ONCE(local_paca->irq_happened);
if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG))
WARN_ON_ONCE(!irq_happened);

Expand All @@ -257,7 +247,7 @@ notrace void arch_local_irq_restore(unsigned long mask)
* IRQ_HARD_DIS again and warn if it is still
* clear.
*/
irq_happened = get_irq_happened();
irq_happened = READ_ONCE(local_paca->irq_happened);
WARN_ON_ONCE(!(irq_happened & PACA_IRQ_HARD_DIS));
}
}
Expand Down

0 comments on commit 9855230

Please sign in to comment.