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

Commit b2133bd7 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/book3s/32: do not include pte-common.h 



As done for book3s/64, add necessary flags/defines in
book3s/32/pgtable.h and do not include pte-common.h

It allows in the meantime to remove all related hash
definitions from pte-common.h and to also remove
_PAGE_EXEC default as _PAGE_EXEC is defined on all
platforms except book3s/32.

Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f4805785

arch/powerpc/include/asm/book3s/32/pgtable.h

+98 −4
Original line number Original line Diff line number Diff line
@@ -8,7 +8,102 @@ 
#include <asm/book3s/32/hash.h>

#include <asm/book3s/32/hash.h>





/* And here we include common definitions */

/* And here we include common definitions */

#include <asm/pte-common.h>



#define _PAGE_KERNEL_RO		0

#define _PAGE_KERNEL_ROX	0

#define _PAGE_KERNEL_RW		(_PAGE_DIRTY | _PAGE_RW)

#define _PAGE_KERNEL_RWX	(_PAGE_DIRTY | _PAGE_RW)



#define _PAGE_HPTEFLAGS _PAGE_HASHPTE



#ifndef __ASSEMBLY__



static inline bool pte_user(pte_t pte)

{

	return pte_val(pte) & _PAGE_USER;

}

#endif /* __ASSEMBLY__ */



/*

 * Location of the PFN in the PTE. Most 32-bit platforms use the same

 * as _PAGE_SHIFT here (ie, naturally aligned).

 * Platform who don't just pre-define the value so we don't override it here.

 */

#define PTE_RPN_SHIFT	(PAGE_SHIFT)



/*

 * The mask covered by the RPN must be a ULL on 32-bit platforms with

 * 64-bit PTEs.

 */

#ifdef CONFIG_PTE_64BIT

#define PTE_RPN_MASK	(~((1ULL << PTE_RPN_SHIFT) - 1))

#else

#define PTE_RPN_MASK	(~((1UL << PTE_RPN_SHIFT) - 1))

#endif



/*

 * _PAGE_CHG_MASK masks of bits that are to be preserved across

 * pgprot changes.

 */

#define _PAGE_CHG_MASK	(PTE_RPN_MASK | _PAGE_HASHPTE | _PAGE_DIRTY | \

			 _PAGE_ACCESSED | _PAGE_SPECIAL)



/* Mask of bits returned by pte_pgprot() */

#define PAGE_PROT_BITS	(_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \

			 _PAGE_WRITETHRU | _PAGE_USER | _PAGE_ACCESSED | \

			 _PAGE_RW | _PAGE_DIRTY)



/*

 * We define 2 sets of base prot bits, one for basic pages (ie,

 * cacheable kernel and user pages) and one for non cacheable

 * pages. We always set _PAGE_COHERENT when SMP is enabled or

 * the processor might need it for DMA coherency.

 */

#define _PAGE_BASE_NC	(_PAGE_PRESENT | _PAGE_ACCESSED)

#define _PAGE_BASE	(_PAGE_BASE_NC | _PAGE_COHERENT)



/*

 * Permission masks used to generate the __P and __S table.

 *

 * Note:__pgprot is defined in arch/powerpc/include/asm/page.h

 *

 * Write permissions imply read permissions for now.

 */

#define PAGE_NONE	__pgprot(_PAGE_BASE)

#define PAGE_SHARED	__pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW)

#define PAGE_SHARED_X	__pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW)

#define PAGE_COPY	__pgprot(_PAGE_BASE | _PAGE_USER)

#define PAGE_COPY_X	__pgprot(_PAGE_BASE | _PAGE_USER)

#define PAGE_READONLY	__pgprot(_PAGE_BASE | _PAGE_USER)

#define PAGE_READONLY_X	__pgprot(_PAGE_BASE | _PAGE_USER)



/* Permission masks used for kernel mappings */

#define PAGE_KERNEL	__pgprot(_PAGE_BASE | _PAGE_KERNEL_RW)

#define PAGE_KERNEL_NC	__pgprot(_PAGE_BASE_NC | _PAGE_KERNEL_RW | _PAGE_NO_CACHE)

#define PAGE_KERNEL_NCG	__pgprot(_PAGE_BASE_NC | _PAGE_KERNEL_RW | \

				 _PAGE_NO_CACHE | _PAGE_GUARDED)

#define PAGE_KERNEL_X	__pgprot(_PAGE_BASE | _PAGE_KERNEL_RWX)

#define PAGE_KERNEL_RO	__pgprot(_PAGE_BASE | _PAGE_KERNEL_RO)

#define PAGE_KERNEL_ROX	__pgprot(_PAGE_BASE | _PAGE_KERNEL_ROX)



/*

 * Protection used for kernel text. We want the debuggers to be able to

 * set breakpoints anywhere, so don't write protect the kernel text

 * on platforms where such control is possible.

 */

