From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
Cc: linux-renesas-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
iommu@lists.linux-foundation.org, robin.murphy@arm.com,
vinod.koul@intel.com, geert+renesas@glider.be,
linus.walleij@linaro.org, dan.j.williams@intel.com,
arnd@arndb.de, linux-arch@vger.kernel.org
Subject: Re: [PATCH v3 4/8] arm: dma-mapping: add {map,unmap}_resource for iommu ops
Date: Thu, 11 Feb 2016 02:12:13 +0200 [thread overview]
Message-ID: <3988595.8dtuaVHoSu@avalon> (raw)
In-Reply-To: <1455065878-11906-5-git-send-email-niklas.soderlund+renesas@ragnatech.se>
Hi Niklas,
Thank you for the patch.
On Wednesday 10 February 2016 01:57:54 Niklas Söderlund wrote:
> Add methods to map/unmap device resources addresses for dma_map_ops that
> are IOMMU aware. This is needed to map a device MMIO register from a
> physical address.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> arch/arm/mm/dma-mapping.c | 63 ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 63 insertions(+)
>
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index 0eca381..ae2b175 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -1814,6 +1814,63 @@ static void arm_iommu_unmap_page(struct device *dev,
> dma_addr_t handle, __free_iova(mapping, iova, len);
> }
>
> +/**
> + * arm_iommu_map_resource - map a device resource for DMA
> + * @dev: valid struct device pointer
> + * @phys_addr: physical address of resource
> + * @size: size of resource to map
> + * @dir: DMA transfer direction
> + */
> +static dma_addr_t arm_iommu_map_resource(struct device *dev,
> + phys_addr_t phys_addr, size_t size,
> + enum dma_data_direction dir, struct dma_attrs *attrs)
> +{
> + struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev);
> + dma_addr_t dma_addr;
> + int ret, prot;
> + phys_addr_t addr = phys_addr & PAGE_MASK;
> + int offset = phys_addr & ~PAGE_MASK;
> + int len = PAGE_ALIGN(size + offset);
> +
> + dma_addr = __alloc_iova(mapping, size);
> + if (dma_addr == DMA_ERROR_CODE)
> + return dma_addr;
> +
> + prot = __dma_direction_to_prot(dir) | IOMMU_MMIO;
> +
> + ret = iommu_map(mapping->domain, dma_addr, addr, len, prot);
> + if (ret < 0)
> + goto fail;
> +
> + return dma_addr + offset;
> +fail:
> + __free_iova(mapping, dma_addr, size);
> + return DMA_ERROR_CODE;
> +}
> +
> +/**
> + * arm_iommu_unmap_resource - unmap a device DMA resource
> + * @dev: valid struct device pointer
> + * @dma_handle: DMA address to resource
> + * @size: size of resource to map
> + * @dir: DMA transfer direction
> + */
> +static void arm_iommu_unmap_resource(struct device *dev, dma_addr_t
> dma_handle, + size_t size, enum dma_data_direction dir,
> + struct dma_attrs *attrs)
> +{
> + struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev);
> + dma_addr_t iova = dma_handle & PAGE_MASK;
> + int offset = dma_handle & ~PAGE_MASK;
> + int len = PAGE_ALIGN(size + offset);
> +
> + if (!iova)
> + return;
> +
> + iommu_unmap(mapping->domain, iova, len);
> + __free_iova(mapping, iova, len);
> +}
> +
> static void arm_iommu_sync_single_for_cpu(struct device *dev,
> dma_addr_t handle, size_t size, enum dma_data_direction dir)
> {
> @@ -1858,6 +1915,9 @@ struct dma_map_ops iommu_ops = {
> .sync_sg_for_cpu = arm_iommu_sync_sg_for_cpu,
> .sync_sg_for_device = arm_iommu_sync_sg_for_device,
>
> + .map_resource = arm_iommu_map_resource,
> + .unmap_resource = arm_iommu_unmap_resource,
> +
> .set_dma_mask = arm_dma_set_mask,
> };
>
> @@ -1873,6 +1933,9 @@ struct dma_map_ops iommu_coherent_ops = {
> .map_sg = arm_coherent_iommu_map_sg,
> .unmap_sg = arm_coherent_iommu_unmap_sg,
>
> + .map_resource = arm_iommu_map_resource,
> + .unmap_resource = arm_iommu_unmap_resource,
> +
> .set_dma_mask = arm_dma_set_mask,
> };
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2016-02-11 0:12 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 0:57 [PATCH v3 0/8] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund
2016-02-10 0:57 ` Niklas Söderlund
2016-02-10 0:57 ` [PATCH v3 1/8] iommu: Add MMIO mapping type Niklas Söderlund
2016-02-10 0:57 ` Niklas Söderlund
[not found] ` <1455065878-11906-2-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-02-11 0:02 ` Laurent Pinchart
2016-02-11 0:02 ` Laurent Pinchart
2016-02-11 15:57 ` Robin Murphy
[not found] ` <56BCAF66.8010206-5wv7dgnIgG8@public.gmane.org>
2016-02-16 12:06 ` Niklas Söderlund
2016-02-16 12:06 ` Niklas Söderlund
2016-02-16 12:43 ` Robin Murphy
2016-02-16 12:43 ` Robin Murphy
2016-02-16 13:30 ` Niklas Söderlund
2016-02-16 13:30 ` Niklas Söderlund
2016-02-10 0:57 ` [PATCH v3 2/8] dma-mapping: add {map,unmap}_resource to dma_map_ops Niklas Söderlund
2016-02-10 0:57 ` Niklas Söderlund
2016-02-10 12:11 ` Sergei Shtylyov
2016-02-10 12:11 ` Sergei Shtylyov
2016-02-11 0:03 ` Laurent Pinchart
2016-02-11 0:03 ` Laurent Pinchart
2016-02-10 0:57 ` [PATCH v3 3/8] dma-mapping: add dma_{map,unmap}_resource Niklas Söderlund
2016-02-10 0:57 ` Niklas Söderlund
[not found] ` <1455065878-11906-4-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-02-10 10:25 ` Robin Murphy
2016-02-10 10:25 ` Robin Murphy
2016-02-10 0:57 ` [PATCH v3 4/8] arm: dma-mapping: add {map,unmap}_resource for iommu ops Niklas Söderlund
2016-02-10 0:57 ` Niklas Söderlund
2016-02-11 0:12 ` Laurent Pinchart [this message]
2016-02-11 0:12 ` Laurent Pinchart
2016-02-10 0:57 ` [PATCH v3 5/8] dmaengine: rcar-dmac: group slave configuration Niklas Söderlund
2016-02-10 0:57 ` Niklas Söderlund
2016-02-11 0:14 ` Laurent Pinchart
2016-02-11 0:14 ` Laurent Pinchart
2016-02-10 0:57 ` [PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund
2016-02-10 0:57 ` Niklas Söderlund
[not found] ` <1455065878-11906-7-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-02-10 10:49 ` Robin Murphy
2016-02-10 10:49 ` Robin Murphy
2016-02-11 0:33 ` Laurent Pinchart
2016-02-11 0:33 ` Laurent Pinchart
2016-02-10 0:57 ` [PATCH v3 7/8] ARM: dts: r8a7790: add iommus to dmac0 and dmac1 Niklas Söderlund
2016-02-10 0:57 ` Niklas Söderlund
2016-02-10 17:55 ` Simon Horman
2016-02-11 0:50 ` Niklas Söderlund
2016-02-11 0:41 ` Laurent Pinchart
2016-02-10 0:57 ` [PATCH v3 8/8] ARM: dts: r8a7791: " Niklas Söderlund
2016-02-10 0:57 ` Niklas Söderlund
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=3988595.8dtuaVHoSu@avalon \
--to=laurent.pinchart@ideasonboard.com \
--cc=arnd@arndb.de \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=geert+renesas@glider.be \
--cc=iommu@lists.linux-foundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=niklas.soderlund+renesas@ragnatech.se \
--cc=robin.murphy@arm.com \
--cc=vinod.koul@intel.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).