diff options
| author | Yoshihiro Shimoda | 2016-02-10 02:18:04 +0100 |
|---|---|---|
| committer | Joerg Roedel | 2016-02-25 14:57:22 +0100 |
| commit | 06bfcaa91f0eff1aeab37c74056afa79fb450aea (patch) | |
| tree | db4123eb959aa17f5cdf5bccf0df590f88c33f9a /drivers/iommu/iommu.c | |
| parent | Linux 4.5-rc5 (diff) | |
| download | kernel-qcow2-linux-06bfcaa91f0eff1aeab37c74056afa79fb450aea.tar.gz kernel-qcow2-linux-06bfcaa91f0eff1aeab37c74056afa79fb450aea.tar.xz kernel-qcow2-linux-06bfcaa91f0eff1aeab37c74056afa79fb450aea.zip | |
iommu: Fix second argument of trace_map() to report correct paddr
Since iommu_map() code added pgsize value to the paddr, trace_map()
used wrong paddr. So, this patch adds "orig_paddr" value in the
iommu_map() to use for the trace_map().
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/iommu.c')
| -rw-r--r-- | drivers/iommu/iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 0e3b0092ec92..bfd4f7c3b1d8 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1314,6 +1314,7 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova, unsigned long orig_iova = iova; unsigned int min_pagesz; size_t orig_size = size; + phys_addr_t orig_paddr = paddr; int ret = 0; if (unlikely(domain->ops->map == NULL || @@ -1358,7 +1359,7 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova, if (ret) iommu_unmap(domain, orig_iova, orig_size - size); else - trace_map(orig_iova, paddr, orig_size); + trace_map(orig_iova, orig_paddr, orig_size); return ret; } |