]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mt76: mt7996: fix SER reset trigger on WED reset
authorRex Lu <rex.lu@mediatek.com>
Tue, 11 Mar 2025 10:36:39 +0000 (11:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 May 2025 09:12:33 +0000 (11:12 +0200)
[ Upstream commit 8d38abdf6c182225c5c0a81451fa51b7b36a635d ]

The firmware needs a specific trigger when WED is being reset due to an
ethernet reset condition. This helps prevent further L1 SER failure.

Signed-off-by: Rex Lu <rex.lu@mediatek.com>
Link: https://patch.msgid.link/20250311103646.43346-2-nbd@nbd.name
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/mt7996/mcu.h
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c

index 43468bcaffc6dd8e972acbf1e1fdc6a1927ba053..a75e1c9435bb01f9a320db37b9191374aa7cc93a 100644 (file)
@@ -908,7 +908,8 @@ enum {
        UNI_CMD_SER_SET_RECOVER_L3_TX_DISABLE,
        UNI_CMD_SER_SET_RECOVER_L3_BF,
        UNI_CMD_SER_SET_RECOVER_L4_MDP,
-       UNI_CMD_SER_SET_RECOVER_FULL,
+       UNI_CMD_SER_SET_RECOVER_FROM_ETH,
+       UNI_CMD_SER_SET_RECOVER_FULL = 8,
        UNI_CMD_SER_SET_SYSTEM_ASSERT,
        /* action */
        UNI_CMD_SER_ENABLE = 1,
index 7a8ee6c75cf2bd0541291b3bfa87eaf81c6446d4..9d37f823874643f7ff9121365b6dccd1d1653a99 100644 (file)
@@ -281,7 +281,7 @@ static int mt7996_mmio_wed_reset(struct mtk_wed_device *wed)
        if (test_and_set_bit(MT76_STATE_WED_RESET, &mphy->state))
                return -EBUSY;
 
-       ret = mt7996_mcu_set_ser(dev, UNI_CMD_SER_TRIGGER, UNI_CMD_SER_SET_RECOVER_L1,
+       ret = mt7996_mcu_set_ser(dev, UNI_CMD_SER_TRIGGER, UNI_CMD_SER_SET_RECOVER_FROM_ETH,
                                 mphy->band_idx);
        if (ret)
                goto out;