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

Commit 935e4739 authored by Hiroshi DOYU's avatar Hiroshi DOYU Committed by Tony Lindgren
Browse files

omap: iommu: avoid remapping if it's been mapped in MPU side 



MPU side (v)-(p) mapping is necessary only if IOVMF_MMIO is set in
"flags".

Signed-off-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 58a5491c

arch/arm/plat-omap/iovmm.c

+6 −4
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ u32 iommu_vmap(struct iommu *obj, u32 da, const struct sg_table *sgt, 
		 u32 flags)

{

	size_t bytes;

	void *va;

	void *va = NULL;



	if (!obj || !obj->dev || !sgt)

		return -EINVAL;
@@ -627,9 +627,11 @@ u32 iommu_vmap(struct iommu *obj, u32 da, const struct sg_table *sgt, 
		return -EINVAL;

	bytes = PAGE_ALIGN(bytes);



	if (flags & IOVMF_MMIO) {

		va = vmap_sg(sgt);

		if (IS_ERR(va))

			return PTR_ERR(va);

	}



	flags &= IOVMF_HW_MASK;

	flags |= IOVMF_DISCONT;