jh71x0: update patches and config

[openwrt/staging/wigyori.git] / target / linux / jh71x0 / patches-6.1 / 0126-dmaengine-dw-axi-dmac-Handle-xfer-start-while-non-id.patch

diff --git a/target/linux/jh71x0/patches-6.1/0126-dmaengine-dw-axi-dmac-Handle-xfer-start-while-non-id.patch b/target/linux/jh71x0/patches-6.1/0126-dmaengine-dw-axi-dmac-Handle-xfer-start-while-non-id.patch
deleted file mode 100644 (file)
index 3707cc1..0000000
--- a/target/linux/jh71x0/patches-6.1/0126-dmaengine-dw-axi-dmac-Handle-xfer-start-while-non-id.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From f2c0c17058bc06786b4d7d64d4bf1e1a498304c4 Mon Sep 17 00:00:00 2001
-From: Samin Guo <samin.guo@starfivetech.com>
-Date: Wed, 17 Nov 2021 14:50:45 +0800
-Subject: [PATCH 126/132] dmaengine: dw-axi-dmac: Handle xfer start while
- non-idle
-
-Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
-Signed-off-by: Curry Zhang <curry.zhang@starfivetech.com>
----
- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 12 +++++++++++-
- drivers/dma/dw-axi-dmac/dw-axi-dmac.h          |  1 +
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-index 6937cc0c0b65..f71105de7e65 100644
---- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-@@ -382,11 +382,13 @@ static void axi_chan_block_xfer_start(struct axi_dma_chan *chan,
-       u32 irq_mask;
-       u8 lms = 0; /* Select AXI0 master for LLI fetching */
- 
-+      chan->is_err = false;
-       if (unlikely(axi_chan_is_hw_enable(chan))) {
-               dev_err(chan2dev(chan), "%s is non-idle!\n",
-                       axi_chan_name(chan));
- 
--              return;
-+              axi_chan_disable(chan);
-+              chan->is_err = true;
-       }
- 
-       axi_dma_enable(chan->chip);
-@@ -1028,6 +1030,14 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)
-                       axi_chan_name(chan));
-               goto out;
-       }
-+      if (chan->is_err) {
-+              struct axi_dma_desc *desc = vd_to_axi_desc(vd);
-+
-+              axi_chan_block_xfer_start(chan, desc);
-+              chan->is_err = false;
-+              goto out;
-+      }
-+
-       /* Remove the completed descriptor from issued list */
-       list_del(&vd->node);
- 
-diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
-index eb267cb24f67..10d96a423bb2 100644
---- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
-+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
-@@ -50,6 +50,7 @@ struct axi_dma_chan {
-       struct dma_slave_config         config;
-       enum dma_transfer_direction     direction;
-       bool                            cyclic;
-+      bool                            is_err;
-       /* these other elements are all protected by vc.lock */
-       bool                            is_paused;
- };
--- 
-2.20.1
-