Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28da2836 authored by Viresh Kumar's avatar Viresh Kumar Committed by Vinod Koul
Browse files

dmaengine/amba-pl08x: Schedule tasklet in case of error interrupt 



Currently, if error interrupt occurs, nothing is done in interrupt handler (just
clearing the interrupts). We must somehow indicate this to the user that DMA is
over, due to ERR interrupt or TC interrupt.

So, this patch just schedules existing tasklet, with a print showing error
interrupt has occurred on which channels.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 16ca8105

drivers/dma/amba-pl08x.c

+23 −21
Original line number Diff line number Diff line
@@ -1619,38 +1619,40 @@ static void pl08x_tasklet(unsigned long data) 
static irqreturn_t pl08x_irq(int irq, void *dev)

{

	struct pl08x_driver_data *pl08x = dev;

	u32 mask = 0;

	u32 val;

	int i;

	u32 mask = 0, err, tc, i;



	val = readl(pl08x->base + PL080_ERR_STATUS);

	if (val) {

		/* An error interrupt (on one or more channels) */

		dev_err(&pl08x->adev->dev,

			"%s error interrupt, register value 0x%08x\n",

				__func__, val);

		/*

		 * Simply clear ALL PL08X error interrupts,

		 * regardless of channel and cause

		 * FIXME: should be 0x00000003 on PL081 really.

		 */

		writel(0x000000FF, pl08x->base + PL080_ERR_CLEAR);

	/* check & clear - ERR & TC interrupts */

	err = readl(pl08x->base + PL080_ERR_STATUS);

	if (err) {

		dev_err(&pl08x->adev->dev, "%s error interrupt, register value 0x%08x\n",

			__func__, err);

		writel(err, pl08x->base + PL080_ERR_CLEAR);

	}

	val = readl(pl08x->base + PL080_INT_STATUS);

	tc = readl(pl08x->base + PL080_INT_STATUS);

	if (tc)

		writel(tc, pl08x->base + PL080_TC_CLEAR);



	if (!err && !tc)

		return IRQ_NONE;



	for (i = 0; i < pl08x->vd->channels; i++) {

		if ((1 << i) & val) {

		if (((1 << i) & err) || ((1 << i) & tc)) {

			/* Locate physical channel */

			struct pl08x_phy_chan *phychan = &pl08x->phy_chans[i];

			struct pl08x_dma_chan *plchan = phychan->serving;



			if (!plchan) {

				dev_err(&pl08x->adev->dev,

					"%s Error TC interrupt on unused channel: 0x%08x\n",

					__func__, i);

				continue;

			}



			/* Schedule tasklet on this channel */

			tasklet_schedule(&plchan->tasklet);



			mask |= (1 << i);

		}

	}

	/* Clear only the terminal interrupts on channels we processed */

	writel(mask, pl08x->base + PL080_TC_CLEAR);



	return mask ? IRQ_HANDLED : IRQ_NONE;

}