mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
dmaengine: xilinx_dma: Correctly handle cyclic descriptor callbacks
DMA clients can provide one of two types of callbacks. For this reason dmaengine drivers should not directly invoke `callback`, but always use `dmaengine_desc_callback_invoke()`. This makes sure that both types of callbacks are handled correctly. The xilinx_dma driver currently doesn't do this for cyclic descriptors and only handles the `callback` type callback. If the client used the `callback_result` type callback it will not be called. Fix this by switching to `dmaengine_desc_callback_valid()` and `dmaengine_desc_callback_invoke()`. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Link: https://lore.kernel.org/r/20211025075428.2094-2-lars@metafoo.de Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
parent
a34da7ef9a
commit
a63ddc3857
1 changed files with 4 additions and 6 deletions
|
@ -998,14 +998,12 @@ static void xilinx_dma_chan_handle_cyclic(struct xilinx_dma_chan *chan,
|
||||||
struct xilinx_dma_tx_descriptor *desc,
|
struct xilinx_dma_tx_descriptor *desc,
|
||||||
unsigned long *flags)
|
unsigned long *flags)
|
||||||
{
|
{
|
||||||
dma_async_tx_callback callback;
|
struct dmaengine_desc_callback cb;
|
||||||
void *callback_param;
|
|
||||||
|
|
||||||
callback = desc->async_tx.callback;
|
dmaengine_desc_get_callback(&desc->async_tx, &cb);
|
||||||
callback_param = desc->async_tx.callback_param;
|
if (dmaengine_desc_callback_valid(&cb)) {
|
||||||
if (callback) {
|
|
||||||
spin_unlock_irqrestore(&chan->lock, *flags);
|
spin_unlock_irqrestore(&chan->lock, *flags);
|
||||||
callback(callback_param);
|
dmaengine_desc_callback_invoke(&cb, NULL);
|
||||||
spin_lock_irqsave(&chan->lock, *flags);
|
spin_lock_irqsave(&chan->lock, *flags);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue