UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/irq64: Remove get_irq_happened() 

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
This commit is contained in:
Christophe Leroy 2022-05-18 09:40:16 +02:00 committed by Michael Ellerman
parent 7d7b28b302
commit 98552307e3
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/kernel/irq_64.c
View File

@ -68,16 +68,6 @@
int distribute_irqs = 1; 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) void replay_soft_interrupts(void)
{ {
struct pt_regs regs; struct pt_regs regs;
@ -234,7 +224,7 @@ notrace void arch_local_irq_restore(unsigned long mask)
return; return;
happened: happened:
irq_happened = get_irq_happened(); irq_happened = READ_ONCE(local_paca->irq_happened);
if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG)) if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG))
WARN_ON_ONCE(!irq_happened); WARN_ON_ONCE(!irq_happened);
@ -257,7 +247,7 @@ happened:
* IRQ_HARD_DIS again and warn if it is still * IRQ_HARD_DIS again and warn if it is still
* clear. * clear.
*/ */
irq_happened = get_irq_happened(); irq_happened = READ_ONCE(local_paca->irq_happened);
WARN_ON_ONCE(!(irq_happened & PACA_IRQ_HARD_DIS)); WARN_ON_ONCE(!(irq_happened & PACA_IRQ_HARD_DIS));
} }
} }