From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 21 Jun 2021 10:59:42 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v5.4.128~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72c5e5dec288d91f87f4425d4b2ea84a3c18692b;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch
---

diff --git a/queue-4.9/dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch b/queue-4.9/dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch
new file mode 100644
index 00000000000..5733a9b11ae
--- /dev/null
+++ b/queue-4.9/dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch
@@ -0,0 +1,52 @@
+From 4ad5dd2d7876d79507a20f026507d1a93b8fff10 Mon Sep 17 00:00:00 2001
+From: Bumyong Lee <bumyong.lee@samsung.com>
+Date: Fri, 7 May 2021 15:36:47 +0900
+Subject: dmaengine: pl330: fix wrong usage of spinlock flags in dma_cyclc
+
+From: Bumyong Lee <bumyong.lee@samsung.com>
+
+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: f6f2421c0a1c ("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>
+---
+ drivers/dma/pl330.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -2579,13 +2579,15 @@ static struct dma_async_tx_descriptor *p
+ 	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,
+@@ -2595,7 +2597,7 @@ static struct dma_async_tx_descriptor *p
+ 
+ 			list_move_tail(&first->node, &pl330->desc_pool);
+ 
+-			spin_unlock_irqrestore(&pl330->pool_lock, flags);
++			spin_unlock_irqrestore(&pl330->pool_lock, iflags);
+ 
+ 			return NULL;
+ 		}
diff --git a/queue-4.9/series b/queue-4.9/series
index d8b8431c1ea..617407017b9 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -40,3 +40,4 @@ tracing-do-no-increment-trace_clock_global-by-one.patch
 pci-mark-ti-c667x-to-avoid-bus-reset.patch
 pci-mark-some-nvidia-gpus-to-avoid-bus-reset.patch
 arcv2-save-abi-registers-across-signal-handling.patch
+dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch