mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
93cb81cf2b
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.96 Manually rebased: generic/hack-6.1/765-mxl-gpy-control-LED-reg-from-DT.patch reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/net/phy/mxl-gpy.c?h=v6.1.96&id=5bd1b7ab6ae5799c136e4319d8644c5ff9c71757 generic: Fix spelling in dmesg output during boot when using the fitblk driver. generic/pending-6.1/510-block-add-uImage.FIT-subimage-block-driver.patch All other patches automatically rebased. Build system: Kirkwood bcm53xx Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com>
56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
From 5fdd2623dd3eed156fa1ec65b2096da735bb0cde 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 1007/1024] 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(-)
|
|
|
|
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
|
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
|
@@ -383,11 +383,13 @@ static void axi_chan_block_xfer_start(st
|
|
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);
|
|
@@ -1029,6 +1031,14 @@ static noinline void axi_chan_handle_err
|
|
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);
|
|
|
|
--- 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;
|
|
};
|