wifi: mt76: connac: add MBSSID support for mt7996

Add bss_info_uni_mbssid tag and implement 802.11v MBSSID support for
mt7996 chipsets.

Signed-off-by: Chank Chen <chank.chen@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
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 390be6fd8862c22c90be8c44ea69f5fd33a610b5..9bc97a35fc1dcbf759ee6b6ac4c1436ec5d85337 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1295,6 +1295,7 @@ enum {
        UNI_BSS_INFO_RLM = 2,
        UNI_BSS_INFO_BSS_COLOR = 4,
        UNI_BSS_INFO_HE_BASIC = 5,
+       UNI_BSS_INFO_11V_MBSSID = 6,
        UNI_BSS_INFO_BCN_CONTENT = 7,
        UNI_BSS_INFO_BCN_CSA = 8,
        UNI_BSS_INFO_BCN_BCC = 9,
@@ -1566,6 +1567,15 @@ struct bss_info_uni_he {
        u8 rsv[2];
 } __packed;
 
+struct bss_info_uni_mbssid {
+       __le16 tag;
+       __le16 len;
+       u8 max_indicator;
+       u8 mbss_idx;
+       u8 tx_bss_omac_idx;
+       u8 rsv;
+} __packed;
+
 struct mt76_connac_gtk_rekey_tlv {
        __le16 tag;
        __le16 len;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/init.c b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
index cc707a6c98cfc8787ed3953bf22274edb249852d..e4bb22b84159b5483794eb95ec36e0a781965b0e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
@@ -181,6 +181,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw)
        wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
        wiphy->reg_notifier = mt7996_regd_notifier;
        wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
+       wiphy->mbssid_max_interfaces = 16;
 
        wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BSS_COLOR);
        wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS);
@@ -204,6 +205,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw)
        ieee80211_hw_set(hw, SUPPORTS_TX_ENCAP_OFFLOAD);
        ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD);
        ieee80211_hw_set(hw, WANT_MONITOR_VIF);
+       ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);
 
        hw->max_tx_fragments = 4;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index 3b56b90bb956f5f744acd2fcfa4eb5039280a8a7..29e287373717dd0e2120556a750eb2b3e271c334 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -600,6 +600,24 @@ mt7996_mcu_bss_he_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
        he->max_nss_mcs[CMD_HE_MCS_BW8080] = cap->he_mcs_nss_supp.tx_mcs_80p80;
 }
 
+static void
+mt7996_mcu_bss_mbssid_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
+                         struct mt7996_phy *phy, int enable)
+{
+       struct bss_info_uni_mbssid *mbssid;
+       struct tlv *tlv;
+
+       tlv = mt7996_mcu_add_uni_tlv(skb, UNI_BSS_INFO_11V_MBSSID, sizeof(*mbssid));
+
+       mbssid = (struct bss_info_uni_mbssid *)tlv;
+
+       if (enable && vif->bss_conf.bssid_indicator) {
+               mbssid->max_indicator = vif->bss_conf.bssid_indicator;
+               mbssid->mbss_idx = vif->bss_conf.bssid_index;
+               mbssid->tx_bss_omac_idx = 0;
+       }
+}
+
 static void
 mt7996_mcu_bss_bmc_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
                       struct mt7996_phy *phy)
@@ -866,6 +884,9 @@ int mt7996_mcu_add_bss_info(struct mt7996_phy *phy,
                /* this tag is necessary no matter if the vif is MLD */
                mt7996_mcu_bss_mld_tlv(skb, vif);
        }
+
+       mt7996_mcu_bss_mbssid_tlv(skb, vif, phy, enable);
+
 out:
        return mt76_mcu_skb_send_msg(&dev->mt76, skb,
                                     MCU_WMWA_UNI_CMD(BSS_INFO_UPDATE), true);
@@ -2126,6 +2147,59 @@ mt7996_mcu_beacon_cntdwn(struct ieee80211_vif *vif, struct sk_buff *rskb,
        info->cnt = skb->data[offs->cntdwn_counter_offs[0]];
 }
 
+static void
+mt7996_mcu_beacon_mbss(struct sk_buff *rskb, struct sk_buff *skb,
+                      struct ieee80211_vif *vif, struct bss_bcn_content_tlv *bcn,
+                      struct ieee80211_mutable_offsets *offs)
+{
+       struct bss_bcn_mbss_tlv *mbss;
+       const struct element *elem;
+       struct tlv *tlv;
+
+       if (!vif->bss_conf.bssid_indicator)
+               return;
+
+       tlv = mt7996_mcu_add_uni_tlv(rskb, UNI_BSS_INFO_BCN_MBSSID, sizeof(*mbss));
+
+       mbss = (struct bss_bcn_mbss_tlv *)tlv;
+       mbss->offset[0] = cpu_to_le16(offs->tim_offset);
+       mbss->bitmap = cpu_to_le32(1);
+
+       for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID,
+                           &skb->data[offs->mbssid_off],
+                           skb->len - offs->mbssid_off) {
+               const struct element *sub_elem;
+
+               if (elem->datalen < 2)
+                       continue;
+
+               for_each_element(sub_elem, elem->data + 1, elem->datalen - 1) {
+                       const struct ieee80211_bssid_index *idx;
+                       const u8 *idx_ie;
+
+                       /* not a valid BSS profile */
+                       if (sub_elem->id || sub_elem->datalen < 4)
+                               continue;
+
+                       /* Find WLAN_EID_MULTI_BSSID_IDX
+                        * in the merged nontransmitted profile
+                        */
+                       idx_ie = cfg80211_find_ie(WLAN_EID_MULTI_BSSID_IDX,
+                                                 sub_elem->data, sub_elem->datalen);
+                       if (!idx_ie || idx_ie[1] < sizeof(*idx))
+                               continue;
+
+                       idx = (void *)(idx_ie + 2);
+                       if (!idx->bssid_index || idx->bssid_index > 31)
+                               continue;
+
+                       mbss->offset[idx->bssid_index] = cpu_to_le16(idx_ie -
+                                                                    skb->data);
+                       mbss->bitmap |= cpu_to_le32(BIT(idx->bssid_index));
+               }
+       }
+}
+
 static void
 mt7996_mcu_beacon_cont(struct mt7996_dev *dev, struct ieee80211_vif *vif,
                       struct sk_buff *rskb, struct sk_buff *skb,
@@ -2166,6 +2240,9 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw,
        struct tlv *tlv;
        struct bss_bcn_content_tlv *bcn;
 
+       if (vif->bss_conf.nontransmitted)
+               return 0;
+
        rskb = __mt7996_mcu_alloc_bss_req(&dev->mt76, &mvif->mt76,
                                          MT7996_BEACON_UPDATE_SIZE);
        if (IS_ERR(rskb))
@@ -2193,7 +2270,7 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw,
        info->hw_queue |= FIELD_PREP(MT_TX_HW_QUEUE_PHY, phy->mt76->band_idx);
 
        mt7996_mcu_beacon_cont(dev, vif, rskb, skb, bcn, &offs);
-       /* TODO: subtag - 11v MBSSID */
+       mt7996_mcu_beacon_mbss(rskb, skb, vif, bcn, &offs);
        mt7996_mcu_beacon_cntdwn(vif, rskb, skb, &offs);
        dev_kfree_skb(skb);
 out: