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 37/59] dmaengine: s3c24xx: Split device_control
Date: Wed, 22 Oct 2014 17:43:51 +0200 [thread overview]
Message-ID: <1413992653-21963-38-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 Samsung S3C24xxx 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/s3c24xx-dma.c | 75 +++++++++++++++++++++++------------------------
1 file changed, 36 insertions(+), 39 deletions(-)
diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
index 7416572d1e40..2177bf5a742c 100644
--- a/drivers/dma/s3c24xx-dma.c
+++ b/drivers/dma/s3c24xx-dma.c
@@ -384,20 +384,30 @@ static u32 s3c24xx_dma_getbytes_chan(struct s3c24xx_dma_chan *s3cchan)
return tc * txd->width;
}
-static int s3c24xx_dma_set_runtime_config(struct s3c24xx_dma_chan *s3cchan,
+static int s3c24xx_dma_set_runtime_config(struct dma_chan *chan,
struct dma_slave_config *config)
{
- if (!s3cchan->slave)
- return -EINVAL;
+ struct s3c24xx_dma_chan *s3cchan = to_s3c24xx_dma_chan(chan);
+ unsigned long flags;
+ int ret = 0;
/* 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;
+ spin_lock_irqsave(&s3cchan->vc.lock, flags);
+
+ if (!s3cchan->slave) {
+ ret = -EINVAL;
+ goto out;
+ }
+
s3cchan->cfg = *config;
- return 0;
+out:
+ spin_lock_irqrestore(&s3cchan->vc.lock, flags);
+ return ret;
}
/*
@@ -703,53 +713,38 @@ static irqreturn_t s3c24xx_dma_irq(int irq, void *data)
* The DMA ENGINE API
*/
-static int s3c24xx_dma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
- unsigned long arg)
+static int s3c24xx_dma_terminate_all(struct dma_chan *chan)
{
struct s3c24xx_dma_chan *s3cchan = to_s3c24xx_dma_chan(chan);
struct s3c24xx_dma_engine *s3cdma = s3cchan->host;
unsigned long flags;
- int ret = 0;
spin_lock_irqsave(&s3cchan->vc.lock, flags);
- switch (cmd) {
- case DMA_SLAVE_CONFIG:
- ret = s3c24xx_dma_set_runtime_config(s3cchan,
- (struct dma_slave_config *)arg);
- break;
- case DMA_TERMINATE_ALL:
- if (!s3cchan->phy && !s3cchan->at) {
- dev_err(&s3cdma->pdev->dev, "trying to terminate already stopped channel %d\n",
- s3cchan->id);
- ret = -EINVAL;
- break;
- }
-
- s3cchan->state = S3C24XX_DMA_CHAN_IDLE;
+ if (!s3cchan->phy && !s3cchan->at) {
+ dev_err(&s3cdma->pdev->dev, "trying to terminate already stopped channel %d\n",
+ s3cchan->id);
+ return -EINVAL;
+ }
- /* Mark physical channel as free */
- if (s3cchan->phy)
- s3c24xx_dma_phy_free(s3cchan);
+ s3cchan->state = S3C24XX_DMA_CHAN_IDLE;
- /* Dequeue current job */
- if (s3cchan->at) {
- s3c24xx_dma_desc_free(&s3cchan->at->vd);
- s3cchan->at = NULL;
- }
+ /* Mark physical channel as free */
+ if (s3cchan->phy)
+ s3c24xx_dma_phy_free(s3cchan);
- /* Dequeue jobs not yet fired as well */
- s3c24xx_dma_free_txd_list(s3cdma, s3cchan);
- break;
- default:
- /* Unknown command */
- ret = -ENXIO;
- break;
+ /* Dequeue current job */
+ if (s3cchan->at) {
+ s3c24xx_dma_desc_free(&s3cchan->at->vd);
+ s3cchan->at = NULL;
}
+ /* Dequeue jobs not yet fired as well */
+ s3c24xx_dma_free_txd_list(s3cdma, s3cchan);
+
spin_unlock_irqrestore(&s3cchan->vc.lock, flags);
- return ret;
+ return 0;
}
static int s3c24xx_dma_alloc_chan_resources(struct dma_chan *chan)
@@ -1300,7 +1295,8 @@ static int s3c24xx_dma_probe(struct platform_device *pdev)
s3cdma->memcpy.device_prep_dma_memcpy = s3c24xx_dma_prep_memcpy;
s3cdma->memcpy.device_tx_status = s3c24xx_dma_tx_status;
s3cdma->memcpy.device_issue_pending = s3c24xx_dma_issue_pending;
- s3cdma->memcpy.device_control = s3c24xx_dma_control;
+ s3cdma->memcpy.device_config = s3c24xx_dma_set_runtime_config;
+ s3cdma->memcpy.device_terminate_all = s3c24xx_dma_terminate_all;
/* Initialize slave engine for SoC internal dedicated peripherals */
dma_cap_set(DMA_SLAVE, s3cdma->slave.cap_mask);
@@ -1315,7 +1311,8 @@ static int s3c24xx_dma_probe(struct platform_device *pdev)
s3cdma->slave.device_issue_pending = s3c24xx_dma_issue_pending;
s3cdma->slave.device_prep_slave_sg = s3c24xx_dma_prep_slave_sg;
s3cdma->slave.device_prep_dma_cyclic = s3c24xx_dma_prep_dma_cyclic;
- s3cdma->slave.device_control = s3c24xx_dma_control;
+ s3cdma->slave.device_config = s3c24xx_dma_set_runtime_config;
+ s3cdma->slave.device_terminate_all = s3c24xx_dma_terminate_all;
/* Register as many memcpy channels as there are physical channels */
ret = s3c24xx_dma_init_virtual_channels(s3cdma, &s3cdma->memcpy,
--
2.1.1
next prev parent reply other threads:[~2014-10-22 15:46 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 ` [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 ` Maxime Ripard [this message]
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-38-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®