Commit 60e50f34 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

m68k: mm: use pgtable-nopXd instead of 4level-fixup 

m68k has two or three levels of page tables and can use appropriate
pgtable-nopXd and folding of the upper layers.

Replace usage of include/asm-generic/4level-fixup.h and explicit
definitions of __PAGETABLE_PxD_FOLDED in m68k with
include/asm-generic/pgtable-nopmd.h for two-level configurations and
with include/asm-generic/pgtable-nopud.h for three-lelve configurations
and adjust page table manipulation macros and functions accordingly.

[akpm@linux-foundation.org: fix merge glitch]
[geert@linux-m68k.org: more merge glitch fixes]
[akpm@linux-foundation.org: s/bad_pgd/bad_pud/, per Mike]
Link: http://lkml.kernel.org/r/1572938135-31886-6-git-send-email-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
Cc: Anatoly Pugachev <matorola@gmail.com>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Peter Rosin <peda@axentia.se>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Sam Creasey <sammy@sammy.net>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f6f7caeb

arch/m68k/include/asm/mcf_pgalloc.h

+0 −7
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address) 
	return (pmd_t *) pgd;

}



#define pmd_alloc_one_fast(mm, address) ({ BUG(); ((pmd_t *)1); })

#define pmd_alloc_one(mm, address)      ({ BUG(); ((pmd_t *)2); })



#define pmd_populate(mm, pmd, page) (pmd_val(*pmd) = \

	(unsigned long)(page_address(page)))
@@ -45,8 +42,6 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page, 
	__free_page(page);

}



#define __pmd_free_tlb(tlb, pmd, address) do { } while (0)



static inline struct page *pte_alloc_one(struct mm_struct *mm)

{

	struct page *page = alloc_pages(GFP_DMA, 0);
@@ -100,6 +95,4 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) 
	return new_pgd;

}



#define pgd_populate(mm, pmd, pte) BUG()



#endif /* M68K_MCF_PGALLOC_H */

arch/m68k/include/asm/mcf_pgtable.h

+10 −18
Original line number Diff line number Diff line
@@ -198,17 +198,9 @@ static inline int pmd_bad2(pmd_t *pmd) { return 0; } 
#define pmd_present(pmd) (!pmd_none2(&(pmd)))

static inline void pmd_clear(pmd_t *pmdp) { pmd_val(*pmdp) = 0; }



static inline int pgd_none(pgd_t pgd) { return 0; }

static inline int pgd_bad(pgd_t pgd) { return 0; }

static inline int pgd_present(pgd_t pgd) { return 1; }

static inline void pgd_clear(pgd_t *pgdp) {}



#define pte_ERROR(e) \

	printk(KERN_ERR "%s:%d: bad pte %08lx.\n",	\

	__FILE__, __LINE__, pte_val(e))

#define pmd_ERROR(e) \

	printk(KERN_ERR "%s:%d: bad pmd %08lx.\n",	\

	__FILE__, __LINE__, pmd_val(e))

#define pgd_ERROR(e) \

	printk(KERN_ERR "%s:%d: bad pgd %08lx.\n",	\

	__FILE__, __LINE__, pgd_val(e))
@@ -339,14 +331,6 @@ extern pgd_t kernel_pg_dir[PTRS_PER_PGD]; 
 */

#define pgd_offset_k(address)	pgd_offset(&init_mm, address)



/*

 * Find an entry in the second-level pagetable.

 */

static inline pmd_t *pmd_offset(pgd_t *pgd, unsigned long address)

{

	return (pmd_t *) pgd;

}



/*

 * Find an entry in the third-level pagetable.

 */
@@ -360,12 +344,16 @@ static inline pmd_t *pmd_offset(pgd_t *pgd, unsigned long address) 
static inline void nocache_page(void *vaddr)

{

	pgd_t *dir;

	p4d_t *p4dp;

	pud_t *pudp;

	pmd_t *pmdp;

	pte_t *ptep;

	unsigned long addr = (unsigned long) vaddr;



	dir = pgd_offset_k(addr);

	pmdp = pmd_offset(dir, addr);

	p4dp = p4d_offset(dir, addr);

	pudp = pud_offset(p4dp, addr);

	pmdp = pmd_offset(pudp, addr);

	ptep = pte_offset_kernel(pmdp, addr);

	*ptep = pte_mknocache(*ptep);

}
@@ -376,12 +364,16 @@ static inline void nocache_page(void *vaddr) 
static inline void cache_page(void *vaddr)

{

	pgd_t *dir;

	p4d_t *p4dp;

	pud_t *pudp;

	pmd_t *pmdp;

	pte_t *ptep;

	unsigned long addr = (unsigned long) vaddr;



	dir = pgd_offset_k(addr);

	pmdp = pmd_offset(dir, addr);

	p4dp = p4d_offset(dir, addr);

	pudp = pud_offset(p4dp, addr);

	pmdp = pmd_offset(pudp, addr);

	ptep = pte_offset_kernel(pmdp, addr);

	*ptep = pte_mkcache(*ptep);

}

arch/m68k/include/asm/mmu_context.h

