]> rtime.felk.cvut.cz Git - vajnamar/linux-xlnx.git/commitdiff
dma: zynqmp_dma: Fix issues with overflow interrupt
authorKedareswara rao Appana <appana.durga.rao@xilinx.com>
Fri, 24 Feb 2017 04:57:52 +0000 (10:27 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 24 Feb 2017 07:13:24 +0000 (08:13 +0100)
This patch fixes the below issues.
--> Need to clear the channel data count register
when overflow interrupts occurs.
--> Reduce the log level from _info to _dbg when
overflow interrupt occurs.

Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/dma/xilinx/zynqmp_dma.c

index 6d221e5c72ee116511a4c2d7459e066ab1a6ba30..78737daf6bdbac5a4ed40a40b4ef91a32149fe46 100644 (file)
@@ -47,6 +47,7 @@
 #define ZYNQMP_DMA_SRC_START_MSB       0x15C
 #define ZYNQMP_DMA_DST_START_LSB       0x160
 #define ZYNQMP_DMA_DST_START_MSB       0x164
+#define ZYNQMP_DMA_TOTAL_BYTE          0x188
 #define ZYNQMP_DMA_RATE_CTRL           0x18C
 #define ZYNQMP_DMA_IRQ_SRC_ACCT                0x190
 #define ZYNQMP_DMA_IRQ_DST_ACCT                0x194
@@ -506,6 +507,7 @@ static int zynqmp_dma_alloc_chan_resources(struct dma_chan *dchan)
 static void zynqmp_dma_start(struct zynqmp_dma_chan *chan)
 {
        writel(ZYNQMP_DMA_INT_EN_DEFAULT_MASK, chan->regs + ZYNQMP_DMA_IER);
+       writel(0, chan->regs + ZYNQMP_DMA_TOTAL_BYTE);
        chan->idle = false;
        writel(ZYNQMP_DMA_ENABLE, chan->regs + ZYNQMP_DMA_CTRL2);
 }
@@ -519,6 +521,8 @@ static void zynqmp_dma_handle_ovfl_int(struct zynqmp_dma_chan *chan, u32 status)
 {
        u32 val;
 
+       if (status & ZYNQMP_DMA_BYTE_CNT_OVRFL)
+               writel(0, chan->regs + ZYNQMP_DMA_TOTAL_BYTE);
        if (status & ZYNQMP_DMA_IRQ_DST_ACCT_ERR)
                val = readl(chan->regs + ZYNQMP_DMA_IRQ_DST_ACCT);
        if (status & ZYNQMP_DMA_IRQ_SRC_ACCT_ERR)
@@ -715,7 +719,7 @@ static irqreturn_t zynqmp_dma_irq_handler(int irq, void *data)
 
        if (status & ZYNQMP_DMA_INT_OVRFL) {
                zynqmp_dma_handle_ovfl_int(chan, status);
-               dev_info(chan->dev, "Channel %p overflow interrupt\n", chan);
+               dev_dbg(chan->dev, "Channel %p overflow interrupt\n", chan);
                ret = IRQ_HANDLED;
        }