linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: zonque@gmail.com (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 05/11] dma: mmp_pdma: make the controller a DMA provider
Date: Sat, 10 Aug 2013 18:52:19 +0200	[thread overview]
Message-ID: <1376153545-14361-6-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1376153545-14361-1-git-send-email-zonque@gmail.com>

This patch makes the mmp_pdma controller able to provide DMA resources
in DT environments by providing an dma xlate function.

of_dma_simple_xlate() isn't used here, because if fails to handle
multiple different DMA engines or several instances of the same
controller. Instead, a private implementation is provided that makes use
of the newly introduced dma_get_slave_channel() call.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 drivers/dma/mmp_pdma.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
index 9dda27e..0ec5c21 100644
--- a/drivers/dma/mmp_pdma.c
+++ b/drivers/dma/mmp_pdma.c
@@ -18,6 +18,7 @@
 #include <linux/platform_data/mmp_dma.h>
 #include <linux/dmapool.h>
 #include <linux/of_device.h>
+#include <linux/of_dma.h>
 #include <linux/of.h>
 #include <linux/dma/mmp-pdma.h>
 
@@ -784,6 +785,39 @@ static struct of_device_id mmp_pdma_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, mmp_pdma_dt_ids);
 
+static struct dma_chan *mmp_pdma_dma_xlate(struct of_phandle_args *dma_spec,
+					   struct of_dma *ofdma)
+{
+	struct mmp_pdma_device *d = ofdma->of_dma_data;
+	struct dma_chan *chan, *candidate;
+
+retry:
+	candidate = NULL;
+
+	/* walk the list of channels registered with the current instance and
+	 * find one that is currently unused */
+	list_for_each_entry(chan, &d->device.channels, device_node)
+		if (chan->client_count == 0) {
+			candidate = chan;
+			break;
+		}
+
+	if (!candidate)
+		return NULL;
+
+	/* dma_get_slave_channel will return NULL if we lost a race between
+	 * the lookup and the reservation */
+	chan = dma_get_slave_channel(candidate);
+
+	if (chan) {
+		struct mmp_pdma_chan *c = to_mmp_pdma_chan(chan);
+		c->drcmr = dma_spec->args[0];
+		return chan;
+	}
+
+	goto retry;
+}
+
 static int mmp_pdma_probe(struct platform_device *op)
 {
 	struct mmp_pdma_device *pdev;
@@ -870,6 +904,16 @@ static int mmp_pdma_probe(struct platform_device *op)
 		return ret;
 	}
 
+	if (op->dev.of_node) {
+		/* Device-tree DMA controller registration */
+		ret = of_dma_controller_register(op->dev.of_node,
+						 mmp_pdma_dma_xlate, pdev);
+		if (ret < 0) {
+			dev_err(&op->dev, "of_dma_controller_register failed\n");
+			return ret;
+		}
+	}
+
 	dev_info(pdev->device.dev, "initialized\n");
 	return 0;
 }
-- 
1.8.3.1

  parent reply	other threads:[~2013-08-10 16:52 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-10 16:52 [PATCH v2 00/11] dma: pdma: some patches needed for PXA DT environments Daniel Mack
2013-08-10 16:52 ` [PATCH v2 01/11] dma: mmp_pdma: factor out DRCMR register calculation Daniel Mack
2013-08-10 16:52 ` [PATCH v2 02/11] dma: mmp_pdma: refactor unlocking path in lookup_phy() Daniel Mack
2013-08-10 16:52 ` [PATCH v2 03/11] dma: mmp_pdma: fix maximum transfer length Daniel Mack
2013-08-10 16:52 ` [PATCH v2 04/11] dma: mmp_pdma: add filter function Daniel Mack
2013-08-10 16:52 ` Daniel Mack [this message]
2013-08-10 16:52 ` [PATCH v2 06/11] dma: mmp_pdma: print the number of channels at probe time Daniel Mack
2013-08-10 16:52 ` [PATCH v2 07/11] dma: mmp_pdma: remove duplicate assignment Daniel Mack
2013-08-10 16:52 ` [PATCH v2 08/11] dma: mmp_pdma: add support for byte-aligned transfers Daniel Mack
2013-08-10 16:52 ` [PATCH v2 09/11] dma: mmp_pdma: implement DMA_PAUSE and DMA_RESUME Daniel Mack
2013-08-14  8:15   ` Vinod Koul
2013-08-14  9:02     ` Daniel Mack
2013-08-14  8:30       ` Vinod Koul
2013-08-10 16:52 ` [PATCH v2 10/11] dma: mmp_pdma: add support for residue reporting Daniel Mack
2013-08-14  8:19   ` Vinod Koul
2013-08-10 16:52 ` [PATCH v2 11/11] dma: mmp_pdma: add support for cyclic DMA descriptors Daniel Mack
2013-08-10 17:18 ` [PATCH v2 00/11] dma: pdma: some patches needed for PXA DT environments Daniel Mack
2013-08-14  8:28   ` Vinod Koul
2013-08-10 21:25 ` Arnd Bergmann
2013-08-13 21:56   ` Daniel Mack

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1376153545-14361-6-git-send-email-zonque@gmail.com \
    --to=zonque@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).