Skip to content

Commit 7bcfba2

Browse files
riteshharjanimaddy-kerneldev
authored andcommitted
powerpc/64s: Rename tlbie_va_lpid to tlbie_va_pid_lpid
It only make sense to rename these functions, so it's better reflect what they are supposed to do. For e.g. __tlbie_va_pid_lpid name better reflect that it is invalidating tlbie using VA, PID and LPID. 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/0a0b2cf23b9522f891f9a0f976bbdc5c8e6f6d8b.1773078178.git.ritesh.list@gmail.com
1 parent 4894e2f commit 7bcfba2

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

arch/powerpc/mm/book3s64/radix_tlb.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,7 @@ static __always_inline void __tlbie_pid_lpid(unsigned long pid,
14111411
trace_tlbie(0, 0, rb, rs, ric, prs, r);
14121412
}
14131413

1414-
static __always_inline void __tlbie_va_lpid(unsigned long va, unsigned long pid,
1414+
static __always_inline void __tlbie_va_pid_lpid(unsigned long va, unsigned long pid,
14151415
unsigned long lpid,
14161416
unsigned long ap, unsigned long ric)
14171417
{
@@ -1443,7 +1443,7 @@ static inline void fixup_tlbie_pid_lpid(unsigned long pid, unsigned long lpid)
14431443

14441444
if (cpu_has_feature(CPU_FTR_P9_TLBIE_STQ_BUG)) {
14451445
asm volatile("ptesync" : : : "memory");
1446-
__tlbie_va_lpid(va, pid, lpid, mmu_get_ap(MMU_PAGE_64K),
1446+
__tlbie_va_pid_lpid(va, pid, lpid, mmu_get_ap(MMU_PAGE_64K),
14471447
RIC_FLUSH_TLB);
14481448
}
14491449
}
@@ -1474,7 +1474,7 @@ static inline void _tlbie_pid_lpid(unsigned long pid, unsigned long lpid,
14741474
asm volatile("eieio; tlbsync; ptesync" : : : "memory");
14751475
}
14761476

1477-
static inline void fixup_tlbie_va_range_lpid(unsigned long va,
1477+
static inline void fixup_tlbie_va_range_pid_lpid(unsigned long va,
14781478
unsigned long pid,
14791479
unsigned long lpid,
14801480
unsigned long ap)
@@ -1486,11 +1486,11 @@ static inline void fixup_tlbie_va_range_lpid(unsigned long va,
14861486

14871487
if (cpu_has_feature(CPU_FTR_P9_TLBIE_STQ_BUG)) {
14881488
asm volatile("ptesync" : : : "memory");
1489-
__tlbie_va_lpid(va, pid, lpid, ap, RIC_FLUSH_TLB);
1489+
__tlbie_va_pid_lpid(va, pid, lpid, ap, RIC_FLUSH_TLB);
14901490
}
14911491
}
14921492

1493-
static inline void __tlbie_va_range_lpid(unsigned long start, unsigned long end,
1493+
static inline void __tlbie_va_range_pid_lpid(unsigned long start, unsigned long end,
14941494
unsigned long pid, unsigned long lpid,
14951495
unsigned long page_size,
14961496
unsigned long psize)
@@ -1499,20 +1499,20 @@ static inline void __tlbie_va_range_lpid(unsigned long start, unsigned long end,
14991499
unsigned long ap = mmu_get_ap(psize);
15001500

15011501
for (addr = start; addr < end; addr += page_size)
1502-
__tlbie_va_lpid(addr, pid, lpid, ap, RIC_FLUSH_TLB);
1502+
__tlbie_va_pid_lpid(addr, pid, lpid, ap, RIC_FLUSH_TLB);
15031503

1504-
fixup_tlbie_va_range_lpid(addr - page_size, pid, lpid, ap);
1504+
fixup_tlbie_va_range_pid_lpid(addr - page_size, pid, lpid, ap);
15051505
}
15061506

1507-
static inline void _tlbie_va_range_lpid(unsigned long start, unsigned long end,
1507+
static inline void _tlbie_va_range_pid_lpid(unsigned long start, unsigned long end,
15081508
unsigned long pid, unsigned long lpid,
15091509
unsigned long page_size,
15101510
unsigned long psize, bool also_pwc)
15111511
{
15121512
asm volatile("ptesync" : : : "memory");
15131513
if (also_pwc)
15141514
__tlbie_pid_lpid(pid, lpid, RIC_FLUSH_PWC);
1515-
__tlbie_va_range_lpid(start, end, pid, lpid, page_size, psize);
1515+
__tlbie_va_range_pid_lpid(start, end, pid, lpid, page_size, psize);
15161516
asm volatile("eieio; tlbsync; ptesync" : : : "memory");
15171517
}
15181518

@@ -1563,7 +1563,7 @@ void do_h_rpt_invalidate_prt(unsigned long pid, unsigned long lpid,
15631563
_tlbie_pid_lpid(pid, lpid, RIC_FLUSH_TLB);
15641564
return;
15651565
}
1566-
_tlbie_va_range_lpid(start, end, pid, lpid,
1566+
_tlbie_va_range_pid_lpid(start, end, pid, lpid,
15671567
(1UL << def->shift), psize, false);
15681568
}
15691569
}

0 commit comments

Comments
 (0)