dmaengine: xilinx: xdma: Clarify the logic between cyclic/sg modes

We support both modes, but they perform totally different taks in the
interrupt handler. Clarify what shall be done in each case.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20231130111315.729430-3-miquel.raynal@bootlin.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/xilinx/xdma.c b/drivers/dma/xilinx/xdma.c
index 2c9c72d4b5a200f365d1c44a10065e6dca1db858..4efef1b5f89c43d346e83b9a5a7ce52c06d18fd0 100644 (file)
--- a/drivers/dma/xilinx/xdma.c
+++ b/drivers/dma/xilinx/xdma.c
@@ -765,26 +765,23 @@ static irqreturn_t xdma_channel_isr(int irq, void *dev_id)
                regmap_write(xdev->rmap, xchan->base + XDMA_CHAN_STATUS, st);
 
                vchan_cyclic_callback(vd);
-               goto out;
-       }
-
-       desc->completed_desc_num += complete_desc_num;
+       } else {
+               desc->completed_desc_num += complete_desc_num;
 
-       /*
-        * if all data blocks are transferred, remove and complete the request
-        */
-       if (desc->completed_desc_num == desc->desc_num) {
-               list_del(&vd->node);
-               vchan_cookie_complete(vd);
-               goto out;
-       }
+               /* if all data blocks are transferred, remove and complete the request */
+               if (desc->completed_desc_num == desc->desc_num) {
+                       list_del(&vd->node);
+                       vchan_cookie_complete(vd);
+                       goto out;
+               }
 
-       if (desc->completed_desc_num > desc->desc_num ||
-           complete_desc_num != XDMA_DESC_BLOCK_NUM * XDMA_DESC_ADJACENT)
-               goto out;
+               if (desc->completed_desc_num > desc->desc_num ||
+                   complete_desc_num != XDMA_DESC_BLOCK_NUM * XDMA_DESC_ADJACENT)
+                       goto out;
 
-       /* transfer the rest of data (SG only) */
-       xdma_xfer_start(xchan);
+               /* transfer the rest of data */
+               xdma_xfer_start(xchan);
+       }
 
 out:
        spin_unlock(&xchan->vchan.lock);