mt76: mt7615: fix mt7615_firmware_own for mt7663e
authorLorenzo Bianconi <lorenzo@kernel.org>
Mon, 20 Apr 2020 12:07:45 +0000 (14:07 +0200)
committerFelix Fietkau <nbd@nbd.name>
Tue, 12 May 2020 17:52:32 +0000 (19:52 +0200)
Check the firmware-own configuration has been applied polling
MT_CONN_HIF_ON_LPCTL register

Fixes: f40ac0f3d3c0 ("mt76: mt7615: introduce mt7663e support")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

index 5329bd4f8237dbec92a19b8217d6459a3816d236..68d48b7ed06bba0fc64172c039c0cf28c2a0acc3 100644 (file)
@@ -1710,9 +1710,8 @@ static int mt7615_firmware_own(struct mt7615_dev *dev)
 
        mt76_wr(dev, addr, MT_CFG_LPCR_HOST_FW_OWN);
 
-       if (is_mt7622(&dev->mt76) &&
-           !mt76_poll_msec(dev, MT_CFG_LPCR_HOST,
-                           MT_CFG_LPCR_HOST_FW_OWN,
+       if (!is_mt7615(&dev->mt76) &&
+           !mt76_poll_msec(dev, addr, MT_CFG_LPCR_HOST_FW_OWN,
                            MT_CFG_LPCR_HOST_FW_OWN, 3000)) {
                dev_err(dev->mt76.dev, "Timeout for firmware own\n");
                return -EIO;