From: Robin Murphy <robin.murphy@arm.com>
To: Tom Murphy <murphyt7@tcd.ie>, iommu@lists.linux-foundation.org
Cc: Heiko Stuebner <heiko@sntech.de>,
virtualization@lists.linux-foundation.org,
Matthias Brugger <matthias.bgg@gmail.com>,
Thierry Reding <thierry.reding@gmail.com>,
Will Deacon <will@kernel.org>,
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, linux-tegra@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Rob Clark <robdclark@gmail.com>,
Kukjin Kim <kgene@kernel.org>,
David Woodhouse <dwmw2@infradead.org>
Subject: Re: [PATCH V5 4/5] iommu/dma-iommu: Use the dev->coherent_dma_mask
Date: Mon, 19 Aug 2019 19:39:23 +0100 [thread overview]
Message-ID: <d3c8d4ce-8ffb-bf69-a8f3-d64108f5987a@arm.com> (raw)
In-Reply-To: <20190815110944.3579-5-murphyt7@tcd.ie>
On 15/08/2019 12:09, Tom Murphy wrote:
> Use the dev->coherent_dma_mask when allocating in the dma-iommu ops api.
Oops... I suppose technically that's my latent bug, but since we've all
missed it so far, I doubt arm64 systems ever see any devices which
actually have different masks.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Tom Murphy <murphyt7@tcd.ie>
> ---
> 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 906b7fa14d3c..b9a3ab02434b 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;
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-19 18:39 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 11:09 [PATCH V5 0/5] iommu/amd: Convert the AMD iommu driver to the dma-iommu api Tom Murphy
2019-08-15 11:09 ` [PATCH V5 1/5] iommu/amd: Remove unnecessary locking from AMD iommu driver Tom Murphy
2019-08-20 9:41 ` Christoph Hellwig
2019-08-24 7:56 ` Tom Murphy
2019-08-24 22:41 ` Christoph Hellwig
2019-08-15 11:09 ` [PATCH V5 2/5] iommu: Add gfp parameter to iommu_ops::map Tom Murphy
2019-08-19 18:23 ` Robin Murphy
2019-08-20 9:41 ` Christoph Hellwig
2019-08-15 11:09 ` [PATCH V5 3/5] iommu/dma-iommu: Handle deferred devices Tom Murphy
2019-08-19 18:26 ` Robin Murphy
2019-08-20 9:43 ` Christoph Hellwig
2019-08-15 11:09 ` [PATCH V5 4/5] iommu/dma-iommu: Use the dev->coherent_dma_mask Tom Murphy
2019-08-19 18:39 ` Robin Murphy [this message]
2019-08-20 9:43 ` Christoph Hellwig
2019-08-15 11:09 ` [PATCH V5 5/5] iommu/amd: Convert AMD iommu driver to the dma-iommu api Tom Murphy
2019-08-17 3:39 ` [PATCH V5 3/5] iommu/dma-iommu: Handle deferred devices Hillf Danton
2019-08-17 7:19 ` Tom Murphy
2019-09-05 6:18 ` [PATCH V5 0/5] iommu/amd: Convert the AMD iommu driver to the dma-iommu api Christoph Hellwig
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=d3c8d4ce-8ffb-bf69-a8f3-d64108f5987a@arm.com \
--to=robin.murphy@arm.com \
--cc=agross@kernel.org \
--cc=dwmw2@infradead.org \
--cc=gerald.schaefer@de.ibm.com \
--cc=heiko@sntech.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.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=thierry.reding@gmail.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=will@kernel.org \
/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).