diff mbox series

mt76: mt7921: do not always disable fw runtime-pm

Message ID 910ea351fa27e39b9116a3895090291235e24b4b.1640950454.git.lorenzo@kernel.org (mailing list archive)
State Accepted
Delegated to: Felix Fietkau
Headers show
Series mt76: mt7921: do not always disable fw runtime-pm | expand

Commit Message

Lorenzo Bianconi Dec. 31, 2021, 11:36 a.m. UTC
After commit 'd430dffbe9dd ("mt76: mt7921: fix a possible race
enabling/disabling runtime-pm")', runtime-pm is always disabled in the
fw even if the user requests to enable it toggling debugfs node since
mt7921_pm_interface_iter routine will use pm->enable to configure the fw.
Fix the issue moving enable variable configuration before running
mt7921_pm_interface_iter routine.

Fixes: d430dffbe9dd ("mt76: mt7921: fix a possible race enabling/disabling runtime-pm")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
 drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Kalle Valo Jan. 11, 2022, 10:46 a.m. UTC | #1
Lorenzo Bianconi <lorenzo@kernel.org> writes:

> After commit 'd430dffbe9dd ("mt76: mt7921: fix a possible race
> enabling/disabling runtime-pm")', runtime-pm is always disabled in the
> fw even if the user requests to enable it toggling debugfs node since
> mt7921_pm_interface_iter routine will use pm->enable to configure the fw.
> Fix the issue moving enable variable configuration before running
> mt7921_pm_interface_iter routine.

The style for referencing commits is:

After commit d430dffbe9dd ("mt76: mt7921: fix a possible race
enabling/disabling runtime-pm"), runtime-pm is always disabled in the...
diff mbox series

Patch

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
index 86fd7292b229..45a393070e46 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
@@ -291,13 +291,12 @@  mt7921_pm_set(void *data, u64 val)
 	pm->enable = false;
 	mt76_connac_pm_wake(&dev->mphy, pm);
 
+	pm->enable = val;
 	ieee80211_iterate_active_interfaces(mt76_hw(dev),
 					    IEEE80211_IFACE_ITER_RESUME_ALL,
 					    mt7921_pm_interface_iter, dev);
 
 	mt76_connac_mcu_set_deep_sleep(&dev->mt76, pm->ds_enable);
-
-	pm->enable = val;
 	mt76_connac_power_save_sched(&dev->mphy, pm);
 out:
 	mutex_unlock(&dev->mt76.mutex);