[PATCH 1/2] base: dma-coherent: Add DT property for non exclusive shared-dma-pool

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Neil Armstrong <narmstrong@baylibre.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/2] base: dma-coherent: Add DT property for non exclusive shared-dma-pool
Date	Mon, 12 Oct 2015 09:40:02 +0200
Message-ID	<qiFSa-Bb-7@gated-at.bofh.it> (permalink)
X-Original-To	Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Grant Likely <grant.likely@linaro.org>, Josh Cartwright <joshc@codeaurora.org>, Marek Szyprowski <m.szyprowski@samsung.com>
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:organization:message-id:date :user-agent:mime-version:content-type:content-transfer-encoding; bh=RWs3a+tZr7rXWXOltu8QcLrdwQ5jEquJ4jN3TnCTy6Y=; b=OyN+/doQI6sgz8tUp5gaML+ATyhsfPeJe2LQqN7ygyupHWKpPE+mKIc6rpv7PZENW2 2uiWqNX5sG/dTEA0zwEKRsk/2xU4ENgDoxrBzRtD0SpPSSuEXrXooDandK0Qfv53+GUD LhFX+kBn3vup8rGeLkp6YYPvnbo4BNkuv1nF2GPfvkcqoCmydiWUrgenPLHg5vkZgnid nYHB7wgFlso4PUe699MtU7JmR984/btD8GLI6sDxXkVbKT7uwdy58k1hFomsiGu/rg2V ruiHz15Ar76Nh6S6YLA0y7zxp0V6ToVN6An7HPPxMaAhJG+HorERuexvY4NmEV5ieGAY T9IQ==
X-Gm-Message-State	ALoCoQm4PFBu0sw3tgEvqYmYgD4bQGKqvRrH6b0CMEfiTqfMp67TGVd0rPp7pIOIg8zuECOnD1p8
X-Received	by 10.180.20.1 with SMTP id j1mr5739162wie.78.1444635191907; Mon, 12 Oct 2015 00:33:11 -0700 (PDT)
X-Enigmail-Draft-Status	N1110
Organization	Baylibre
User-Agent	Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0
MIME-Version	1.0
Content-Type	text/plain; charset=utf-8
Content-Transfer-Encoding	8bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	81
X-Original-Date	Mon, 12 Oct 2015 09:33:07 +0200
X-Original-Message-ID	<561B6233.9090008@baylibre.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1244441

Show key headers only | View raw

In order to have the ability to declare a non exclusive shared-dma-pool,
i.e. without the DMA_MEMORY_EXCLUSIVE flag, add the 'no-exclusive' DT
optional parameter to initialize the coherent memory without the flag.

Leave exclusive memory as default.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/base/dma-coherent.c | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
index 55b8398..e32d3cc 100644
--- a/drivers/base/dma-coherent.c
+++ b/drivers/base/dma-coherent.c
@@ -276,13 +276,14 @@ EXPORT_SYMBOL(dma_mmap_from_coherent);
 #include <linux/of_fdt.h>
 #include <linux/of_reserved_mem.h>

-static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
+static int rmem_dma_device_flags_init(struct reserved_mem *rmem,
+				      struct device *dev, int flags)
 {
 	struct dma_coherent_mem *mem = rmem->priv;

 	if (!mem &&
 	    dma_init_coherent_memory(rmem->base, rmem->base, rmem->size,
-				     DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE,
+				     DMA_MEMORY_MAP | flags,
 				     &mem) != DMA_MEMORY_MAP) {
 		pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
 			&rmem->base, (unsigned long)rmem->size / SZ_1M);
@@ -293,6 +294,17 @@ static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
 	return 0;
 }

+static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
+{
+	return rmem_dma_device_flags_init(rmem, dev, 0);
+}
+
+static int rmem_dma_device_exclusive_init(struct reserved_mem *rmem,
+					  struct device *dev)
+{
+	return rmem_dma_device_flags_init(rmem, dev, DMA_MEMORY_EXCLUSIVE);
+}
+
 static void rmem_dma_device_release(struct reserved_mem *rmem,
 				    struct device *dev)
 {
@@ -304,6 +316,11 @@ static const struct reserved_mem_ops rmem_dma_ops = {
 	.device_release	= rmem_dma_device_release,
 };

+static const struct reserved_mem_ops rmem_dma_exclusive_ops = {
+	.device_init	= rmem_dma_device_exclusive_init,
+	.device_release	= rmem_dma_device_release,
+};
+
 static int __init rmem_dma_setup(struct reserved_mem *rmem)
 {
 	unsigned long node = rmem->fdt_node;
@@ -318,7 +335,10 @@ static int __init rmem_dma_setup(struct reserved_mem *rmem)
 	}
 #endif

-	rmem->ops = &rmem_dma_ops;
+	if (of_get_flat_dt_prop(node, "no-exclusive", NULL))
+		rmem->ops = &rmem_dma_ops;
+	else
+		rmem->ops = &rmem_dma_exclusive_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;
-- 
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 1/2] base: dma-coherent: Add DT property for non exclusive  shared-dma-pool Neil Armstrong <narmstrong@baylibre.com> - 2015-10-12 09:40 +0200

csiph-web