From: Lorenzo Bianconi Date: Fri, 3 Jul 2020 08:15:40 +0000 (+0200) Subject: mt76: mt7615: avoid polling in fw_own for mt7663 X-Git-Tag: v5.9-rc1~133^2~19^2~34^2~39 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=757b0e7fd6f4f2e558fac602ea34a9be20143c95;p=linux-2.6-block.git mt76: mt7615: avoid polling in fw_own for mt7663 According to the vendor sdk, mt7663 does not need to poll register after firmware own. Since just mt7622 polls status register, set proper timeout value according to the vendor sdk Signed-off-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau --- diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index 445eb81267ef..0fcb379a8c06 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -1918,9 +1918,9 @@ int mt7615_firmware_own(struct mt7615_dev *dev) mt76_wr(dev, addr, MT_CFG_LPCR_HOST_FW_OWN); - if (!is_mt7615(&dev->mt76) && + if (is_mt7622(&dev->mt76) && !mt76_poll_msec(dev, addr, MT_CFG_LPCR_HOST_FW_OWN, - MT_CFG_LPCR_HOST_FW_OWN, 3000)) { + MT_CFG_LPCR_HOST_FW_OWN, 300)) { dev_err(dev->mt76.dev, "Timeout for firmware own\n"); return -EIO; }