hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dmaengine: Add device_terminate_all callback 

Split out the terminate_all command from device_control to a dma_device
callback. In order to preserve backward capability, still rely on
device_control if no such callback has been implemented.

Eventually, this will allow to create a generic dma_slave_caps callback.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Maxime Ripard 2014-11-17 14:42:02 +01:00 committed by Vinod Koul
parent 23a3ea2f5b
commit 7fa0cf462d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/dmaengine.h
View File

@ -616,6 +616,8 @@ struct dma_tx_state {
* 0 or an error code * 0 or an error code
* @device_resume: Resumes any transfer on a channel previously * @device_resume: Resumes any transfer on a channel previously
* paused. Returns 0 or an error code * paused. Returns 0 or an error code
* @device_terminate_all: Aborts all transfers on a channel. Returns 0
* or an error code
* @device_tx_status: poll for transaction completion, the optional * @device_tx_status: poll for transaction completion, the optional
* txstate parameter can be supplied with a pointer to get a * txstate parameter can be supplied with a pointer to get a
* struct with auxiliary transfer status information, otherwise the call * struct with auxiliary transfer status information, otherwise the call
@ -687,6 +689,7 @@ struct dma_device {
unsigned long arg); unsigned long arg);
int (*device_pause)(struct dma_chan *chan); int (*device_pause)(struct dma_chan *chan);
int (*device_resume)(struct dma_chan *chan); int (*device_resume)(struct dma_chan *chan);
int (*device_terminate_all)(struct dma_chan *chan);
enum dma_status (*device_tx_status)(struct dma_chan *chan, enum dma_status (*device_tx_status)(struct dma_chan *chan,
dma_cookie_t cookie, dma_cookie_t cookie,
@ -796,6 +799,9 @@ static inline int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_cap
static inline int dmaengine_terminate_all(struct dma_chan *chan) static inline int dmaengine_terminate_all(struct dma_chan *chan)
{ {
if (chan->device->device_terminate_all)
return chan->device->device_terminate_all(chan);
return dmaengine_device_control(chan, DMA_TERMINATE_ALL, 0); return dmaengine_device_control(chan, DMA_TERMINATE_ALL, 0);
} }