mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: dmaengine@vger.kernel.org, Vinod Koul <vinod.koul@intel.com>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
	"Antoine Ténart" <antoine@free-electrons.com>,
	lars@metafoo.de, "Russell King" <linux@arm.linux.org.uk>,
	"Maxime Ripard" <maxime.ripard@free-electrons.com>,
	"Dan Williams" <dan.j.williams@intel.com>
Subject: [PATCH v3 28/59] dmaengine: mmp-tdma: Split device_control
Date: Wed, 22 Oct 2014 17:43:42 +0200	[thread overview]
Message-ID: <1413992653-21963-29-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1413992653-21963-1-git-send-email-maxime.ripard@free-electrons.com>

Split the device_control callback of the Marvell MMP TDMA driver to make use
of the newly introduced callbacks, that will eventually be used to retrieve
slave capabilities.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 drivers/dma/mmp_tdma.c | 82 +++++++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index c6bd015b7165..1fe6eabceb70 100644
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -164,33 +164,46 @@ static void mmp_tdma_enable_chan(struct mmp_tdma_chan *tdmac)
 	tdmac->status = DMA_IN_PROGRESS;
 }
 
-static void mmp_tdma_disable_chan(struct mmp_tdma_chan *tdmac)
+static int mmp_tdma_disable_chan(struct dma_chan *chan)
 {
+	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
+
 	writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN,
 					tdmac->reg_base + TDCR);
 
 	tdmac->status = DMA_COMPLETE;
+
+	return 0;
 }
 
-static void mmp_tdma_resume_chan(struct mmp_tdma_chan *tdmac)
+static int mmp_tdma_resume_chan(struct dma_chan *chan)
 {
+	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
+
 	writel(readl(tdmac->reg_base + TDCR) | TDCR_CHANEN,
 					tdmac->reg_base + TDCR);
 	tdmac->status = DMA_IN_PROGRESS;
+
+	return 0;
 }
 
-static void mmp_tdma_pause_chan(struct mmp_tdma_chan *tdmac)
+static int mmp_tdma_pause_chan(struct dma_chan *chan)
 {
+	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
+
 	writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN,
 					tdmac->reg_base + TDCR);
 	tdmac->status = DMA_PAUSED;
+
+	return 0;
 }
 
-static int mmp_tdma_config_chan(struct mmp_tdma_chan *tdmac)
+static int mmp_tdma_config_chan(struct dma_chan *chan)
 {
+	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
 	unsigned int tdcr = 0;
 
-	mmp_tdma_disable_chan(tdmac);
+	mmp_tdma_disable_chan(chan);
 
 	if (tdmac->dir == DMA_MEM_TO_DEV)
 		tdcr = TDCR_DSTDIR_ADDR_HOLD | TDCR_SRCDIR_ADDR_INC;
@@ -452,42 +465,32 @@ err_out:
 	return NULL;
 }
 
-static int mmp_tdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
-		unsigned long arg)
+static int mmp_tdma_terminate_all(struct dma_chan *chan)
 {
 	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
-	struct dma_slave_config *dmaengine_cfg = (void *)arg;
-	int ret = 0;
-
-	switch (cmd) {
-	case DMA_TERMINATE_ALL:
-		mmp_tdma_disable_chan(tdmac);
-		/* disable interrupt */
-		mmp_tdma_enable_irq(tdmac, false);
-		break;
-	case DMA_PAUSE:
-		mmp_tdma_pause_chan(tdmac);
-		break;
-	case DMA_RESUME:
-		mmp_tdma_resume_chan(tdmac);
-		break;
-	case DMA_SLAVE_CONFIG:
-		if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {
-			tdmac->dev_addr = dmaengine_cfg->src_addr;
-			tdmac->burst_sz = dmaengine_cfg->src_maxburst;
-			tdmac->buswidth = dmaengine_cfg->src_addr_width;
-		} else {
-			tdmac->dev_addr = dmaengine_cfg->dst_addr;
-			tdmac->burst_sz = dmaengine_cfg->dst_maxburst;
-			tdmac->buswidth = dmaengine_cfg->dst_addr_width;
-		}
-		tdmac->dir = dmaengine_cfg->direction;
-		return mmp_tdma_config_chan(tdmac);
-	default:
-		ret = -ENOSYS;
+
+	mmp_tdma_disable_chan(chan);
+	/* disable interrupt */
+	mmp_tdma_enable_irq(tdmac, false);
+}
+
+static int mmp_tdma_config(struct dma_chan *chan,
+			   struct dma_slave_config *dmaengine_cfg)
+{
+	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
+
+	if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {
+		tdmac->dev_addr = dmaengine_cfg->src_addr;
+		tdmac->burst_sz = dmaengine_cfg->src_maxburst;
+		tdmac->buswidth = dmaengine_cfg->src_addr_width;
+	} else {
+		tdmac->dev_addr = dmaengine_cfg->dst_addr;
+		tdmac->burst_sz = dmaengine_cfg->dst_maxburst;
+		tdmac->buswidth = dmaengine_cfg->dst_addr_width;
 	}
+	tdmac->dir = dmaengine_cfg->direction;
 
-	return ret;
+	return mmp_tdma_config_chan(chan);
 }
 
 static enum dma_status mmp_tdma_tx_status(struct dma_chan *chan,
@@ -668,7 +671,10 @@ static int mmp_tdma_probe(struct platform_device *pdev)
 	tdev->device.device_prep_dma_cyclic = mmp_tdma_prep_dma_cyclic;
 	tdev->device.device_tx_status = mmp_tdma_tx_status;
 	tdev->device.device_issue_pending = mmp_tdma_issue_pending;
-	tdev->device.device_control = mmp_tdma_control;
+	tdev->device.device_config = mmp_tdma_config;
+	tdev->device.device_pause = mmp_tdma_pause_chan;
+	tdev->device.device_resume = mmp_tdma_resume_chan;
+	tdev->device.device_terminate_all = mmp_tdma_terminate_all;
 	tdev->device.copy_align = TDMA_ALIGNMENT;
 
 	dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
-- 
2.1.1


  parent reply	other threads:[~2014-10-22 16:03 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-22 15:43 [PATCH v3 00/59] dmaengine: Implement generic slave capabilities retrieval Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 01/59] crypto: ux500: Use dmaengine_terminate_all API Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 02/59] serial: at91: Use dmaengine_slave_config API Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 03/59] dmaengine: Make the destination abbreviation coherent Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 04/59] dmaengine: Rework dma_chan_get Maxime Ripard
2014-10-22 21:27   ` Laurent Pinchart
2014-10-22 15:43 ` [PATCH v3 05/59] dmaengine: Make channel allocation callbacks optional Maxime Ripard
2014-10-22 21:05   ` Laurent Pinchart
2014-10-22 15:43 ` [PATCH v3 06/59] dmaengine: Introduce a device_config callback Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 07/59] dmaengine: split out pause/resume operations from device_control Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 08/59] dmaengine: Add device_terminate_all callback Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 09/59] dmaengine: Remove the need to declare device_control Maxime Ripard
2014-10-22 21:06   ` Laurent Pinchart
2014-10-22 15:43 ` [PATCH v3 10/59] dmaengine: Create a generic dma_slave_caps callback Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 11/59] dmaengine: Move slave caps to dma_device Maxime Ripard
2014-10-22 21:06   ` Laurent Pinchart
2014-10-22 15:43 ` [PATCH v3 12/59] dmaengine: pl08x: Split device_control Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 13/59] dmaengine: hdmac: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 14/59] dmaengine: bcm2835: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 15/59] dmaengine: coh901318: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 16/59] dmaengine: cppi41: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 17/59] dmaengine: jz4740: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 18/59] dmaengine: dw: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 19/59] dmaengine: edma: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 20/59] dmaengine: ep93xx: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 21/59] dmaengine: fsl-edma: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 22/59] dmaengine: imx: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 23/59] dmaengine: imx-sdma: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 24/59] dmaengine: intel-mid-dma: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 25/59] dmaengine: ipu-idmac: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 26/59] dmaengine: k3: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 27/59] dmaengine: mmp-pdma: " Maxime Ripard
2014-10-22 15:43 ` Maxime Ripard [this message]
2014-10-22 15:43 ` [PATCH v3 29/59] dmaengine: moxart: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 30/59] dmaengine: fsl-dma: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 31/59] dmaengine: mpc512x: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 32/59] dmaengine: mxs: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 33/59] dmaengine: nbpfaxi: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 34/59] dmaengine: omap: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 35/59] dmaengine: pl330: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 36/59] dmaengine: bam-dma: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 37/59] dmaengine: s3c24xx: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 38/59] dmaengine: sa11x0: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 39/59] dmaengine: sh: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 40/59] dmaengine: sirf: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 41/59] dmaengine: sun6i: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 42/59] dmaengine: d40: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 43/59] dmaengine: tegra20: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 44/59] dmaengine: xilinx: " Maxime Ripard
2014-10-22 15:43 ` [PATCH v3 45/59] dmaengine: mv_xor: Remove device_control Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 46/59] dmaengine: pch-dma: Rename device_control Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 47/59] dmaengine: td: " Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 48/59] dmaengine: txx9: " Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 49/59] dmaengine: rapidio: tsi721: " Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 50/59] dmaengine: bcm2835: Declare slave capabilities for the generic code Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 51/59] dmaengine: fsl-edma: " Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 52/59] dmaengine: edma: " Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 53/59] dmaengine: nbpfaxi: " Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 54/59] dmaengine: omap: " Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 55/59] dmaengine: pl330: " Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 56/59] dmaengine: sirf: " Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 57/59] dmaengine: sun6i: " Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 58/59] dmaengine: Add a warning for drivers not using the generic slave caps retrieval Maxime Ripard
2014-10-22 21:21   ` Laurent Pinchart
2014-10-23 13:19     ` Maxime Ripard
2014-10-23 13:38       ` Laurent Pinchart
2014-10-23 13:46         ` Maxime Ripard
2014-10-22 15:44 ` [PATCH v3 59/59] dmaengine: Remove device_control and device_slave_caps Maxime Ripard
2014-10-22 21:22   ` Laurent Pinchart

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=1413992653-21963-29-git-send-email-maxime.ripard@free-electrons.com \
    --to=maxime.ripard@free-electrons.com \
    --cc=antoine@free-electrons.com \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=lars@metafoo.de \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=vinod.koul@intel.com \
    /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

all inboxes | Powered by JetHome®