diff options
Diffstat (limited to 'include/linux/dmaengine.h')
-rw-r--r-- | include/linux/dmaengine.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 20ea12c86fd0..0731802f876f 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
@@ -107,6 +107,19 @@ enum dma_ctrl_flags { | |||
107 | }; | 107 | }; |
108 | 108 | ||
109 | /** | 109 | /** |
110 | * enum dma_ctrl_cmd - DMA operations that can optionally be exercised | ||
111 | * on a running channel. | ||
112 | * @DMA_TERMINATE_ALL: terminate all ongoing transfers | ||
113 | * @DMA_PAUSE: pause ongoing transfers | ||
114 | * @DMA_RESUME: resume paused transfer | ||
115 | */ | ||
116 | enum dma_ctrl_cmd { | ||
117 | DMA_TERMINATE_ALL, | ||
118 | DMA_PAUSE, | ||
119 | DMA_RESUME, | ||
120 | }; | ||
121 | |||
122 | /** | ||
110 | * enum sum_check_bits - bit position of pq_check_flags | 123 | * enum sum_check_bits - bit position of pq_check_flags |
111 | */ | 124 | */ |
112 | enum sum_check_bits { | 125 | enum sum_check_bits { |
@@ -261,7 +274,8 @@ struct dma_async_tx_descriptor { | |||
261 | * @device_prep_dma_memset: prepares a memset operation | 274 | * @device_prep_dma_memset: prepares a memset operation |
262 | * @device_prep_dma_interrupt: prepares an end of chain interrupt operation | 275 | * @device_prep_dma_interrupt: prepares an end of chain interrupt operation |
263 | * @device_prep_slave_sg: prepares a slave dma operation | 276 | * @device_prep_slave_sg: prepares a slave dma operation |
264 | * @device_terminate_all: terminate all pending operations | 277 | * @device_control: manipulate all pending operations on a channel, returns |
278 | * zero or error code | ||
265 | * @device_is_tx_complete: poll for transaction completion | 279 | * @device_is_tx_complete: poll for transaction completion |
266 | * @device_issue_pending: push pending transactions to hardware | 280 | * @device_issue_pending: push pending transactions to hardware |
267 | */ | 281 | */ |
@@ -313,7 +327,7 @@ struct dma_device { | |||
313 | struct dma_chan *chan, struct scatterlist *sgl, | 327 | struct dma_chan *chan, struct scatterlist *sgl, |
314 | unsigned int sg_len, enum dma_data_direction direction, | 328 | unsigned int sg_len, enum dma_data_direction direction, |
315 | unsigned long flags); | 329 | unsigned long flags); |
316 | void (*device_terminate_all)(struct dma_chan *chan); | 330 | int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd); |
317 | 331 | ||
318 | enum dma_status (*device_is_tx_complete)(struct dma_chan *chan, | 332 | enum dma_status (*device_is_tx_complete)(struct dma_chan *chan, |
319 | dma_cookie_t cookie, dma_cookie_t *last, | 333 | dma_cookie_t cookie, dma_cookie_t *last, |