diff options
| author | Andy Green <andy.green@linaro.org> | 2016-08-29 10:30:49 -0700 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-08-31 10:09:32 +0530 |
| commit | 0173c895ed83f4654e7d6535088973725e76f304 (patch) | |
| tree | d7d5a0ab34f297a1bc377f8bcde7fe8d87871e06 /drivers/dma | |
| parent | aceaaa17e795b963880d71a03ab1ca9f4f597185 (diff) | |
| download | linux-stable-0173c895ed83f4654e7d6535088973725e76f304.tar.gz linux-stable-0173c895ed83f4654e7d6535088973725e76f304.tar.bz2 linux-stable-0173c895ed83f4654e7d6535088973725e76f304.zip | |
k3dma: Fix "nobody cared" message seen on any error
As it was before, as soon as the DMAC IP felt there was an error
he would return IRQ_NONE since no actual transfer had completed.
After spinning on that for 100K interrupts, Linux yanks the IRQ with
a "nobody cared" error.
This patch lets it handle the interrupt and keep the IRQ alive.
Cc: Zhangfei Gao <zhangfei.gao@linaro.org>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Andy Green <andy@warmcat.com>
Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Andy Green <andy.green@linaro.org>
[jstultz: Forward ported to mainline]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/k3dma.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index 7dc7816d2a0c..f46b9b86fc9b 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -221,11 +221,13 @@ static irqreturn_t k3_dma_int_handler(int irq, void *dev_id) writel_relaxed(err1, d->base + INT_ERR1_RAW); writel_relaxed(err2, d->base + INT_ERR2_RAW); - if (irq_chan) { + if (irq_chan) tasklet_schedule(&d->task); + + if (irq_chan || err1 || err2) return IRQ_HANDLED; - } else - return IRQ_NONE; + + return IRQ_NONE; } static int k3_dma_start_txd(struct k3_dma_chan *c) |