mirror of
https://github.com/outbackdingo/mt76.git
synced 2026-10-24 13:26:48 +00:00
wifi: mt76: mt7925: fix the unfinished command of regd_notifier before suspend
Before entering suspend, we need to ensure that all MCU command are completed. In some cases, such as with regd_notifier, there is a chance that CLC commands, will be executed before suspend. Signed-off-by: Quan Zhou <[email protected]> Link: https://patch.msgid.link/3af7b4e5bf7437832b016e32743657d1d55b1f9d.1735910288.git.quan.zhou@mediatek.com Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
@@ -79,11 +79,14 @@ mt7925_regd_notifier(struct wiphy *wiphy,
|
||||
mdev->region = req->dfs_region;
|
||||
dev->country_ie_env = req->country_ie_env;
|
||||
|
||||
dev->regd_in_progress = true;
|
||||
mt792x_mutex_acquire(dev);
|
||||
mt7925_mcu_set_clc(dev, req->alpha2, req->country_ie_env);
|
||||
mt7925_mcu_set_channel_domain(hw->priv);
|
||||
mt7925_set_tx_sar_pwr(hw, NULL);
|
||||
mt792x_mutex_release(dev);
|
||||
dev->regd_in_progress = false;
|
||||
wake_up(&dev->wait);
|
||||
}
|
||||
|
||||
static void mt7925_mac_init_basic_rates(struct mt792x_dev *dev)
|
||||
@@ -226,6 +229,7 @@ int mt7925_register_device(struct mt792x_dev *dev)
|
||||
spin_lock_init(&dev->pm.wake.lock);
|
||||
mutex_init(&dev->pm.mutex);
|
||||
init_waitqueue_head(&dev->pm.wait);
|
||||
init_waitqueue_head(&dev->wait);
|
||||
spin_lock_init(&dev->pm.txq_lock);
|
||||
INIT_DELAYED_WORK(&dev->mphy.mac_work, mt792x_mac_work);
|
||||
INIT_DELAYED_WORK(&dev->phy.scan_work, mt7925_scan_work);
|
||||
|
||||
@@ -455,6 +455,9 @@ static int mt7925_pci_suspend(struct device *device)
|
||||
if (err < 0)
|
||||
goto restore_suspend;
|
||||
|
||||
wait_event_timeout(dev->wait,
|
||||
!dev->regd_in_progress, 5 * HZ);
|
||||
|
||||
/* always enable deep sleep during suspend to reduce
|
||||
* power consumption
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user