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

Commit 5baf1e9d authored by Robin Murphy's avatar Robin Murphy Committed by Will Deacon
Browse files

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



The short-descriptor format also allows privileged-only mappings, so
let's wire it up.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Tested-by: default avatarSricharan R <sricharan@codeaurora.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent e7468a23

drivers/iommu/io-pgtable-arm-v7s.c

+5 −1
Original line number Diff line number Diff line
@@ -265,7 +265,9 @@ static arm_v7s_iopte arm_v7s_prot_to_pte(int prot, int lvl, 
	if (!(prot & IOMMU_MMIO))

		pte |= ARM_V7S_ATTR_TEX(1);

	if (ap) {

		pte |= ARM_V7S_PTE_AF | ARM_V7S_PTE_AP_UNPRIV;

		pte |= ARM_V7S_PTE_AF;

		if (!(prot & IOMMU_PRIV))

			pte |= ARM_V7S_PTE_AP_UNPRIV;

		if (!(prot & IOMMU_WRITE))

			pte |= ARM_V7S_PTE_AP_RDONLY;

	}
@@ -288,6 +290,8 @@ static int arm_v7s_pte_to_prot(arm_v7s_iopte pte, int lvl) 


	if (!(attr & ARM_V7S_PTE_AP_RDONLY))

		prot |= IOMMU_WRITE;

	if (!(attr & ARM_V7S_PTE_AP_UNPRIV))

		prot |= IOMMU_PRIV;

	if ((attr & (ARM_V7S_TEX_MASK << ARM_V7S_TEX_SHIFT)) == 0)

		prot |= IOMMU_MMIO;

	else if (pte & ARM_V7S_ATTR_C)