On Wed, Jul 13, 2016 at 03:05:29PM +0530, Aneesh Kumar K.V wrote: > We add a tlb flush variant, to flush LPID mappings. > > Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com> > --- > .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 4 +- > arch/powerpc/mm/tlb-radix.c | 52 > ++++++++++++++++++++++ > 2 files changed, 55 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h > b/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h > index 3fa94fcac628..00703e7e4c94 100644 > --- a/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h > +++ b/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h > @@ -32,5 +32,7 @@ extern void radix__flush_tlb_pwc(struct mmu_gather *tlb, > unsigned long addr); > #define radix___flush_tlb_page(mm,addr,p,i) > radix___local_flush_tlb_page(mm,addr,p,i) > #define radix__flush_tlb_pwc(tlb, addr) radix__local_flush_tlb_pwc(tlb, > addr) > #endif > - > +extern void radix__flush_tlb_lpid_va(unsigned long lpid, unsigned long gpa, > + unsigned long page_size); > +extern void radix__flush_tlb_lpid(unsigned long lpid); > #endif > diff --git a/arch/powerpc/mm/tlb-radix.c b/arch/powerpc/mm/tlb-radix.c > index 35690c41f85d..e1f22700fb16 100644 > --- a/arch/powerpc/mm/tlb-radix.c > +++ b/arch/powerpc/mm/tlb-radix.c > @@ -282,9 +282,61 @@ void radix__flush_tlb_range(struct vm_area_struct *vma, > unsigned long start, > } > EXPORT_SYMBOL(radix__flush_tlb_range); > > +static int radix_get_mmu_psize(int page_size) > +{ > + int psize; > + > + if (page_size == (1UL << mmu_psize_defs[mmu_virtual_psize].shift)) > + psize = mmu_virtual_psize; > + else if (page_size == (1UL << mmu_psize_defs[MMU_PAGE_2M].shift)) > + psize = MMU_PAGE_2M; > + else if (page_size == (1UL << mmu_psize_defs[MMU_PAGE_1G].shift)) > + psize = MMU_PAGE_1G; > + else > + return -1;
Just do psize = -1; > + return psize; > +} > > void radix__tlb_flush(struct mmu_gather *tlb) > { > struct mm_struct *mm = tlb->mm; > radix__flush_tlb_mm(mm); > } > + > +void radix__flush_tlb_lpid_va(unsigned long lpid, unsigned long gpa, > + unsigned long page_size) > +{ > + unsigned long rb,rs,prs,r; > + unsigned long ap; > + unsigned long ric = RIC_FLUSH_TLB; > + > + ap = mmu_get_ap(radix_get_mmu_psize(page_size)); > + rb = gpa & ~(PPC_BITMASK(52, 63)); > + rb |= ap << PPC_BITLSHIFT(58); > + rs = lpid & ((1UL << 32) - 1); > + prs = 0; /* process scoped */ > + r = 1; /* raidx format */ > + > + asm volatile("ptesync": : :"memory"); > + asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) > + : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : > "memory"); > + asm volatile("eieio; tlbsync; ptesync": : :"memory"); > +} > +EXPORT_SYMBOL(radix__flush_tlb_lpid_va); > + > +void radix__flush_tlb_lpid(unsigned long lpid) > +{ > + unsigned long rb,rs,prs,r; > + unsigned long ric = RIC_FLUSH_ALL; > + > + rb = 0x2 << PPC_BITLSHIFT(53); /* IS = 2 */ > + rs = lpid & ((1UL << 32) - 1); > + prs = 0; /* partition scoped */ > + r = 1; /* raidx format */ > + > + asm volatile("ptesync": : :"memory"); > + asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) > + : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : > "memory"); > + asm volatile("eieio; tlbsync; ptesync": : :"memory"); > +} > +EXPORT_SYMBOL(radix__flush_tlb_lpid); _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev