From: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
To: vinod.koul@intel.com, 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
Cc: robin.murphy@arm.com, laurent.pinchart@ideasonboard.com,
geert+renesas@glider.be, linus.walleij@linaro.org,
dan.j.williams@intel.com, arnd@arndb.de,
linux-arch@vger.kernel.org,
"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
Subject: [PATCH v5 4/9] arm: dma-mapping: add {map,unmap}_resource for iommu ops
Date: Tue, 8 Mar 2016 03:42:49 +0100 [thread overview]
Message-ID: <1457404974-1800-5-git-send-email-niklas.soderlund+renesas@ragnatech.se> (raw)
Message-ID: <20160308024249.wfvoRMY_u6zhRl2X_OHk61QUiR6AETVStLAV-GWQW3g@z> (raw)
In-Reply-To: <1457404974-1800-1-git-send-email-niklas.soderlund+renesas@ragnatech.se>
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,
};
--
2.7.2
next prev parent reply other threads:[~2016-03-08 2:44 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-08 2:42 [PATCH v5 0/9] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
2016-03-08 2:42 ` [PATCH v5 1/9] iommu: Add MMIO mapping type Niklas Söderlund
[not found] ` <1457404974-1800-2-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-03-17 11:18 ` Laurent Pinchart
2016-03-17 11:18 ` Laurent Pinchart
2016-03-08 2:42 ` [PATCH v5 2/9] dma-mapping: add {map,unmap}_resource to dma_map_ops Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
[not found] ` <1457404974-1800-1-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-03-08 2:42 ` [PATCH v5 3/9] dma-mapping: add dma_{map,unmap}_resource Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
2016-03-08 7:38 ` Christoph Hellwig
2016-03-10 16:05 ` Niklas S??derlund
2016-03-10 16:05 ` Niklas S??derlund
2016-03-11 6:19 ` Vinod Koul
2016-03-11 6:19 ` Vinod Koul
2016-03-11 6:47 ` Dan Williams
2016-03-11 6:47 ` Dan Williams
2016-03-11 11:15 ` Christoph Hellwig
2016-03-11 12:58 ` Niklas Söderlund
2016-03-11 12:58 ` Niklas Söderlund
2016-03-15 8:22 ` Christoph Hellwig
[not found] ` <20160315082254.GE9136-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-03-17 11:33 ` Laurent Pinchart
2016-03-17 11:33 ` Laurent Pinchart
2016-03-21 15:26 ` Christoph Hellwig
2016-03-21 15:26 ` Christoph Hellwig
[not found] ` <20160321152601.GA11674-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-04-13 13:29 ` Niklas Söderlund
2016-04-13 13:29 ` Niklas Söderlund
2016-04-21 9:48 ` Niklas Söderlund
2016-04-21 9:48 ` Niklas Söderlund
2016-04-21 13:49 ` Christoph Hellwig
2016-04-21 13:49 ` Christoph Hellwig
2016-04-25 14:26 ` Niklas Söderlund
2016-04-25 14:26 ` Niklas Söderlund
2016-04-25 19:10 ` Christoph Hellwig
2016-04-25 19:10 ` Christoph Hellwig
[not found] ` <20160425191004.GA13906-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-04-26 13:29 ` Niklas Söderlund
2016-04-26 13:29 ` Niklas Söderlund
[not found] ` <CAPcyv4gO4EZnBuVKXT8+gsMhbHJzuK7sfr0uRcjVdJP-nUUz4A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-03-11 13:46 ` Robin Murphy
2016-03-11 13:46 ` Robin Murphy
2016-03-11 17:51 ` Dan Williams
2016-03-08 2:42 ` Niklas Söderlund [this message]
2016-03-08 2:42 ` [PATCH v5 4/9] arm: dma-mapping: add {map,unmap}_resource for iommu ops Niklas Söderlund
2016-03-08 2:42 ` [PATCH v5 5/9] dmaengine: rcar-dmac: slave address are physical Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
[not found] ` <1457404974-1800-6-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-03-17 11:30 ` Laurent Pinchart
2016-03-17 11:30 ` Laurent Pinchart
2016-03-08 2:42 ` [PATCH v5 6/9] dmaengine: rcar-dmac: group slave configuration Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
[not found] ` <1457404974-1800-7-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-03-17 11:28 ` Laurent Pinchart
2016-03-17 11:28 ` Laurent Pinchart
2016-03-08 2:42 ` [PATCH v5 7/9] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
2016-03-08 2:42 ` [PATCH v5 8/9] ARM: dts: r8a7790: add iommus to dmac0 and dmac1 Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
2016-03-08 2:42 ` [PATCH v5 9/9] ARM: dts: r8a7791: " 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=1457404974-1800-5-git-send-email-niklas.soderlund+renesas@ragnatech.se \
--to=niklas.soderlund+renesas@ragnatech.se \
--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=laurent.pinchart@ideasonboard.com \
--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=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).