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: 11011 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F1D2523F25 for ; Wed, 29 Aug 2012 06:56:34 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 28560A1869D for ; Wed, 29 Aug 2012 06:56:02 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so459132iaf.11 for ; Tue, 28 Aug 2012 23:56:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :x-pgp-universal:from:to:date:message-id:x-mailer:in-reply-to :references:mime-version:cc:subject:x-beenthere:x-mailman-version :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:content-type:content-transfer-encoding :sender:errors-to:x-gm-message-state; bh=GxAz5qE+P7mmrM6trRwhpSBHL+Pqzkx36p3Ek7bcY6Y=; b=npgWio+3+vShyYR3K4NbbkTrSuzi7UNbF3+OJ4RnY7M7RC8S+7uzsVJ/mxw3rEbZ4w KKVFVBrzf9wi0+TR3if/qBaR5a2yLqyJaGURNqYTLWS/f2imINDTFnfU5mC1iGwlkK4V aTH3BMSQC2YOOqhhfH1+0uEjS/8n+lulooBJDbcIJORHMkXcz+W1Z9KdvdrX2NrUribs CEeKkhCHEYNXHfRc2AlHqWFBkG3bpeDhweCucam7mZ5ISOD8wQsS0GukE+dl4VoDNkU4 Or//ineSCr0xI8/1mUEN8XzBcYc/i1VxnbVbctaPyDGrpPLnKUSbzt9g+o+tBKcxMlkN IecQ== Received: by 10.50.10.201 with SMTP id k9mr571253igb.28.1346223394202; Tue, 28 Aug 2012 23:56:34 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp68334igc; Tue, 28 Aug 2012 23:56:33 -0700 (PDT) Received: by 10.205.136.194 with SMTP id il2mr235826bkc.81.1346223392689; Tue, 28 Aug 2012 23:56:32 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id fo1si14678830bkc.85.2012.08.28.23.56.31; Tue, 28 Aug 2012 23:56:32 -0700 (PDT) Received-SPF: neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) client-ip=91.189.95.16; Authentication-Results: mx.google.com; spf=neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) smtp.mail=linaro-mm-sig-bounces@lists.linaro.org Received: from localhost ([127.0.0.1] helo=mombin.canonical.com) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T6cCU-0008Ff-CP; Wed, 29 Aug 2012 06:56:30 +0000 Received: from hqemgate03.nvidia.com ([216.228.121.140]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T6cCT-0008FP-Ic for linaro-mm-sig@lists.linaro.org; Wed, 29 Aug 2012 06:56:29 +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: 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 Cc: linux@arm.linux.org.uk, arnd@arndb.de, minchan@kernel.org, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, 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 Subject: [Linaro-mm-sig] [RFC 3/5] ARM: dma-mapping: New dma_map_ops->iova_alloc*_at* function X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Unified memory management interest group." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linaro-mm-sig-bounces@lists.linaro.org Errors-To: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQmx5ywduuItpHtrjAxbz7Sat1OilV1fPymTETeGIVQSzhl5r7Wj4kAHVQGJWl0+/mGCTDqd 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);