Commit 3d1224a9 authored May 07, 2021 by Bumyong Lee Committed by Sasha Levin Jun 30, 2021

dmaengine: pl330: fix wrong usage of spinlock flags in dma_cyclc



commit 4ad5dd2d7876d79507a20f026507d1a93b8fff10 upstream.

flags varible which is the input parameter of pl330_prep_dma_cyclic()
should not be used by spinlock_irq[save/restore] function.

Signed-off-by: Jongho Park <jongho7.park@samsung.com>
Signed-off-by: Bumyong Lee <bumyong.lee@samsung.com>
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
Link: https://lore.kernel.org/r/20210507063647.111209-1-chanho61.park@samsung.com


Fixes: f6f2421c ("dmaengine: pl330: Merge dma_pl330_dmac and pl330_dmac structs")
Cc: stable@vger.kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f2f1b3a3

drivers/dma/pl330.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -2671,13 +2671,15 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(
		for (i = 0; i < len / period_len; i++) {
		desc = pl330_get_desc(pch);
		if (!desc) {
		unsigned long iflags;

		dev_err(pch->dmac->ddma.dev, "%s:%d Unable to fetch desc\n",
		__func__, __LINE__);

		if (!first)
		return NULL;

		spin_lock_irqsave(&pl330->pool_lock, flags);
		spin_lock_irqsave(&pl330->pool_lock, iflags);

		while (!list_empty(&first->node)) {
		desc = list_entry(first->node.next,
		@@ -2687,7 +2689,7 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(

		list_move_tail(&first->node, &pl330->desc_pool);

		spin_unlock_irqrestore(&pl330->pool_lock, flags);
		spin_unlock_irqrestore(&pl330->pool_lock, iflags);

		return NULL;
		}