Skip to content

Commit f074059

Browse files
riteshharjanimaddy-kerneldev
authored andcommitted
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
1 parent 7bcfba2 commit f074059

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

arch/powerpc/mm/book3s64/radix_tlb.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static __always_inline void __tlbie_va(unsigned long va, unsigned long pid,
185185
trace_tlbie(0, 0, rb, rs, ric, prs, r);
186186
}
187187

188-
static __always_inline void __tlbie_lpid_va(unsigned long va, unsigned long lpid,
188+
static __always_inline void __tlbie_va_lpid(unsigned long va, unsigned long lpid,
189189
unsigned long ap, unsigned long ric)
190190
{
191191
unsigned long rb,rs,prs,r;
@@ -249,17 +249,17 @@ static inline void fixup_tlbie_pid(unsigned long pid)
249249
}
250250
}
251251

252-
static inline void fixup_tlbie_lpid_va(unsigned long va, unsigned long lpid,
252+
static inline void fixup_tlbie_va_lpid(unsigned long va, unsigned long lpid,
253253
unsigned long ap)
254254
{
255255
if (cpu_has_feature(CPU_FTR_P9_TLBIE_ERAT_BUG)) {
256256
asm volatile("ptesync": : :"memory");
257-
__tlbie_lpid_va(va, 0, ap, RIC_FLUSH_TLB);
257+
__tlbie_va_lpid(va, 0, ap, RIC_FLUSH_TLB);
258258
}
259259

260260
if (cpu_has_feature(CPU_FTR_P9_TLBIE_STQ_BUG)) {
261261
asm volatile("ptesync": : :"memory");
262-
__tlbie_lpid_va(va, lpid, ap, RIC_FLUSH_TLB);
262+
__tlbie_va_lpid(va, lpid, ap, RIC_FLUSH_TLB);
263263
}
264264
}
265265

@@ -278,7 +278,7 @@ static inline void fixup_tlbie_lpid(unsigned long lpid)
278278

279279
if (cpu_has_feature(CPU_FTR_P9_TLBIE_STQ_BUG)) {
280280
asm volatile("ptesync": : :"memory");
281-
__tlbie_lpid_va(va, lpid, mmu_get_ap(MMU_PAGE_64K), RIC_FLUSH_TLB);
281+
__tlbie_va_lpid(va, lpid, mmu_get_ap(MMU_PAGE_64K), RIC_FLUSH_TLB);
282282
}
283283
}
284284

@@ -529,14 +529,14 @@ static void do_tlbiel_va_range(void *info)
529529
t->psize, t->also_pwc);
530530
}
531531

532-
static __always_inline void _tlbie_lpid_va(unsigned long va, unsigned long lpid,
532+
static __always_inline void _tlbie_va_lpid(unsigned long va, unsigned long lpid,
533533
unsigned long psize, unsigned long ric)
534534
{
535535
unsigned long ap = mmu_get_ap(psize);
536536

537537
asm volatile("ptesync": : :"memory");
538-
__tlbie_lpid_va(va, lpid, ap, ric);
539-
fixup_tlbie_lpid_va(va, lpid, ap);
538+
__tlbie_va_lpid(va, lpid, ap, ric);
539+
fixup_tlbie_va_lpid(va, lpid, ap);
540540
asm volatile("eieio; tlbsync; ptesync": : :"memory");
541541
}
542542

@@ -1147,7 +1147,7 @@ void radix__flush_tlb_lpid_page(unsigned int lpid,
11471147
{
11481148
int psize = radix_get_mmu_psize(page_size);
11491149

1150-
_tlbie_lpid_va(addr, lpid, psize, RIC_FLUSH_TLB);
1150+
_tlbie_va_lpid(addr, lpid, psize, RIC_FLUSH_TLB);
11511151
}
11521152
EXPORT_SYMBOL_GPL(radix__flush_tlb_lpid_page);
11531153

0 commit comments

Comments
 (0)