powerpc/512x: fix the hanged dma transfer issue
authorIlya Yanok <yanok@emcraft.com>
Tue, 26 Oct 2010 23:52:56 +0000 (01:52 +0200)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 30 Dec 2010 05:28:14 +0000 (22:28 -0700)
Current code clears interrupt active status _after_ submitting new
transfers. This leaves a possibility of clearing the interrupt for this
new transfer (if it is triggered fast enough) and thus lose this
interrupt. We want to clear interrupt active status _before_ new
transfers is submitted and for current channel only.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Acked-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
drivers/dma/mpc512x_dma.c

index 1bc04aa27b14b5353ad29aa1fcc235fa30c123b4..071752727718dbac0470c739520f9879e0bf05d0 100644 (file)
@@ -276,6 +276,9 @@ static void mpc_dma_irq_process(struct mpc_dma *mdma, u32 is, u32 es, int off)
 
                spin_lock(&mchan->lock);
 
+               out_8(&mdma->regs->dmacint, ch + off);
+               out_8(&mdma->regs->dmacerr, ch + off);
+
                /* Check error status */
                if (es & (1 << ch))
                        list_for_each_entry(mdesc, &mchan->active, node)
@@ -309,12 +312,6 @@ static irqreturn_t mpc_dma_irq(int irq, void *data)
        mpc_dma_irq_process(mdma, in_be32(&mdma->regs->dmaintl),
                                        in_be32(&mdma->regs->dmaerrl), 0);
 
-       /* Ack interrupt on all channels */
-       out_be32(&mdma->regs->dmainth, 0xFFFFFFFF);
-       out_be32(&mdma->regs->dmaintl, 0xFFFFFFFF);
-       out_be32(&mdma->regs->dmaerrh, 0xFFFFFFFF);
-       out_be32(&mdma->regs->dmaerrl, 0xFFFFFFFF);
-
        /* Schedule tasklet */
        tasklet_schedule(&mdma->tasklet);