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

Commit 10bd3808 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm: Don't use pte_val as lvalue 



We also convert few #define to static inline in this patch for better
type checking

Acked-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b0412ea9

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

+83 −35
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 


/* Generic accessors to PTE bits */

static inline int pte_write(pte_t pte)		{ return !!(pte_val(pte) & _PAGE_RW);}

static inline int pte_dirty(pte_t pte)		{ return pte_val(pte) & _PAGE_DIRTY; }

static inline int pte_young(pte_t pte)		{ return pte_val(pte) & _PAGE_ACCESSED; }

static inline int pte_special(pte_t pte)	{ return pte_val(pte) & _PAGE_SPECIAL; }

static inline int pte_dirty(pte_t pte)		{ return !!(pte_val(pte) & _PAGE_DIRTY); }

static inline int pte_young(pte_t pte)		{ return !!(pte_val(pte) & _PAGE_ACCESSED); }

static inline int pte_special(pte_t pte)	{ return !!(pte_val(pte) & _PAGE_SPECIAL); }

static inline int pte_none(pte_t pte)		{ return (pte_val(pte) & ~_PTE_NONE_MASK) == 0; }

static inline pgprot_t pte_pgprot(pte_t pte)	{ return __pgprot(pte_val(pte) & PAGE_PROT_BITS); }
@@ -47,36 +47,61 @@ static inline int pte_present(pte_t pte) 
 * Even if PTEs can be unsigned long long, a PFN is always an unsigned

 * long for now.

 */

static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot) {

static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)

{

	return __pte(((pte_basic_t)(pfn) << PTE_RPN_SHIFT) |

		     pgprot_val(pgprot)); }

static inline unsigned long pte_pfn(pte_t pte)	{

	return pte_val(pte) >> PTE_RPN_SHIFT; }

		     pgprot_val(pgprot));

}



static inline unsigned long pte_pfn(pte_t pte)

{

	return pte_val(pte) >> PTE_RPN_SHIFT;

}



/* Generic modifiers for PTE bits */

static inline pte_t pte_wrprotect(pte_t pte)

{

	pte_val(pte) &= ~_PAGE_RW;

	return __pte(pte_val(pte) & ~_PAGE_RW);

}



static inline pte_t pte_mkclean(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_DIRTY);

}



static inline pte_t pte_mkold(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_ACCESSED);

}



static inline pte_t pte_mkwrite(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_RW);

}



static inline pte_t pte_mkdirty(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_DIRTY);

}



static inline pte_t pte_mkyoung(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_ACCESSED);

}



static inline pte_t pte_mkspecial(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_SPECIAL);

}



static inline pte_t pte_mkhuge(pte_t pte)

{

	return pte;

}

static inline pte_t pte_mkclean(pte_t pte) {

	pte_val(pte) &= ~_PAGE_DIRTY; return pte; }

static inline pte_t pte_mkold(pte_t pte) {

	pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }

static inline pte_t pte_mkwrite(pte_t pte) {

	pte_val(pte) |= _PAGE_RW; return pte; }

static inline pte_t pte_mkdirty(pte_t pte) {

	pte_val(pte) |= _PAGE_DIRTY; return pte; }

static inline pte_t pte_mkyoung(pte_t pte) {

	pte_val(pte) |= _PAGE_ACCESSED; return pte; }

static inline pte_t pte_mkspecial(pte_t pte) {

	pte_val(pte) |= _PAGE_SPECIAL; return pte; }

static inline pte_t pte_mkhuge(pte_t pte) {

	return pte; }



static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{

	pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot);

	return pte;

	return __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot));

}
@@ -159,22 +184,45 @@ extern int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addre 
#define _PAGE_CACHE_CTL	(_PAGE_COHERENT | _PAGE_GUARDED | _PAGE_NO_CACHE | \

			 _PAGE_WRITETHRU)



#define pgprot_noncached(prot)	  (__pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) | \

				            _PAGE_NO_CACHE | _PAGE_GUARDED))

#define pgprot_noncached pgprot_noncached

static inline pgprot_t pgprot_noncached(pgprot_t prot)

{

	return __pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) |

			_PAGE_NO_CACHE | _PAGE_GUARDED);

}



#define pgprot_noncached_wc(prot) (__pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) | \

				            _PAGE_NO_CACHE))

#define pgprot_noncached_wc pgprot_noncached_wc

static inline pgprot_t pgprot_noncached_wc(pgprot_t prot)

{

	return __pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) |

			_PAGE_NO_CACHE);

}



#define pgprot_cached(prot)       (__pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) | \

				            _PAGE_COHERENT))

#define pgprot_cached pgprot_cached

static inline pgprot_t pgprot_cached(pgprot_t prot)

{

	return __pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) |

			_PAGE_COHERENT);

}



