From patchwork Wed Aug 29 06:55:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi Doyu X-Patchwork-Id: 11008 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 298C523F27 for ; Wed, 29 Aug 2012 06:56:13 +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 60B41A191BA for ; Wed, 29 Aug 2012 06:55:41 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so459132iaf.11 for ; Tue, 28 Aug 2012 23:56:12 -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=Qt1g9GHMfWDGR1l5/K7smhOodTuYLuj/baFcmZ4xI14=; b=BnWPkyESEOwdzIMnCtYEOMMr2yOwA9fBWvVlxIJkbgP8qigpqqh8sHPvzt9LLRBa6y 6ouFdm2PXb/B2YhRhQTjtBVjG/0+5kffQzr9g9rLIHIwx9ALX7YhPG3VEUxqXDr/QctH Bv7wUqidR6DOpMb/RLkTMgzyKtBwz+1EOZLKSPoS7ZHNQirXAi1i/WMgfeqE5lbKMBGn Olqjoc4N+6+GXtybAprypzfkMofr8GfW1HVEtcKyxcKx0rZ2vxGvwgn4yeFl6NugRuiY RMpL3mP3hUi9pyAQV6oEMyZcgJgev/U0K3pzAkKLVWtFZzJjoXUqGN4zXVPHGiANZmq7 rmXA== Received: by 10.50.180.129 with SMTP id do1mr570097igc.28.1346223372624; Tue, 28 Aug 2012 23:56:12 -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 ex8csp68321igc; Tue, 28 Aug 2012 23:56:11 -0700 (PDT) Received: by 10.204.156.17 with SMTP id u17mr239127bkw.52.1346223371756; Tue, 28 Aug 2012 23:56:11 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id hc18si14675777bkc.108.2012.08.28.23.56.10; Tue, 28 Aug 2012 23:56:11 -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 1T6cC9-0008D2-CF; Wed, 29 Aug 2012 06:56:09 +0000 Received: from hqemgate04.nvidia.com ([216.228.121.35]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T6cC7-0008CV-TG for linaro-mm-sig@lists.linaro.org; Wed, 29 Aug 2012 06:56:08 +0000 Received: from hqnvupgp07.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Tue, 28 Aug 2012 23:55:22 -0700 Received: from hqemhub01.nvidia.com ([172.17.108.22]) by hqnvupgp07.nvidia.com (PGP Universal service); Tue, 28 Aug 2012 23:49:45 -0700 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Tue, 28 Aug 2012 23:49:45 -0700 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by hqemhub01.nvidia.com (172.20.150.30) with Microsoft SMTP Server id 8.3.264.0; Tue, 28 Aug 2012 23:55:59 -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:00 -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 q7T6tkpk016768; Tue, 28 Aug 2012 23:55:56 -0700 (PDT) From: Hiroshi Doyu To: Date: Wed, 29 Aug 2012 09:55:31 +0300 Message-ID: <1346223335-31455-2-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 1/5] ARM: dma-mapping: New dma_map_ops->iova_get_free_{total, max} functions 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: ALoCoQk33+0RqwfGH1La/5JqX/H4kiOyCQl5jx1irkIjqiwe13RKFK/6QTg1X0X1eVbl2EaALusL ->iova>_get_free_total() returns the sum of available free areas. ->iova>_get_free_max() returns the largest available free area size. Signed-off-by: Hiroshi Doyu --- arch/arm/include/asm/dma-mapping.h | 16 ++++++++++ arch/arm/mm/dma-mapping.c | 54 ++++++++++++++++++++++++++++++++++++ include/linux/dma-mapping.h | 3 ++ 3 files changed, 73 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 2300484..1cbd279 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -170,6 +170,22 @@ static inline void dma_free_attrs(struct device *dev, size_t size, ops->free(dev, size, cpu_addr, dma_handle, attrs); } +static inline size_t dma_iova_get_free_total(struct device *dev) +{ + struct dma_map_ops *ops = get_dma_ops(dev); + BUG_ON(!ops); + + return ops->iova_get_free_total(dev); +} + +static inline size_t dma_iova_get_free_max(struct device *dev) +{ + struct dma_map_ops *ops = get_dma_ops(dev); + BUG_ON(!ops); + + return ops->iova_get_free_max(dev); +} + /** * arm_dma_mmap - map a coherent DMA allocation into user space * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index e4746b7..db17338 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1001,6 +1001,57 @@ fs_initcall(dma_debug_do_init); /* IOMMU */ +static size_t arm_iommu_iova_get_free_total(struct device *dev) +{ + struct dma_iommu_mapping *mapping = dev->archdata.mapping; + unsigned long flags; + size_t size = 0; + unsigned long start = 0; + + BUG_ON(!dev); + BUG_ON(!mapping); + + spin_lock_irqsave(&mapping->lock, flags); + while (1) { + unsigned long end; + + start = bitmap_find_next_zero_area(mapping->bitmap, + mapping->bits, start, 1, 0); + if (start > mapping->bits) + break; + + end = find_next_bit(mapping->bitmap, mapping->bits, start); + size += end - start; + start = end; + } + spin_unlock_irqrestore(&mapping->lock, flags); + return size << (mapping->order + PAGE_SHIFT); +} + +static size_t arm_iommu_iova_get_free_max(struct device *dev) +{ + struct dma_iommu_mapping *mapping = dev->archdata.mapping; + unsigned long flags; + size_t max_free = 0; + unsigned long start = 0; + + spin_lock_irqsave(&mapping->lock, flags); + while (1) { + unsigned long end; + + start = bitmap_find_next_zero_area(mapping->bitmap, + mapping->bits, start, 1, 0); + if (start > mapping->bits) + break; + + end = find_next_bit(mapping->bitmap, mapping->bits, start); + max_free = max_t(size_t, max_free, end - start); + start = end; + } + spin_unlock_irqrestore(&mapping->lock, flags); + return max_free << (mapping->order + PAGE_SHIFT); +} + static inline dma_addr_t __alloc_iova(struct dma_iommu_mapping *mapping, size_t size) { @@ -1721,6 +1772,9 @@ struct dma_map_ops iommu_ops = { .unmap_sg = arm_iommu_unmap_sg, .sync_sg_for_cpu = arm_iommu_sync_sg_for_cpu, .sync_sg_for_device = arm_iommu_sync_sg_for_device, + + .iova_get_free_total = arm_iommu_iova_get_free_total, + .iova_get_free_max = arm_iommu_iova_get_free_max, }; struct dma_map_ops iommu_coherent_ops = { diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 94af418..0337182 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -53,6 +53,9 @@ struct dma_map_ops { #ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK u64 (*get_required_mask)(struct device *dev); #endif + size_t (*iova_get_free_total)(struct device *dev); + size_t (*iova_get_free_max)(struct device *dev); + int is_phys; };