This is a note to let you know that I've just added the patch titled
net: stmmac: increase the timeout for dma reset
to the 5.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-stmmac-increase-the-timeout-for-dma-reset.patch
and it can be found in the queue-5.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat Dec 19 11:38:44 AM CET 2020
From: Fugang Duan <fugang.duan@xxxxxxx>
Date: Mon, 7 Dec 2020 18:51:37 +0800
Subject: net: stmmac: increase the timeout for dma reset
From: Fugang Duan <fugang.duan@xxxxxxx>
[ Upstream commit 9d14edfdeabf37d8d8f045e63e5873712aadcd6b ]
Current timeout value is not enough for gmac5 dma reset
on imx8mp platform, increase the timeout range.
Signed-off-by: Fugang Duan <fugang.duan@xxxxxxx>
Signed-off-by: Joakim Zhang <qiangqing.zhang@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
@@ -22,7 +22,7 @@ int dwmac4_dma_reset(void __iomem *ioadd
return readl_poll_timeout(ioaddr + DMA_BUS_MODE, value,
!(value & DMA_BUS_MODE_SFT_RESET),
- 10000, 100000);
+ 10000, 1000000);
}
void dwmac4_set_rx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan)
Patches currently in stable-queue which might be from fugang.duan@xxxxxxx are
queue-5.9/net-stmmac-free-tx-skb-buffer-in-stmmac_resume.patch
queue-5.9/net-stmmac-overwrite-the-dma_cap.addr64-according-to-hw-design.patch
queue-5.9/net-stmmac-start-phylink-instance-before-stmmac_hw_setup.patch
queue-5.9/net-stmmac-delete-the-eee_ctrl_timer-after-napi-disabled.patch
queue-5.9/net-stmmac-increase-the-timeout-for-dma-reset.patch
