Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dmaengine: zynqmp_dma: Correctly handle 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 zynqmp_dma driver currently doesn't do this 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-3-lars@metafoo.de
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Lars-Peter Clausen and committed by
Vinod Koul
1825ecc9 a63ddc38

+4 -6
+4 -6
drivers/dma/xilinx/zynqmp_dma.c
··· 605 605 spin_lock_irqsave(&chan->lock, irqflags); 606 606 607 607 list_for_each_entry_safe(desc, next, &chan->done_list, node) { 608 - dma_async_tx_callback callback; 609 - void *callback_param; 608 + struct dmaengine_desc_callback cb; 610 609 611 - callback = desc->async_tx.callback; 612 - callback_param = desc->async_tx.callback_param; 613 - if (callback) { 610 + dmaengine_desc_get_callback(&desc->async_tx, &cb); 611 + if (dmaengine_desc_callback_valid(&cb)) { 614 612 spin_unlock_irqrestore(&chan->lock, irqflags); 615 - callback(callback_param); 613 + dmaengine_desc_callback_invoke(&cb, NULL); 616 614 spin_lock_irqsave(&chan->lock, irqflags); 617 615 } 618 616