mt76: mt7921s: clear MT76_STATE_MCU_RUNNING immediately after reset

clear the flag MT76_STATE_MCU_RUNNING immediately after reset to indicate
the MCU has already stopped working at the point. That is a preliminary
patch for the following patch to perform the register access in the
remaining reset handler using SDIO mailbox way instead of MCU command
because the RAM firmware is cleared out.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
index ccaf8134cec7e69450d244c3873f84d7d77864e6..e0f0d3a2b17e2380531087104e2858ba6dad433c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
@@ -60,6 +60,8 @@ int mt7921s_wfsys_reset(struct mt7921_dev *dev)
 
        sdio_release_host(sdio->func);
 
+       clear_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state);
+
        /* activate mt7921s again */
        mt7921s_mcu_fw_pmctrl(dev);
        mt7921s_mcu_drv_pmctrl(dev);
@@ -81,7 +83,6 @@ int mt7921s_init_reset(struct mt7921_dev *dev)
        mt7921s_wfsys_reset(dev);
 
        mt76_worker_enable(&dev->mt76.sdio.txrx_worker);
-       clear_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state);
        clear_bit(MT76_MCU_RESET, &dev->mphy.state);
        mt7921s_enable_irq(&dev->mt76);
 
@@ -114,7 +115,6 @@ int mt7921s_mac_reset(struct mt7921_dev *dev)
        mt76_worker_enable(&dev->mt76.sdio.net_worker);
 
        dev->fw_assert = false;
-       clear_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state);
        clear_bit(MT76_MCU_RESET, &dev->mphy.state);
        mt7921s_enable_irq(&dev->mt76);