diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2020-10-22 09:29:34 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-12-09 08:46:55 +0300 |
| commit | b91280f3f36d64cc6f8022893af00935c99de197 (patch) | |
| tree | 3c06fe44af8f674075d15792a700af2e4bb6e671 | |
| parent | cfe32ad0b3dc74df34ab6fea38ccb1e53f904a10 (diff) | |
| download | linux-b91280f3f36d64cc6f8022893af00935c99de197.tar.xz | |
powerpc/32s: Inline _tlbie() on non SMP
On non SMP, _tlbie() is just a tlbie plus a sync instruction.
Make it static inline.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/475136425541db5c7c8a0395d19d400525b251bc.1603348103.git.christophe.leroy@csgroup.eu
| -rw-r--r-- | arch/powerpc/include/asm/book3s/32/tlbflush.h | 7 | ||||
| -rw-r--r-- | arch/powerpc/mm/book3s32/hash_low.S | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/book3s/32/tlbflush.h b/arch/powerpc/include/asm/book3s/32/tlbflush.h index 3043e7af70aa..f392a619138d 100644 --- a/arch/powerpc/include/asm/book3s/32/tlbflush.h +++ b/arch/powerpc/include/asm/book3s/32/tlbflush.h @@ -12,7 +12,14 @@ extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned long end); extern void flush_tlb_kernel_range(unsigned long start, unsigned long end); +#ifdef CONFIG_SMP void _tlbie(unsigned long address); +#else +static inline void _tlbie(unsigned long address) +{ + asm volatile ("tlbie %0; sync" : : "r" (address) : "memory"); +} +#endif void _tlbia(void); static inline void local_flush_tlb_page(struct vm_area_struct *vma, diff --git a/arch/powerpc/mm/book3s32/hash_low.S b/arch/powerpc/mm/book3s32/hash_low.S index aca353d1c5f4..ce1459dd08ba 100644 --- a/arch/powerpc/mm/book3s32/hash_low.S +++ b/arch/powerpc/mm/book3s32/hash_low.S @@ -622,8 +622,8 @@ _ASM_NOKPROBE_SYMBOL(flush_hash_pages) /* * Flush an entry from the TLB */ -_GLOBAL(_tlbie) #ifdef CONFIG_SMP +_GLOBAL(_tlbie) lwz r8,TASK_CPU(r2) oris r8,r8,11 mfmsr r10 @@ -647,12 +647,9 @@ _GLOBAL(_tlbie) stw r0,0(r9) /* clear mmu_hash_lock */ mtmsr r10 isync -#else /* CONFIG_SMP */ - tlbie r3 - sync -#endif /* CONFIG_SMP */ blr _ASM_NOKPROBE_SYMBOL(_tlbie) +#endif /* CONFIG_SMP */ /* * Flush the entire TLB. 603/603e only |