mt76: connac: use waitqueue for runtime-pm

Simplify the code using a wait_queue_head_t instead of a completion to
wait the chip is fully awake in mt76_connac_pm_wake routine

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
index 3ef6bcd..894b258 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -508,7 +508,7 @@ void mt7615_init_device(struct mt7615_dev *dev)
        INIT_WORK(&dev->pm.wake_work, mt7615_pm_wake_work);
        spin_lock_init(&dev->pm.wake.lock);
        mutex_init(&dev->pm.mutex);
-       init_completion(&dev->pm.wake_cmpl);
+       init_waitqueue_head(&dev->pm.wait);
        spin_lock_init(&dev->pm.txq_lock);
        set_bit(MT76_STATE_PM, &dev->mphy.state);
        INIT_DELAYED_WORK(&dev->mphy.mac_work, mt7615_mac_work);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index adbc726..747bf90 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -1919,7 +1919,7 @@ void mt7615_pm_wake_work(struct work_struct *work)
        }
 
        ieee80211_wake_queues(mphy->hw);
-       complete_all(&dev->pm.wake_cmpl);
+       wake_up(&dev->pm.wait);
 }
 
 void mt7615_pm_power_save_work(struct work_struct *work)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
index 116d800..e3937f6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
@@ -53,7 +53,7 @@ struct mt76_connac_pm {
        } tx_q[IEEE80211_NUM_ACS];
 
        struct work_struct wake_work;
-       struct completion wake_cmpl;
+       wait_queue_head_t wait;
 
        struct {
                spinlock_t lock;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index a263921..66f1667 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -17,10 +17,10 @@ int mt76_connac_pm_wake(struct mt76_phy *phy, struct mt76_connac_pm *pm)
        if (!test_bit(MT76_STATE_PM, &phy->state))
                return 0;
 
-       if (queue_work(dev->wq, &pm->wake_work))
-               reinit_completion(&pm->wake_cmpl);
-
-       if (!wait_for_completion_timeout(&pm->wake_cmpl, 3 * HZ)) {
+       queue_work(dev->wq, &pm->wake_work);
+       if (!wait_event_timeout(pm->wait,
+                               !test_bit(MT76_STATE_PM, &phy->state),
+                               3 * HZ)) {
                ieee80211_wake_queues(phy->hw);
                return -ETIMEDOUT;
        }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index ce0e231..2d8dba0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -225,7 +225,7 @@ int mt7921_register_device(struct mt7921_dev *dev)
        INIT_WORK(&dev->pm.wake_work, mt7921_pm_wake_work);
        spin_lock_init(&dev->pm.wake.lock);
        mutex_init(&dev->pm.mutex);
-       init_completion(&dev->pm.wake_cmpl);
+       init_waitqueue_head(&dev->pm.wait);
        spin_lock_init(&dev->pm.txq_lock);
        set_bit(MT76_STATE_PM, &dev->mphy.state);
        INIT_LIST_HEAD(&dev->phy.stats_list);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 90ede75..7b53231 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -1530,7 +1530,7 @@ void mt7921_pm_wake_work(struct work_struct *work)
        }
 
        ieee80211_wake_queues(mphy->hw);
-       complete_all(&dev->pm.wake_cmpl);
+       wake_up(&dev->pm.wait);
 }
 
 void mt7921_pm_power_save_work(struct work_struct *work)