powerpc/64s: Rename tlbie_lpid_va to tlbie_va_lpid

In previous patch we renamed tlbie_va_lpid functions to
tlbie_va_pid_lpid() since those were working with PIDs as well.
This then allows us to rename tlbie_lpid_va to tlbie_va_lpid, which
finally makes all the tlbie function naming consistent.

No functional change in this patch.

Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/8fadd2beb2f883c65ba0d797c87d238098cd13c8.1773078178.git.ritesh.list@gmail.com

diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c
index 1adf20798ca6e434471600bc6fb8c5df2b1c7a1f..6ce94eaefc1bd06c9211e4cec335cc28baf91211 100644 (file)
--- a/arch/powerpc/mm/book3s64/radix_tlb.c
+++ b/arch/powerpc/mm/book3s64/radix_tlb.c
@@ -185,7 +185,7 @@ static __always_inline void __tlbie_va(unsigned long va, unsigned long pid,
        trace_tlbie(0, 0, rb, rs, ric, prs, r);
 }
 
-static __always_inline void __tlbie_lpid_va(unsigned long va, unsigned long lpid,
+static __always_inline void __tlbie_va_lpid(unsigned long va, unsigned long lpid,
                                            unsigned long ap, unsigned long ric)
 {
        unsigned long rb,rs,prs,r;
@@ -249,17 +249,17 @@ static inline void fixup_tlbie_pid(unsigned long pid)
        }
 }
 
-static inline void fixup_tlbie_lpid_va(unsigned long va, unsigned long lpid,
+static inline void fixup_tlbie_va_lpid(unsigned long va, unsigned long lpid,
                                       unsigned long ap)
 {
        if (cpu_has_feature(CPU_FTR_P9_TLBIE_ERAT_BUG)) {
                asm volatile("ptesync": : :"memory");
-               __tlbie_lpid_va(va, 0, ap, RIC_FLUSH_TLB);
+               __tlbie_va_lpid(va, 0, ap, RIC_FLUSH_TLB);
        }
 
        if (cpu_has_feature(CPU_FTR_P9_TLBIE_STQ_BUG)) {
                asm volatile("ptesync": : :"memory");
-               __tlbie_lpid_va(va, lpid, ap, RIC_FLUSH_TLB);
+               __tlbie_va_lpid(va, lpid, ap, RIC_FLUSH_TLB);
        }
 }
 
@@ -278,7 +278,7 @@ static inline void fixup_tlbie_lpid(unsigned long lpid)
 
        if (cpu_has_feature(CPU_FTR_P9_TLBIE_STQ_BUG)) {
                asm volatile("ptesync": : :"memory");
-               __tlbie_lpid_va(va, lpid, mmu_get_ap(MMU_PAGE_64K), RIC_FLUSH_TLB);
+               __tlbie_va_lpid(va, lpid, mmu_get_ap(MMU_PAGE_64K), RIC_FLUSH_TLB);
        }
 }
 
@@ -529,14 +529,14 @@ static void do_tlbiel_va_range(void *info)
                                    t->psize, t->also_pwc);
 }
 
-static __always_inline void _tlbie_lpid_va(unsigned long va, unsigned long lpid,
+static __always_inline void _tlbie_va_lpid(unsigned long va, unsigned long lpid,
                              unsigned long psize, unsigned long ric)
 {
        unsigned long ap = mmu_get_ap(psize);
 
        asm volatile("ptesync": : :"memory");
-       __tlbie_lpid_va(va, lpid, ap, ric);
-       fixup_tlbie_lpid_va(va, lpid, ap);
+       __tlbie_va_lpid(va, lpid, ap, ric);
+       fixup_tlbie_va_lpid(va, lpid, ap);
        asm volatile("eieio; tlbsync; ptesync": : :"memory");
 }
 
@@ -1147,7 +1147,7 @@ void radix__flush_tlb_lpid_page(unsigned int lpid,
 {
        int psize = radix_get_mmu_psize(page_size);
 
-       _tlbie_lpid_va(addr, lpid, psize, RIC_FLUSH_TLB);
+       _tlbie_va_lpid(addr, lpid, psize, RIC_FLUSH_TLB);
 }
 EXPORT_SYMBOL_GPL(radix__flush_tlb_lpid_page);