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

Commit 36311607 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: KVM: define HYP and Stage-2 translation page flags 



Add HYP and S2 page flags, for both normal and device memory.

Reviewed-by: default avatarChristopher Covington <cov@codeaurora.org>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent d683b96b

arch/arm64/include/asm/memory.h

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,12 @@ 
#define MT_NORMAL_NC		3

#define MT_NORMAL		4



/*

 * Memory types for Stage-2 translation

 */

#define MT_S2_NORMAL		0xf

#define MT_S2_DEVICE_nGnRE	0x1



#ifndef __ASSEMBLY__



extern phys_addr_t		memstart_addr;

arch/arm64/include/asm/pgtable-hwdef.h

+19 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
/*

 * Section

 */

#define PMD_SECT_USER		(_AT(pteval_t, 1) << 6)		/* AP[1] */

#define PMD_SECT_S		(_AT(pmdval_t, 3) << 8)

#define PMD_SECT_AF		(_AT(pmdval_t, 1) << 10)

#define PMD_SECT_NG		(_AT(pmdval_t, 1) << 11)
@@ -67,6 +68,24 @@ 
#define PTE_ATTRINDX(t)		(_AT(pteval_t, (t)) << 2)

#define PTE_ATTRINDX_MASK	(_AT(pteval_t, 7) << 2)



/*

 * 2nd stage PTE definitions

 */

#define PTE_S2_RDONLY		(_AT(pteval_t, 1) << 6)   /* HAP[2:1] */

#define PTE_S2_RDWR		(_AT(pteval_t, 3) << 6)   /* HAP[2:1] */



/*

 * Memory Attribute override for Stage-2 (MemAttr[3:0])

 */

#define PTE_S2_MEMATTR(t)	(_AT(pteval_t, (t)) << 2)

#define PTE_S2_MEMATTR_MASK	(_AT(pteval_t, 0xf) << 2)



/*

 * EL2/HYP PTE/PMD definitions

 */

#define PMD_HYP			PMD_SECT_USER

#define PTE_HYP			PTE_USER



/*

 * 40-bit physical address supported.

 */

arch/arm64/include/asm/pgtable.h

+12 −0
Original line number Diff line number Diff line
@@ -76,6 +76,12 @@ extern pgprot_t pgprot_default; 
#define PAGE_KERNEL		_MOD_PROT(pgprot_default, PTE_PXN | PTE_UXN | PTE_DIRTY)

#define PAGE_KERNEL_EXEC	_MOD_PROT(pgprot_default, PTE_UXN | PTE_DIRTY)



#define PAGE_HYP		_MOD_PROT(pgprot_default, PTE_HYP)

#define PAGE_HYP_DEVICE		__pgprot(PROT_DEVICE_nGnRE | PTE_HYP)



#define PAGE_S2			__pgprot_modify(pgprot_default, PTE_S2_MEMATTR_MASK, PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_S2_RDONLY)

#define PAGE_S2_DEVICE		__pgprot(PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDWR | PTE_UXN)



#define __PAGE_NONE		__pgprot(((_PAGE_DEFAULT) & ~PTE_TYPE_MASK) | PTE_PROT_NONE)

#define __PAGE_SHARED		__pgprot(_PAGE_DEFAULT | PTE_USER | PTE_NG | PTE_PXN | PTE_UXN)

#define __PAGE_SHARED_EXEC	__pgprot(_PAGE_DEFAULT | PTE_USER | PTE_NG | PTE_PXN)
@@ -197,6 +203,12 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, 


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



#define pmd_table(pmd)		((pmd_val(pmd) & PMD_TYPE_MASK) == \

				 PMD_TYPE_TABLE)

#define pmd_sect(pmd)		((pmd_val(pmd) & PMD_TYPE_MASK) == \

				 PMD_TYPE_SECT)





static inline void set_pmd(pmd_t *pmdp, pmd_t pmd)

{

	*pmdp = pmd;