wifi: mt76: mt7921: get rid of the false positive reset

False positive reset would be possibly triggered by those commands we
applied in suspend with HZ MCU timeout, especially it happened when we
enabled kernel log in pm core to diagnose how much time we spend in each
driver during suspend procedure. So we enlarge the value and align the MCU
timeout as other commands we did to reduce the false positive reset.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
index 5efda694fb9d56c338d6da47e922d3bb1199295c..64568536c1e9650eeea21ec8acf11a5525deabd6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
@@ -30,12 +30,7 @@ mt7921_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
        if (ret)
                return ret;
 
-       if (cmd == MCU_UNI_CMD(HIF_CTRL) ||
-           cmd == MCU_UNI_CMD(SUSPEND) ||
-           cmd == MCU_UNI_CMD(OFFLOAD))
-               mdev->mcu.timeout = HZ;
-       else
-               mdev->mcu.timeout = 3 * HZ;
+       mdev->mcu.timeout = 3 * HZ;
 
        if (cmd == MCU_CMD(FW_SCATTER))
                txq = MT_MCUQ_FWDL;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c
index e038d7404323fb851ee9cc402b19ebe421ad920b..5c1489766d9fd72a3e3e9742c52fb43be6bef886 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c
@@ -33,12 +33,7 @@ mt7921s_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
        if (ret)
                return ret;
 
-       if (cmd == MCU_UNI_CMD(HIF_CTRL) ||
-           cmd == MCU_UNI_CMD(SUSPEND) ||
-           cmd == MCU_UNI_CMD(OFFLOAD))
-               mdev->mcu.timeout = HZ;
-       else
-               mdev->mcu.timeout = 3 * HZ;
+       mdev->mcu.timeout = 3 * HZ;
 
        if (cmd == MCU_CMD(FW_SCATTER))
                type = MT7921_SDIO_FWDL;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
index 07fbe265283d5acc05059d36a2bff8e8b5d202b5..29c0ee330dbeda6333a976ef1f6653eee9b9ea45 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
@@ -106,12 +106,7 @@ mt7921u_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
        if (ret)
                return ret;
 
-       if (cmd == MCU_UNI_CMD(HIF_CTRL) ||
-           cmd == MCU_UNI_CMD(SUSPEND) ||
-           cmd == MCU_UNI_CMD(OFFLOAD))
-               mdev->mcu.timeout = HZ;
-       else
-               mdev->mcu.timeout = 3 * HZ;
+       mdev->mcu.timeout = 3 * HZ;
 
        if (cmd != MCU_CMD(FW_SCATTER))
                ep = MT_EP_OUT_INBAND_CMD;