From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Vinod Koul <vinod.koul@intel.com>, dmaengine@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
"Antoine Ténart" <antoine@free-electrons.com>,
"Russell King" <linux@arm.linux.org.uk>,
lars@metafoo.de,
"Maxime Ripard" <maxime.ripard@free-electrons.com>
Subject: [PATCH v5 06/61] dmaengine: Introduce a device_config callback
Date: Mon, 17 Nov 2014 14:42:00 +0100 [thread overview]
Message-ID: <1416231775-31252-7-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1416231775-31252-1-git-send-email-maxime.ripard@free-electrons.com>
The fact that the channel configuration is done in device_control is rather
misleading, since it's not really advertised as such, plus, the fact that the
framework exposes a function of its own makes it not really intuitive, while
we're losing the type checking whenever we pass that unsigned long argument.
Add a device_config callback to dma_device, with a fallback on the old
behaviour for now for existing drivers to opt in.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
include/linux/dmaengine.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 4d912575fec0..f797cb81355f 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -607,6 +607,8 @@ struct dma_tx_state {
* The function takes a buffer of size buf_len. The callback function will
* be called after period_len bytes have been transferred.
* @device_prep_interleaved_dma: Transfer expression in a generic way.
+ * @device_config: Pushes a new configuration to a channel, return 0 or an error
+ * code
* @device_control: manipulate all pending operations on a channel, returns
* zero or error code
* @device_tx_status: poll for transaction completion, the optional
@@ -673,6 +675,9 @@ struct dma_device {
struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)(
struct dma_chan *chan, struct dma_interleaved_template *xt,
unsigned long flags);
+
+ int (*device_config)(struct dma_chan *chan,
+ struct dma_slave_config *config);
int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
unsigned long arg);
@@ -696,6 +701,9 @@ static inline int dmaengine_device_control(struct dma_chan *chan,
static inline int dmaengine_slave_config(struct dma_chan *chan,
struct dma_slave_config *config)
{
+ if (chan->device->device_config)
+ return chan->device->device_config(chan, config);
+
return dmaengine_device_control(chan, DMA_SLAVE_CONFIG,
(unsigned long)config);
}
--
2.1.1
next prev parent reply other threads:[~2014-11-17 13:49 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 13:41 [PATCH v5 00/61] dmaengine: Implement generic slave capabilities retrieval Maxime Ripard
2014-11-17 13:41 ` [PATCH v5 01/61] serial: at91: Use dmaengine_slave_config API Maxime Ripard
2014-11-17 13:41 ` [PATCH v5 02/61] crypto: ux500: Use dmaengine_terminate_all API Maxime Ripard
2014-11-17 13:41 ` [PATCH v5 03/61] dmaengine: Make the destination abbreviation coherent Maxime Ripard
2014-11-17 13:41 ` [PATCH v5 04/61] dmaengine: Rework dma_chan_get Maxime Ripard
2014-11-17 13:41 ` [PATCH v5 05/61] dmaengine: Make channel allocation callbacks optional Maxime Ripard
2014-11-17 13:42 ` Maxime Ripard [this message]
2014-11-17 13:42 ` [PATCH v5 07/61] dmaengine: split out pause/resume operations from device_control Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 08/61] dmaengine: Add device_terminate_all callback Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 09/61] dmaengine: Remove the need to declare device_control Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 10/61] dmaengine: Create a generic dma_slave_caps callback Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 11/61] dmaengine: pl08x: Split device_control Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 12/61] dmaengine: hdmac: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 13/61] dmaengine: at_xdmac: split device_control Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 14/61] dmaengine: bcm2835: Split device_control Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 15/61] dmaengine: coh901318: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 16/61] dmaengine: cppi41: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 17/61] dmaengine: jz4740: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 18/61] dmaengine: dw: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 19/61] dmaengine: edma: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 20/61] dmaengine: ep93xx: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 21/61] dmaengine: fsl-edma: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 22/61] dmaengine: imx: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 23/61] dmaengine: imx-sdma: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 24/61] dmaengine: intel-mid-dma: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 25/61] dmaengine: ipu-idmac: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 26/61] dmaengine: k3: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 27/61] dmaengine: mmp-pdma: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 28/61] dmaengine: mmp-tdma: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 29/61] dmaengine: moxart: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 30/61] dmaengine: fsl-dma: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 31/61] dmaengine: mpc512x: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 32/61] dmaengine: mxs: " Maxime Ripard
2014-12-05 14:29 ` Vinod Koul
2014-11-17 13:42 ` [PATCH v5 33/61] dmaengine: nbpfaxi: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 34/61] dmaengine: omap: " Maxime Ripard
2014-12-05 14:27 ` Vinod Koul
2014-12-05 14:33 ` Maxime Ripard
2014-12-05 14:56 ` Vinod Koul
2014-12-05 17:07 ` Maxime Ripard
2014-12-05 17:39 ` Vinod Koul
2014-11-17 13:42 ` [PATCH v5 35/61] dmaengine: pl330: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 36/61] dmaengine: bam-dma: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 37/61] dmaengine: s3c24xx: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 38/61] dmaengine: sa11x0: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 39/61] dmaengine: sh: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 40/61] dmaengine: sirf: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 41/61] dmaengine: sun6i: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 42/61] dmaengine: d40: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 43/61] dmaengine: tegra20: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 44/61] dmaengine: xilinx: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 45/61] dmaengine: mv_xor: Remove device_control Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 46/61] dmaengine: pch-dma: Rename device_control Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 47/61] dmaengine: td: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 48/61] dmaengine: txx9: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 49/61] dmaengine: rapidio: tsi721: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 50/61] dmaengine: at_xdmac: Declare slave capabilities for the generic code Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 51/61] dmaengine: bcm2835: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 52/61] dmaengine: fsl-edma: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 53/61] dmaengine: edma: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 54/61] dmaengine: nbpfaxi: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 55/61] dmaengine: omap: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 56/61] dmaengine: pl330: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 57/61] dmaengine: sirf: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 58/61] dmaengine: sun6i: " Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 59/61] dmaengine: Add a warning for drivers not using the generic slave caps retrieval Maxime Ripard
2015-02-19 7:57 ` Viresh Kumar
2015-02-19 8:09 ` Jean Delvare
2015-02-19 8:53 ` Viresh Kumar
2015-02-20 6:24 ` Vinod Koul
2014-11-17 13:42 ` [PATCH v5 60/61] dmaengine: Remove device_control and device_slave_caps Maxime Ripard
2014-11-17 13:42 ` [PATCH v5 61/61] Documentation: dmaengine: Update the documentation Maxime Ripard
2014-12-08 6:17 ` [PATCH v5 00/61] dmaengine: Implement generic slave capabilities retrieval Vinod Koul
2014-12-08 9:32 ` Ludovic Desroches
2014-12-08 13:30 ` Vinod Koul
2014-12-08 14:31 ` Maxime Ripard
2014-12-08 14:18 ` Maxime Ripard
2014-12-08 16:28 ` Vinod Koul
2014-12-08 18:38 ` Maxime Ripard
2014-12-08 21:49 ` Lars-Peter Clausen
2014-12-11 17:03 ` Maxime Ripard
2014-12-09 4:43 ` Vinod Koul
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=1416231775-31252-7-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=antoine@free-electrons.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®