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 12/59] dmaengine: pl08x: Split device_control
Date: Wed, 22 Oct 2014 17:43:26 +0200	[thread overview]
Message-ID: <1413992653-21963-13-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 AMBA PL08x DMA 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/amba-pl08x.c | 156 +++++++++++++++++++++++++++--------------------
 1 file changed, 90 insertions(+), 66 deletions(-)

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index e34024b000a4..aa99c13b5666 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -1386,32 +1386,6 @@ static u32 pl08x_get_cctl(struct pl08x_dma_chan *plchan,
 	return pl08x_cctl(cctl);
 }
 
-static int dma_set_runtime_config(struct dma_chan *chan,
-				  struct dma_slave_config *config)
-{
-	struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
-	struct pl08x_driver_data *pl08x = plchan->host;
-
-	if (!plchan->slave)
-		return -EINVAL;
-
-	/* Reject definitely invalid configurations */
-	if (config->src_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES ||
-	    config->dst_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES)
-		return -EINVAL;
-
-	if (config->device_fc && pl08x->vd->pl080s) {
-		dev_err(&pl08x->adev->dev,
-			"%s: PL080S does not support peripheral flow control\n",
-			__func__);
-		return -EINVAL;
-	}
-
-	plchan->cfg = *config;
-
-	return 0;
-}
-
 /*
  * Slave transactions callback to the slave device to allow
  * synchronization of slave DMA signals with the DMAC enable
@@ -1693,20 +1667,71 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_cyclic(
 	return vchan_tx_prep(&plchan->vc, &txd->vd, flags);
 }
 
-static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
-			 unsigned long arg)
+static int pl08x_config(struct dma_chan *chan,
+			struct dma_slave_config *config)
+{
+	struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
+	struct pl08x_driver_data *pl08x = plchan->host;
+
+	if (!plchan->slave)
+		return -EINVAL;
+
+	/* Reject definitely invalid configurations */
+	if (config->src_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES ||
+	    config->dst_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES)
+		return -EINVAL;
+
+	if (config->device_fc && pl08x->vd->pl080s) {
+		dev_err(&pl08x->adev->dev,
+			"%s: PL080S does not support peripheral flow control\n",
+			__func__);
+		return -EINVAL;
+	}
+
+	plchan->cfg = *config;
+
+	return 0;
+}
+
+static int pl08x_terminate_all(struct dma_chan *chan)
 {
 	struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
 	struct pl08x_driver_data *pl08x = plchan->host;
 	unsigned long flags;
-	int ret = 0;
 
-	/* Controls applicable to inactive channels */
-	if (cmd == DMA_SLAVE_CONFIG) {
-		return dma_set_runtime_config(chan,
-					      (struct dma_slave_config *)arg);
+	spin_lock_irqsave(&plchan->vc.lock, flags);
+	if (!plchan->phychan && !plchan->at) {
+		spin_unlock_irqrestore(&plchan->vc.lock, flags);
+		return 0;
 	}
 
+	plchan->state = PL08X_CHAN_IDLE;
+
+	if (plchan->phychan) {
+		/*
+		 * Mark physical channel as free and free any slave
+		 * signal
+		 */
+		pl08x_phy_free(plchan);
+	}
+	/* Dequeue jobs and free LLIs */
+	if (plchan->at) {
+		pl08x_desc_free(&plchan->at->vd);
+		plchan->at = NULL;
+	}
+	/* Dequeue jobs not yet fired as well */
+	pl08x_free_txd_list(pl08x, plchan);
+
+	spin_unlock_irqrestore(&plchan->vc.lock, flags);
+
+	return 0;
+}
+
+static int pl08x_pause(struct dma_chan *chan)
+{
+	struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
+	unsigned long flags;
+
 	/*
 	 * Anything succeeds on channels with no physical allocation and
 	 * no queued transfers.
@@ -1717,42 +1742,35 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 		return 0;
 	}
 
-	switch (cmd) {
-	case DMA_TERMINATE_ALL:
-		plchan->state = PL08X_CHAN_IDLE;
+	pl08x_pause_phy_chan(plchan->phychan);
+	plchan->state = PL08X_CHAN_PAUSED;
 
-		if (plchan->phychan) {
-			/*
-			 * Mark physical channel as free and free any slave
-			 * signal
-			 */
-			pl08x_phy_free(plchan);
-		}
-		/* Dequeue jobs and free LLIs */
-		if (plchan->at) {
-			pl08x_desc_free(&plchan->at->vd);
-			plchan->at = NULL;
-		}
-		/* Dequeue jobs not yet fired as well */
-		pl08x_free_txd_list(pl08x, plchan);
-		break;
-	case DMA_PAUSE:
-		pl08x_pause_phy_chan(plchan->phychan);
-		plchan->state = PL08X_CHAN_PAUSED;
-		break;
-	case DMA_RESUME:
-		pl08x_resume_phy_chan(plchan->phychan);
-		plchan->state = PL08X_CHAN_RUNNING;
-		break;
-	default:
-		/* Unknown command */
-		ret = -ENXIO;
-		break;
+	spin_unlock_irqrestore(&plchan->vc.lock, flags);
+
+	return 0;
+}
+
+static int pl08x_resume(struct dma_chan *chan)
+{
+	struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
+	unsigned long flags;
+
+	/*
+	 * Anything succeeds on channels with no physical allocation and
+	 * no queued transfers.
+	 */
+	spin_lock_irqsave(&plchan->vc.lock, flags);
+	if (!plchan->phychan && !plchan->at) {
+		spin_unlock_irqrestore(&plchan->vc.lock, flags);
+		return 0;
 	}
 
+	pl08x_resume_phy_chan(plchan->phychan);
+	plchan->state = PL08X_CHAN_RUNNING;
+
 	spin_unlock_irqrestore(&plchan->vc.lock, flags);
 
-	return ret;
+	return 0;
 }
 
 bool pl08x_filter_id(struct dma_chan *chan, void *chan_id)
