Commit 9800462d authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

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



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

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 7f2bc8ba

drivers/net/wireless/mediatek/mt76/mt7921/init.c

+2 −0
Original line number Diff line number Diff line
@@ -219,9 +219,11 @@ int mt7921_register_device(struct mt7921_dev *dev) 
	dev->phy.dev = dev;

	dev->phy.mt76 = &dev->mt76.phy;

	dev->mt76.phy.priv = &dev->phy;

	dev->mt76.tx_worker.fn = mt7921_tx_worker;



	INIT_DELAYED_WORK(&dev->pm.ps_work, mt7921_pm_power_save_work);

	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);

	spin_lock_init(&dev->pm.txq_lock);

drivers/net/wireless/mediatek/mt76/mt7921/main.c

+9 −14
Original line number Diff line number Diff line
@@ -725,23 +725,18 @@ void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	mt76_connac_power_save_sched(&dev->mphy, &dev->pm);

}



static void

mt7921_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq)

void mt7921_tx_worker(struct mt76_worker *w)

{

	struct mt7921_dev *dev = mt7921_hw_dev(hw);

	struct mt7921_phy *phy = mt7921_hw_phy(hw);

	struct mt76_phy *mphy = phy->mt76;



	if (!test_bit(MT76_STATE_RUNNING, &mphy->state))

		return;

	struct mt7921_dev *dev = container_of(w, struct mt7921_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_txq_schedule_all(&dev->mphy);

	mt76_connac_pm_unref(&dev->pm);

}



static void mt7921_tx(struct ieee80211_hw *hw,
@@ -769,9 +764,9 @@ static void mt7921_tx(struct ieee80211_hw *hw, 
		wcid = &mvif->sta.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;

	}
@@ -1200,7 +1195,7 @@ const struct ieee80211_ops mt7921_ops = { 
	.set_key = mt7921_set_key,

	.ampdu_action = mt7921_ampdu_action,

	.set_rts_threshold = mt7921_set_rts_threshold,

	.wake_tx_queue = mt7921_wake_tx_queue,

	.wake_tx_queue = mt76_wake_tx_queue,

	.release_buffered_frames = mt76_release_buffered_frames,

	.get_txpower = mt76_get_txpower,

	.get_stats = mt7921_get_stats,

drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h

+2 −0
Original line number Diff line number Diff line
@@ -336,6 +336,8 @@ int mt7921_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
			  enum mt76_txq_id qid, struct mt76_wcid *wcid,

			  struct ieee80211_sta *sta,

			  struct mt76_tx_info *tx_info);



void mt7921_tx_worker(struct mt76_worker *w);

void mt7921_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);

int mt7921_init_tx_queues(struct mt7921_phy *phy, int idx, int n_desc);

void mt7921_tx_token_put(struct mt7921_dev *dev);