Commit b44eeb8c authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau

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

After commit 'd430dffb ("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: d430dffb ("mt76: mt7921: fix a possible race enabling/disabling runtime-pm")
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 988845c9
...@@ -291,13 +291,12 @@ mt7921_pm_set(void *data, u64 val) ...@@ -291,13 +291,12 @@ mt7921_pm_set(void *data, u64 val)
pm->enable = false; pm->enable = false;
mt76_connac_pm_wake(&dev->mphy, pm); mt76_connac_pm_wake(&dev->mphy, pm);
pm->enable = val;
ieee80211_iterate_active_interfaces(mt76_hw(dev), ieee80211_iterate_active_interfaces(mt76_hw(dev),
IEEE80211_IFACE_ITER_RESUME_ALL, IEEE80211_IFACE_ITER_RESUME_ALL,
mt7921_pm_interface_iter, dev); mt7921_pm_interface_iter, dev);
mt76_connac_mcu_set_deep_sleep(&dev->mt76, pm->ds_enable); mt76_connac_mcu_set_deep_sleep(&dev->mt76, pm->ds_enable);
pm->enable = val;
mt76_connac_power_save_sched(&dev->mphy, pm); mt76_connac_power_save_sched(&dev->mphy, pm);
out: out:
mutex_unlock(&dev->mt76.mutex); mutex_unlock(&dev->mt76.mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment