net: ethernet: mtk_eth_soc: fix WED + wifi reset
Subsystems (4)
Felix Fietkau
maintainerPATCH 1/1 net: ethernet: mtk_eth_soc: fix WED + wifi reset
The WLAN + WED reset sequence relies on being able to receive interrupts from the card, in order to synchronize individual steps with the firmware. When WED is stopped, leave interrupts running and rely on the driver turning off unwanted ones.
WED DMA also needs to be disabled before resetting.
--- drivers/net/ethernet/mediatek/mtk_wed.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/ethernet/mediatek/mtk_wed.c +1 -5
@@ -1074,13 +1074,13 @@ mtk_wed_dma_disable(struct mtk_wed_device *dev)static void mtk_wed_stop (struct mtk_wed_device *dev) { +mtk_wed_dma_disable (dev);mtk_wed_set_ext_int (dev, false);wed_w32 (dev,MTK_WED_WPDMA_INT_TRIGGER ,0 );wed_w32 (dev,MTK_WED_WDMA_INT_TRIGGER ,0 );wdma_w32 (dev,MTK_WDMA_INT_MASK ,0 );wdma_w32 (dev,MTK_WDMA_INT_GRP2 ,0 ); -wed_w32 (dev,MTK_WED_WPDMA_INT_MASK ,0 );if (!mtk_wed_get_rx_capa (dev))return ;
@@ -1093,7 +1093,6 @@ static void mtk_wed_deinit(struct mtk_wed_device *dev) {mtk_wed_stop (dev); -mtk_wed_dma_disable (dev); wed_clr(dev, MTK_WED_CTRL, MTK_WED_CTRL_WDMA_INT_AGENT_EN |
@@ -2605,9 +2604,6 @@ mtk_wed_irq_get(struct mtk_wed_device *dev, u32 mask)static void mtk_wed_irq_set_mask (struct mtk_wed_device *dev,u32 mask) { -if (!dev->running) -return ; -mtk_wed_set_ext_int (dev, !!mask);wed_w32 (dev,MTK_WED_INT_MASK , mask); }
Signature · 1 line
2.44.0
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Tue, 16 Apr 2024 10:23:29 +0200 you wrote:
The WLAN + WED reset sequence relies on being able to receive interrupts from the card, in order to synchronize individual steps with the firmware. When WED is stopped, leave interrupts running and rely on the driver turning off unwanted ones.
WED DMA also needs to be disabled before resetting.Fixes f78cd9c783e0 ("net: ethernet: mtk_wed: update mtk_wed_stop")Signed-off-by Felix Fietkau <[email protected]>[...]
Here is the summary with links:
- [net] net: ethernet: mtk_eth_soc: fix WED + wifi reset
https://git.kernel.org/netdev/net/c/94667949ec3b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html