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 4/9] dmaengine: split out pause/resume operations from device_control
Date: Sat, 27 Sep 2014 10:54:40 +0200 [thread overview]
Message-ID: <1411808085-27792-5-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1411808085-27792-1-git-send-email-maxime.ripard@free-electrons.com>
Split out the pause and resume operations to callbacks of their own. In order
to preserve some backwark compatibility, the dmaengine_pause/dmaengine_resume
are still falling back on dmaengine_device_control.
Hopefully, that will allow to get the device capabilities in a generic way,
removing the need to implement device_slave_caps.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
include/linux/dmaengine.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 7937f81e5e2e..b89c8004fcd8 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -612,6 +612,10 @@ struct dma_tx_state {
* code
* @device_control: manipulate all pending operations on a channel, returns
* zero or error code
+ * @device_pause: Pauses any transfer happening on a channel. Returns
+ * 0 or an error code
+ * @device_resume: Resumes any transfer on a channel previously
+ * paused. Returns 0 or an error code
* @device_tx_status: poll for transaction completion, the optional
* txstate parameter can be supplied with a pointer to get a
* struct with auxiliary transfer status information, otherwise the call
@@ -680,6 +684,8 @@ struct dma_device {
struct dma_slave_config *config);
int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
unsigned long arg);
+ int (*device_pause)(struct dma_chan *chan);
+ int (*device_resume)(struct dma_chan *chan);
enum dma_status (*device_tx_status)(struct dma_chan *chan,
dma_cookie_t cookie,
struct dma_tx_state *txstate);
@@ -783,11 +789,17 @@ static inline int dmaengine_terminate_all(struct dma_chan *chan)
static inline int dmaengine_pause(struct dma_chan *chan)
{
+ if (chan->device->device_pause)
+ return chan->device->device_pause(chan);
+
return dmaengine_device_control(chan, DMA_PAUSE, 0);
}
static inline int dmaengine_resume(struct dma_chan *chan)
{
+ if (chan->device->device_resume)
+ return chan->device->device_resume(chan);
+
return dmaengine_device_control(chan, DMA_RESUME, 0);
}
--
2.1.0
next prev parent reply other threads:[~2014-09-27 8:56 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 ` Maxime Ripard [this message]
2014-09-27 8:54 ` [PATCH 5/9] dmaengine: Add device_terminate_all callback Maxime Ripard
2014-09-27 8:54 ` [PATCH 6/9] dmaengine: Create a generic dma_slave_caps callback Maxime Ripard
2014-09-27 9:25 ` 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-5-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®