wifi: mt76: mt7925: update mt7925_mcu_bss_mld_tlv for MLO

update mt7925_mcu_bss_mld_tlv for the MLO-enabled firmware,
the change remains compatible with the non-MLO mode and the
older firmware.

Co-developed-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Co-developed-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/2d89b93bcfd92e7c6987aaa0a3c4637e605ac154.1720248331.git.sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index 59ae1fbc238b0386376d276aa66c4cf4dbc37e15..7a02251271354bc6783c353d32fcdf1c57eeb74a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -2393,24 +2393,29 @@ mt7925_mcu_bss_bmc_tlv(struct sk_buff *skb, struct mt792x_phy *phy,
 
 static void
 mt7925_mcu_bss_mld_tlv(struct sk_buff *skb,
-                      struct ieee80211_bss_conf *link_conf,
-                      struct ieee80211_link_sta *link_sta)
+                      struct ieee80211_bss_conf *link_conf)
 {
        struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);
-       bool is_mld = ieee80211_vif_is_mld(link_conf->vif);
+       struct mt792x_vif *mvif = (struct mt792x_vif *)link_conf->vif->drv_priv;
        struct bss_mld_tlv *mld;
        struct tlv *tlv;
+       bool is_mld;
+
+       is_mld = ieee80211_vif_is_mld(link_conf->vif) ||
+                (hweight16(mvif->valid_links) > 1);
 
        tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_MLD, sizeof(*mld));
        mld = (struct bss_mld_tlv *)tlv;
 
-       mld->link_id = link_sta ? (is_mld ? link_conf->link_id : 0) : 0xff;
-       mld->group_mld_id = is_mld ? mconf->mt76.idx : 0xff;
+       mld->link_id = is_mld ? link_conf->link_id : 0xff;
+       /* apply the index of the primary link */
+       mld->group_mld_id = is_mld ? mvif->bss_conf.mt76.idx : 0xff;
        mld->own_mld_id = mconf->mt76.idx + 32;
        mld->remap_idx = 0xff;
+       mld->eml_enable = !!(link_conf->vif->cfg.eml_cap &
+                            IEEE80211_EML_CAP_EMLSR_SUPP);
 
-       if (link_sta)
-               memcpy(mld->mac_addr, link_sta->addr, ETH_ALEN);
+       memcpy(mld->mac_addr, link_conf->addr, ETH_ALEN);
 }
 
 static void
@@ -2520,10 +2525,9 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,
        mt7925_mcu_bss_basic_tlv(skb, link_conf, link_sta, ctx, phy->mt76,
                                 mvif->sta.deflink.wcid.idx, enable);
        mt7925_mcu_bss_sec_tlv(skb, link_conf);
-
        mt7925_mcu_bss_bmc_tlv(skb, phy, ctx, link_conf);
        mt7925_mcu_bss_qos_tlv(skb, link_conf);
-       mt7925_mcu_bss_mld_tlv(skb, link_conf, link_sta);
+       mt7925_mcu_bss_mld_tlv(skb, link_conf);
        mt7925_mcu_bss_ifs_tlv(skb, link_conf);
 
        if (link_conf->he_support) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
index 6ae5286385d90e9d906b433aea5caff26f547e73..7b0c6937f91820773e92b3b96b29370f7d23f4aa 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
@@ -366,7 +366,10 @@ struct bss_mld_tlv {
        u8 mac_addr[ETH_ALEN];
        u8 remap_idx;
        u8 link_id;
-       u8 __rsv[2];
+       u8 eml_enable;
+       u8 max_link_num;
+       u8 hybrid_mode;
+       u8 __rsv[3];
 } __packed;
 
 struct sta_rec_ba_uni {