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

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: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 310718ba

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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)

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -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);