[PATCH mt76-fixes] wifi: mt76: mt7925: restore the reset state when fw_pmctrl fails

[PATCH mt76-fixes] wifi: mt76: mt7925: restore the reset state when fw_pmctrl fails

[Felix Fietkau]

mt7925e_mac_reset() returns directly when mt792xe_mcu_fw_pmctrl()
fails, leaving MT76_RESET set and the TX worker parked. Every other
error path jumps to out, which clears both. mt7925_mac_reset_work()
clears neither, so once every reset attempt fails there, TX stays
blocked until another reset succeeds.

Jump to out instead.

Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt7925 chips")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c
index 280797fa0d85..67eb86746779 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c
@@ -127,7 +127,7 @@ int mt7925e_mac_reset(struct mt792x_dev *dev)
 
 	err = mt792xe_mcu_fw_pmctrl(dev);
 	if (err)
-		return err;
+		goto out;
 
 	err = __mt792xe_mcu_drv_pmctrl(dev);
 	if (err)
-- 
2.47.3

Re: [PATCH mt76-fixes] wifi: mt76: mt7925: restore the reset state when fw_pmctrl fails

[Lorenzo Bianconi]

[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]

> mt7925e_mac_reset() returns directly when mt792xe_mcu_fw_pmctrl()
> fails, leaving MT76_RESET set and the TX worker parked. Every other
> error path jumps to out, which clears both. mt7925_mac_reset_work()
> clears neither, so once every reset attempt fails there, TX stays
> blocked until another reset succeeds.
> 
> Jump to out instead.
> 
> Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt7925 chips")
> Signed-off-by: Felix Fietkau <nbd@nbd.name>

Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>

> ---
>  drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c
> index 280797fa0d85..67eb86746779 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c
> @@ -127,7 +127,7 @@ int mt7925e_mac_reset(struct mt792x_dev *dev)
>  
>  	err = mt792xe_mcu_fw_pmctrl(dev);
>  	if (err)
> -		return err;
> +		goto out;
>  
>  	err = __mt792xe_mcu_drv_pmctrl(dev);
>  	if (err)
> -- 
> 2.47.3
> 
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]