wifi: mt76: mt7921s: fix workqueue problem causes STA association fail

The ieee80211_queue_work function queues work into the mac80211
local->workqueue, which is widely used for mac80211 internal
work processes. In the mt76 driver, both the mt76-sido-status and
mt76-sdio-net threads enqueue workers to the workqueue with this
function. However, in some cases, when two workers are enqueued
to the workqueue almost simultaneously, the second worker may not
be scheduled immediately and may get stuck for a while.
This can cause timing issues. To avoid these timing
conflicts caused by worker scheduling, replace the worker
with an independent thread.

Fixes: 48fab5bbef40 ("mt76: mt7921: introduce mt7921s support")
Signed-off-by: Wang Zhao <wang.zhao@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index b1d3f55d7034a96c49d8225074998b0a7afafb10..d66864afaf381dd8804e3f7cfbb55ab2259898dc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -609,8 +609,7 @@ struct mt76_sdio {
        struct mt76_worker txrx_worker;
        struct mt76_worker status_worker;
        struct mt76_worker net_worker;
-
-       struct work_struct stat_work;
+       struct mt76_worker stat_worker;
 
        u8 *xmit_buf;
        u32 xmit_buf_sz;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
index fc547a0031eae22dc7553aa19be85bbe12d83d62..67cedd2555f973fc53cd0e37312771c3e0fa1116 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
@@ -204,8 +204,8 @@ static int mt7663s_suspend(struct device *dev)
        mt76_worker_disable(&mdev->mt76.sdio.txrx_worker);
        mt76_worker_disable(&mdev->mt76.sdio.status_worker);
        mt76_worker_disable(&mdev->mt76.sdio.net_worker);
+       mt76_worker_disable(&mdev->mt76.sdio.stat_worker);
 
-       cancel_work_sync(&mdev->mt76.sdio.stat_work);
        clear_bit(MT76_READING_STATS, &mdev->mphy.state);
 
        mt76_tx_status_check(&mdev->mt76, true);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
index dc1beb76df3e16f8674dbc30338fa99c4906361b..7591e54d289733472740a5afe747833070363f2e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
@@ -228,7 +228,7 @@ static int mt7921s_suspend(struct device *__dev)
        mt76_txq_schedule_all(&dev->mphy);
        mt76_worker_disable(&mdev->tx_worker);
        mt76_worker_disable(&mdev->sdio.status_worker);
-       cancel_work_sync(&mdev->sdio.stat_work);
+       mt76_worker_disable(&mdev->sdio.stat_worker);
        clear_bit(MT76_READING_STATS, &dev->mphy.state);
        mt76_tx_status_check(mdev, true);
 
@@ -260,6 +260,7 @@ restore_txrx_worker:
 restore_worker:
        mt76_worker_enable(&mdev->tx_worker);
        mt76_worker_enable(&mdev->sdio.status_worker);
+       mt76_worker_enable(&mdev->sdio.stat_worker);
 
        if (!pm->ds_enable)
                mt76_connac_mcu_set_deep_sleep(mdev, false);
@@ -292,6 +293,7 @@ static int mt7921s_resume(struct device *__dev)
        mt76_worker_enable(&mdev->sdio.txrx_worker);
        mt76_worker_enable(&mdev->sdio.status_worker);
        mt76_worker_enable(&mdev->sdio.net_worker);
+       mt76_worker_enable(&mdev->sdio.stat_worker);
 
        /* restore previous ds setting */
        if (!pm->ds_enable)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
index 8edd0291c1280183ba3a91c515fcfed1aed720a4..389eb0903807e9603d99830f61aef8f7cce5c598 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
@@ -107,7 +107,7 @@ int mt7921s_mac_reset(struct mt792x_dev *dev)
        mt76_worker_disable(&dev->mt76.sdio.txrx_worker);
        mt76_worker_disable(&dev->mt76.sdio.status_worker);
        mt76_worker_disable(&dev->mt76.sdio.net_worker);
-       cancel_work_sync(&dev->mt76.sdio.stat_work);
+       mt76_worker_disable(&dev->mt76.sdio.stat_worker);
 
        mt7921s_disable_irq(&dev->mt76);
        mt7921s_wfsys_reset(dev);
@@ -115,6 +115,7 @@ int mt7921s_mac_reset(struct mt792x_dev *dev)
        mt76_worker_enable(&dev->mt76.sdio.txrx_worker);
        mt76_worker_enable(&dev->mt76.sdio.status_worker);
        mt76_worker_enable(&dev->mt76.sdio.net_worker);
+       mt76_worker_enable(&dev->mt76.sdio.stat_worker);
 
        dev->fw_assert = false;
        clear_bit(MT76_MCU_RESET, &dev->mphy.state);

diff --git a/drivers/net/wireless/mediatek/mt76/sdio.c b/drivers/net/wireless/mediatek/mt76/sdio.c
index 419723118ded8e3f187aa2887d987b2697b48bb0..c52d550f0c32aac260e3163f14ec4989efbacc53 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/sdio.c
+++ b/drivers/net/wireless/mediatek/mt76/sdio.c
@@ -481,21 +481,21 @@ static void mt76s_status_worker(struct mt76_worker *w)
                if (dev->drv->tx_status_data && ndata_frames > 0 &&
                    !test_and_set_bit(MT76_READING_STATS, &dev->phy.state) &&
                    !test_bit(MT76_STATE_SUSPEND, &dev->phy.state))
-                       ieee80211_queue_work(dev->hw, &dev->sdio.stat_work);
+                       mt76_worker_schedule(&sdio->stat_worker);
        } while (nframes > 0);
 
        if (resched)
                mt76_worker_schedule(&dev->tx_worker);
 }
 
