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 3/5] ARM: dma-mapping: New dma_map_ops->iova_alloc*_at* function
Date: Wed, 29 Aug 2012 09:55:33 +0300 [thread overview]
Message-ID: <1346223335-31455-4-git-send-email-hdoyu@nvidia.com> (raw)
In-Reply-To: <1346223335-31455-1-git-send-email-hdoyu@nvidia.com>
To allocate IOVA area at specified address
Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
---
arch/arm/include/asm/dma-mapping.h | 9 +++++++++
arch/arm/mm/dma-mapping.c | 35 +++++++++++++++++++++++++++++++++++
include/linux/dma-mapping.h | 2 ++
3 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 5b86600..f04a533 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -187,6 +187,15 @@ static inline void dma_iova_free(struct device *dev, dma_addr_t addr,
ops->iova_free(dev, addr, size);
}
+static inline dma_addr_t dma_iova_alloc_at(struct device *dev, dma_addr_t addr,
+ size_t size)
+{
+ struct dma_map_ops *ops = get_dma_ops(dev);
+ BUG_ON(!ops);
+
+ return ops->iova_alloc_at(dev, addr, size);
+}
+
static inline size_t dma_iova_get_free_total(struct device *dev)
{
struct dma_map_ops *ops = get_dma_ops(dev);
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index c18522a..8ca2d1a 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1080,6 +1080,40 @@ static inline dma_addr_t __alloc_iova(struct dma_iommu_mapping *mapping,
return mapping->base + (start << (mapping->order + PAGE_SHIFT));
}
+static dma_addr_t __alloc_iova_at(struct dma_iommu_mapping *mapping,
+ dma_addr_t iova, size_t size)
+{
+ unsigned int count, start, orig;
+ unsigned long flags;
+
+ count = ((PAGE_ALIGN(size) >> PAGE_SHIFT) +
+ (1 << mapping->order) - 1) >> mapping->order;
+
+ spin_lock_irqsave(&mapping->lock, flags);
+
+ orig = (iova - mapping->base) >> (mapping->order + PAGE_SHIFT);
+ start = bitmap_find_next_zero_area(mapping->bitmap, mapping->bits,
+ orig, count, 0);
+
+ if ((start > mapping->bits) || (orig != start)) {
+ spin_unlock_irqrestore(&mapping->lock, flags);
+ return DMA_ERROR_CODE;
+ }
+
+ bitmap_set(mapping->bitmap, start, count);
+ spin_unlock_irqrestore(&mapping->lock, flags);
+
+ return mapping->base + (start << (mapping->order + PAGE_SHIFT));
+}
+
+static dma_addr_t arm_iommu_iova_alloc_at(struct device *dev, dma_addr_t iova,
+ size_t size)
+{
+ struct dma_iommu_mapping *mapping = dev->archdata.mapping;
+
+ return __alloc_iova_at(mapping, iova, size);
+}
+
static dma_addr_t arm_iommu_iova_alloc(struct device *dev, size_t size)
{
struct dma_iommu_mapping *mapping = dev->archdata.mapping;
@@ -1789,6 +1823,7 @@ struct dma_map_ops iommu_ops = {
.sync_sg_for_device = arm_iommu_sync_sg_for_device,
.iova_alloc = arm_iommu_iova_alloc,
+ .iova_alloc_at = arm_iommu_iova_alloc_at,
.iova_free = arm_iommu_iova_free,
.iova_get_free_total = arm_iommu_iova_get_free_total,
.iova_get_free_max = arm_iommu_iova_get_free_max,
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index e85aa04..4cf4427 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -54,6 +54,8 @@ struct dma_map_ops {
u64 (*get_required_mask)(struct device *dev);
#endif
dma_addr_t (*iova_alloc)(struct device *dev, size_t size);
+ dma_addr_t (*iova_alloc_at)(struct device *dev, dma_addr_t dma_addr,
+ size_t size);
void (*iova_free)(struct device *dev, dma_addr_t addr, size_t size);
size_t (*iova_get_free_total)(struct device *dev);
size_t (*iova_get_free_max)(struct device *dev);
--
1.7.5.4
next prev parent reply other threads:[~2012-08-29 6:56 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 ` Hiroshi Doyu [this message]
2012-08-29 6:55 ` [RFC 4/5] ARM: dma-mapping: New dma_map_ops->map_page*_at* function Hiroshi Doyu
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-4-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).