@@ -2048,7 +2066,10 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
 	pl08x->memcpy.device_prep_dma_interrupt = pl08x_prep_dma_interrupt;
 	pl08x->memcpy.device_tx_status = pl08x_dma_tx_status;
 	pl08x->memcpy.device_issue_pending = pl08x_issue_pending;
-	pl08x->memcpy.device_control = pl08x_control;
+	pl08x->memcpy.device_config = pl08x_config;
+	pl08x->memcpy.device_pause = pl08x_pause;
+	pl08x->memcpy.device_resume = pl08x_resume;
+	pl08x->memcpy.device_terminate_all = pl08x_terminate_all;
 
 	/* Initialize slave engine */
 	dma_cap_set(DMA_SLAVE, pl08x->slave.cap_mask);
@@ -2061,7 +2082,10 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
 	pl08x->slave.device_issue_pending = pl08x_issue_pending;
 	pl08x->slave.device_prep_slave_sg = pl08x_prep_slave_sg;
 	pl08x->slave.device_prep_dma_cyclic = pl08x_prep_dma_cyclic;
-	pl08x->slave.device_control = pl08x_control;
+	pl08x->slave.device_config = pl08x_config;
+	pl08x->slave.device_pause = pl08x_pause;
+	pl08x->slave.device_resume = pl08x_resume;
+	pl08x->slave.device_terminate_all = pl08x_terminate_all;
 
 	/* Get the platform data */
 	pl08x->pd = dev_get_platdata(&adev->dev);
-- 
2.1.1


  parent reply	other threads:[~2014-10-22 16:08 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 ` Maxime Ripard [this message]
2014-10-22 15:43 ` [PATCH v3 13/59] dmaengine: hdmac: Split device_control 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 ` [PATCH v3 28/59] dmaengine: mmp-tdma: " Maxime Ripard
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-13-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®