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

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

nds32 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 nds32 with
include/asm-generic/pgtable-nopmd.h and adjust page table manipulation
macros and functions accordingly.

Link: http://lkml.kernel.org/r/1572938135-31886-8-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 ed48e1f8

arch/nds32/include/asm/page.h

+0 −3
Original line number Diff line number Diff line
@@ -41,17 +41,14 @@ void clear_page(void *page); 
void copy_page(void *to, void *from);



typedef unsigned long pte_t;

typedef unsigned long pmd_t;

typedef unsigned long pgd_t;

typedef unsigned long pgprot_t;



#define pte_val(x)      (x)

#define pmd_val(x)      (x)

#define pgd_val(x)	(x)

#define pgprot_val(x)   (x)



#define __pte(x)        (x)

#define __pmd(x)        (x)

#define __pgd(x)        (x)

#define __pgprot(x)     (x)

arch/nds32/include/asm/pgalloc.h

+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
/*

 * Since we have only two-level page tables, these are trivial

 */

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

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

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

#define pmd_pgtable(pmd) pmd_page(pmd)



extern pgd_t *pgd_alloc(struct mm_struct *mm);

arch/nds32/include/asm/pgtable.h

+1 −11
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
#ifndef _ASMNDS32_PGTABLE_H

#define _ASMNDS32_PGTABLE_H



#define __PAGETABLE_PMD_FOLDED 1

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

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

#include <linux/sizes.h>



#include <asm/memory.h>
@@ -18,26 +17,20 @@ 
#ifdef CONFIG_ANDES_PAGE_SIZE_4KB

#define PGDIR_SHIFT      22

#define PTRS_PER_PGD     1024

#define PMD_SHIFT        22

#define PTRS_PER_PMD     1

#define PTRS_PER_PTE     1024

#endif



#ifdef CONFIG_ANDES_PAGE_SIZE_8KB

#define PGDIR_SHIFT      24

#define PTRS_PER_PGD     256

#define PMD_SHIFT        24

#define PTRS_PER_PMD     1

#define PTRS_PER_PTE     2048

#endif



#ifndef __ASSEMBLY__

extern void __pte_error(const char *file, int line, unsigned long val);

extern void __pmd_error(const char *file, int line, unsigned long val);

extern void __pgd_error(const char *file, int line, unsigned long val);



#define pte_ERROR(pte)		__pte_error(__FILE__, __LINE__, pte_val(pte))

#define pmd_ERROR(pmd)		__pmd_error(__FILE__, __LINE__, pmd_val(pmd))

#define pgd_ERROR(pgd)		__pgd_error(__FILE__, __LINE__, pgd_val(pgd))

#endif /* !__ASSEMBLY__ */
@@ -368,9 +361,6 @@ static inline pmd_t __mk_pmd(pte_t * ptep, unsigned long prot) 
/* to find an entry in a kernel page-table-directory */

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



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

#define pmd_offset(dir, addr)	((pmd_t *)(dir))



static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{

	const unsigned long mask = 0xfff;

arch/nds32/include/asm/tlb.h

+0 −1
Original line number Diff line number Diff line
@@ -7,6 +7,5 @@ 
#include <asm-generic/tlb.h>



#define __pte_free_tlb(tlb, pte, addr)	pte_free((tlb)->mm, pte)

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



#endif

arch/nds32/kernel/pm.c

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ unsigned int *phy_addr_sp_tmp; 
static void nds32_suspend2ram(void)

{

	pgd_t *pgdv;

	p4d_t *p4dv;

	pud_t *pudv;

	pmd_t *pmdv;

	pte_t *ptev;
@@ -21,7 +22,8 @@ static void nds32_suspend2ram(void) 
	pgdv = (pgd_t *)__va((__nds32__mfsr(NDS32_SR_L1_PPTB) &

		L1_PPTB_mskBASE)) + pgd_index((unsigned int)cpu_resume);



	pudv = pud_offset(pgdv, (unsigned int)cpu_resume);

	p4dv = p4d_offset(pgdv, (unsigned int)cpu_resume);

	pudv = pud_offset(p4dv, (unsigned int)cpu_resume);

	pmdv = pmd_offset(pudv, (unsigned int)cpu_resume);

	ptev = pte_offset_map(pmdv, (unsigned int)cpu_resume);

CRA Git | Maintained and supported by SUSTech CRA and CCSE