From: Hiroshi Doyu <hdoyu@nvidia.com>
To: <m.szyprowski@samsung.com>
Cc: <iommu@lists.linux-foundation.org>,
Hiroshi Doyu <hdoyu@nvidia.com>,
<linux-arm-kernel@lists.infradead.org>,
<linaro-mm-sig@lists.linaro.org>, <linux-mm@kvack.org>,
<linux-kernel@vger.kernel.org>, <kyungmin.park@samsung.com>,
<arnd@arndb.de>, <linux@arm.linux.org.uk>,
<chunsang.jeong@linaro.org>, <vdumpa@nvidia.com>,
<subashrp@gmail.com>, <minchan@kernel.org>,
<pullip.cho@samsung.com>, <konrad.wilk@oracle.com>,
<linux-tegra@vger.kernel.org>
Subject: [RFC 4/5] ARM: dma-mapping: New dma_map_ops->map_page*_at* function
Date: Wed, 29 Aug 2012 09:55:34 +0300 [thread overview]
Message-ID: <1346223335-31455-5-git-send-email-hdoyu@nvidia.com> (raw)
In-Reply-To: <1346223335-31455-1-git-send-email-hdoyu@nvidia.com>
Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
---
arch/arm/mm/dma-mapping.c | 18 ++++++++++++++++++
include/asm-generic/dma-mapping-common.h | 19 +++++++++++++++++++
include/linux/dma-mapping.h | 7 +++++++
3 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 8ca2d1a..242289f 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1715,6 +1715,23 @@ static dma_addr_t arm_iommu_map_page(struct device *dev, struct page *page,
return arm_coherent_iommu_map_page(dev, page, offset, size, dir, attrs);
}
+static dma_addr_t arm_iommu_map_page_at(struct device *dev, struct page *page,
+ dma_addr_t dma_addr, unsigned long offset, size_t size,
+ enum dma_data_direction dir, struct dma_attrs *attrs)
+{
+ struct dma_iommu_mapping *mapping = dev->archdata.mapping;
+ int ret, len = PAGE_ALIGN(size + offset);
+
+ if (!dma_get_attr(DMA_ATTR_SKIP_CPU_SYNC, attrs))
+ __dma_page_cpu_to_dev(page, offset, size, dir);
+
+ ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len, 0);
+ if (ret < 0)
+ return DMA_ERROR_CODE;
+
+ return dma_addr + offset;
+}
+
/**
* arm_coherent_iommu_unmap_page
* @dev: valid struct device pointer
@@ -1813,6 +1830,7 @@ struct dma_map_ops iommu_ops = {
.get_sgtable = arm_iommu_get_sgtable,
.map_page = arm_iommu_map_page,
+ .map_page_at = arm_iommu_map_page_at,
.unmap_page = arm_iommu_unmap_page,
.sync_single_for_cpu = arm_iommu_sync_single_for_cpu,
.sync_single_for_device = arm_iommu_sync_single_for_device,
diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h
index de8bf89..eada2d8 100644
--- a/include/asm-generic/dma-mapping-common.h
+++ b/include/asm-generic/dma-mapping-common.h
@@ -26,6 +26,23 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
return addr;
}
+static inline dma_addr_t dma_map_single_at_attrs(struct device *dev, void *ptr,
+ dma_addr_t handle,
+ size_t size,
+ enum dma_data_direction dir,
+ struct dma_attrs *attrs)
+{
+ struct dma_map_ops *ops = get_dma_ops(dev);
+ dma_addr_t addr;
+
+ kmemcheck_mark_initialized(ptr, size);
+ BUG_ON(!valid_dma_direction(dir));
+ addr = ops->map_page_at(dev, virt_to_page(ptr), handle,
+ (unsigned long)ptr & ~PAGE_MASK, size,
+ dir, attrs);
+ return addr;
+}
+
static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
size_t size,
enum dma_data_direction dir,
@@ -172,6 +189,8 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
}
#define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL)
+#define dma_map_single_at(d, a, h, s, r) \
+ dma_map_single_at_attrs(d, a, h, s, r, NULL)
#define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL)
#define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, NULL)
#define dma_unmap_sg(d, s, n, r) dma_unmap_sg_attrs(d, s, n, r, NULL)
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 4cf4427..218bee3 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -25,6 +25,13 @@ struct dma_map_ops {
unsigned long offset, size_t size,
enum dma_data_direction dir,
struct dma_attrs *attrs);
+
+ dma_addr_t (*map_page_at)(struct device *dev, struct page *page,
+ dma_addr_t dma_handle,
+ unsigned long offset, size_t size,
+ enum dma_data_direction dir,
+ struct dma_attrs *attrs);
+
void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
size_t size, enum dma_data_direction dir,
struct dma_attrs *attrs);
--
1.7.5.4
next prev parent reply other threads:[~2012-08-29 6:57 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-29 6:55 [RFC 0/5] ARM: dma-mapping: New dma_map_ops to control IOVA more precisely Hiroshi Doyu
2012-08-29 6:55 ` [RFC 1/5] ARM: dma-mapping: New dma_map_ops->iova_get_free_{total,max} functions Hiroshi Doyu
2012-08-29 6:55 ` [RFC 2/5] ARM: dma-mapping: New dma_map_ops->iova_{alloc,free}() functions Hiroshi Doyu
2012-08-29 6:55 ` [RFC 3/5] ARM: dma-mapping: New dma_map_ops->iova_alloc*_at* function Hiroshi Doyu
2012-08-29 6:55 ` Hiroshi Doyu [this message]
2012-08-29 6:55 ` [RFC 5/5] ARM: dma-mapping: Introduce dma_map_linear_attrs() for IOVA linear map Hiroshi Doyu
2012-09-18 12:49 ` [RFC 0/5] ARM: dma-mapping: New dma_map_ops to control IOVA more precisely Joerg Roedel
2012-09-19 6:58 ` Hiroshi Doyu
2012-09-19 7:59 ` Arnd Bergmann
2012-09-19 11:41 ` Hiroshi Doyu
2012-09-19 12:50 ` Joerg Roedel
2012-09-20 1:44 ` Krishna Reddy
2012-09-20 2:21 ` Stephen Warren
2012-09-20 6:40 ` Krishna Reddy
2012-09-20 15:27 ` Stephen Warren
2012-09-21 18:16 ` Krishna Reddy
2012-09-24 9:04 ` How to specify IOMMU'able devices in DT (was: [RFC 0/5] ARM: dma-mapping: New dma_map_ops to control IOVA more precisely) Hiroshi Doyu
2012-09-24 9:28 ` James Bottomley
2012-09-24 9:44 ` Hiroshi Doyu
2012-09-24 11:14 ` Marek Szyprowski
2012-09-24 11:50 ` How to specify IOMMU'able devices in DT Hiroshi Doyu
2012-11-28 13:48 ` [PATCH 1/1] ARM: tegra: bus_notifier registers IOMMU devices(was: How to specify IOMMU'able devices in DT) Hiroshi Doyu
2012-11-28 18:07 ` Stephen Warren
2012-11-29 6:45 ` Hiroshi Doyu
2012-11-29 10:17 ` Thierry Reding
2012-11-30 4:59 ` Mark Zhang
2012-11-30 8:06 ` [PATCH 1/1] ARM: tegra: bus_notifier registers IOMMU devices Hiroshi Doyu
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=1346223335-31455-5-git-send-email-hdoyu@nvidia.com \
--to=hdoyu@nvidia.com \
--cc=arnd@arndb.de \
--cc=chunsang.jeong@linaro.org \
--cc=iommu@lists.linux-foundation.org \
--cc=konrad.wilk@oracle.com \
--cc=kyungmin.park@samsung.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=m.szyprowski@samsung.com \
--cc=minchan@kernel.org \
--cc=pullip.cho@samsung.com \
--cc=subashrp@gmail.com \
--cc=vdumpa@nvidia.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).