dmaengine: altera-msgdma: Correctly handle descriptor callbacks
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 25 Oct 2021 07:54:26 +0000 (09:54 +0200)
committerVinod Koul <vkoul@kernel.org>
Thu, 28 Oct 2021 17:23:54 +0000 (22:53 +0530)
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 altera-msgdma 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-1-lars@metafoo.de
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/altera-msgdma.c

index 5a2c7573b692725afb91148fac725baf6fc82b4c..f5b885d69cd3c9ec97420851bcf8d22d402764df 100644 (file)
@@ -585,16 +585,14 @@ static void msgdma_chan_desc_cleanup(struct msgdma_device *mdev)
        struct msgdma_sw_desc *desc, *next;
 
        list_for_each_entry_safe(desc, next, &mdev->done_list, node) {
-               dma_async_tx_callback callback;
-               void *callback_param;
+               struct dmaengine_desc_callback cb;
 
                list_del(&desc->node);
 
-               callback = desc->async_tx.callback;
-               callback_param = desc->async_tx.callback_param;
-               if (callback) {
+               dmaengine_desc_get_callback(&desc->async_tx, &cb);
+               if (dmaengine_desc_callback_valid(&cb)) {
                        spin_unlock(&mdev->lock);
-                       callback(callback_param);
+                       dmaengine_desc_callback_invoke(&cb, NULL);
                        spin_lock(&mdev->lock);
                }