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

Commit f27d9b71 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk/prot-none' of... 

Merge branch 'for-rmk/prot-none' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
parents c71d4aa7 26ffd0d4

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

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
 * The PTE table pointer refers to the hardware entries; the "Linux"

 * entries are stored 1024 bytes below.

 */

#define L_PTE_VALID		(_AT(pteval_t, 1) << 0)		/* Valid */

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

#define L_PTE_YOUNG		(_AT(pteval_t, 1) << 1)

#define L_PTE_FILE		(_AT(pteval_t, 1) << 2)	/* only when !PRESENT */
@@ -123,6 +124,7 @@ 
#define L_PTE_USER		(_AT(pteval_t, 1) << 8)

#define L_PTE_XN		(_AT(pteval_t, 1) << 9)

#define L_PTE_SHARED		(_AT(pteval_t, 1) << 10)	/* shared(v6), coherent(xsc3) */

#define L_PTE_NONE		(_AT(pteval_t, 1) << 11)



/*

 * These are the memory types, defined to be compatible with

arch/arm/include/asm/pgtable-3level.h

+3 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ 
 * These bits overlap with the hardware bits but the naming is preserved for

 * consistency with the classic page table format.

 */

#define L_PTE_PRESENT		(_AT(pteval_t, 3) << 0)		/* Valid */

#define L_PTE_VALID		(_AT(pteval_t, 1) << 0)		/* Valid */

#define L_PTE_PRESENT		(_AT(pteval_t, 3) << 0)		/* Present */

#define L_PTE_FILE		(_AT(pteval_t, 1) << 2)		/* only when !PRESENT */

#define L_PTE_USER		(_AT(pteval_t, 1) << 6)		/* AP[1] */

#define L_PTE_RDONLY		(_AT(pteval_t, 1) << 7)		/* AP[2] */
@@ -76,6 +77,7 @@ 
#define L_PTE_XN		(_AT(pteval_t, 1) << 54)	/* XN */

#define L_PTE_DIRTY		(_AT(pteval_t, 1) << 55)	/* unused */

#define L_PTE_SPECIAL		(_AT(pteval_t, 1) << 56)	/* unused */

#define L_PTE_NONE		(_AT(pteval_t, 1) << 57)	/* PROT_NONE */



/*

 * To be used in assembly code with the upper page attributes.

arch/arm/include/asm/pgtable.h

+4 −6
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ extern pgprot_t pgprot_kernel; 


#define _MOD_PROT(p, b)	__pgprot(pgprot_val(p) | (b))



#define PAGE_NONE		_MOD_PROT(pgprot_user, L_PTE_XN | L_PTE_RDONLY)

#define PAGE_NONE		_MOD_PROT(pgprot_user, L_PTE_XN | L_PTE_RDONLY | L_PTE_NONE)

#define PAGE_SHARED		_MOD_PROT(pgprot_user, L_PTE_USER | L_PTE_XN)

#define PAGE_SHARED_EXEC	_MOD_PROT(pgprot_user, L_PTE_USER)

#define PAGE_COPY		_MOD_PROT(pgprot_user, L_PTE_USER | L_PTE_RDONLY | L_PTE_XN)
@@ -83,7 +83,7 @@ extern pgprot_t pgprot_kernel; 
#define PAGE_KERNEL		_MOD_PROT(pgprot_kernel, L_PTE_XN)

#define PAGE_KERNEL_EXEC	pgprot_kernel



#define __PAGE_NONE		__pgprot(_L_PTE_DEFAULT | L_PTE_RDONLY | L_PTE_XN)

#define __PAGE_NONE		__pgprot(_L_PTE_DEFAULT | L_PTE_RDONLY | L_PTE_XN | L_PTE_NONE)

#define __PAGE_SHARED		__pgprot(_L_PTE_DEFAULT | L_PTE_USER | L_PTE_XN)

#define __PAGE_SHARED_EXEC	__pgprot(_L_PTE_DEFAULT | L_PTE_USER)

#define __PAGE_COPY		__pgprot(_L_PTE_DEFAULT | L_PTE_USER | L_PTE_RDONLY | L_PTE_XN)
@@ -203,9 +203,7 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd) 
#define pte_exec(pte)		(!(pte_val(pte) & L_PTE_XN))

#define pte_special(pte)	(0)



#define pte_present_user(pte) \

	((pte_val(pte) & (L_PTE_PRESENT | L_PTE_USER)) == \

	 (L_PTE_PRESENT | L_PTE_USER))

#define pte_present_user(pte)  (pte_present(pte) && (pte_val(pte) & L_PTE_USER))



#if __LINUX_ARM_ARCH__ < 6

static inline void __sync_icache_dcache(pte_t pteval)
@@ -242,7 +240,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } 


static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{

	const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER;

	const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER | L_PTE_NONE;

	pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);

	return pte;

}

arch/arm/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static void __init build_mem_type_table(void) 
#endif



	for (i = 0; i < 16; i++) {

		unsigned long v = pgprot_val(protection_map[i]);

		pteval_t v = pgprot_val(protection_map[i]);

		protection_map[i] = __pgprot(v | user_pgprot);

	}

arch/arm/mm/proc-macros.S

+4 −0
Original line number Diff line number Diff line
@@ -167,6 +167,10 @@ 
	tst	r1, #L_PTE_YOUNG

	tstne	r1, #L_PTE_PRESENT

	moveq	r3, #0

#ifndef CONFIG_CPU_USE_DOMAINS

	tstne	r1, #L_PTE_NONE

	movne	r3, #0

#endif



	str	r3, [r0]

	mcr	p15, 0, r0, c7, c10, 1		@ flush_pte