This is a note to let you know that I've just added the patch titled
net: stmmac: stop each tx channel independently
to the 5.4-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-stop-each-tx-channel-independently.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a3e860a83397bf761ec1128a3f0ba186445992c6 Mon Sep 17 00:00:00 2001
From: Joakim Zhang <qiangqing.zhang@xxxxxxx>
Date: Thu, 25 Feb 2021 17:01:10 +0800
Subject: net: stmmac: stop each tx channel independently
From: Joakim Zhang <qiangqing.zhang@xxxxxxx>
commit a3e860a83397bf761ec1128a3f0ba186445992c6 upstream.
If clear GMAC_CONFIG_TE bit, it would stop all tx channels, but users
may only want to stop specific tx channel.
Fixes: 48863ce5940f ("stmmac: add DMA support for GMAC 4.xx")
Signed-off-by: Joakim Zhang <qiangqing.zhang@xxxxxxx>
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 ----
1 file changed, 4 deletions(-)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
@@ -60,10 +60,6 @@ void dwmac4_dma_stop_tx(void __iomem *io
value &= ~DMA_CONTROL_ST;
writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan));
-
- value = readl(ioaddr + GMAC_CONFIG);
- value &= ~GMAC_CONFIG_TE;
- writel(value, ioaddr + GMAC_CONFIG);
}
void dwmac4_dma_start_rx(void __iomem *ioaddr, u32 chan)
Patches currently in stable-queue which might be from qiangqing.zhang@xxxxxxx are
queue-5.4/net-stmmac-stop-each-tx-channel-independently.patch
queue-5.4/can-flexcan-enable-rx-fifo-after-frz-halt-valid.patch
queue-5.4/net-stmmac-fix-watchdog-timeout-during-suspend-resume-stress-test.patch
queue-5.4/can-flexcan-assert-frz-bit-in-flexcan_chip_freeze.patch
queue-5.4/can-flexcan-invoke-flexcan_chip_freeze-to-enter-freeze-mode.patch