#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) ||\

	defined(CONFIG_KPROBES) || defined(CONFIG_DYNAMIC_FTRACE)

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_X

#else

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_ROX

#endif



/* Make modules code happy. We don't set RO yet */

#define PAGE_KERNEL_EXEC	PAGE_KERNEL_X



/* Advertise special mapping type for AGP */

#define PAGE_AGP		(PAGE_KERNEL_NC)

#define HAVE_PAGE_AGP





#define PTE_INDEX_SIZE	PTE_SHIFT

#define PTE_INDEX_SIZE	PTE_SHIFT

#define PMD_INDEX_SIZE	0

#define PMD_INDEX_SIZE	0
@@ -219,7 +314,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, 
static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,

static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,

				      pte_t *ptep)

				      pte_t *ptep)

{

{

	pte_update(ptep, (_PAGE_RW | _PAGE_HWWRITE), _PAGE_RO);

	pte_update(ptep, _PAGE_RW, 0);

}

}

static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,

static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,

					   unsigned long addr, pte_t *ptep)

					   unsigned long addr, pte_t *ptep)
@@ -235,9 +330,8 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, 
{

{

	unsigned long set = pte_val(entry) &

	unsigned long set = pte_val(entry) &

		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW);

		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW);

	unsigned long clr = ~pte_val(entry) & _PAGE_RO;





	pte_update(ptep, clr, set);

	pte_update(ptep, 0, set);





	flush_tlb_page(vma, address);

	flush_tlb_page(vma, address);

}

}

arch/powerpc/include/asm/pte-common.h

+3 −13
Original line number Original line Diff line number Diff line
@@ -5,15 +5,9 @@ 
 * Some bits are only used on some cpu families... Make sure that all

 * Some bits are only used on some cpu families... Make sure that all

 * the undefined gets a sensible default

 * the undefined gets a sensible default

 */

 */

#ifndef _PAGE_HASHPTE

#define _PAGE_HASHPTE	0

#endif

#ifndef _PAGE_HWWRITE

#ifndef _PAGE_HWWRITE

#define _PAGE_HWWRITE	0

#define _PAGE_HWWRITE	0

#endif

#endif

#ifndef _PAGE_EXEC

#define _PAGE_EXEC	0

#endif

#ifndef _PAGE_COHERENT

#ifndef _PAGE_COHERENT

#define _PAGE_COHERENT	0

#define _PAGE_COHERENT	0

#endif

#endif
@@ -68,11 +62,8 @@ 
#define _PAGE_KERNEL_RWX	(_PAGE_PRIVILEGED | _PAGE_DIRTY | _PAGE_RW | \

#define _PAGE_KERNEL_RWX	(_PAGE_PRIVILEGED | _PAGE_DIRTY | _PAGE_RW | \

				 _PAGE_HWWRITE | _PAGE_EXEC)

				 _PAGE_HWWRITE | _PAGE_EXEC)

#endif

#endif

#ifndef _PAGE_HPTEFLAGS

#define _PAGE_HPTEFLAGS _PAGE_HASHPTE

#endif

#ifndef _PTE_NONE_MASK

#ifndef _PTE_NONE_MASK

#define _PTE_NONE_MASK	_PAGE_HPTEFLAGS

#define _PTE_NONE_MASK	0

#endif

#endif





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__
@@ -108,7 +99,7 @@ static inline bool pte_user(pte_t pte) 
/* _PAGE_CHG_MASK masks of bits that are to be preserved across

/* _PAGE_CHG_MASK masks of bits that are to be preserved across

 * pgprot changes

 * pgprot changes

 */

 */

#define _PAGE_CHG_MASK	(PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \

#define _PAGE_CHG_MASK	(PTE_RPN_MASK | _PAGE_DIRTY | \

                         _PAGE_ACCESSED | _PAGE_SPECIAL)

                         _PAGE_ACCESSED | _PAGE_SPECIAL)





/* Mask of bits returned by pte_pgprot() */

/* Mask of bits returned by pte_pgprot() */
@@ -125,8 +116,7 @@ static inline bool pte_user(pte_t pte) 
 * the processor might need it for DMA coherency.

 * the processor might need it for DMA coherency.

 */

 */

#define _PAGE_BASE_NC	(_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_PSIZE)

#define _PAGE_BASE_NC	(_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_PSIZE)

#if defined(CONFIG_SMP) || defined(CONFIG_PPC_STD_MMU) || \

#if defined(CONFIG_SMP) || defined(CONFIG_PPC_E500MC)

	defined(CONFIG_PPC_E500MC)

#define _PAGE_BASE	(_PAGE_BASE_NC | _PAGE_COHERENT)

#define _PAGE_BASE	(_PAGE_BASE_NC | _PAGE_COHERENT)

#else

#else

#define _PAGE_BASE	(_PAGE_BASE_NC)

#define _PAGE_BASE	(_PAGE_BASE_NC)