[PATCH V6 4/5] iommu/dma-iommu: Use the dev->coherent_dma_mask

From: Tom Murphy <murphyt7@tcd•ie>
To: iommu@lists•linux-foundation.org
Cc: Heiko Stuebner <heiko@sntech•de>,
	virtualization@lists•linux-foundation.org,
	linux-tegra@vger•kernel.org,
	Thierry Reding <thierry.reding@gmail•com>,
	Will Deacon <will@kernel•org>, Christoph Hellwig <hch@lst•de>,
	Marek Szyprowski <m.szyprowski@samsung•com>,
	Jean-Philippe Brucker <jean-philippe@linaro•org>,
	linux-samsung-soc@vger•kernel.org, Joerg Roedel <joro@8bytes•org>,
	Krzysztof Kozlowski <krzk@kernel•org>,
	Jonathan Hunter <jonathanh@nvidia•com>,
	linux-rockchip@lists•infradead.org,
	Andy Gross <agross@kernel•org>,
	Gerald Schaefer <gerald.schaefer@de•ibm.com>,
	linux-s390@vger•kernel.org, linux-arm-msm@vger•kernel.org,
	linux-mediatek@lists•infradead.org,
	Matthias Brugger <matthias.bgg@gmail•com>,
	linux-arm-kernel@lists•infradead.org,
	David Woodhouse <dwmw2@infradead•org>,
	linux-kernel@vger•kernel.org, Tom Murphy <murphyt7@tcd•ie>,
	Rob Clark <robdclark@gmail•com>, Kukjin Kim <kgene@kernel•org>,
	Robin Murphy <robin.murphy@arm•com>
Subject: [PATCH V6 4/5] iommu/dma-iommu: Use the dev->coherent_dma_mask
Date: Sun,  8 Sep 2019 09:56:40 -0700	[thread overview]
Message-ID: <20190908165642.22253-5-murphyt7@tcd.ie> (raw)
In-Reply-To: <20190908165642.22253-1-murphyt7@tcd.ie>

Use the dev->coherent_dma_mask when allocating in the dma-iommu ops api.

Signed-off-by: Tom Murphy <murphyt7@tcd•ie>
Reviewed-by: Robin Murphy <robin.murphy@arm•com>
Reviewed-by: Christoph Hellwig <hch@lst•de>
---
 drivers/iommu/dma-iommu.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index bd09b6b31c4e..0cf52fae1471 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -471,7 +471,7 @@ static void __iommu_dma_unmap(struct device *dev, dma_addr_t dma_addr,
 }
 
 static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,
-		size_t size, int prot)
+		size_t size, int prot, dma_addr_t dma_mask)
 {
 	struct iommu_domain *domain = iommu_get_dma_domain(dev);
 	struct iommu_dma_cookie *cookie = domain->iova_cookie;
@@ -484,7 +484,7 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,
 
 	size = iova_align(iovad, size + iova_off);
 
-	iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev);
+	iova = iommu_dma_alloc_iova(domain, size, dma_mask, dev);
 	if (!iova)
 		return DMA_MAPPING_ERROR;
 
@@ -735,7 +735,7 @@ static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page,
 	int prot = dma_info_to_prot(dir, coherent, attrs);
 	dma_addr_t dma_handle;
 
-	dma_handle = __iommu_dma_map(dev, phys, size, prot);
+	dma_handle = __iommu_dma_map(dev, phys, size, prot, dma_get_mask(dev));
 	if (!coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
 	    dma_handle != DMA_MAPPING_ERROR)
 		arch_sync_dma_for_device(dev, phys, size, dir);
@@ -938,7 +938,8 @@ static dma_addr_t iommu_dma_map_resource(struct device *dev, phys_addr_t phys,
 		size_t size, enum dma_data_direction dir, unsigned long attrs)
 {
 	return __iommu_dma_map(dev, phys, size,
-			dma_info_to_prot(dir, false, attrs) | IOMMU_MMIO);
+			dma_info_to_prot(dir, false, attrs) | IOMMU_MMIO,
+			dma_get_mask(dev));
 }
 
 static void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle,
@@ -1041,7 +1042,8 @@ static void *iommu_dma_alloc(struct device *dev, size_t size,
 	if (!cpu_addr)
 		return NULL;
 
-	*handle = __iommu_dma_map(dev, page_to_phys(page), size, ioprot);
+	*handle = __iommu_dma_map(dev, page_to_phys(page), size, ioprot,
+			dev->coherent_dma_mask);
 	if (*handle == DMA_MAPPING_ERROR) {
 		__iommu_dma_free(dev, size, cpu_addr);
 		return NULL;
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
