From patchwork Wed Aug 29 06:55:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi DOYU X-Patchwork-Id: 1416901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 3E6493FC85 for ; Thu, 6 Sep 2012 16:17:19 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9eSU-00036O-PU; Thu, 06 Sep 2012 15:57:37 +0000 Received: from hqemgate03.nvidia.com ([216.228.121.140]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T6cC9-0002sp-E0 for linux-arm-kernel@lists.infradead.org; Wed, 29 Aug 2012 06:56:10 +0000 Received: from hqnvupgp06.nvidia.com (Not Verified[216.228.121.13]) by hqemgate03.nvidia.com id ; Tue, 28 Aug 2012 23:57:29 -0700 Received: from hqemhub03.nvidia.com ([172.17.108.22]) by hqnvupgp06.nvidia.com (PGP Universal service); Tue, 28 Aug 2012 23:56:08 -0700 X-PGP-Universal: processed; by hqnvupgp06.nvidia.com on Tue, 28 Aug 2012 23:56:08 -0700 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQEMHUB03.nvidia.com (172.20.150.15) with Microsoft SMTP Server id 8.3.264.0; Tue, 28 Aug 2012 23:56:08 -0700 Received: from daphne.nvidia.com (Not Verified[172.16.212.96]) by hqnvemgw01.nvidia.com with MailMarshal (v6,7,2,8378) id ; Tue, 28 Aug 2012 23:56:08 -0700 Received: from oreo.Nvidia.com (dhcp-10-21-25-186.nvidia.com [10.21.25.186]) by daphne.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id q7T6tkpm016768; Tue, 28 Aug 2012 23:56:04 -0700 (PDT) From: Hiroshi Doyu To: Subject: [RFC 3/5] ARM: dma-mapping: New dma_map_ops->iova_alloc*_at* function Date: Wed, 29 Aug 2012 09:55:33 +0300 Message-ID: <1346223335-31455-4-git-send-email-hdoyu@nvidia.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1346223335-31455-1-git-send-email-hdoyu@nvidia.com> References: <1346223335-31455-1-git-send-email-hdoyu@nvidia.com> MIME-Version: 1.0 X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Note: CRM114 invocation failed X-Spam-Score: -7.1 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [216.228.121.140 listed in list.dnswl.org] 0.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.2 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Mailman-Approved-At: Thu, 06 Sep 2012 10:43:50 -0400 Cc: linux@arm.linux.org.uk, arnd@arndb.de, minchan@kernel.org, chunsang.jeong@linaro.org, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, subashrp@gmail.com, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org, linux-tegra@vger.kernel.org, kyungmin.park@samsung.com, pullip.cho@samsung.com, linux-arm-kernel@lists.infradead.org, Hiroshi Doyu X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org To allocate IOVA area at specified address Signed-off-by: Hiroshi Doyu --- 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);