mt76: mt7915: fix polling firmware-own status

[ Upstream commit 71bb496ce17f6976c8a75b054861781965b07ac0 ]

Check the register status bit instead of the trigger bit

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index e9d854e3293e4bd2be1a884e7e324a4ec5653220..1c900454cf58c0132068d3213e241b3d8641bdcd 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -2689,7 +2689,7 @@ static int mt7915_driver_own(struct mt7915_dev *dev)
 {
        mt76_wr(dev, MT_TOP_LPCR_HOST_BAND0, MT_TOP_LPCR_HOST_DRV_OWN);
        if (!mt76_poll_msec(dev, MT_TOP_LPCR_HOST_BAND0,
-                           MT_TOP_LPCR_HOST_FW_OWN, 0, 500)) {
+                           MT_TOP_LPCR_HOST_FW_OWN_STAT, 0, 500)) {
                dev_err(dev->mt76.dev, "Timeout for driver own\n");
                return -EIO;
        }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
index a213b5cb82f81324b5c3434e9bb546871769f7f2..f4101cc9f9eb14540df9f8fa8d6a8b743eb692fa 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
@@ -426,6 +426,7 @@
 #define MT_TOP_LPCR_HOST_BAND0         MT_TOP(0x10)
 #define MT_TOP_LPCR_HOST_FW_OWN                BIT(0)
 #define MT_TOP_LPCR_HOST_DRV_OWN       BIT(1)
+#define MT_TOP_LPCR_HOST_FW_OWN_STAT   BIT(2)
 
 #define MT_TOP_MISC                    MT_TOP(0xf0)
 #define MT_TOP_MISC_FW_STATE           GENMASK(2, 0)