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

Commit 7e1e63c5 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/mm: Convert pte_user() to static inline 



In a subsequent patch we want to add a second definition of pte_user().
Before we do that, make the signature clear, ie. it takes a pte_t and
returns bool.

We move it up inside the existing #ifndef __ASSEMBLY__ block, but
otherwise it's a straight conversion.

Convert the call in settlbcam(), which passes an unsigned long, to pass
a pte_t.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 73a1441a

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

+10 −7
Original line number Diff line number Diff line
@@ -76,6 +76,16 @@ 
 */

#ifndef __ASSEMBLY__

extern unsigned long bad_call_to_PMD_PAGE_SIZE(void);



/*

 * Don't just check for any non zero bits in __PAGE_USER, since for book3e

 * and PTE_64BIT, PAGE_KERNEL_X contains _PAGE_BAP_SR which is also in

 * _PAGE_USER.  Need to explicitly match _PAGE_BAP_UR bit in that case too.

 */

static inline bool pte_user(pte_t pte)

{

	return (pte_val(pte) & _PAGE_USER) == _PAGE_USER;

}

#endif /* __ASSEMBLY__ */



/* Location of the PFN in the PTE. Most 32-bit platforms use the same
@@ -184,13 +194,6 @@ extern unsigned long bad_call_to_PMD_PAGE_SIZE(void); 
/* Make modules code happy. We don't set RO yet */

#define PAGE_KERNEL_EXEC	PAGE_KERNEL_X



/*

 * Don't just check for any non zero bits in __PAGE_USER, since for book3e

 * and PTE_64BIT, PAGE_KERNEL_X contains _PAGE_BAP_SR which is also in

 * _PAGE_USER.  Need to explicitly match _PAGE_BAP_UR bit in that case too.

 */

#define pte_user(val)		((val & _PAGE_USER) == _PAGE_USER)



/* Advertise special mapping type for AGP */

#define PAGE_AGP		(PAGE_KERNEL_NC)

#define HAVE_PAGE_AGP

arch/powerpc/mm/fsl_booke_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static void settlbcam(int index, unsigned long virt, phys_addr_t phys, 
		TLBCAM[index].MAS7 = (u64)phys >> 32;



	/* Below is unlikely -- only for large user pages or similar */

	if (pte_user(flags)) {

	if (pte_user(__pte(flags))) {

	   TLBCAM[index].MAS3 |= MAS3_UX | MAS3_UR;

	   TLBCAM[index].MAS3 |= ((flags & _PAGE_RW) ? MAS3_UW : 0);

	}