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

Commit f7638c90 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Vinod Koul
Browse files

dmaengine: rcar-dmac: Fix oops due to unintialized list in error ISR 



The error interrupt handler stops and reinitializes all channels. This
causes a crash for channels that have never been used, as their
descriptor lists are uninitialized. Fix it by initializing the
descriptor lists at probe time.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent f3915072

drivers/dma/sh/rcar-dmac.c

+11 −10
Original line number Diff line number Diff line
@@ -929,11 +929,6 @@ static int rcar_dmac_alloc_chan_resources(struct dma_chan *chan) 
	struct rcar_dmac_chan *rchan = to_rcar_dmac_chan(chan);

	int ret;



	INIT_LIST_HEAD(&rchan->desc.free);

	INIT_LIST_HEAD(&rchan->desc.pending);

	INIT_LIST_HEAD(&rchan->desc.active);

	INIT_LIST_HEAD(&rchan->desc.done);

	INIT_LIST_HEAD(&rchan->desc.wait);

	INIT_LIST_HEAD(&rchan->desc.chunks_free);

	INIT_LIST_HEAD(&rchan->desc.pages);
@@ -970,11 +965,11 @@ static void rcar_dmac_free_chan_resources(struct dma_chan *chan) 
		rchan->mid_rid = -EINVAL;

	}



	list_splice(&rchan->desc.free, &list);

	list_splice(&rchan->desc.pending, &list);

	list_splice(&rchan->desc.active, &list);

	list_splice(&rchan->desc.done, &list);

	list_splice(&rchan->desc.wait, &list);

	list_splice_init(&rchan->desc.free, &list);

	list_splice_init(&rchan->desc.pending, &list);

	list_splice_init(&rchan->desc.active, &list);

	list_splice_init(&rchan->desc.done, &list);

	list_splice_init(&rchan->desc.wait, &list);



	list_for_each_entry(desc, &list, node)

		rcar_dmac_realloc_hwdesc(rchan, desc, 0);
@@ -1519,6 +1514,12 @@ static int rcar_dmac_chan_probe(struct rcar_dmac *dmac, 


	spin_lock_init(&rchan->lock);



	INIT_LIST_HEAD(&rchan->desc.free);

	INIT_LIST_HEAD(&rchan->desc.pending);

	INIT_LIST_HEAD(&rchan->desc.active);

	INIT_LIST_HEAD(&rchan->desc.done);

	INIT_LIST_HEAD(&rchan->desc.wait);



	/* Request the channel interrupt. */

	sprintf(pdev_irqname, "ch%u", index);

	irq = platform_get_irq_byname(pdev, pdev_irqname);