From: Tom Murphy <tmurphy@arista.com>
To: iommu@lists.linux-foundation.org
Cc: murphyt7@tcd.ie, Tom Murphy <tmurphy@arista.com>,
Joerg Roedel <joro@8bytes.org>, Will Deacon <will.deacon@arm.com>,
Robin Murphy <robin.murphy@arm.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
David Woodhouse <dwmw2@infradead.org>,
Andy Gross <andy.gross@linaro.org>,
David Brown <david.brown@linaro.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Rob Clark <robdclark@gmail.com>, Heiko Stuebner <heiko@sntech.de>,
Gerald Schaefer <gerald.schaefer@de.ibm.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-mediatek@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-s390@vger.kernel.org,
linux-tegra@vger.kernel.org
Subject: [PATCH v2 3/4] iommu/dma-iommu: Use the dev->coherent_dma_mask
Date: Tue, 30 Apr 2019 01:29:50 +0100 [thread overview]
Message-ID: <20190430002952.18909-4-tmurphy@arista.com> (raw)
In-Reply-To: <20190430002952.18909-1-tmurphy@arista.com>
Use the dev->coherent_dma_mask when allocating in the dma-iommu ops api.
Signed-off-by: Tom Murphy <tmurphy@arista.com>
---
drivers/iommu/dma-iommu.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index c18f74ad1e8b..df03104978d7 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -436,7 +436,8 @@ static void __iommu_dma_unmap(struct iommu_domain *domain, dma_addr_t dma_addr,
}
static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,
- size_t size, int prot, struct iommu_domain *domain)
+ size_t size, int prot, struct iommu_domain *domain,
+ dma_addr_t dma_limit)
{
struct iommu_dma_cookie *cookie = domain->iova_cookie;
size_t iova_off = 0;
@@ -447,7 +448,7 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,
size = iova_align(&cookie->iovad, size + iova_off);
}
- iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev);
+ iova = iommu_dma_alloc_iova(domain, size, dma_limit, dev);
if (!iova)
return DMA_MAPPING_ERROR;
@@ -490,7 +491,7 @@ static void *iommu_dma_alloc_contiguous(struct device *dev, size_t size,
return NULL;
*dma_handle = __iommu_dma_map(dev, page_to_phys(page), size, ioprot,
- iommu_get_dma_domain(dev));
+ iommu_get_dma_domain(dev), dev->coherent_dma_mask);
if (*dma_handle == DMA_MAPPING_ERROR) {
if (!dma_release_from_contiguous(dev, page, count))
__free_pages(page, page_order);
@@ -760,7 +761,7 @@ static void *iommu_dma_alloc_pool(struct device *dev, size_t size,
*dma_handle = __iommu_dma_map(dev, page_to_phys(page), size,
dma_info_to_prot(DMA_BIDIRECTIONAL, coherent, attrs),
- iommu_get_domain_for_dev(dev));
+ iommu_get_domain_for_dev(dev), dev->coherent_dma_mask);
if (*dma_handle == DMA_MAPPING_ERROR) {
dma_free_from_pool(vaddr, PAGE_ALIGN(size));
return NULL;
@@ -850,7 +851,7 @@ static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page,
dma_handle =__iommu_dma_map(dev, phys, size,
dma_info_to_prot(dir, coherent, attrs),
- iommu_get_dma_domain(dev));
+ iommu_get_dma_domain(dev), 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);
@@ -1065,7 +1066,7 @@ static dma_addr_t iommu_dma_map_resource(struct device *dev, phys_addr_t phys,
return __iommu_dma_map(dev, phys, size,
dma_info_to_prot(dir, false, attrs) | IOMMU_MMIO,
- iommu_get_dma_domain(dev));
+ iommu_get_dma_domain(dev), dma_get_mask(dev));
}
static void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle,
@@ -1250,7 +1251,8 @@ static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev,
if (!msi_page)
return NULL;
- iova = __iommu_dma_map(dev, msi_addr, size, prot, domain);
+ iova = __iommu_dma_map(dev, msi_addr, size, prot, domain,
+ dma_get_mask(dev));
if (iova == DMA_MAPPING_ERROR)
goto out_free_page;
--
2.17.1
next prev parent reply other threads:[~2019-04-30 0:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 0:29 [PATCH v2 0/4] iommu/amd: Convert the AMD iommu driver to the dma-iommu api Tom Murphy
2019-04-30 0:29 ` [PATCH v2 1/4] iommu: Add gfp parameter to iommu_ops::map Tom Murphy
2019-04-30 0:29 ` [PATCH v2 2/4] iommu/dma-iommu: Handle deferred devices Tom Murphy
2019-04-30 13:42 ` Robin Murphy
2019-04-30 14:04 ` Tom Murphy
2019-04-30 0:29 ` Tom Murphy [this message]
2019-04-30 11:12 ` [PATCH v2 3/4] iommu/dma-iommu: Use the dev->coherent_dma_mask Christoph Hellwig
2019-04-30 11:27 ` Robin Murphy
2019-04-30 11:32 ` Christoph Hellwig
2019-04-30 12:04 ` Robin Murphy
2019-05-06 17:56 ` Tom Murphy
2019-05-07 6:35 ` Christoph Hellwig
2019-04-30 0:29 ` [PATCH v2 4/4] iommu/amd: Convert the AMD iommu driver to the dma-iommu api Tom Murphy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190430002952.18909-4-tmurphy@arista.com \
--to=tmurphy@arista.com \
--cc=andy.gross@linaro.org \
--cc=david.brown@linaro.org \
--cc=dwmw2@infradead.org \
--cc=gerald.schaefer@de.ibm.com \
--cc=heiko@sntech.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=matthias.bgg@gmail.com \
--cc=murphyt7@tcd.ie \
--cc=robdclark@gmail.com \
--cc=robin.murphy@arm.com \
--cc=thierry.reding@gmail.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).