From e8157ac1aae9fd25df66c3acb41d024365b5b7e8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 21 Jun 2021 12:59:16 +0200 Subject: [PATCH] 4.4-stable patches added patches: dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch --- ...usage-of-spinlock-flags-in-dma_cyclc.patch | 52 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 53 insertions(+) create mode 100644 queue-4.4/dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch diff --git a/queue-4.4/dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch b/queue-4.4/dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch new file mode 100644 index 00000000000..3f6d3989351 --- /dev/null +++ b/queue-4.4/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 +Date: Fri, 7 May 2021 15:36:47 +0900 +Subject: dmaengine: pl330: fix wrong usage of spinlock flags in dma_cyclc + +From: Bumyong Lee + +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 +Signed-off-by: Bumyong Lee +Signed-off-by: Chanho Park +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 +Signed-off-by: Greg Kroah-Hartman +--- + drivers/dma/pl330.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/dma/pl330.c ++++ b/drivers/dma/pl330.c +@@ -2531,13 +2531,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, +@@ -2547,7 +2549,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.4/series b/queue-4.4/series index 8c9ea52438f..0ebb6d206dd 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -33,3 +33,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 -- 2.47.2