diff options
| author | Krishna Reddy <vdumpa@nvidia.com> | 2014-04-03 10:40:21 -0700 |
|---|---|---|
| committer | Krishna Reddy <vdumpa@nvidia.com> | 2014-04-04 10:39:44 -0700 |
| commit | 86adddb544eae25833264810af6b8bf7ed7e8936 (patch) | |
| tree | b8574bb2891cc654740f4afd33ac21471e3eeef3 /arch/arm/mm/dma-mapping.c | |
| parent | 4682c28c44acbcbd610e146f1486b103ded0d667 (diff) | |
arm: dma-mapping: fix incorrect phys address in trace message
Fix incorrect phys address printed in trace message in
arm_coherent_iommu_unmap_page(). iommu_iova_to_phys() is
called after unmap iova in arm_coherent_iommu_unmap_page().
This causes invalid phys address printed in trace message.
Change-Id: I94acbfc9ef6f25c765ed3057b474596c8f12c6dc
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/391952
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 08f68889f0b4..e4b0e52f569c 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -2141,12 +2141,11 @@ static void arm_coherent_iommu_unmap_page(struct device *dev, dma_addr_t handle, if (!iova) return; + trace_dmadebug_unmap_page(dev, handle, size, + phys_to_page(iommu_iova_to_phys(mapping->domain, handle))); pg_iommu_unmap(mapping->domain, iova, len, (int)attrs); if (!dma_get_attr(DMA_ATTR_SKIP_FREE_IOVA, attrs)) __free_iova(mapping, iova, len, attrs); - - trace_dmadebug_unmap_page(dev, handle, size, - phys_to_page(iommu_iova_to_phys(mapping->domain, handle))); } /** |