From patchwork Mon Jul 14 07:12:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 33553 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D0E5D213FD for ; Mon, 14 Jul 2014 07:33:52 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id id10sf15623408vcb.3 for ; Mon, 14 Jul 2014 00:33:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=2Q6JafKKAaAPe8k7PkEiAz7GDknz6U5HAbrb3++Xghc=; b=eNnfHYwh42oDNeoQUMHeSwVrnLMyKJ2lxoFaAZECBJnCTcopKIzQTIcMZxdaxKoehV 1xsqw/M4dg680lxvodWi5YCGgDo16QWE8rMFq04bUxFYk9MSdgkO7HvDsn3JRD2JhyEr 2ZkrPYEew4lKxowJAiiPKmoImTI8Ev4sE5sSKLYmes6Y5Yla2+0cryjt51BTF9Z+HD9l bA441eO5Q2rN4Yp84HygYEWXLWRdhHUZQ6ijVB1opWZBrtz4JUyQqn6cJLGgwk4EKrBu rJ0fxAAsqwy32Cr2F/X+WveDMXXMg8n6nhpvHqope6ziuNNCpkUQiP2FaJI07TS32DH+ qJag== X-Gm-Message-State: ALoCoQmqOQ/uj5ja5NpUxqtud1eH+1Jo5O9lfLjcKrlH5Jxhp6wsNeW7xsZRsvBUWW/qpr/jRyUW X-Received: by 10.224.97.8 with SMTP id j8mr7194892qan.0.1405323232625; Mon, 14 Jul 2014 00:33:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.16 with SMTP id 16ls959184qgg.57.gmail; Mon, 14 Jul 2014 00:33:52 -0700 (PDT) X-Received: by 10.52.253.39 with SMTP id zx7mr3335114vdc.2.1405323232559; Mon, 14 Jul 2014 00:33:52 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id r6si633402vei.7.2014.07.14.00.33.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Jul 2014 00:33:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id ij19so6662131vcb.9 for ; Mon, 14 Jul 2014 00:33:52 -0700 (PDT) X-Received: by 10.220.59.65 with SMTP id k1mr5484088vch.22.1405323232496; Mon, 14 Jul 2014 00:33:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp112927vcb; Mon, 14 Jul 2014 00:33:52 -0700 (PDT) X-Received: by 10.66.121.197 with SMTP id lm5mr1448622pab.118.1405323231584; Mon, 14 Jul 2014 00:33:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wm6si8547651pab.102.2014.07.14.00.33.50; Mon, 14 Jul 2014 00:33:51 -0700 (PDT) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753365AbaGNHdp (ORCPT + 8 others); Mon, 14 Jul 2014 03:33:45 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:50335 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753260AbaGNHdc (ORCPT ); Mon, 14 Jul 2014 03:33:32 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8O00H17YBPM700@mailout1.w1.samsung.com>; Mon, 14 Jul 2014 08:33:25 +0100 (BST) X-AuditID: cbfec7f5-b7f626d000004b39-6d-53c387c825e3 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id DC.F3.19257.8C783C35; Mon, 14 Jul 2014 08:33:28 +0100 (BST) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N8O00FFGYBLTX50@eusync3.samsung.com>; Mon, 14 Jul 2014 08:33:28 +0100 (BST) From: Marek Szyprowski To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marek Szyprowski , Benjamin Herrenschmidt , linaro-mm-sig@lists.linaro.org, devicetree@vger.kernel.org, Arnd Bergmann , Michal Nazarewicz , Grant Likely , Tomasz Figa , Sascha Hauer , Laura Abbott , Nishanth Peethambaran , Marc , Josh Cartwright , Catalin Marinas , Will Deacon , Paul Mackerras , Jon Medhurst , Joonsoo Kim , "Aneesh Kumar K.V." , Andrew Morton Subject: [PATCH v2 3/4] drivers: dma-coherent: add initialization from device tree Date: Mon, 14 Jul 2014 09:12:45 +0200 Message-id: <1405321966-28184-4-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1405321966-28184-1-git-send-email-m.szyprowski@samsung.com> References: <1405321966-28184-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xq7on2g8HGxy6r2UxZ/0aNovHr+ex WPyddIzd4kNTK7PF+2U9jBbzj5xjtTjwZwejxcruZjaLneveMVqcbXrDbrG9cwa7xZcrD5ks Nj2+xmpxedccNou1R+6yW2x4eZDJYsHxFlaLP9PlLNYcWcxu8Xf7JhaL9TNes1gsnH+f3eLl xxMsDuIea+atYfT4/WsSo8flvl4mj52z7rJ79LxpYfXoenuFyePOtT1sHidm/GbxeHBoM4vH 5iX1Hrf/PWb2WPfnFZNH/18Dj7m7+hg9+rasYvT4vEkuQCCKyyYlNSezLLVI3y6BK+PQnG7G gmV8FZu3L2NrYJzB08XIySEhYCKxo3EfG4QtJnHh3nogm4tDSGApo8TOjiVQTh+TxPSTy1lA qtgEDCW63naBdYgIuEn8W3cIrIhZYAGbxNH/PxhBEsICIRJT9n8CK2IRUJVY9fgcUxcjBwev gIfEgkv2ENvkJP6/XMEEYnMKeEpsnPyNFcQWAio5vG8P4wRG3gWMDKsYRVNLkwuKk9JzjfSK E3OLS/PS9ZLzczcxQuLr6w7GpcesDjEKcDAq8fAW8B8OFmJNLCuuzD3EKMHBrCTCG+4GFOJN SaysSi3Kjy8qzUktPsTIxMEp1cDoOO2+77zl/vNlPdq0WD/meK67y6T1a4+S+Z2ZRi9rDlo4 Pfbo0JWs2uop2n3vdZnNqTAlRs8wWY2OzSnRb++v+vFEL0q4Kina2nrJrmPHV/67IpI/tbH6 yDKV0HVMLjsyV2uL7vW7vetqw2vDuN3798y/oXjJaaV89QqlOX+a/UQ0GioL8jmUWIozEg21 mIuKEwGDqAOxjQIAAA== Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m.szyprowski@samsung.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add support for handling 'shared-dma-pool' reserved-memory device tree nodes. Based on previous code provided by Josh Cartwright Signed-off-by: Marek Szyprowski --- drivers/base/dma-coherent.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c index 7d6e84a51424..b20cbe095d86 100644 --- a/drivers/base/dma-coherent.c +++ b/drivers/base/dma-coherent.c @@ -218,3 +218,43 @@ int dma_mmap_from_coherent(struct device *dev, struct vm_area_struct *vma, return 0; } EXPORT_SYMBOL(dma_mmap_from_coherent); + +/* + * Support for reserved memory regions defined in device tree + */ +#ifdef CONFIG_OF_RESERVED_MEM +#include +#include +#include + +static void rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev) +{ + dma_declare_coherent_memory(dev, rmem->base, rmem->base, + rmem->size, DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE); +} + +static void rmem_dma_device_release(struct reserved_mem *rmem, + struct device *dev) +{ + dma_release_declared_memory(dev); +} + +static const struct reserved_mem_ops rmem_dma_ops = { + .device_init = rmem_dma_device_init, + .device_release = rmem_dma_device_release, +}; + +static int __init rmem_dma_setup(struct reserved_mem *rmem) +{ + unsigned long node = rmem->fdt_node; + + if (of_get_flat_dt_prop(node, "reusable", NULL)) + return -EINVAL; + + rmem->ops = &rmem_dma_ops; + pr_info("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n", + &rmem->base, (unsigned long)rmem->size / SZ_1M); + return 0; +} +RESERVEDMEM_OF_DECLARE(dma, "shared-dma-pool", rmem_dma_setup); +#endif