Skip to content

Commit

Permalink
mt7603: fix watchdog reset sequence
Browse files Browse the repository at this point in the history
- issue PSE reset first
- skip DMA reset if PSE reset failed
- schedule tx after reset has completed

Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
nbd168 committed Nov 21, 2018
1 parent 4734108 commit 9428e34
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions mt7603/mac.c
Expand Up @@ -1259,6 +1259,10 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)

mutex_lock(&dev->mt76.mutex);

mt7603_pse_reset(dev);
if (dev->pse_reset_failed)
goto skip_dma_reset;

mt7603_mac_stop(dev);

mt76_clear(dev, MT_WPDMA_GLO_CFG,
Expand All @@ -1271,8 +1275,6 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)
mt7603_beacon_set_timer(dev, -1, 0);
mt76_set(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_FORCE_TX_EOF);

mt7603_pse_reset(dev);

for (i = 0; i < ARRAY_SIZE(dev->mt76.q_tx); i++)
mt76_queue_tx_cleanup(dev, i, true);

Expand All @@ -1282,16 +1284,19 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)
mt7603_mac_dma_start(dev);

mt7603_irq_enable(dev, mask);
clear_bit(MT76_RESET, &dev->mt76.state);

mt7603_beacon_set_timer(dev, -1, beacon_int);

skip_dma_reset:
clear_bit(MT76_RESET, &dev->mt76.state);
mutex_unlock(&dev->mt76.mutex);

tasklet_enable(&dev->tx_tasklet);
tasklet_enable(&dev->pre_tbtt_tasklet);
napi_enable(&dev->mt76.napi[0]);
napi_enable(&dev->mt76.napi[1]);
ieee80211_wake_queues(dev->mt76.hw);
mt76_txq_schedule_all(&dev->mt76);
}

static u32 mt7603_dma_debug(struct mt7603_dev *dev, u8 index)
Expand Down

0 comments on commit 9428e34

Please sign in to comment.