From b70055f85a9666e36ee5db73b951236996573fb3 Mon Sep 17 00:00:00 2001 From: Guangming Cao Date: Tue, 22 Jun 2021 12:18:08 +0800 Subject: [PATCH] ANDROID: iommu: Revise vendor hook param for iova free tracking Iova is identified in the alloc vendor hook by its pfn (iova->pfn_lo) and in free vendor hook by its address (iova->pfn_lo << iova_shift(iovad)). Change alloc vendor hook to use address as well for consistency. Bug: 187861158 Change-Id: I8255f3e5899008b80a9f8ed960e2ba948ba13cc2 Signed-off-by: Guangming Cao --- drivers/iommu/dma-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 0a51e7d7bfea..27f74c12bd02 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -487,7 +487,7 @@ static dma_addr_t iommu_dma_alloc_iova(struct iommu_domain *domain, iova = alloc_iova_fast(iovad, iova_len, dma_limit >> shift, true); - trace_android_vh_iommu_alloc_iova(dev, iova, size); + trace_android_vh_iommu_alloc_iova(dev, (dma_addr_t)iova << shift, size); return (dma_addr_t)iova << shift; }