From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Vinod Koul <vinod.koul@intel.com>, dmaengine@vger.kernel.org
Cc: "Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
"Antoine Ténart" <antoine@free-electrons.com>,
lars@metafoo.de,
"Maxime Ripard" <maxime.ripard@free-electrons.com>
Subject: [PATCH 6/9] dmaengine: Create a generic dma_slave_caps callback
Date: Sat, 27 Sep 2014 10:54:42 +0200 [thread overview]
Message-ID: <1411808085-27792-7-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1411808085-27792-1-git-send-email-maxime.ripard@free-electrons.com>
dma_slave_caps is very important to the generic layers that might interact with
dmaengine, such as ASoC. Unfortunately, it has been added as yet another
dma_device callback, and most of the existing drivers haven't implemented it,
reducing its reliability.
Introduce a generic behaviour, pre-filling the dma_slave_caps struct with what
it knows about the dma controller, before calling the dma_device callback, both
to maintain a backward compatibility and to make sure that drivers can override
that generic behaviour.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
include/linux/dmaengine.h | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 4d0294ec3567..cfcbee145898 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -772,17 +772,24 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_interleaved_dma(
static inline int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps)
{
+ struct dma_device *device;
+
if (!chan || !caps)
return -EINVAL;
+ device = chan->device;
+
/* check if the channel supports slave transactions */
- if (!test_bit(DMA_SLAVE, chan->device->cap_mask.bits))
+ if (!test_bit(DMA_SLAVE, device->cap_mask.bits))
return -ENXIO;
- if (chan->device->device_slave_caps)
- return chan->device->device_slave_caps(chan, caps);
+ caps->cmd_pause = !!device->device_pause;
+ caps->cmd_terminate = !!device->device_terminate_all;
+
+ if (device->device_slave_caps)
+ return device->device_slave_caps(chan, caps);
- return -ENXIO;
+ return 0;
}
static inline int dmaengine_terminate_all(struct dma_chan *chan)
--
2.1.0
next prev parent reply other threads:[~2014-09-27 8:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-27 8:54 [PATCH 0/9] dmaengine: Implement generic slave capabilities retrieval Maxime Ripard
2014-09-27 8:54 ` [PATCH 1/9] dmaengine: Make the destination abbreviation coherent Maxime Ripard
2014-09-27 8:54 ` [PATCH 2/9] dmaengine: Make channel allocation callbacks optional Maxime Ripard
2014-09-28 16:07 ` Vinod Koul
2014-10-01 8:39 ` Maxime Ripard
2014-09-27 8:54 ` [PATCH 3/9] dmaengine: Introduce a device_config callback Maxime Ripard
2014-09-28 16:13 ` Vinod Koul
2014-09-28 16:14 ` Vinod Koul
2014-09-27 8:54 ` [PATCH 4/9] dmaengine: split out pause/resume operations from device_control Maxime Ripard
2014-09-27 8:54 ` [PATCH 5/9] dmaengine: Add device_terminate_all callback Maxime Ripard
2014-09-27 8:54 ` Maxime Ripard [this message]
2014-09-27 9:25 ` [PATCH 6/9] dmaengine: Create a generic dma_slave_caps callback Russell King - ARM Linux
2014-10-01 8:21 ` Maxime Ripard
2014-09-27 8:54 ` [PATCH 7/9] dmaengine: Move slave caps to dma_device Maxime Ripard
2014-09-27 9:28 ` Russell King - ARM Linux
2014-10-01 8:27 ` Maxime Ripard
2014-10-01 8:55 ` Russell King - ARM Linux
2014-09-27 8:54 ` [PATCH 8/9] dmaengine: Mark device_control as deprecated Maxime Ripard
2014-09-27 8:54 ` [PATCH 9/9] dmaengine: sun6i: Convert to generic slave_caps Maxime Ripard
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=1411808085-27792-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=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®