From 2dcd28f7b4f5b92686da45f4ec46802026fb8573 Mon Sep 17 00:00:00 2001 From: Roy Pledge Date: Mon, 11 Jul 2016 14:34:59 +0800 Subject: [PATCH 24/70] Add APIs to setup HugeTLB mappings for USDPAA commit 189653d40d5dc41b8bd4cfb61f766bd8a89b1e34 [context adjustment] Signed-off-by: Zhao Qiang --- arch/powerpc/mm/fsl_booke_mmu.c | 14 +++++++++++++- arch/powerpc/mm/mmu_decl.h | 6 ++++++ 2 files changed, 19 insertions(+), 1 deletion(-) --- a/arch/powerpc/mm/fsl_booke_mmu.c +++ b/arch/powerpc/mm/fsl_booke_mmu.c @@ -105,7 +105,7 @@ unsigned long p_mapped_by_tlbcam(phys_ad * an unsigned long (for example, 32-bit implementations cannot support a 4GB * size). */ -static void settlbcam(int index, unsigned long virt, phys_addr_t phys, +void settlbcam(int index, unsigned long virt, phys_addr_t phys, unsigned long size, unsigned long flags, unsigned int pid) { unsigned int tsize; @@ -143,6 +143,18 @@ static void settlbcam(int index, unsigne tlbcam_addrs[index].phys = phys; } +void cleartlbcam(unsigned long virt, unsigned int pid) +{ + int i = 0; + for (i = 0; i < NUM_TLBCAMS; i++) { + if (tlbcam_addrs[i].start == virt) { + TLBCAM[i].MAS1 = 0; + loadcam_entry(i); + return; + } + } +} + unsigned long calc_cam_sz(unsigned long ram, unsigned long virt, phys_addr_t phys) { --- a/arch/powerpc/mm/mmu_decl.h +++ b/arch/powerpc/mm/mmu_decl.h @@ -91,6 +91,12 @@ extern void _tlbia(void); #endif /* CONFIG_PPC_MMU_NOHASH */ +void settlbcam(int index, unsigned long virt, phys_addr_t phys, + unsigned long size, unsigned long flags, unsigned int pid); + +void cleartlbcam(unsigned long virt, unsigned int pid); + + #ifdef CONFIG_PPC32 extern void mapin_ram(void);