Commit 2b8cdfb2 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: mt7615: wake device before pushing frames in mt7615_tx 



Queue frames pushed by mac80211 running mt7615_tx if the device is
low-power state. Run wake workqueue in order to swicth to full-power
before transmitting pending frames

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

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

+1 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ void mt7615_init_device(struct mt7615_dev *dev) 
	INIT_DELAYED_WORK(&dev->pm.ps_work, mt7615_pm_power_save_work);

	INIT_WORK(&dev->pm.wake_work, mt7615_pm_wake_work);

	init_completion(&dev->pm.wake_cmpl);

	spin_lock_init(&dev->pm.txq_lock);

	INIT_DELAYED_WORK(&dev->phy.mac_work, mt7615_mac_work);

	INIT_DELAYED_WORK(&dev->phy.scan_work, mt7615_scan_work);

	skb_queue_head_init(&dev->phy.scan_event_list);

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+24 −1
Original line number Diff line number Diff line
@@ -1836,6 +1836,7 @@ void mt7615_pm_wake_work(struct work_struct *work) 
{

	struct mt7615_dev *dev;

	struct mt76_phy *mphy;

	int i;



	dev = (struct mt7615_dev *)container_of(work, struct mt7615_dev,

						pm.wake_work);
@@ -1846,8 +1847,28 @@ void mt7615_pm_wake_work(struct work_struct *work) 
		goto out;

	}



	spin_lock_bh(&dev->pm.txq_lock);

	for (i = 0; i < IEEE80211_NUM_ACS; i++) {

		struct mt7615_sta *msta = dev->pm.tx_q[i].msta;

		struct mt76_wcid *wcid = msta ? &msta->wcid : NULL;

		struct ieee80211_sta *sta = NULL;



		if (!dev->pm.tx_q[i].skb)

			continue;



		if (msta && wcid->sta)

			sta = container_of((void *)msta, struct ieee80211_sta,

					   drv_priv);



		mt76_tx(mphy, sta, wcid, dev->pm.tx_q[i].skb);

		dev->pm.tx_q[i].skb = NULL;

	}

	spin_unlock_bh(&dev->pm.txq_lock);



	tasklet_schedule(&dev->mt76.tx_tasklet);



out:

	ieee80211_wake_queues(mphy->hw);

	complete_all(&dev->pm.wake_cmpl);

}
@@ -1871,8 +1892,10 @@ int mt7615_pm_wake(struct mt7615_dev *dev) 
	if (queue_work(dev->mt76.wq, &dev->pm.wake_work))

		reinit_completion(&dev->pm.wake_cmpl);



	if (!wait_for_completion_timeout(&dev->pm.wake_cmpl, 3 * HZ))

	if (!wait_for_completion_timeout(&dev->pm.wake_cmpl, 3 * HZ)) {

		ieee80211_wake_queues(mphy->hw);

		return -ETIMEDOUT;

	}



	return 0;

}

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

+50 −6
Original line number Diff line number Diff line
@@ -24,6 +24,22 @@ static bool mt7615_dev_running(struct mt7615_dev *dev) 
	return phy && test_bit(MT76_STATE_RUNNING, &phy->mt76->state);

}



static void mt7615_free_pending_tx_skbs(struct mt7615_dev *dev,

					struct mt7615_sta *msta)

{

	int i;



	spin_lock_bh(&dev->pm.txq_lock);

	for (i = 0; i < IEEE80211_NUM_ACS; i++) {

		if (msta && dev->pm.tx_q[i].msta != msta)

			continue;



		dev_kfree_skb(dev->pm.tx_q[i].skb);

		dev->pm.tx_q[i].skb = NULL;

	}

	spin_unlock_bh(&dev->pm.txq_lock);

}



static int mt7615_start(struct ieee80211_hw *hw)

{

	struct mt7615_dev *dev = mt7615_hw_dev(hw);
@@ -77,6 +93,8 @@ static void mt7615_stop(struct ieee80211_hw *hw) 
	cancel_delayed_work_sync(&dev->pm.ps_work);

	cancel_work_sync(&dev->pm.wake_work);



	mt7615_free_pending_tx_skbs(dev, NULL);



	mt7615_mutex_acquire(dev);



	mt76_testmode_reset(&dev->mt76, true);
@@ -214,6 +232,8 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw, 
	if (vif == phy->monitor_vif)

	    phy->monitor_vif = NULL;



	mt7615_free_pending_tx_skbs(dev, msta);



	mt7615_mcu_add_dev_info(dev, vif, false);



	rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
@@ -595,6 +615,8 @@ void mt7615_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);

	struct mt7615_sta *msta = (struct mt7615_sta *)sta->drv_priv;



	mt7615_free_pending_tx_skbs(dev, msta);



	mt7615_mcu_sta_add(dev, vif, sta, false);

	mt7615_mac_wtbl_update(dev, msta->wcid.idx,

			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
@@ -665,22 +687,43 @@ static void mt7615_tx(struct ieee80211_hw *hw, 
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_vif *vif = info->control.vif;

	struct mt76_wcid *wcid = &dev->mt76.global_wcid;

	struct mt7615_sta *msta = NULL;

	int qid;



	if (control->sta) {

		struct mt7615_sta *sta;



		sta = (struct mt7615_sta *)control->sta->drv_priv;

		wcid = &sta->wcid;

		msta = (struct mt7615_sta *)control->sta->drv_priv;

		wcid = &msta->wcid;

	}



	if (vif && !control->sta) {

		struct mt7615_vif *mvif;



		mvif = (struct mt7615_vif *)vif->drv_priv;

		wcid = &mvif->sta.wcid;

		msta = &mvif->sta;

		wcid = &msta->wcid;

	}



	if (!test_bit(MT76_STATE_PM, &mphy->state)) {

		mt76_tx(mphy, control->sta, wcid, skb);

		return;

	}



	qid = skb_get_queue_mapping(skb);

	if (qid >= MT_TXQ_PSD) {

		qid = IEEE80211_AC_BE;

		skb_set_queue_mapping(skb, qid);

	}



	spin_lock_bh(&dev->pm.txq_lock);

	if (!dev->pm.tx_q[qid].skb) {

		ieee80211_stop_queues(hw);

		dev->pm.tx_q[qid].msta = msta;

		dev->pm.tx_q[qid].skb = skb;

		queue_work(dev->mt76.wq, &dev->pm.wake_work);

	} else {

		dev_kfree_skb(skb);

	}

	spin_unlock_bh(&dev->pm.txq_lock);

}



static int mt7615_set_rts_threshold(struct ieee80211_hw *hw, u32 val)
@@ -1059,6 +1102,7 @@ static int mt7615_suspend(struct ieee80211_hw *hw, 
	int err = 0;



	cancel_delayed_work_sync(&dev->pm.ps_work);

	mt7615_free_pending_tx_skbs(dev, NULL);



	mt7615_mutex_acquire(dev);

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

+6 −0
Original line number Diff line number Diff line
@@ -302,6 +302,12 @@ struct mt7615_dev { 
	struct {

		bool enable;



		spinlock_t txq_lock;

		struct {

			struct mt7615_sta *msta;

			struct sk_buff *skb;

		} tx_q[IEEE80211_NUM_ACS];



		struct work_struct wake_work;

		struct completion wake_cmpl;