Commit 94667949 authored by Felix Fietkau's avatar Felix Fietkau Committed by Jakub Kicinski
Browse files

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.

Fixes: f78cd9c7 ("net: ethernet: mtk_wed: update mtk_wed_stop")
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20240416082330.82564-1-nbd@nbd.name


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d3620460

drivers/net/ethernet/mediatek/mtk_wed.c

+1 −5
Original line number Diff line number Diff line
@@ -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);

}