-static void mt76s_tx_status_data(struct work_struct *work)
+static void mt76s_tx_status_data(struct mt76_worker *worker)
 {
        struct mt76_sdio *sdio;
        struct mt76_dev *dev;
        u8 update = 1;
        u16 count = 0;
 
-       sdio = container_of(work, struct mt76_sdio, stat_work);
+       sdio = container_of(worker, struct mt76_sdio, stat_worker);
        dev = container_of(sdio, struct mt76_dev, sdio);
 
        while (true) {
@@ -508,7 +508,7 @@ static void mt76s_tx_status_data(struct work_struct *work)
        }
 
        if (count && test_bit(MT76_STATE_RUNNING, &dev->phy.state))
-               ieee80211_queue_work(dev->hw, &sdio->stat_work);
+               mt76_worker_schedule(&sdio->status_worker);
        else
                clear_bit(MT76_READING_STATS, &dev->phy.state);
 }
@@ -600,8 +600,8 @@ void mt76s_deinit(struct mt76_dev *dev)
        mt76_worker_teardown(&sdio->txrx_worker);
        mt76_worker_teardown(&sdio->status_worker);
        mt76_worker_teardown(&sdio->net_worker);
+       mt76_worker_teardown(&sdio->stat_worker);
 
-       cancel_work_sync(&sdio->stat_work);
        clear_bit(MT76_READING_STATS, &dev->phy.state);
 
        mt76_tx_status_check(dev, true);
@@ -644,10 +644,14 @@ int mt76s_init(struct mt76_dev *dev, struct sdio_func *func,
        if (err)
                return err;
 
+       err = mt76_worker_setup(dev->hw, &sdio->stat_worker, mt76s_tx_status_data,
+                               "sdio-sta");
+       if (err)
+               return err;
+
        sched_set_fifo_low(sdio->status_worker.task);
        sched_set_fifo_low(sdio->net_worker.task);
-
-       INIT_WORK(&sdio->stat_work, mt76s_tx_status_data);
+       sched_set_fifo_low(sdio->stat_worker.task);
 
        dev->queue_ops = &sdio_queue_ops;
        dev->bus = bus_ops;