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

Commit 2e4e3c2c authored by Jeremy Gebben's avatar Jeremy Gebben Committed by Jordan Crouse
Browse files

iommu/io-pgtable-arm: add support for the IOMMU_PRIV flag 



Allow the creation of privileged mode mappings, for stage 1 only.

Change-Id: Ie91168012b61c0774d840a35b3ed2f18b834873f
Signed-off-by: default avatarJeremy Gebben <jgebben@codeaurora.org>
parent d89a5277

drivers/iommu/io-pgtable-arm.c

+11 −5
Original line number Diff line number Diff line
@@ -99,8 +99,10 @@ 
					 ARM_LPAE_PTE_ATTR_HI_MASK)



/* Stage-1 PTE */

#define ARM_LPAE_PTE_AP_UNPRIV		(((arm_lpae_iopte)1) << 6)

#define ARM_LPAE_PTE_AP_RDONLY		(((arm_lpae_iopte)2) << 6)

#define ARM_LPAE_PTE_AP_PRIV_RW		(((arm_lpae_iopte)0) << 6)

#define ARM_LPAE_PTE_AP_RW		(((arm_lpae_iopte)1) << 6)

#define ARM_LPAE_PTE_AP_PRIV_RO		(((arm_lpae_iopte)2) << 6)

#define ARM_LPAE_PTE_AP_RO		(((arm_lpae_iopte)3) << 6)

#define ARM_LPAE_PTE_ATTRINDX_SHIFT	2

#define ARM_LPAE_PTE_nG			(((arm_lpae_iopte)1) << 11)
@@ -407,10 +409,14 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data, 


	if (data->iop.fmt == ARM_64_LPAE_S1 ||

	    data->iop.fmt == ARM_32_LPAE_S1) {

		pte = ARM_LPAE_PTE_AP_UNPRIV | ARM_LPAE_PTE_nG;

		pte = ARM_LPAE_PTE_nG;



		if (!(prot & IOMMU_WRITE) && (prot & IOMMU_READ))

			pte |= ARM_LPAE_PTE_AP_RDONLY;

		if (prot & IOMMU_WRITE)

			pte |= (prot & IOMMU_PRIV) ? ARM_LPAE_PTE_AP_PRIV_RW

					: ARM_LPAE_PTE_AP_RW;

		else

			pte |= (prot & IOMMU_PRIV) ? ARM_LPAE_PTE_AP_PRIV_RO

					: ARM_LPAE_PTE_AP_RO;



		if (prot & IOMMU_CACHE)

			pte |= (ARM_LPAE_MAIR_ATTR_IDX_CACHE