wifi: mt76: mt7925: extend mt7925_mcu_sta_update for per-link STA

Extend mt7925_mcu_sta_update with the per-link STA configuration.

The patch we created is a prerequisite to enable the MLO function in the
driver. It is purely a refactoring patch so the functionality should
remain unchanged.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/20240613030241.5771-25-sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 5c7c42c95de19d5d875f2e5a10f5d5e69d894f27..994136285815106aa26f06f4c9acf1e2a2ecf431 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1733,7 +1733,10 @@ enum mt76_sta_info_state {
 };
 
 struct mt76_sta_cmd_info {
-       struct ieee80211_sta *sta;
+       union {
+               struct ieee80211_sta *sta;
+               struct ieee80211_link_sta *link_sta;
+       };
        struct mt76_wcid *wcid;
 
        struct ieee80211_vif *vif;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index cd20b85109b96cbc4c25eb7fafa3cb39e4bdd239..f3a32fe9a754c7b38d7c8f809e6277c602817dcb 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -740,7 +740,7 @@ int mt7925_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
                mt7925_mcu_add_bss_info(&dev->phy, mvif->bss_conf.mt76.ctx,
                                        link_conf, sta, false);
 
-       ret = mt7925_mcu_sta_update(dev, sta, vif, true,
+       ret = mt7925_mcu_sta_update(dev, &sta->deflink, vif, true,
                                    MT76_STA_INFO_STATE_NONE);
        if (ret)
                return ret;
@@ -773,7 +773,7 @@ void mt7925_mac_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,
                               MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
        memset(msta->deflink.airtime_ac, 0, sizeof(msta->deflink.airtime_ac));
 
-       mt7925_mcu_sta_update(dev, sta, vif, true, MT76_STA_INFO_STATE_ASSOC);
+       mt7925_mcu_sta_update(dev, &sta->deflink, vif, true, MT76_STA_INFO_STATE_ASSOC);
 
        mt792x_mutex_release(dev);
 }
@@ -789,7 +789,7 @@ void mt7925_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
        mt76_connac_free_pending_tx_skbs(&dev->pm, &msta->deflink.wcid);
        mt76_connac_pm_wake(&dev->mphy, &dev->pm);
 
-       mt7925_mcu_sta_update(dev, sta, vif, false, MT76_STA_INFO_STATE_NONE);
+       mt7925_mcu_sta_update(dev, &sta->deflink, vif, false, MT76_STA_INFO_STATE_NONE);
        mt7925_mac_wtbl_update(dev, msta->deflink.wcid.idx,
                               MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index 9d56013b2f559ce1c51992da310c8d940ed29817..9b69b4b178de73f4e2efa0f0cdf77fca02dc7b3b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -1628,39 +1628,46 @@ mt7925_mcu_sta_cmd(struct mt76_phy *phy,
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 
-       if (info->sta || !info->offload_fw)
-               mt76_connac_mcu_sta_basic_tlv(dev, skb, info->vif, info->sta,
+       if (info->link_sta || !info->offload_fw)
+               mt76_connac_mcu_sta_basic_tlv(dev, skb, info->vif,
+                                             info->link_sta->sta,
                                              info->enable, info->newly);
-       if (info->sta && info->enable) {
-               mt7925_mcu_sta_phy_tlv(skb, info->vif, info->sta);
-               mt7925_mcu_sta_ht_tlv(skb, info->sta);
-               mt7925_mcu_sta_vht_tlv(skb, info->sta);
-               mt76_connac_mcu_sta_uapsd(skb, info->vif, info->sta);
-               mt7925_mcu_sta_amsdu_tlv(skb, info->vif, info->sta);
-               mt7925_mcu_sta_he_tlv(skb, info->sta);
-               mt7925_mcu_sta_he_6g_tlv(skb, info->sta);
-               mt7925_mcu_sta_eht_tlv(skb, info->sta);
-               mt7925_mcu_sta_rate_ctrl_tlv(skb, info->vif, info->sta);
-               mt7925_mcu_sta_state_v2_tlv(phy, skb, info->sta,
+       if (info->link_sta && info->enable) {
+               mt7925_mcu_sta_phy_tlv(skb, info->vif, info->link_sta->sta);
+               mt7925_mcu_sta_ht_tlv(skb, info->link_sta->sta);
+               mt7925_mcu_sta_vht_tlv(skb, info->link_sta->sta);
+               mt76_connac_mcu_sta_uapsd(skb, info->vif, info->link_sta->sta);
+               mt7925_mcu_sta_amsdu_tlv(skb, info->vif, info->link_sta->sta);
+               mt7925_mcu_sta_he_tlv(skb, info->link_sta->sta);
+               mt7925_mcu_sta_he_6g_tlv(skb, info->link_sta->sta);
+               mt7925_mcu_sta_eht_tlv(skb, info->link_sta->sta);
+               mt7925_mcu_sta_rate_ctrl_tlv(skb, info->vif,
+                                            info->link_sta->sta);
+               mt7925_mcu_sta_state_v2_tlv(phy, skb, info->link_sta->sta,
                                            info->vif, info->rcpi,
                                            info->state);
-               mt7925_mcu_sta_mld_tlv(skb, info->vif, info->sta);
+               mt7925_mcu_sta_mld_tlv(skb, info->vif, info->link_sta->sta);
        }
 
-       if (info->enable)
-               mt7925_mcu_sta_hdr_trans_tlv(skb, info->vif, info->sta);
+       if (info->enable) {
+               struct ieee80211_sta *sta = info->link_sta ?
+                       info->link_sta->sta : NULL;
+
+               mt7925_mcu_sta_hdr_trans_tlv(skb, info->vif, sta);
+       }
 
        return mt76_mcu_skb_send_msg(dev, skb, info->cmd, true);
 }
 
-int mt7925_mcu_sta_update(struct mt792x_dev *dev, struct ieee80211_sta *sta,
+int mt7925_mcu_sta_update(struct mt792x_dev *dev,
+                         struct ieee80211_link_sta *link_sta,
                          struct ieee80211_vif *vif, bool enable,
                          enum mt76_sta_info_state state)
 {
        struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
        int rssi = -ewma_rssi_read(&mvif->bss_conf.rssi);
        struct mt76_sta_cmd_info info = {
-               .sta = sta,
+               .link_sta = link_sta,
                .vif = vif,
                .enable = enable,
                .cmd = MCU_UNI_CMD(STA_REC_UPDATE),
@@ -1669,10 +1676,14 @@ int mt7925_mcu_sta_update(struct mt792x_dev *dev, struct ieee80211_sta *sta,
                .rcpi = to_rcpi(rssi),
        };
        struct mt792x_sta *msta;
+       struct mt792x_link_sta *mlink;
 
-       msta = sta ? (struct mt792x_sta *)sta->drv_priv : NULL;
-       info.wcid = msta ? &msta->deflink.wcid : &mvif->sta.deflink.wcid;
-       info.newly = msta ? state != MT76_STA_INFO_STATE_ASSOC : true;
+       if (link_sta) {
+               msta = (struct mt792x_sta *)link_sta->sta->drv_priv;
+               mlink = mt792x_sta_to_link(msta, link_sta->link_id);
+       }
+       info.wcid = link_sta ? &mlink->wcid : &mvif->sta.deflink.wcid;
+       info.newly = link_sta ? state != MT76_STA_INFO_STATE_ASSOC : true;
 
        return mt7925_mcu_sta_cmd(&dev->mphy, &info);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
index ef37951f69d537231627905708a2041bcd3e08c1..8ec5a3a202028d12bc02b1c4e2091c9c334541dd 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
@@ -195,7 +195,8 @@ int mt7925_run_firmware(struct mt792x_dev *dev);
 int mt7925_mcu_set_bss_pm(struct mt792x_dev *dev,
                          struct ieee80211_bss_conf *link_conf,
                          bool enable);
-int mt7925_mcu_sta_update(struct mt792x_dev *dev, struct ieee80211_sta *sta,
+int mt7925_mcu_sta_update(struct mt792x_dev *dev,
+                         struct ieee80211_link_sta *link_sta,
                          struct ieee80211_vif *vif, bool enable,
                          enum mt76_sta_info_state state);
 int mt7925_mcu_set_chan_info(struct mt792x_phy *phy, u16 tag);

diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index f36e4aeb79b2216274581581db386fe907ada3a4..69eb8dac0b70655cf3a5be391ca8c31ec54904e1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -96,6 +96,7 @@ struct mt792x_link_sta {
 
 struct mt792x_sta {
        struct mt792x_link_sta deflink; /* must be first */
+       struct mt792x_link_sta __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS];
 
        struct mt792x_vif *vif;
 };
@@ -238,6 +239,21 @@ mt792x_vif_to_link(struct mt792x_vif *mvif, u8 link_id)
                lockdep_is_held(&mvif->phy->dev->mt76.mutex));
 }
 
+static inline struct mt792x_link_sta *
+mt792x_sta_to_link(struct mt792x_sta *msta, u8 link_id)
+{
+       struct ieee80211_vif *vif;
+
+       vif = container_of((void *)msta->vif, struct ieee80211_vif, drv_priv);
+
+       if (!ieee80211_vif_is_mld(vif) ||
+           link_id >= IEEE80211_LINK_UNSPECIFIED)
+               return &msta->deflink;
+
+       return rcu_dereference_protected(msta->link[link_id],
+               lockdep_is_held(&msta->vif->phy->dev->mt76.mutex));
+}
+
 static inline struct mt792x_bss_conf *
 mt792x_link_conf_to_mconf(struct ieee80211_bss_conf *link_conf)
 {