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

microblaze: use pgtable-nopmd instead of 4level-fixup 

microblaze has only two-level page tables and can use pgtable-nopmd and
folding of the upper layers.

Replace usage of include/asm-generic/4level-fixup.h and explicit
definition of __PAGETABLE_PMD_FOLDED in microblaze with
include/asm-generic/pgtable-nopmd.h and adjust page table manipulation
macros and functions accordingly.

Link: http://lkml.kernel.org/r/1572938135-31886-7-git-send-email-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
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: Greg Ungerer <gerg@linux-m68k.org>
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 60e50f34

arch/microblaze/include/asm/page.h

+0 −3
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ typedef struct { unsigned long pte; } pte_t; 
typedef struct { unsigned long	pgprot; }	pgprot_t;

/* FIXME this can depend on linux kernel version */

#   ifdef CONFIG_MMU

typedef struct { unsigned long pmd; } pmd_t;

typedef struct { unsigned long pgd; } pgd_t;

#   else /* CONFIG_MMU */

typedef struct { unsigned long	ste[64]; }	pmd_t;
@@ -103,7 +102,6 @@ typedef struct { p4d_t pge[1]; } pgd_t; 
# define pgprot_val(x)	((x).pgprot)



#   ifdef CONFIG_MMU

#   define pmd_val(x)      ((x).pmd)

#   define pgd_val(x)      ((x).pgd)

#   else  /* CONFIG_MMU */

#   define pmd_val(x)	((x).ste[0])
@@ -112,7 +110,6 @@ typedef struct { p4d_t pge[1]; } pgd_t; 
#   endif  /* CONFIG_MMU */



# define __pte(x)	((pte_t) { (x) })

# define __pmd(x)	((pmd_t) { (x) })

# define __pgd(x)	((pgd_t) { (x) })

# define __pgprot(x)	((pgprot_t) { (x) })

arch/microblaze/include/asm/pgalloc.h

+0 −16
Original line number Diff line number Diff line
@@ -41,13 +41,6 @@ static inline void free_pgd(pgd_t *pgd) 


#define pmd_pgtable(pmd)	pmd_page(pmd)



/*

 * We don't have any real pmd's, and this code never triggers because

 * the pgd will always be present..

 */

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

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



extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm);



#define __pte_free_tlb(tlb, pte, addr)	pte_free((tlb)->mm, (pte))
@@ -58,15 +51,6 @@ extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm); 
#define pmd_populate_kernel(mm, pmd, pte) \

		(pmd_val(*(pmd)) = (unsigned long) (pte))



/*

 * We don't have any real pmd's, and this code never triggers because

 * the pgd will always be present..

 */

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

#define pmd_free(mm, x)			do { } while (0)

#define __pmd_free_tlb(tlb, x, addr)	pmd_free((tlb)->mm, x)

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



#endif /* CONFIG_MMU */



#endif /* _ASM_MICROBLAZE_PGALLOC_H */

arch/microblaze/include/asm/pgtable.h

+2 −30
Original line number Diff line number Diff line
@@ -59,9 +59,7 @@ extern int mem_init_done; 


#else /* CONFIG_MMU */



#include <asm-generic/4level-fixup.h>



#define __PAGETABLE_PMD_FOLDED 1

#include <asm-generic/pgtable-nopmd.h>



#ifdef __KERNEL__

#ifndef __ASSEMBLY__
@@ -138,13 +136,8 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } 
 *

 */



/* PMD_SHIFT determines the size of the area mapped by the PTE pages */

#define PMD_SHIFT	(PAGE_SHIFT + PTE_SHIFT)

#define PMD_SIZE	(1UL << PMD_SHIFT)

#define PMD_MASK	(~(PMD_SIZE-1))



/* PGDIR_SHIFT determines what a top-level page table entry can map */

#define PGDIR_SHIFT	PMD_SHIFT

#define PGDIR_SHIFT	(PAGE_SHIFT + PTE_SHIFT)

#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)

#define PGDIR_MASK	(~(PGDIR_SIZE-1))
@@ -165,9 +158,6 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } 
#define pte_ERROR(e) \

	printk(KERN_ERR "%s:%d: bad pte "PTE_FMT".\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))
@@ -313,18 +303,6 @@ extern unsigned long empty_zero_page[1024]; 
	__pte(((pte_basic_t)(pfn) << PFN_SHIFT_OFFSET) | pgprot_val(prot))



#ifndef __ASSEMBLY__

/*

 * The "pgd_xxx()" functions here are trivial for a folded two-level

 * setup: the pgd is never bad, and a pmd always exists (as it's folded

 * into the pgd entry)

 */

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; }

#define pgd_clear(xp)				do { } while (0)

#define pgd_page(pgd) \

	((unsigned long) __va(pgd_val(pgd) & PAGE_MASK))



/*

 * The following only work if pte_present() is true.

 * Undefined behaviour if not..
@@ -479,12 +457,6 @@ static inline void ptep_mkdirty(struct mm_struct *mm, 
#define pgd_index(address)	 ((address) >> PGDIR_SHIFT)

#define pgd_offset(mm, address)	 ((mm)->pgd + pgd_index(address))



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

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

{

	return (pmd_t *) dir;

}



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

#define pte_index(address)		\

	(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))

arch/microblaze/kernel/signal.c

+7 −3
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, 
	int err = 0, sig = ksig->sig;

	unsigned long address = 0;

#ifdef CONFIG_MMU

	pgd_t *pgdp;

	p4d_t *p4dp;

	pud_t *pudp;

	pmd_t *pmdp;

	pte_t *ptep;

#endif
@@ -195,9 +198,10 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, 


	address = ((unsigned long)frame->tramp);

#ifdef CONFIG_MMU

	pmdp = pmd_offset(pud_offset(

			pgd_offset(current->mm, address),

					address), address);

	pgdp = pgd_offset(current->mm, address);

	p4dp = p4d_offset(pgdp, address);

	pudp = pud_offset(p4dp, address);

	pmdp = pmd_offset(pudp, address);



	preempt_disable();

	ptep = pte_offset_map(pmdp, address);

arch/microblaze/mm/init.c

+5 −2
Original line number Diff line number Diff line
@@ -53,8 +53,11 @@ EXPORT_SYMBOL(kmap_prot); 


static inline pte_t *virt_to_kpte(unsigned long vaddr)

{

	return pte_offset_kernel(pmd_offset(pgd_offset_k(vaddr),

			vaddr), vaddr);

	pgd_t *pgd = pgd_offset_k(vaddr);

	p4d_t *p4d = p4d_offset(pgd, vaddr);

	pud_t *pud = pud_offset(p4d, vaddr);



	return pte_offset_kernel(pmd_offset(pud, vaddr), vaddr);

}



static void __init highmem_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE