wifi: mt76: mt7925: update the power-saving flow

After joining MLO, ensure that all links are setup before
enabling power-saving.

Fixes: 86c051f2c418 ("wifi: mt76: mt7925: enabling MLO when the firmware supports it")
Cc: stable@vger.kernel.org
Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Tested-by: Caleb Jorden <cjorden@gmail.com>
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Link: https://patch.msgid.link/20250305000851.493671-6-sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/init.c b/drivers/net/wireless/mediatek/mt76/mt7925/init.c
index f41ca42484978e9c80a9ca66008ea2aca77cd51c..a2bb36dab2310ed6afb0fcaa55a4bc879bc357d1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/init.c
@@ -244,6 +244,7 @@ int mt7925_register_device(struct mt792x_dev *dev)
        dev->mt76.tx_worker.fn = mt792x_tx_worker;
 
        INIT_DELAYED_WORK(&dev->pm.ps_work, mt792x_pm_power_save_work);
+       INIT_DELAYED_WORK(&dev->mlo_pm_work, mt7925_mlo_pm_work);
        INIT_WORK(&dev->pm.wake_work, mt792x_pm_wake_work);
        spin_lock_init(&dev->pm.wake.lock);
        mutex_init(&dev->pm.mutex);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index 2f6c687d0a0563765b5b2575e742c676fb7c70f7..0b390b2691e3f210d4518687bed7380f10151a0e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -427,6 +427,7 @@ mt7925_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        mvif->bss_conf.vif = mvif;
        mvif->sta.vif = mvif;
        mvif->deflink_id = IEEE80211_LINK_UNSPECIFIED;
+       mvif->mlo_pm_state = MT792x_MLO_LINK_DISASSOC;
 
        ret = mt7925_mac_link_bss_add(dev, &vif->bss_conf, &mvif->sta.deflink);
        if (ret < 0)
@@ -1242,6 +1243,7 @@ void mt7925_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
 {
        struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);
        struct mt792x_sta *msta = (struct mt792x_sta *)sta->drv_priv;
+       struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
        unsigned long rem;
 
        rem = ieee80211_vif_is_mld(vif) ? msta->valid_links : BIT(0);
@@ -1252,11 +1254,11 @@ void mt7925_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
                mt7925_mcu_del_dev(mdev, vif);
 
        if (vif->type == NL80211_IFTYPE_STATION) {
-               struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
-
                mvif->wep_sta = NULL;
                ewma_rssi_init(&mvif->bss_conf.rssi);
        }
+
+       mvif->mlo_pm_state = MT792x_MLO_LINK_DISASSOC;
 }
 EXPORT_SYMBOL_GPL(mt7925_mac_sta_remove);
 
@@ -1328,6 +1330,38 @@ mt7925_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        return ret;
 }
 
+static void
+mt7925_mlo_pm_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
+{
+       struct mt792x_dev *dev = priv;
+       struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
+       unsigned long valid = ieee80211_vif_is_mld(vif) ?
+                                   mvif->valid_links : BIT(0);
+       struct ieee80211_bss_conf *bss_conf;
+       int i;
+
+       if (mvif->mlo_pm_state != MT792x_MLO_CHANGED_PS)
+               return;
+
+       mt792x_mutex_acquire(dev);
+       for_each_set_bit(i, &valid, IEEE80211_MLD_MAX_NUM_LINKS) {
+               bss_conf = mt792x_vif_to_bss_conf(vif, i);
+               mt7925_mcu_uni_bss_ps(dev, bss_conf);
+       }
+       mt792x_mutex_release(dev);
+}
+
+void mt7925_mlo_pm_work(struct work_struct *work)
+{
+       struct mt792x_dev *dev = container_of(work, struct mt792x_dev,
+                                             mlo_pm_work.work);
+       struct ieee80211_hw *hw = mt76_hw(dev);
+
+       ieee80211_iterate_active_interfaces(hw,
+                                           IEEE80211_IFACE_ITER_RESUME_ALL,
+                                           mt7925_mlo_pm_iter, dev);
+}
+
 static bool is_valid_alpha2(const char *alpha2)
 {
        if (!alpha2)
@@ -1877,6 +1911,9 @@ static void mt7925_vif_cfg_changed(struct ieee80211_hw *hw,
                mt7925_mcu_sta_update(dev, NULL, vif, true,
                                      MT76_STA_INFO_STATE_ASSOC);
                mt7925_mcu_set_beacon_filter(dev, vif, vif->cfg.assoc);
+
+               if (ieee80211_vif_is_mld(vif))
+                       mvif->mlo_pm_state = MT792x_MLO_LINK_ASSOC;
        }
 
        if (changed & BSS_CHANGED_ARP_FILTER) {
@@ -1887,9 +1924,19 @@ static void mt7925_vif_cfg_changed(struct ieee80211_hw *hw,
        }
 
        if (changed & BSS_CHANGED_PS) {
-               for_each_set_bit(i, &valid, IEEE80211_MLD_MAX_NUM_LINKS) {
-                       bss_conf = mt792x_vif_to_bss_conf(vif, i);
+               if (hweight16(mvif->valid_links) < 2) {
+                       /* legacy */
+                       bss_conf = &vif->bss_conf;
                        mt7925_mcu_uni_bss_ps(dev, bss_conf);
+               } else {
+                       if (mvif->mlo_pm_state == MT792x_MLO_LINK_ASSOC) {
+                               mvif->mlo_pm_state = MT792x_MLO_CHANGED_PS_PENDING;
+                       } else if (mvif->mlo_pm_state == MT792x_MLO_CHANGED_PS) {
+                               for_each_set_bit(i, &valid, IEEE80211_MLD_MAX_NUM_LINKS) {
+                                       bss_conf = mt792x_vif_to_bss_conf(vif, i);
+                                       mt7925_mcu_uni_bss_ps(dev, bss_conf);
+                               }
+                       }
                }
        }
 
@@ -1940,11 +1987,12 @@ static void mt7925_link_info_changed(struct ieee80211_hw *hw,
        if (changed & (BSS_CHANGED_QOS | BSS_CHANGED_BEACON_ENABLED))
                mt7925_mcu_set_tx(dev, info);
 
-       if (changed & BSS_CHANGED_BSSID) {
-               if (ieee80211_vif_is_mld(vif) &&
-                   hweight16(mvif->valid_links) == 2)
-                       /* Indicate the secondary setup done */
-                       mt7925_mcu_uni_bss_bcnft(dev, info, true);
+       if (mvif->mlo_pm_state == MT792x_MLO_CHANGED_PS_PENDING) {
+               /* Indicate the secondary setup done */
+               mt7925_mcu_uni_bss_bcnft(dev, info, true);
+
+               ieee80211_queue_delayed_work(hw, &dev->mlo_pm_work, 5 * HZ);
+               mvif->mlo_pm_state = MT792x_MLO_CHANGED_PS;
        }
 
        mt792x_mutex_release(dev);
@@ -2028,8 +2076,6 @@ mt7925_change_vif_links(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                        goto free;
 
                if (mconf != &mvif->bss_conf) {
-                       mt7925_mcu_set_bss_pm(dev, link_conf, true);
-
                        err = mt7925_set_mlo_roc(phy, &mvif->bss_conf,
                                                 vif->active_links);
                        if (err < 0)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
index fd5f9d4ea4a7a5a90b5166f471ced3e8f0e0fa09..cb7b1a49fbd14ec09b39fda22005e004d5db8b91 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
@@ -268,6 +268,7 @@ int mt7925_mcu_uni_tx_ba(struct mt792x_dev *dev,
 int mt7925_mcu_uni_rx_ba(struct mt792x_dev *dev,
                         struct ieee80211_ampdu_params *params,
                         bool enable);
+void mt7925_mlo_pm_work(struct work_struct *work);
 void mt7925_scan_work(struct work_struct *work);
 void mt7925_roc_work(struct work_struct *work);
 int mt7925_mcu_uni_bss_ps(struct mt792x_dev *dev,

diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index 454c6f523cc2292b53fd9a06f6c5c3e2b3e4542c..048f9ab161263339d32a8228f4835401542b51fb 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -82,6 +82,13 @@ enum mt792x_reg_power_type {
        MT_AP_VLP,
 };
 
+enum mt792x_mlo_pm_state {
+       MT792x_MLO_LINK_DISASSOC,
+       MT792x_MLO_LINK_ASSOC,
+       MT792x_MLO_CHANGED_PS_PENDING,
+       MT792x_MLO_CHANGED_PS,
+};
+
 DECLARE_EWMA(avg_signal, 10, 8)
 
 struct mt792x_link_sta {
@@ -135,6 +142,7 @@ struct mt792x_vif {
        struct mt792x_phy *phy;
        u16 valid_links;
        u8 deflink_id;
+       enum mt792x_mlo_pm_state mlo_pm_state;
 
        struct work_struct csa_work;
        struct timer_list csa_timer;
@@ -240,6 +248,7 @@ struct mt792x_dev {
        const struct mt792x_irq_map *irq_map;
 
        struct work_struct ipv6_ns_work;
+       struct delayed_work mlo_pm_work;
        /* IPv6 addresses for WoWLAN */
        struct sk_buff_head ipv6_ns_list;