summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/msm_iommu.c
diff options
context:
space:
mode:
authorArchit Taneja <architt@codeaurora.org>2016-04-17 16:58:43 +0200
committerRob Clark <robdclark@gmail.com>2016-07-16 16:08:34 +0200
commit69be1f4e6f4bd92fa96c2de80982f045f9fa9ccc (patch)
tree7aa3efc6abaa0b32586a8826257727ddba56391f /drivers/gpu/drm/msm/msm_iommu.c
parentMerge tag 'drm-vc4-next-2016-07-15' of https://github.com/anholt/linux into d... (diff)
downloadlinux-69be1f4e6f4bd92fa96c2de80982f045f9fa9ccc.tar.xz
linux-69be1f4e6f4bd92fa96c2de80982f045f9fa9ccc.zip
drm/msm: Use correct type for physical addresses
The u32 type used to pass the physical addresses to iommu_map can't accommodate 64 bit addresses. Move to dma_addr_t to ensure wrong addresses aren't provided to the IOMMU driver. Signed-off-by: Archit Taneja <architt@codeaurora.org> Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_iommu.c')
-rw-r--r--drivers/gpu/drm/msm/msm_iommu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c
index a7a0b6d9b057..3bc8fd327eed 100644
--- a/drivers/gpu/drm/msm/msm_iommu.c
+++ b/drivers/gpu/drm/msm/msm_iommu.c
@@ -59,10 +59,10 @@ static int msm_iommu_map(struct msm_mmu *mmu, uint32_t iova,
return -EINVAL;
for_each_sg(sgt->sgl, sg, sgt->nents, i) {
- u32 pa = sg_phys(sg) - sg->offset;
+ dma_addr_t pa = sg_phys(sg) - sg->offset;
size_t bytes = sg->length + sg->offset;
- VERB("map[%d]: %08x %08x(%zx)", i, iova, pa, bytes);
+ VERB("map[%d]: %08x %08lx(%zx)", i, iova, (unsigned long)pa, bytes);
ret = iommu_map(domain, da, pa, bytes, prot);
if (ret)