Commit a61210ca authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Vinod Koul
Browse files

dmaengine: at_xdmac: Remove a level of indentation in at_xdmac_tasklet() 



Apart of making the code easier to read, this patch is a prerequisite for
a functional change: tasklets run with interrupts enabled, so we need to
protect atchan->irq_status with spin_lock_irq() otherwise the tasklet can
be interrupted by the IRQ that modifies irq_status. atchan->irq_status
will be protected in a further patch.

Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20211215110115.191749-12-tudor.ambarus@microchip.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 912f7c6f

drivers/dma/at_xdmac.c

+34 −36
Original line number Diff line number Diff line
@@ -1667,27 +1667,27 @@ static void at_xdmac_tasklet(struct tasklet_struct *t) 
{

	struct at_xdmac_chan	*atchan = from_tasklet(atchan, t, tasklet);

	struct at_xdmac_desc	*desc;

	struct dma_async_tx_descriptor *txd;

	u32			error_mask;



	dev_dbg(chan2dev(&atchan->chan), "%s: status=0x%08x\n",

		__func__, atchan->irq_status);



	error_mask = AT_XDMAC_CIS_RBEIS

		     | AT_XDMAC_CIS_WBEIS

		     | AT_XDMAC_CIS_ROIS;

	if (at_xdmac_chan_is_cyclic(atchan))

		return at_xdmac_handle_cyclic(atchan);



	if (at_xdmac_chan_is_cyclic(atchan)) {

		at_xdmac_handle_cyclic(atchan);

	} else if ((atchan->irq_status & AT_XDMAC_CIS_LIS)

		   || (atchan->irq_status & error_mask)) {

		struct dma_async_tx_descriptor  *txd;

	error_mask = AT_XDMAC_CIS_RBEIS | AT_XDMAC_CIS_WBEIS |

		AT_XDMAC_CIS_ROIS;



	if (!(atchan->irq_status & AT_XDMAC_CIS_LIS) &&

	    !(atchan->irq_status & error_mask))

		return;



	if (atchan->irq_status & error_mask)

		at_xdmac_handle_error(atchan);



	spin_lock_irq(&atchan->lock);

		desc = list_first_entry(&atchan->xfers_list,

					struct at_xdmac_desc,

	desc = list_first_entry(&atchan->xfers_list, struct at_xdmac_desc,

				xfer_node);

	dev_vdbg(chan2dev(&atchan->chan), "%s: desc 0x%p\n", __func__, desc);

	if (!desc->active_xfer) {
@@ -1709,12 +1709,10 @@ static void at_xdmac_tasklet(struct tasklet_struct *t) 


	spin_lock_irq(&atchan->lock);

	/* Move the xfer descriptors into the free descriptors list. */

		list_splice_tail_init(&desc->descs_list,

				      &atchan->free_descs_list);

	list_splice_tail_init(&desc->descs_list, &atchan->free_descs_list);

	at_xdmac_advance_work(atchan);

	spin_unlock_irq(&atchan->lock);

}

}



static irqreturn_t at_xdmac_interrupt(int irq, void *dev_id)

{