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

Commit fb948251 authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu/io-pgtable-arm: Support IOMMU_MMIO flag 



Teach the LPAE format to create Device mappings when asked.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Tested-by: default avatarEric Auger <eric.auger@linaro.org>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 31e6850e

drivers/iommu/io-pgtable-arm.c

+7 −2
Original line number Diff line number Diff line
@@ -355,7 +355,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data, 
		if (!(prot & IOMMU_WRITE) && (prot & IOMMU_READ))

			pte |= ARM_LPAE_PTE_AP_RDONLY;



		if (prot & IOMMU_CACHE)

		if (prot & IOMMU_MMIO)

			pte |= (ARM_LPAE_MAIR_ATTR_IDX_DEV

				<< ARM_LPAE_PTE_ATTRINDX_SHIFT);

		else if (prot & IOMMU_CACHE)

			pte |= (ARM_LPAE_MAIR_ATTR_IDX_CACHE

				<< ARM_LPAE_PTE_ATTRINDX_SHIFT);

	} else {
@@ -364,7 +367,9 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data, 
			pte |= ARM_LPAE_PTE_HAP_READ;

		if (prot & IOMMU_WRITE)

			pte |= ARM_LPAE_PTE_HAP_WRITE;

		if (prot & IOMMU_CACHE)

		if (prot & IOMMU_MMIO)

			pte |= ARM_LPAE_PTE_MEMATTR_DEV;

		else if (prot & IOMMU_CACHE)

			pte |= ARM_LPAE_PTE_MEMATTR_OIWB;

		else

			pte |= ARM_LPAE_PTE_MEMATTR_NC;