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

Commit f24ffde4 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

parisc: expose number of page table levels on Kconfig level 



We would want to use number of page table level to define mm_struct.
Let's expose it as CONFIG_PGTABLE_LEVELS.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a728ab52

arch/parisc/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -103,6 +103,11 @@ config ARCH_MAY_HAVE_PC_FDC 
	depends on BROKEN

	default y



config PGTABLE_LEVELS

	int

	default 3 if 64BIT && PARISC_PAGE_SIZE_4KB

	default 2



source "init/Kconfig"



source "kernel/Kconfig.freezer"

arch/parisc/include/asm/pgalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) 
	free_pages((unsigned long)pgd, PGD_ALLOC_ORDER);

}



#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3



/* Three Level Page Table Support for pmd's */

arch/parisc/include/asm/pgtable.h

+7 −9
Original line number Diff line number Diff line
@@ -68,13 +68,11 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long); 
#define KERNEL_INITIAL_ORDER	24	/* 0 to 1<<24 = 16MB */

#define KERNEL_INITIAL_SIZE	(1 << KERNEL_INITIAL_ORDER)



#if defined(CONFIG_64BIT) && defined(CONFIG_PARISC_PAGE_SIZE_4KB)

#define PT_NLEVELS	3

#if CONFIG_PGTABLE_LEVELS == 3

#define PGD_ORDER	1 /* Number of pages per pgd */

#define PMD_ORDER	1 /* Number of pages per pmd */

#define PGD_ALLOC_ORDER	2 /* first pgd contains pmd */

#else

#define PT_NLEVELS	2

#define PGD_ORDER	1 /* Number of pages per pgd */

#define PGD_ALLOC_ORDER	PGD_ORDER

#endif
@@ -93,7 +91,7 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long); 
#define PMD_SHIFT       (PLD_SHIFT + BITS_PER_PTE)

#define PMD_SIZE	(1UL << PMD_SHIFT)

#define PMD_MASK	(~(PMD_SIZE-1))

#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

#define BITS_PER_PMD	(PAGE_SHIFT + PMD_ORDER - BITS_PER_PMD_ENTRY)

#else

#define __PAGETABLE_PMD_FOLDED
@@ -277,7 +275,7 @@ extern unsigned long *empty_zero_page; 
#define pgd_flag(x)	(pgd_val(x) & PxD_FLAG_MASK)

#define pgd_address(x)	((unsigned long)(pgd_val(x) &~ PxD_FLAG_MASK) << PxD_VALUE_SHIFT)



#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

/* The first entry of the permanent pmd is not there if it contains

 * the gateway marker */

#define pmd_none(x)	(!pmd_val(x) || pmd_flag(x) == PxD_FLAG_ATTACHED)
@@ -287,7 +285,7 @@ extern unsigned long *empty_zero_page; 
#define pmd_bad(x)	(!(pmd_flag(x) & PxD_FLAG_VALID))

#define pmd_present(x)	(pmd_flag(x) & PxD_FLAG_PRESENT)

static inline void pmd_clear(pmd_t *pmd) {

#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

	if (pmd_flag(*pmd) & PxD_FLAG_ATTACHED)

		/* This is the entry pointing to the permanent pmd

		 * attached to the pgd; cannot clear it */
@@ -299,7 +297,7 @@ static inline void pmd_clear(pmd_t *pmd) { 






#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

#define pgd_page_vaddr(pgd) ((unsigned long) __va(pgd_address(pgd)))

#define pgd_page(pgd)	virt_to_page((void *)pgd_page_vaddr(pgd))
@@ -309,7 +307,7 @@ static inline void pmd_clear(pmd_t *pmd) { 
#define pgd_bad(x)      (!(pgd_flag(x) & PxD_FLAG_VALID))

#define pgd_present(x)  (pgd_flag(x) & PxD_FLAG_PRESENT)

static inline void pgd_clear(pgd_t *pgd) {

#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

	if(pgd_flag(*pgd) & PxD_FLAG_ATTACHED)

		/* This is the permanent pmd attached to the pgd; cannot

		 * free it */
@@ -393,7 +391,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 


/* Find an entry in the second-level page table.. */



#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

#define pmd_offset(dir,address) \

((pmd_t *) pgd_page_vaddr(*(dir)) + (((address)>>PMD_SHIFT) & (PTRS_PER_PMD-1)))

#else

arch/parisc/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ 
	 * can address up to 1TB

	 */

	.macro		L2_ptep	pmd,pte,index,va,fault

#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

	extru		\va,31-ASM_PMD_SHIFT,ASM_BITS_PER_PMD,\index

#else

# if defined(CONFIG_64BIT)
@@ -436,7 +436,7 @@ 
	 * all ILP32 processes and all the kernel for machines with

	 * under 4GB of memory) */

	.macro		L3_ptep pgd,pte,index,va,fault

#if PT_NLEVELS == 3 /* we might have a 2-Level scheme, e.g. with 16kb page size */

#if CONFIG_PGTABLE_LEVELS == 3 /* we might have a 2-Level scheme, e.g. with 16kb page size */

	extrd,u		\va,63-ASM_PGDIR_SHIFT,ASM_BITS_PER_PGD,\index

	copy		%r0,\pte

	extrd,u,*=	\va,63-ASM_PGDIR_SHIFT,64-ASM_PGDIR_SHIFT,%r0

arch/parisc/kernel/head.S

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ $bss_loop: 
	mtctl		%r4,%cr24	/* Initialize kernel root pointer */

	mtctl		%r4,%cr25	/* Initialize user root pointer */



#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

	/* Set pmd in pgd */

	load32		PA(pmd0),%r5

	shrd            %r5,PxD_VALUE_SHIFT,%r3
@@ -97,7 +97,7 @@ $bss_loop: 
	stw		%r3,0(%r4)

	ldo		(PAGE_SIZE >> PxD_VALUE_SHIFT)(%r3),%r3

	addib,>		-1,%r1,1b

#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

	ldo             ASM_PMD_ENTRY_SIZE(%r4),%r4

#else

	ldo             ASM_PGD_ENTRY_SIZE(%r4),%r4