omap iommu: avoid remapping if it's been mapped in MPU side
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): 1251283037-19573-1-git-send-email-sakari.ailus@maxwell.research.nokia.com
PATCH 1/1 omap iommu: avoid remapping if it's been mapped in MPU side
From: Hiroshi DOYU <[email protected]>
MPU side (v)-(p) mapping is necessary only if IOVMF_MMIO is set in "flags".
--- arch/arm/plat-omap/iovmm.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
arch/arm/plat-omap/iovmm.c +6 -4
@@ -615,7 +615,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 ;
@@ -625,9 +625,11 @@ u32 iommu_vmap(struct iommu *obj, u32 da, const struct sg_table *sgt,return -EINVAL ; bytes =PAGE_ALIGN (bytes); - va =vmap_sg (sgt); -if (IS_ERR (va)) -return PTR_ERR (va); +if (flags &IOVMF_MMIO ) { + va =vmap_sg (sgt); +if (IS_ERR (va)) +return PTR_ERR (va); + } flags &=IOVMF_HW_MASK ; flags |=IOVMF_DISCONT ;
Signature · 1 line
1.5.6.5
PATCH 1/1 omap iommu: avoid remapping if it's been mapped in MPU side
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next
Initial commit ID (Likely to change): 3b61e08a6ea37d353d98979040aef10f7cf6f83d
PatchWorks
http://patchwork.kernel.org/patch/44014/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=3b61e08a6ea37d353d98979040aef10f7cf6f83d