mt76: mt7663: rely on mt76_connac_pm_ref/mt76_connac_pm_unref in tx path

Introduce mt7615_tx_worker routine as mt76 tx worker callback for
mt7663.
Rely on mt76_connac_pm_ref/mt76_connac_pm_unref to check PM state and
increment/decrement wake counter

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
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 289f195a7951af0deac980fded6b1104ae2d47c5..0660b708156da9b61c13ad60a85b4984187328cd 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -1015,6 +1015,7 @@ void mt76_stop_tx_queues(struct mt76_phy *phy, struct ieee80211_sta *sta,
 void mt76_tx_check_agg_ssn(struct ieee80211_sta *sta, struct sk_buff *skb);
 void mt76_txq_schedule(struct mt76_phy *phy, enum mt76_txq_id qid);
 void mt76_txq_schedule_all(struct mt76_phy *phy);
+void mt76_tx_worker_run(struct mt76_dev *dev);
 void mt76_tx_worker(struct mt76_worker *w);
 void mt76_release_buffered_frames(struct ieee80211_hw *hw,
                                  struct ieee80211_sta *sta,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
index 5429536e8d43386d5742b92d763e9f2d27e523b6..3ef6bcdf38c4b2e57e1b087bf5e89acc30b1e043 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -502,9 +502,11 @@ void mt7615_init_device(struct mt7615_dev *dev)
        dev->phy.dev = dev;
        dev->phy.mt76 = &dev->mt76.phy;
        dev->mt76.phy.priv = &dev->phy;
+       dev->mt76.tx_worker.fn = mt7615_tx_worker;
 
        INIT_DELAYED_WORK(&dev->pm.ps_work, mt7615_pm_power_save_work);
        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);
        spin_lock_init(&dev->pm.txq_lock);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 8313bf468db240f84ddfa20268874764e1aa6869..a3e53d3aec020fb0112c71d60fd3ea7e3dd9119e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -694,28 +694,25 @@ static void mt7615_sta_rate_tbl_update(struct ieee80211_hw *hw,
                        break;
        }
        msta->n_rates = i;
-       if (!test_bit(MT76_STATE_PM, &phy->mt76->state))
+       if (mt76_connac_pm_ref(phy->mt76, &dev->pm)) {
                mt7615_mac_set_rates(phy, msta, NULL, msta->rates);
+               mt76_connac_pm_unref(&dev->pm);
+       }
        spin_unlock_bh(&dev->mt76.lock);
 }
 
-static void
-mt7615_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq)
+void mt7615_tx_worker(struct mt76_worker *w)
 {
-       struct mt7615_dev *dev = mt7615_hw_dev(hw);
-       struct mt7615_phy *phy = mt7615_hw_phy(hw);
-       struct mt76_phy *mphy = phy->mt76;
-
-       if (!test_bit(MT76_STATE_RUNNING, &mphy->state))
-               return;
+       struct mt7615_dev *dev = container_of(w, struct mt7615_dev,
+                                             mt76.tx_worker);
 
-       if (test_bit(MT76_STATE_PM, &mphy->state)) {
+       if (!mt76_connac_pm_ref(&dev->mphy, &dev->pm)) {
                queue_work(dev->mt76.wq, &dev->pm.wake_work);
                return;
        }
 
-       dev->pm.last_activity = jiffies;
-       mt76_worker_schedule(&dev->mt76.tx_worker);
+       mt76_tx_worker_run(&dev->mt76);
+       mt76_connac_pm_unref(&dev->pm);
 }
 
 static void mt7615_tx(struct ieee80211_hw *hw,
@@ -743,9 +740,9 @@ static void mt7615_tx(struct ieee80211_hw *hw,
                wcid = &msta->wcid;
        }
 
-       if (!test_bit(MT76_STATE_PM, &mphy->state)) {
-               dev->pm.last_activity = jiffies;
+       if (mt76_connac_pm_ref(mphy, &dev->pm)) {
                mt76_tx(mphy, control->sta, wcid, skb);
+               mt76_connac_pm_unref(&dev->pm);
                return;
        }
 
@@ -1272,7 +1269,7 @@ const struct ieee80211_ops mt7615_ops = {
        .sta_set_decap_offload = mt7615_sta_set_decap_offload,
        .ampdu_action = mt7615_ampdu_action,
        .set_rts_threshold = mt7615_set_rts_threshold,
-       .wake_tx_queue = mt7615_wake_tx_queue,
+       .wake_tx_queue = mt76_wake_tx_queue,
        .sta_rate_tbl_update = mt7615_sta_rate_tbl_update,
        .sw_scan_start = mt76_sw_scan,
        .sw_scan_complete = mt76_sw_scan_complete,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 5262b84a28c7f4c16cd269f074fd6f0ef52f4ad1..4c533b8ffa47c3f0b7051cb96397afef79f46202 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -508,6 +508,7 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
                          struct ieee80211_sta *sta,
                          struct mt76_tx_info *tx_info);
 
+void mt7615_tx_worker(struct mt76_worker *w);
 void mt7615_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
 void mt7615_tx_token_put(struct mt7615_dev *dev);
 void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,

diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index 04e47259ea5f53bd01e5ff306131bbacd928362f..cfc7229aa7b09b030ae3fab4eec5475d3d7e15ad 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -540,10 +540,8 @@ void mt76_txq_schedule_all(struct mt76_phy *phy)
 }
 EXPORT_SYMBOL_GPL(mt76_txq_schedule_all);
 
-void mt76_tx_worker(struct mt76_worker *w)
+void mt76_tx_worker_run(struct mt76_dev *dev)
 {
-       struct mt76_dev *dev = container_of(w, struct mt76_dev, tx_worker);
-
        mt76_txq_schedule_all(&dev->phy);
        if (dev->phy2)
                mt76_txq_schedule_all(dev->phy2);
@@ -555,6 +553,14 @@ void mt76_tx_worker(struct mt76_worker *w)
                mt76_testmode_tx_pending(dev->phy2);
 #endif
 }
+EXPORT_SYMBOL_GPL(mt76_tx_worker_run);
+
+void mt76_tx_worker(struct mt76_worker *w)
+{
+       struct mt76_dev *dev = container_of(w, struct mt76_dev, tx_worker);
+
+       mt76_tx_worker_run(dev);
+}
 
 void mt76_stop_tx_queues(struct mt76_phy *phy, struct ieee80211_sta *sta,
                         bool send_bar)