2
0

963-net-ethernet-mtk_eth_soc-fix-WED-wifi-reset.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. From: Felix Fietkau <[email protected]>
  2. Date: Thu, 18 Jan 2024 12:51:32 +0100
  3. Subject: [PATCH] net: ethernet: mtk_eth_soc: fix WED + wifi reset
  4. The WLAN + WED reset sequence relies on being able to receive interrupts from
  5. the card, in order to synchronize individual steps with the firmware.
  6. When WED is stopped, leave interrupts running and rely on the driver turning
  7. off unwanted ones.
  8. WED DMA also needs to be disabled before resetting.
  9. Fixes: f78cd9c783e0 ("net: ethernet: mtk_wed: update mtk_wed_stop")
  10. Signed-off-by: Felix Fietkau <[email protected]>
  11. ---
  12. --- a/drivers/net/ethernet/mediatek/mtk_wed.c
  13. +++ b/drivers/net/ethernet/mediatek/mtk_wed.c
  14. @@ -1072,13 +1072,13 @@ mtk_wed_dma_disable(struct mtk_wed_devic
  15. static void
  16. mtk_wed_stop(struct mtk_wed_device *dev)
  17. {
  18. + mtk_wed_dma_disable(dev);
  19. mtk_wed_set_ext_int(dev, false);
  20. wed_w32(dev, MTK_WED_WPDMA_INT_TRIGGER, 0);
  21. wed_w32(dev, MTK_WED_WDMA_INT_TRIGGER, 0);
  22. wdma_w32(dev, MTK_WDMA_INT_MASK, 0);
  23. wdma_w32(dev, MTK_WDMA_INT_GRP2, 0);
  24. - wed_w32(dev, MTK_WED_WPDMA_INT_MASK, 0);
  25. if (!mtk_wed_get_rx_capa(dev))
  26. return;
  27. @@ -1091,7 +1091,6 @@ static void
  28. mtk_wed_deinit(struct mtk_wed_device *dev)
  29. {
  30. mtk_wed_stop(dev);
  31. - mtk_wed_dma_disable(dev);
  32. wed_clr(dev, MTK_WED_CTRL,
  33. MTK_WED_CTRL_WDMA_INT_AGENT_EN |
  34. @@ -2622,9 +2621,6 @@ mtk_wed_irq_get(struct mtk_wed_device *d
  35. static void
  36. mtk_wed_irq_set_mask(struct mtk_wed_device *dev, u32 mask)
  37. {
  38. - if (!dev->running)
  39. - return;
  40. -
  41. mtk_wed_set_ext_int(dev, !!mask);
  42. wed_w32(dev, MTK_WED_INT_MASK, mask);
  43. }