+11 −1
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ static inline void load_ksp_mmu(struct task_struct *task) 
	struct mm_struct *mm;

	int asid;

	pgd_t *pgd;

	p4d_t *p4d;

	pud_t *pud;

	pmd_t *pmd;

	pte_t *pte;

	unsigned long mmuar;
@@ -127,7 +129,15 @@ static inline void load_ksp_mmu(struct task_struct *task) 
	if (pgd_none(*pgd))

		goto bug;



	pmd = pmd_offset(pgd, mmuar);

	p4d = p4d_offset(pgd, mmuar);

	if (p4d_none(*p4d))

		goto bug;



	pud = pud_offset(p4d, mmuar);

	if (pud_none(*pud))

		goto bug;



	pmd = pmd_offset(pud, mmuar);

	if (pmd_none(*pmd))

		goto bug;

arch/m68k/include/asm/motorola_pgalloc.h

+2 −2
Original line number Diff line number Diff line
@@ -106,9 +106,9 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page 
}

#define pmd_pgtable(pmd) pmd_page(pmd)



static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)

static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)

{

	pgd_set(pgd, pmd);

	pud_set(pud, pmd);

}



#endif /* _MOTOROLA_PGALLOC_H */

arch/m68k/include/asm/motorola_pgtable.h

+20 −12
Original line number Diff line number Diff line
@@ -117,14 +117,14 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep) 
	}

}



static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp)

static inline void pud_set(pud_t *pudp, pmd_t *pmdp)

{

	pgd_val(*pgdp) = _PAGE_TABLE | _PAGE_ACCESSED | __pa(pmdp);

	pud_val(*pudp) = _PAGE_TABLE | _PAGE_ACCESSED | __pa(pmdp);

}



#define __pte_page(pte) ((unsigned long)__va(pte_val(pte) & PAGE_MASK))

#define __pmd_page(pmd) ((unsigned long)__va(pmd_val(pmd) & _TABLE_MASK))

#define __pgd_page(pgd) ((unsigned long)__va(pgd_val(pgd) & _TABLE_MASK))

#define pud_page_vaddr(pud) ((unsigned long)__va(pud_val(pud) & _TABLE_MASK))





#define pte_none(pte)		(!pte_val(pte))
@@ -147,11 +147,11 @@ static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp) 
#define pmd_page(pmd)		virt_to_page(__va(pmd_val(pmd)))





#define pgd_none(pgd)		(!pgd_val(pgd))

#define pgd_bad(pgd)		((pgd_val(pgd) & _DESCTYPE_MASK) != _PAGE_TABLE)

#define pgd_present(pgd)	(pgd_val(pgd) & _PAGE_TABLE)

#define pgd_clear(pgdp)		({ pgd_val(*pgdp) = 0; })

#define pgd_page(pgd)		(mem_map + ((unsigned long)(__va(pgd_val(pgd)) - PAGE_OFFSET) >> PAGE_SHIFT))

#define pud_none(pud)		(!pud_val(pud))

#define pud_bad(pud)		((pud_val(pud) & _DESCTYPE_MASK) != _PAGE_TABLE)

#define pud_present(pud)	(pud_val(pud) & _PAGE_TABLE)

#define pud_clear(pudp)		({ pud_val(*pudp) = 0; })

#define pud_page(pud)		(mem_map + ((unsigned long)(__va(pud_val(pud)) - PAGE_OFFSET) >> PAGE_SHIFT))



#define pte_ERROR(e) \

	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
@@ -209,9 +209,9 @@ static inline pgd_t *pgd_offset_k(unsigned long address) 




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

static inline pmd_t *pmd_offset(pgd_t *dir, unsigned long address)

static inline pmd_t *pmd_offset(pud_t *dir, unsigned long address)

{

	return (pmd_t *)__pgd_page(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PMD-1));

	return (pmd_t *)pud_page_vaddr(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PMD-1));

}



/* Find an entry in the third-level page table.. */
@@ -239,11 +239,15 @@ static inline void nocache_page(void *vaddr) 


	if (CPU_IS_040_OR_060) {

		pgd_t *dir;

		p4d_t *p4dp;

		pud_t *pudp;

		pmd_t *pmdp;

		pte_t *ptep;



		dir = pgd_offset_k(addr);

		pmdp = pmd_offset(dir, addr);

		p4dp = p4d_offset(dir, addr);

		pudp = pud_offset(p4dp, addr);

		pmdp = pmd_offset(pudp, addr);

		ptep = pte_offset_kernel(pmdp, addr);

		*ptep = pte_mknocache(*ptep);

	}
@@ -255,11 +259,15 @@ static inline void cache_page(void *vaddr) 


	if (CPU_IS_040_OR_060) {

		pgd_t *dir;

		p4d_t *p4dp;

		pud_t *pudp;

		pmd_t *pmdp;

		pte_t *ptep;



		dir = pgd_offset_k(addr);

		pmdp = pmd_offset(dir, addr);

		p4dp = p4d_offset(dir, addr);

		pudp = pud_offset(p4dp, addr);

		pmdp = pmd_offset(pudp, addr);

		ptep = pte_offset_kernel(pmdp, addr);

		*ptep = pte_mkcache(*ptep);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE