mt76: mt7915: cleanup mcu tx queue in mt7915_dma_reset()

Cleanup mcu queues in mt7915_mac_reset_work().

Fixes: e637763b606b ("mt76: move mcu queues to mt76_dev q_mcu array")
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index d3a6312c058c40bf735628bbe1335bc3958157cf..0924ae074db22258dd344266eceea11f6503c9fc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1515,9 +1515,8 @@ mt7915_update_beacons(struct mt7915_dev *dev)
 }
 
 static void
-mt7915_dma_reset(struct mt7915_phy *phy)
+mt7915_dma_reset(struct mt7915_dev *dev)
 {
-       struct mt7915_dev *dev = phy->dev;
        struct mt76_phy *mphy_ext = dev->mt76.phy2;
        u32 hif1_ofs = MT_WFDMA1_PCIE1_BASE - MT_WFDMA1_BASE;
        int i;
@@ -1534,18 +1533,20 @@ mt7915_dma_reset(struct mt7915_phy *phy)
                           (MT_WFDMA1_GLO_CFG_TX_DMA_EN |
                            MT_WFDMA1_GLO_CFG_RX_DMA_EN));
        }
+
        usleep_range(1000, 2000);
 
-       mt76_queue_tx_cleanup(dev, dev->mt76.q_mcu[MT_MCUQ_WA], true);
        for (i = 0; i < __MT_TXQ_MAX; i++) {
-               mt76_queue_tx_cleanup(dev, phy->mt76->q_tx[i], true);
+               mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[i], true);
                if (mphy_ext)
                        mt76_queue_tx_cleanup(dev, mphy_ext->q_tx[i], true);
        }
 
-       mt76_for_each_q_rx(&dev->mt76, i) {
+       for (i = 0; i < __MT_MCUQ_MAX; i++)
+               mt76_queue_tx_cleanup(dev, dev->mt76.q_mcu[i], true);
+
+       mt76_for_each_q_rx(&dev->mt76, i)
                mt76_queue_rx_reset(dev, i);
-       }
 
        /* re-init prefetch settings after reset */
        mt7915_dma_prefetch(dev);
@@ -1630,7 +1631,7 @@ void mt7915_mac_reset_work(struct work_struct *work)
        idr_init(&dev->token);
 
        if (mt7915_wait_reset_state(dev, MT_MCU_CMD_RESET_DONE)) {
-               mt7915_dma_reset(&dev->phy);
+               mt7915_dma_reset(dev);
 
                mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_DMA_INIT);
                mt7915_wait_reset_state(dev, MT_MCU_CMD_RECOVERY_DONE);