Merge branch 'topic/edma' into for-linus

[deliverable/linux.git] / drivers / dma / edma.c

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 04070baab78ab0cc7772085dd70828741317dd5a..b95ef7482c524718ef4bd3d9a32389167e6fd92b 100644 (file)
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -1069,10 +1069,8 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
 
        edesc = kzalloc(sizeof(*edesc) + sg_len * sizeof(edesc->pset[0]),
                        GFP_ATOMIC);
-       if (!edesc) {
-               dev_err(dev, "%s: Failed to allocate a descriptor\n", __func__);
+       if (!edesc)
                return NULL;
-       }
 
        edesc->pset_nr = sg_len;
        edesc->residue = 0;
@@ -1114,14 +1112,17 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
                edesc->absync = ret;
                edesc->residue += sg_dma_len(sg);
 
-               /* If this is the last in a current SG set of transactions,
-                  enable interrupts so that next set is processed */
-               if (!((i+1) % MAX_NR_SG))
-                       edesc->pset[i].param.opt |= TCINTEN;
-
-               /* If this is the last set, enable completion interrupt flag */
                if (i == sg_len - 1)
+                       /* Enable completion interrupt */
                        edesc->pset[i].param.opt |= TCINTEN;
+               else if (!((i+1) % MAX_NR_SG))
+                       /*
+                        * Enable early completion interrupt for the
+                        * intermediateset. In this case the driver will be
+                        * notified when the paRAM set is submitted to TC. This
+                        * will allow more time to set up the next set of slots.
+                        */
+                       edesc->pset[i].param.opt |= (TCINTEN | TCCMODE);
        }
        edesc->residue_stat = edesc->residue;
 
@@ -1173,10 +1174,8 @@ static struct dma_async_tx_descriptor *edma_prep_dma_memcpy(
 
        edesc = kzalloc(sizeof(*edesc) + nslots * sizeof(edesc->pset[0]),
                        GFP_ATOMIC);
-       if (!edesc) {
-               dev_dbg(dev, "Failed to allocate a descriptor\n");
+       if (!edesc)
                return NULL;
-       }
 
        edesc->pset_nr = nslots;
        edesc->residue = edesc->residue_stat = len;
@@ -1298,10 +1297,8 @@ static struct dma_async_tx_descriptor *edma_prep_dma_cyclic(
 
        edesc = kzalloc(sizeof(*edesc) + nslots * sizeof(edesc->pset[0]),
                        GFP_ATOMIC);
-       if (!edesc) {
-               dev_err(dev, "%s: Failed to allocate a descriptor\n", __func__);
+       if (!edesc)
                return NULL;
-       }
 
        edesc->cyclic = 1;
        edesc->pset_nr = nslots;
@@ -1537,8 +1534,17 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
 
        dev_vdbg(ecc->dev, "dma_ccerr_handler\n");
 
-       if (!edma_error_pending(ecc))
+       if (!edma_error_pending(ecc)) {
+               /*
+                * The registers indicate no pending error event but the irq
+                * handler has been called.
+                * Ask eDMA to re-evaluate the error registers.
+                */
+               dev_err(ecc->dev, "%s: Error interrupt without error event!\n",
+                       __func__);
+               edma_write(ecc, EDMA_EEVAL, 1);
                return IRQ_NONE;
+       }
 
        while (1) {
                /* Event missed register(s) */
@@ -2198,10 +2204,8 @@ static int edma_probe(struct platform_device *pdev)
                return ret;
 
        ecc = devm_kzalloc(dev, sizeof(*ecc), GFP_KERNEL);
-       if (!ecc) {
-               dev_err(dev, "Can't allocate controller\n");
+       if (!ecc)
                return -ENOMEM;
-       }
 
        ecc->dev = dev;
        ecc->id = pdev->id;