mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-02 12:06:50 +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>
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From 92c2dc96af79b2f181cc97157ce3ef2be5b48f4c Mon Sep 17 00:00:00 2001
|
|
From: Walker Chen <walker.chen@starfivetech.com>
|
|
Date: Wed, 22 Mar 2023 17:48:19 +0800
|
|
Subject: [PATCH 113/122] dmaengine: dw-axi-dmac: Increase polling time to DMA
|
|
transmission completion status
|
|
|
|
The bit DMAC_CHEN[0] is automatically cleared by hardware to disable the
|
|
channel after the last AMBA transfer of the DMA transfer to the
|
|
destination has completed. Software can therefore poll this bit to
|
|
determine when this channel is free for a new DMA transfer.
|
|
This time requires at least 40 milliseconds on JH7110 SoC, otherwise an
|
|
error message 'failed to stop' will be reported.
|
|
|
|
Signed-off-by: Walker Chen <walker.chen@starfivetech.com>
|
|
---
|
|
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
|
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
|
@@ -1145,7 +1145,7 @@ static int dma_chan_terminate_all(struct
|
|
axi_chan_disable(chan);
|
|
|
|
ret = readl_poll_timeout_atomic(chan->chip->regs + DMAC_CHEN, val,
|
|
- !(val & chan_active), 1000, 10000);
|
|
+ !(val & chan_active), 1000, 50000);
|
|
if (ret == -ETIMEDOUT)
|
|
dev_warn(dchan2dev(dchan),
|
|
"%s failed to stop\n", axi_chan_name(chan));
|