#define pgprot_cached_wthru(prot) (__pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) | \

				            _PAGE_COHERENT | _PAGE_WRITETHRU))

#define pgprot_cached_wthru pgprot_cached_wthru

static inline pgprot_t pgprot_cached_wthru(pgprot_t prot)

{

	return __pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) |

			_PAGE_COHERENT | _PAGE_WRITETHRU);

}



#define pgprot_cached_noncoherent(prot) \

		(__pgprot(pgprot_val(prot) & ~_PAGE_CACHE_CTL))

#define pgprot_cached_noncoherent pgprot_cached_noncoherent

static inline pgprot_t pgprot_cached_noncoherent(pgprot_t prot)

{

	return __pgprot(pgprot_val(prot) & ~_PAGE_CACHE_CTL);

}



#define pgprot_writecombine pgprot_noncached_wc

#define pgprot_writecombine pgprot_writecombine

static inline pgprot_t pgprot_writecombine(pgprot_t prot)

{

	return pgprot_noncached_wc(prot);

}



struct file;

extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,

arch/powerpc/include/asm/page.h

+8 −2
Original line number Diff line number Diff line
@@ -286,8 +286,11 @@ extern long long virt_phys_offset; 


/* PTE level */

typedef struct { pte_basic_t pte; } pte_t;

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

#define __pte(x)	((pte_t) { (x) })

static inline pte_basic_t pte_val(pte_t x)

{

	return x.pte;

}



/* 64k pages additionally define a bigger "real PTE" type that gathers

 * the "second half" part of the PTE for pseudo 64k pages
@@ -329,8 +332,11 @@ typedef struct { unsigned long pgprot; } pgprot_t; 
 */



typedef pte_basic_t pte_t;

#define pte_val(x)	(x)

#define __pte(x)	(x)

static inline pte_basic_t pte_val(pte_t pte)

{

	return pte;

}



#if defined(CONFIG_PPC_64K_PAGES) && defined(CONFIG_PPC_STD_MMU_64)

typedef struct { pte_t pte; unsigned long hidx; } real_pte_t;

arch/powerpc/include/asm/pgtable-book3e.h

+48 −20
Original line number Diff line number Diff line
@@ -56,30 +56,58 @@ static inline unsigned long pte_pfn(pte_t pte) { 
	return pte_val(pte) >> PTE_RPN_SHIFT; }



/* Generic modifiers for PTE bits */

static inline pte_t pte_wrprotect(pte_t pte) {

	pte_val(pte) &= ~(_PAGE_RW | _PAGE_HWWRITE);

	pte_val(pte) |= _PAGE_RO; return pte; }

static inline pte_t pte_mkclean(pte_t pte) {

	pte_val(pte) &= ~(_PAGE_DIRTY | _PAGE_HWWRITE); return pte; }

static inline pte_t pte_mkold(pte_t pte) {

	pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }

static inline pte_t pte_mkwrite(pte_t pte) {

	pte_val(pte) &= ~_PAGE_RO;

	pte_val(pte) |= _PAGE_RW; return pte; }

static inline pte_t pte_mkdirty(pte_t pte) {

	pte_val(pte) |= _PAGE_DIRTY; return pte; }

static inline pte_t pte_mkyoung(pte_t pte) {

	pte_val(pte) |= _PAGE_ACCESSED; return pte; }

static inline pte_t pte_mkspecial(pte_t pte) {

	pte_val(pte) |= _PAGE_SPECIAL; return pte; }

static inline pte_t pte_mkhuge(pte_t pte) {

	return pte; }

static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

static inline pte_t pte_wrprotect(pte_t pte)

{

	pte_basic_t ptev;



	ptev = pte_val(pte) & ~(_PAGE_RW | _PAGE_HWWRITE);

	ptev |= _PAGE_RO;

	return __pte(ptev);

}



static inline pte_t pte_mkclean(pte_t pte)

{

	return __pte(pte_val(pte) & ~(_PAGE_DIRTY | _PAGE_HWWRITE));

}



static inline pte_t pte_mkold(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_ACCESSED);

}



static inline pte_t pte_mkwrite(pte_t pte)

{

	pte_basic_t ptev;



	ptev = pte_val(pte) & ~_PAGE_RO;

	ptev |= _PAGE_RW;

	return __pte(ptev);

}



static inline pte_t pte_mkdirty(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_DIRTY);

}



static inline pte_t pte_mkyoung(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_ACCESSED);

}



static inline pte_t pte_mkspecial(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_SPECIAL);

}



static inline pte_t pte_mkhuge(pte_t pte)

{

	pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot);

	return pte;

}



static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{

	return __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot));

}



/* Insert a PTE, top-level function is out of line. It uses an inline

 * low level function in the respective pgtable-* files