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

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

powerpc/mm: Split pgtable types to separate header 



We move the page table accessors into a separate header. We will
later add a big endian variant of the table which is needed for radix.
No functionality change only code movement.

Reviewed-by: default avatarPaul Mackerras <paulus@samba.org>
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 bf6a4d5b

arch/powerpc/include/asm/page.h

+1 −103
Original line number Diff line number Diff line
@@ -288,109 +288,7 @@ extern long long virt_phys_offset; 


#ifndef __ASSEMBLY__



#ifdef CONFIG_STRICT_MM_TYPECHECKS

/* These are used to make use of C type-checking. */



/* PTE level */

typedef struct { pte_basic_t pte; } pte_t;

#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

 */

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

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

#else

typedef struct { pte_t pte; } real_pte_t;

#endif



/* PMD level */

#ifdef CONFIG_PPC64

typedef struct { unsigned long pmd; } pmd_t;

#define __pmd(x)	((pmd_t) { (x) })

static inline unsigned long pmd_val(pmd_t x)

{

	return x.pmd;

}



/* PUD level exusts only on 4k pages */

#ifndef CONFIG_PPC_64K_PAGES

typedef struct { unsigned long pud; } pud_t;

#define __pud(x)	((pud_t) { (x) })

static inline unsigned long pud_val(pud_t x)

{

	return x.pud;

}

#endif /* !CONFIG_PPC_64K_PAGES */

#endif /* CONFIG_PPC64 */



/* PGD level */

typedef struct { unsigned long pgd; } pgd_t;

#define __pgd(x)	((pgd_t) { (x) })

static inline unsigned long pgd_val(pgd_t x)

{

	return x.pgd;

}



/* Page protection bits */

typedef struct { unsigned long pgprot; } pgprot_t;

#define pgprot_val(x)	((x).pgprot)

#define __pgprot(x)	((pgprot_t) { (x) })



#else



/*

 * .. while these make it easier on the compiler

 */



typedef pte_basic_t pte_t;

#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;

#else

typedef pte_t real_pte_t;

#endif





#ifdef CONFIG_PPC64

typedef unsigned long pmd_t;

#define __pmd(x)	(x)

static inline unsigned long pmd_val(pmd_t pmd)

{

	return pmd;

}



#ifndef CONFIG_PPC_64K_PAGES

typedef unsigned long pud_t;

#define __pud(x)	(x)

static inline unsigned long pud_val(pud_t pud)

{

	return pud;

}

#endif /* !CONFIG_PPC_64K_PAGES */

#endif /* CONFIG_PPC64 */



typedef unsigned long pgd_t;

#define __pgd(x)	(x)

static inline unsigned long pgd_val(pgd_t pgd)

{

	return pgd;

}



typedef unsigned long pgprot_t;

#define pgprot_val(x)	(x)

#define __pgprot(x)	(x)



#endif

#include <asm/pgtable-types.h>



typedef struct { signed long pd; } hugepd_t;

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

0 → 100644
+108 −0
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_PGTABLE_TYPES_H

#define _ASM_POWERPC_PGTABLE_TYPES_H



#ifdef CONFIG_STRICT_MM_TYPECHECKS

/* These are used to make use of C type-checking. */



/* PTE level */

typedef struct { pte_basic_t pte; } pte_t;

#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

 */

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

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

#else

typedef struct { pte_t pte; } real_pte_t;

#endif



/* PMD level */

#ifdef CONFIG_PPC64

typedef struct { unsigned long pmd; } pmd_t;

#define __pmd(x)	((pmd_t) { (x) })

static inline unsigned long pmd_val(pmd_t x)

{

	return x.pmd;

}



/* PUD level exusts only on 4k pages */

#ifndef CONFIG_PPC_64K_PAGES

typedef struct { unsigned long pud; } pud_t;

#define __pud(x)	((pud_t) { (x) })

static inline unsigned long pud_val(pud_t x)

{

	return x.pud;

}

#endif /* !CONFIG_PPC_64K_PAGES */

#endif /* CONFIG_PPC64 */



/* PGD level */

typedef struct { unsigned long pgd; } pgd_t;

#define __pgd(x)	((pgd_t) { (x) })

static inline unsigned long pgd_val(pgd_t x)

{

	return x.pgd;

}



/* Page protection bits */

typedef struct { unsigned long pgprot; } pgprot_t;

#define pgprot_val(x)	((x).pgprot)

#define __pgprot(x)	((pgprot_t) { (x) })



#else



/*

 * .. while these make it easier on the compiler

 */



typedef pte_basic_t pte_t;

#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;

#else

typedef pte_t real_pte_t;

#endif





#ifdef CONFIG_PPC64

typedef unsigned long pmd_t;

#define __pmd(x)	(x)

static inline unsigned long pmd_val(pmd_t pmd)

{

	return pmd;

}



#ifndef CONFIG_PPC_64K_PAGES

typedef unsigned long pud_t;

#define __pud(x)	(x)

static inline unsigned long pud_val(pud_t pud)

{

	return pud;

}

#endif /* !CONFIG_PPC_64K_PAGES */

#endif /* CONFIG_PPC64 */



typedef unsigned long pgd_t;

#define __pgd(x)	(x)

static inline unsigned long pgd_val(pgd_t pgd)

{

	return pgd;

}



typedef unsigned long pgprot_t;

#define pgprot_val(x)	(x)

#define __pgprot(x)	(x)



#endif



#endif /* _ASM_POWERPC_PGTABLE_TYPES_H */