wifi: mt76: mt7921e: fix probe timeout after reboot

BugLink: https://bugs.launchpad.net/bugs/2025067
[ Upstream commit c397fc1e6365a2a9e5540a85b2c1d4ea412aa0e2 ]

In system warm reboot scene, due to the polling timeout(now 1000us)
is too short to wait dma idle in time, it may make driver probe fail
with error code -ETIMEDOUT. Meanwhile, we also found the dma may take
around 70ms to enter idle state. Change the polling idle timeout to
100ms to avoid the probabilistic probe fail.

Tested pass with 5000 times warm reboot on x86 platform.

[4.477496] pci 0000:01:00.0: attach allowed to drvr mt7921e [internal device]
[4.478306] mt7921e 0000:01:00.0: ASIC revision: 79610010
[4.480063] mt7921e: probe of 0000:01:00.0 failed with error -110

Fixes: 0a1059d0f060 ("mt76: mt7921: move mt7921_dma_reset in dma.c")
Signed-off-by: Quan Zhou <quan.zhou@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
index d1f10f6d9adc37ff108a066c0ec5618b482b3071..dc4ccfef4b048f1d71235856780f763df0e5edfa 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
@@ -90,9 +90,9 @@ static int mt7921_dma_disable(struct mt7921_dev *dev, bool force)
                   MT_WFDMA0_GLO_CFG_OMIT_RX_INFO |
                   MT_WFDMA0_GLO_CFG_OMIT_RX_INFO_PFET2);
 
-       if (!mt76_poll(dev, MT_WFDMA0_GLO_CFG,
-                      MT_WFDMA0_GLO_CFG_TX_DMA_BUSY |
-                      MT_WFDMA0_GLO_CFG_RX_DMA_BUSY, 0, 1000))
+       if (!mt76_poll_msec_tick(dev, MT_WFDMA0_GLO_CFG,
+                                MT_WFDMA0_GLO_CFG_TX_DMA_BUSY |
+                                MT_WFDMA0_GLO_CFG_RX_DMA_BUSY, 0, 100, 1))
                return -ETIMEDOUT;
 
        return 0;