Merge branch 'liblockdep-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / dma / cppi41.c

diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c
index a58eec3b2cad0d0ac5af88a9900dd79d633e8e5a..b743adf56465644670ed77f4a4153cce9015491a 100644 (file)
--- a/drivers/dma/cppi41.c
+++ b/drivers/dma/cppi41.c
@@ -1,3 +1,4 @@
+#include <linux/delay.h>
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
@@ -567,7 +568,7 @@ static int cppi41_tear_down_chan(struct cppi41_channel *c)
                reg |= GCR_TEARDOWN;
                cppi_writel(reg, c->gcr_reg);
                c->td_queued = 1;
-               c->td_retry = 100;
+               c->td_retry = 500;
        }
 
        if (!c->td_seen || !c->td_desc_seen) {
@@ -603,12 +604,16 @@ static int cppi41_tear_down_chan(struct cppi41_channel *c)
         * descriptor before the TD we fetch it from enqueue, it has to be
         * there waiting for us.
         */
-       if (!c->td_seen && c->td_retry)
+       if (!c->td_seen && c->td_retry) {
+               udelay(1);
                return -EAGAIN;
-
+       }
        WARN_ON(!c->td_retry);
+
        if (!c->td_desc_seen) {
                desc_phys = cppi41_pop_desc(cdd, c->q_num);
+               if (!desc_phys)
+                       desc_phys = cppi41_pop_desc(cdd, c->q_comp_num);
                WARN_ON(!desc_phys);
        }
 
@@ -1088,7 +1093,6 @@ static struct platform_driver cpp41_dma_driver = {
        .remove = cppi41_dma_remove,
        .driver = {
                .name = "cppi41-dma-engine",
-               .owner = THIS_MODULE,
                .pm = &cppi41_pm_ops,
                .of_match_table = of_match_ptr(cppi41_dma_ids),
        },