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

Commit 73c608f2 authored by Mitchel Humpherys's avatar Mitchel Humpherys Committed by Matt Wagantall
Browse files

Revert "Add support of the IOMMU_DEVICE flag." 



This reverts commit fd3161483bd7af420b503a8e63d3c1f24a7cf936.  This code
is about to be ripped out in favor of the generic io-pgtable code, so
leaving it in will only cause merged conflicts.

Change-Id: I1404f79f08340d3de4a52155c3c82fae6df6515c
Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
parent e15c25ca

drivers/iommu/arm-smmu.c

+0 −7
Original line number Diff line number Diff line
@@ -1693,10 +1693,6 @@ static int arm_smmu_alloc_init_pte(struct arm_smmu_domain *smmu_domain, 
		if (prot & IOMMU_CACHE)

			pteval |= (MAIR_ATTR_IDX_CACHE <<

				   ARM_SMMU_PTE_ATTRINDX_SHIFT);



		if (prot & IOMMU_DEVICE)

			pteval |= (MAIR_ATTR_IDX_DEV <<

					ARM_SMMU_PTE_ATTRINDX_SHIFT);

	} else {

		pteval |= ARM_SMMU_PTE_HAP_FAULT;

		if (prot & IOMMU_READ && !(prot & IOMMU_PRIV))
@@ -1707,9 +1703,6 @@ static int arm_smmu_alloc_init_pte(struct arm_smmu_domain *smmu_domain, 
			pteval |= ARM_SMMU_PTE_MEMATTR_OIWB;

		else

			pteval |= ARM_SMMU_PTE_MEMATTR_NC;



		if (prot & IOMMU_DEVICE)

			pteval |= ARM_SMMU_PTE_MEMATTR_DEV;

	}



	/* If no access, create a faulting entry to avoid TLB fills */