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

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

ARM: pgtable: group pte functions together 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4eec4b13

arch/arm/include/asm/pgtable.h

+51 −59
Original line number Diff line number Diff line
@@ -299,26 +299,66 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; 
#define set_pgd(pgd,pgdp)	do { } while (0)





#define pte_pfn(pte)		(pte_val(pte) >> PAGE_SHIFT)

#define pfn_pte(pfn,prot)	(__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)))

/* Find an entry in the second-level page table.. */

#define pmd_offset(dir, addr)	((pmd_t *)(dir))



#define pte_none(pte)		(!pte_val(pte))

#define pte_clear(mm,addr,ptep)	set_pte_ext(ptep, __pte(0), 0)

#define pte_page(pte)		(pfn_to_page(pte_pfn(pte)))

#define pte_offset_kernel(dir,addr)	(pmd_page_vaddr(*(dir)) + __pte_index(addr))

#define pmd_none(pmd)		(!pmd_val(pmd))

#define pmd_present(pmd)	(pmd_val(pmd))

#define pmd_bad(pmd)		(pmd_val(pmd) & 2)



#define copy_pmd(pmdpd,pmdps)		\

	do {				\

		pmdpd[0] = pmdps[0];	\

		pmdpd[1] = pmdps[1];	\

		flush_pmd_entry(pmdpd);	\

	} while (0)



#define pmd_clear(pmdp)			\

	do {				\

		pmdp[0] = __pmd(0);	\

		pmdp[1] = __pmd(0);	\

		clean_pmd_entry(pmdp);	\

	} while (0)



static inline pte_t *pmd_page_vaddr(pmd_t pmd)

{

	unsigned long ptr;



	ptr = pmd_val(pmd) & ~(PTRS_PER_PTE * sizeof(void *) - 1);

	ptr += PTRS_PER_PTE * sizeof(void *);



	return __va(ptr);

}



#define pmd_page(pmd)		pfn_to_page(__phys_to_pfn(pmd_val(pmd)))



/* we don't need complex calculations here as the pmd is folded into the pgd */

#define pmd_addr_end(addr,end)	(end)



#define pte_offset_map(dir,addr)	(__pte_map(dir) + __pte_index(addr))

#define pte_unmap(pte)			__pte_unmap(pte)



#ifndef CONFIG_HIGHPTE

#define __pte_map(dir)		pmd_page_vaddr(*(dir))

#define __pte_map(pmd)		pmd_page_vaddr(*(pmd))

#define __pte_unmap(pte)	do { } while (0)

#else

#define __pte_map(dir)		((pte_t *)kmap_atomic(pmd_page(*(dir))) + PTRS_PER_PTE)

#define __pte_map(pmd)		((pte_t *)kmap_atomic(pmd_page(*(pmd))) + PTRS_PER_PTE)

#define __pte_unmap(pte)	kunmap_atomic((pte - PTRS_PER_PTE))

#endif



#define pte_index(addr)		(((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))



#define pte_offset_kernel(pmd,addr)	(pmd_page_vaddr(*(pmd)) + pte_index(addr))



#define pte_offset_map(pmd,addr)	(__pte_map(pmd) + pte_index(addr))

#define pte_unmap(pte)			__pte_unmap(pte)



#define pte_pfn(pte)		(pte_val(pte) >> PAGE_SHIFT)

#define pfn_pte(pfn,prot)	__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))



#define pte_page(pte)		pfn_to_page(pte_pfn(pte))

#define mk_pte(page,prot)	pfn_pte(page_to_pfn(page), prot)



#define set_pte_ext(ptep,pte,ext) cpu_set_pte_ext(ptep,pte,ext)

#define pte_clear(mm,addr,ptep)	set_pte_ext(ptep, __pte(0), 0)



#if __LINUX_ARM_ARCH__ < 6

static inline void __sync_icache_dcache(pte_t pteval)
@@ -339,10 +379,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, 
	}

}



/*

 * The following only work if pte_present() is true.

 * Undefined behaviour if not..

 */

#define pte_none(pte)		(!pte_val(pte))

#define pte_present(pte)	(pte_val(pte) & L_PTE_PRESENT)

#define pte_write(pte)		(pte_val(pte) & L_PTE_WRITE)

#define pte_dirty(pte)		(pte_val(pte) & L_PTE_DIRTY)
@@ -366,51 +403,6 @@ PTE_BIT_FUNC(mkyoung, |= L_PTE_YOUNG); 


static inline pte_t pte_mkspecial(pte_t pte) { return pte; }



#define pmd_none(pmd)		(!pmd_val(pmd))

#define pmd_present(pmd)	(pmd_val(pmd))

#define pmd_bad(pmd)		(pmd_val(pmd) & 2)



#define copy_pmd(pmdpd,pmdps)		\

	do {				\

		pmdpd[0] = pmdps[0];	\

		pmdpd[1] = pmdps[1];	\

		flush_pmd_entry(pmdpd);	\

	} while (0)



#define pmd_clear(pmdp)			\

	do {				\

		pmdp[0] = __pmd(0);	\

		pmdp[1] = __pmd(0);	\

		clean_pmd_entry(pmdp);	\

	} while (0)



static inline pte_t *pmd_page_vaddr(pmd_t pmd)

{

	unsigned long ptr;



	ptr = pmd_val(pmd) & ~(PTRS_PER_PTE * sizeof(void *) - 1);

	ptr += PTRS_PER_PTE * sizeof(void *);



	return __va(ptr);

}



#define pmd_page(pmd)		pfn_to_page(__phys_to_pfn(pmd_val(pmd)))



/* we don't need complex calculations here as the pmd is folded into the pgd */

#define pmd_addr_end(addr,end)	(end)



/*

 * Conversion functions: convert a page and protection to a page entry,

 * and a page entry and page directory to the page they refer to.

 */

#define mk_pte(page,prot)	pfn_pte(page_to_pfn(page),prot)



/* Find an entry in the second-level page table.. */

#define pmd_offset(dir, addr)	((pmd_t *)(dir))



/* Find an entry in the third-level page table.. */

#define __pte_index(addr)	(((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))



static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{

	const unsigned long mask = L_PTE_EXEC | L_PTE_WRITE | L_PTE_USER;