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

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.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 912f7c6f
...@@ -1667,27 +1667,27 @@ static void at_xdmac_tasklet(struct tasklet_struct *t) ...@@ -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_chan *atchan = from_tasklet(atchan, t, tasklet);
struct at_xdmac_desc *desc; struct at_xdmac_desc *desc;
struct dma_async_tx_descriptor *txd;
u32 error_mask; u32 error_mask;
dev_dbg(chan2dev(&atchan->chan), "%s: status=0x%08x\n", dev_dbg(chan2dev(&atchan->chan), "%s: status=0x%08x\n",
__func__, atchan->irq_status); __func__, atchan->irq_status);
error_mask = AT_XDMAC_CIS_RBEIS if (at_xdmac_chan_is_cyclic(atchan))
| AT_XDMAC_CIS_WBEIS return at_xdmac_handle_cyclic(atchan);
| AT_XDMAC_CIS_ROIS;
if (at_xdmac_chan_is_cyclic(atchan)) { error_mask = AT_XDMAC_CIS_RBEIS | AT_XDMAC_CIS_WBEIS |
at_xdmac_handle_cyclic(atchan); AT_XDMAC_CIS_ROIS;
} else if ((atchan->irq_status & AT_XDMAC_CIS_LIS)
|| (atchan->irq_status & error_mask)) { if (!(atchan->irq_status & AT_XDMAC_CIS_LIS) &&
struct dma_async_tx_descriptor *txd; !(atchan->irq_status & error_mask))
return;
if (atchan->irq_status & error_mask) if (atchan->irq_status & error_mask)
at_xdmac_handle_error(atchan); at_xdmac_handle_error(atchan);
spin_lock_irq(&atchan->lock); spin_lock_irq(&atchan->lock);
desc = list_first_entry(&atchan->xfers_list, desc = list_first_entry(&atchan->xfers_list, struct at_xdmac_desc,
struct at_xdmac_desc,
xfer_node); xfer_node);
dev_vdbg(chan2dev(&atchan->chan), "%s: desc 0x%p\n", __func__, desc); dev_vdbg(chan2dev(&atchan->chan), "%s: desc 0x%p\n", __func__, desc);
if (!desc->active_xfer) { if (!desc->active_xfer) {
...@@ -1709,11 +1709,9 @@ static void at_xdmac_tasklet(struct tasklet_struct *t) ...@@ -1709,11 +1709,9 @@ static void at_xdmac_tasklet(struct tasklet_struct *t)
spin_lock_irq(&atchan->lock); spin_lock_irq(&atchan->lock);
/* Move the xfer descriptors into the free descriptors list. */ /* Move the xfer descriptors into the free descriptors list. */
list_splice_tail_init(&desc->descs_list, list_splice_tail_init(&desc->descs_list, &atchan->free_descs_list);
&atchan->free_descs_list);
at_xdmac_advance_work(atchan); at_xdmac_advance_work(atchan);
spin_unlock_irq(&atchan->lock); spin_unlock_irq(&atchan->lock);
}
} }
static irqreturn_t at_xdmac_interrupt(int irq, void *dev_id) static irqreturn_t at_xdmac_interrupt(int irq, void *dev_id)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment