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

Commit 442e70c0 authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

ARM: 7076/1: LPAE: Add (pte|pmd)val_t type definitions as u32 



This patch defines the (pte|pmd)val_t as u32 and changes the page table
types to be based on these. The PMD bits are converted to the
corresponding type using the _AT macro.

The flush_pmd_entry/clean_pmd_entry argument was changed to (void *) to
allow them to be used with both PGD and PMD pointers and avoid code
duplication.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 17f57211

arch/arm/include/asm/pgalloc.h

+2 −2
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 
}



static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,

	unsigned long prot)

				  pmdval_t prot)

{

	unsigned long pmdval = (pte + PTE_HWTABLE_OFF) | prot;

	pmdval_t pmdval = (pte + PTE_HWTABLE_OFF) | prot;

	pmdp[0] = __pmd(pmdval);

	pmdp[1] = __pmd(pmdval + 256 * sizeof(pte_t));

	flush_pmd_entry(pmdp);

arch/arm/include/asm/pgtable-2level-hwdef.h

+41 −41
Original line number Diff line number Diff line
@@ -16,29 +16,29 @@ 
 * + Level 1 descriptor (PMD)

 *   - common

 */

#define PMD_TYPE_MASK		(3 << 0)

#define PMD_TYPE_FAULT		(0 << 0)

#define PMD_TYPE_TABLE		(1 << 0)

#define PMD_TYPE_SECT		(2 << 0)

#define PMD_BIT4		(1 << 4)

#define PMD_DOMAIN(x)		((x) << 5)

#define PMD_PROTECTION		(1 << 9)	/* v5 */

#define PMD_TYPE_MASK		(_AT(pmdval_t, 3) << 0)

#define PMD_TYPE_FAULT		(_AT(pmdval_t, 0) << 0)

#define PMD_TYPE_TABLE		(_AT(pmdval_t, 1) << 0)

#define PMD_TYPE_SECT		(_AT(pmdval_t, 2) << 0)

#define PMD_BIT4		(_AT(pmdval_t, 1) << 4)

#define PMD_DOMAIN(x)		(_AT(pmdval_t, (x)) << 5)

#define PMD_PROTECTION		(_AT(pmdval_t, 1) << 9)		/* v5 */

/*

 *   - section

 */

#define PMD_SECT_BUFFERABLE	(1 << 2)

#define PMD_SECT_CACHEABLE	(1 << 3)

#define PMD_SECT_XN		(1 << 4)	/* v6 */

#define PMD_SECT_AP_WRITE	(1 << 10)

#define PMD_SECT_AP_READ	(1 << 11)

#define PMD_SECT_TEX(x)		((x) << 12)	/* v5 */

#define PMD_SECT_APX		(1 << 15)	/* v6 */

#define PMD_SECT_S		(1 << 16)	/* v6 */

#define PMD_SECT_nG		(1 << 17)	/* v6 */

#define PMD_SECT_SUPER		(1 << 18)	/* v6 */

#define PMD_SECT_AF		(0)

#define PMD_SECT_BUFFERABLE	(_AT(pmdval_t, 1) << 2)

#define PMD_SECT_CACHEABLE	(_AT(pmdval_t, 1) << 3)

#define PMD_SECT_XN		(_AT(pmdval_t, 1) << 4)		/* v6 */

#define PMD_SECT_AP_WRITE	(_AT(pmdval_t, 1) << 10)

#define PMD_SECT_AP_READ	(_AT(pmdval_t, 1) << 11)

#define PMD_SECT_TEX(x)		(_AT(pmdval_t, (x)) << 12)	/* v5 */

#define PMD_SECT_APX		(_AT(pmdval_t, 1) << 15)	/* v6 */

#define PMD_SECT_S		(_AT(pmdval_t, 1) << 16)	/* v6 */

#define PMD_SECT_nG		(_AT(pmdval_t, 1) << 17)	/* v6 */

#define PMD_SECT_SUPER		(_AT(pmdval_t, 1) << 18)	/* v6 */

#define PMD_SECT_AF		(_AT(pmdval_t, 0))



#define PMD_SECT_UNCACHED	(0)

#define PMD_SECT_UNCACHED	(_AT(pmdval_t, 0))

#define PMD_SECT_BUFFERED	(PMD_SECT_BUFFERABLE)

#define PMD_SECT_WT		(PMD_SECT_CACHEABLE)

#define PMD_SECT_WB		(PMD_SECT_CACHEABLE | PMD_SECT_BUFFERABLE)
@@ -54,38 +54,38 @@ 
 * + Level 2 descriptor (PTE)

 *   - common

 */

#define PTE_TYPE_MASK		(3 << 0)

#define PTE_TYPE_FAULT		(0 << 0)

#define PTE_TYPE_LARGE		(1 << 0)

#define PTE_TYPE_SMALL		(2 << 0)

#define PTE_TYPE_EXT		(3 << 0)	/* v5 */

#define PTE_BUFFERABLE		(1 << 2)

#define PTE_CACHEABLE		(1 << 3)

#define PTE_TYPE_MASK		(_AT(pteval_t, 3) << 0)

#define PTE_TYPE_FAULT		(_AT(pteval_t, 0) << 0)

#define PTE_TYPE_LARGE		(_AT(pteval_t, 1) << 0)

#define PTE_TYPE_SMALL		(_AT(pteval_t, 2) << 0)

#define PTE_TYPE_EXT		(_AT(pteval_t, 3) << 0)		/* v5 */

#define PTE_BUFFERABLE		(_AT(pteval_t, 1) << 2)

#define PTE_CACHEABLE		(_AT(pteval_t, 1) << 3)



/*

 *   - extended small page/tiny page

 */

#define PTE_EXT_XN		(1 << 0)	/* v6 */

#define PTE_EXT_AP_MASK		(3 << 4)

#define PTE_EXT_AP0		(1 << 4)

#define PTE_EXT_AP1		(2 << 4)

#define PTE_EXT_AP_UNO_SRO	(0 << 4)

#define PTE_EXT_XN		(_AT(pteval_t, 1) << 0)		/* v6 */

#define PTE_EXT_AP_MASK		(_AT(pteval_t, 3) << 4)

#define PTE_EXT_AP0		(_AT(pteval_t, 1) << 4)

#define PTE_EXT_AP1		(_AT(pteval_t, 2) << 4)

#define PTE_EXT_AP_UNO_SRO	(_AT(pteval_t, 0) << 4)

#define PTE_EXT_AP_UNO_SRW	(PTE_EXT_AP0)

#define PTE_EXT_AP_URO_SRW	(PTE_EXT_AP1)

#define PTE_EXT_AP_URW_SRW	(PTE_EXT_AP1|PTE_EXT_AP0)

#define PTE_EXT_TEX(x)		((x) << 6)	/* v5 */

#define PTE_EXT_APX		(1 << 9)	/* v6 */

#define PTE_EXT_COHERENT	(1 << 9)	/* XScale3 */

#define PTE_EXT_SHARED		(1 << 10)	/* v6 */

#define PTE_EXT_NG		(1 << 11)	/* v6 */

#define PTE_EXT_TEX(x)		(_AT(pteval_t, (x)) << 6)	/* v5 */

#define PTE_EXT_APX		(_AT(pteval_t, 1) << 9)		/* v6 */

#define PTE_EXT_COHERENT	(_AT(pteval_t, 1) << 9)		/* XScale3 */

#define PTE_EXT_SHARED		(_AT(pteval_t, 1) << 10)	/* v6 */

#define PTE_EXT_NG		(_AT(pteval_t, 1) << 11)	/* v6 */



/*

 *   - small page

 */

#define PTE_SMALL_AP_MASK	(0xff << 4)

#define PTE_SMALL_AP_UNO_SRO	(0x00 << 4)

#define PTE_SMALL_AP_UNO_SRW	(0x55 << 4)

#define PTE_SMALL_AP_URO_SRW	(0xaa << 4)

#define PTE_SMALL_AP_URW_SRW	(0xff << 4)

#define PTE_SMALL_AP_MASK	(_AT(pteval_t, 0xff) << 4)

#define PTE_SMALL_AP_UNO_SRO	(_AT(pteval_t, 0x00) << 4)

#define PTE_SMALL_AP_UNO_SRW	(_AT(pteval_t, 0x55) << 4)

#define PTE_SMALL_AP_URO_SRW	(_AT(pteval_t, 0xaa) << 4)

#define PTE_SMALL_AP_URW_SRW	(_AT(pteval_t, 0xff) << 4)



#endif

arch/arm/include/asm/pgtable-2level-types.h

+10 −7
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ 
#ifndef _ASM_PGTABLE_2LEVEL_TYPES_H

#define _ASM_PGTABLE_2LEVEL_TYPES_H



typedef unsigned long pteval_t;

#include <asm/types.h>



typedef u32 pteval_t;

typedef u32 pmdval_t;



#undef STRICT_MM_TYPECHECKS
@@ -28,9 +31,9 @@ typedef unsigned long pteval_t; 
 * These are used to make use of C type-checking..

 */

typedef struct { pteval_t pte; } pte_t;

typedef struct { unsigned long pmd; } pmd_t;

typedef struct { unsigned long pgd[2]; } pgd_t;

typedef struct { unsigned long pgprot; } pgprot_t;

typedef struct { pmdval_t pmd; } pmd_t;

typedef struct { pmdval_t pgd[2]; } pgd_t;

typedef struct { pteval_t pgprot; } pgprot_t;



#define pte_val(x)      ((x).pte)

#define pmd_val(x)      ((x).pmd)
@@ -46,9 +49,9 @@ typedef struct { unsigned long pgprot; } pgprot_t; 
 * .. while these make it easier on the compiler

 */

typedef pteval_t pte_t;

typedef unsigned long pmd_t;

typedef unsigned long pgd_t[2];

typedef unsigned long pgprot_t;

typedef pmdval_t pmd_t;

typedef pmdval_t pgd_t[2];

typedef pteval_t pgprot_t;



#define pte_val(x)      (x)

#define pmd_val(x)      (x)

arch/arm/include/asm/tlbflush.h

+2 −2
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static inline void local_flush_tlb_kernel_page(unsigned long kaddr) 
 *	these operations.  This is typically used when we are removing

 *	PMD entries.

 */

static inline void flush_pmd_entry(pmd_t *pmd)

static inline void flush_pmd_entry(void *pmd)

{

	const unsigned int __tlb_flag = __cpu_tlb_flags;
@@ -487,7 +487,7 @@ static inline void flush_pmd_entry(pmd_t *pmd) 
		dsb();

}



static inline void clean_pmd_entry(pmd_t *pmd)

static inline void clean_pmd_entry(void *pmd)

{

	const unsigned int __tlb_flag = __cpu_tlb_flags;

arch/arm/mm/mm.h

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ static inline pmd_t *pmd_off_k(unsigned long virt) 


struct mem_type {

	pteval_t prot_pte;

	unsigned int prot_l1;

	unsigned int prot_sect;

	pmdval_t prot_l1;

	pmdval_t prot_sect;

	unsigned int domain;

};