From a94e43f277e22ce24237320ce92b1f185eff0b1e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 10 Mar 2020 17:10:59 +0100 Subject: [PATCH] mt76: mt76x02: reset MCU timeout counter earlier in watchdog reset Ensure that MCU commands issued right after hardware reset are not dropped and treated as failed. Signed-off-by: Felix Fietkau --- mt76x02_mmio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mt76x02_mmio.c b/mt76x02_mmio.c index b7456ab1..9ca6150f 100644 --- a/mt76x02_mmio.c +++ b/mt76x02_mmio.c @@ -460,6 +460,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev) mutex_lock(&dev->mt76.mutex); + dev->mcu_timeout = 0; if (restart) mt76x02_reset_state(dev); @@ -559,10 +560,6 @@ static void mt76x02_check_tx_hang(struct mt76x02_dev *dev) restart: mt76x02_watchdog_reset(dev); - mutex_lock(&dev->mt76.mcu.mutex); - dev->mcu_timeout = 0; - mutex_unlock(&dev->mt76.mcu.mutex); - dev->tx_hang_reset++; dev->tx_hang_check = 0; memset(dev->mt76.tx_dma_idx, 0xff,