Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c61a8843 authored by Paul Mackerras's avatar Paul Mackerras Committed by Michael Ellerman
Browse files

powerpc/mm/book3s-64: Use physical addresses in upper page table tree levels 



This changes the Linux page tables to store physical addresses
rather than kernel virtual addresses in the upper levels of the
tree (pgd, pud and pmd) for 64-bit Book 3S machines.

This also changes the hugepd pointers used to implement hugepages
when the base page size is 4k to store physical addresses rather than
virtual addresses (again just for 64-bit Book3S machines).

This frees up some high order bits, and will be needed with
PowerISA v3.0 machines which read the page table tree in hardware
in radix mode.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f1a9ae03

arch/powerpc/include/asm/book3s/64/hash-4k.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
#define pgd_none(pgd)		(!pgd_val(pgd))

#define pgd_bad(pgd)		(pgd_val(pgd) == 0)

#define pgd_present(pgd)	(pgd_val(pgd) != 0)

#define pgd_page_vaddr(pgd)	(pgd_val(pgd) & ~PGD_MASKED_BITS)

#define pgd_page_vaddr(pgd)	__va(pgd_val(pgd) & ~PGD_MASKED_BITS)



static inline void pgd_clear(pgd_t *pgdp)

{

arch/powerpc/include/asm/book3s/64/hash.h

+7 −6
Original line number Diff line number Diff line
@@ -222,13 +222,14 @@ 
#define PUD_BAD_BITS		(PMD_TABLE_SIZE-1)



#ifndef __ASSEMBLY__

#define	pmd_bad(pmd)		(!is_kernel_addr(pmd_val(pmd)) \

				 || (pmd_val(pmd) & PMD_BAD_BITS))

#define pmd_page_vaddr(pmd)	(pmd_val(pmd) & ~PMD_MASKED_BITS)

#define	pmd_bad(pmd)		(pmd_val(pmd) & PMD_BAD_BITS)

#define pmd_page_vaddr(pmd)	__va(pmd_val(pmd) & ~PMD_MASKED_BITS)



#define	pud_bad(pud)		(!is_kernel_addr(pud_val(pud)) \

				 || (pud_val(pud) & PUD_BAD_BITS))

#define pud_page_vaddr(pud)	(pud_val(pud) & ~PUD_MASKED_BITS)

#define	pud_bad(pud)		(pud_val(pud) & PUD_BAD_BITS)

#define pud_page_vaddr(pud)	__va(pud_val(pud) & ~PUD_MASKED_BITS)



/* Pointers in the page table tree are physical addresses */

#define __pgtable_ptr_val(ptr)	__pa(ptr)



#define pgd_index(address) (((address) >> (PGDIR_SHIFT)) & (PTRS_PER_PGD - 1))

#define pmd_index(address) (((address) >> (PMD_SHIFT)) & (PTRS_PER_PMD - 1))

arch/powerpc/include/asm/hugetlb.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ static inline pte_t *hugepd_page(hugepd_t hpd) 
	 * We have only four bits to encode, MMU page size

	 */

	BUILD_BUG_ON((MMU_PAGE_COUNT - 1) > 0xf);

	return (pte_t *)(hpd.pd & ~HUGEPD_SHIFT_MASK);

	return __va(hpd.pd & HUGEPD_ADDR_MASK);

}



static inline unsigned int hugepd_mmu_psize(hugepd_t hpd)

arch/powerpc/include/asm/nohash/64/pgtable.h

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ 
#ifndef __ASSEMBLY__

/* pte_clear moved to later in this file */



/* Pointers in the page table tree are virtual addresses */

#define __pgtable_ptr_val(ptr)	((unsigned long)(ptr))



#define PMD_BAD_BITS		(PTE_TABLE_SIZE-1)

#define PUD_BAD_BITS		(PMD_TABLE_SIZE-1)

arch/powerpc/include/asm/page.h

+7 −0
Original line number Diff line number Diff line
@@ -271,6 +271,13 @@ extern long long virt_phys_offset; 
#else

#define PD_HUGE 0x80000000

#endif



#else	/* CONFIG_PPC_BOOK3S_64 */

/*

 * Book3S 64 stores real addresses in the hugepd entries to

 * avoid overlaps with _PAGE_PRESENT and _PAGE_PTE.

 */

#define HUGEPD_ADDR_MASK	(0x0ffffffffffffffful & ~HUGEPD_SHIFT_MASK)

#endif /* CONFIG_PPC_BOOK3S_64 */



/*