| From 0449694e4e963d0b48354ae2c52016c34899fba6 Mon Sep 17 00:00:00 2001 |
| From: mtk20656 <chank.chen@mediatek.com> |
| Date: Wed, 8 Mar 2023 14:18:29 +0800 |
| Subject: [PATCH 28/39] wifi: mt76: mt7996: add 11v mbss support for mt76 |
| |
| Signed-off-by: mtk20656 <chank.chen@mediatek.com> |
| --- |
| mt76_connac_mcu.h | 10 ++++++ |
| mt7996/init.c | 2 ++ |
| mt7996/mcu.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++- |
| 3 files changed, 90 insertions(+), 1 deletion(-) |
| |
| diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h |
| index 724a48a..97f874b 100644 |
| --- a/mt76_connac_mcu.h |
| +++ b/mt76_connac_mcu.h |
| @@ -1281,6 +1281,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, |
| @@ -1551,6 +1552,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[1]; |
| +} __packed; |
| + |
| struct mt76_connac_gtk_rekey_tlv { |
| __le16 tag; |
| __le16 len; |
| diff --git a/mt7996/init.c b/mt7996/init.c |
| index 192af3f..0562439 100644 |
| --- a/mt7996/init.c |
| +++ b/mt7996/init.c |
| @@ -359,6 +359,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); |
| @@ -381,6 +382,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/mt7996/mcu.c b/mt7996/mcu.c |
| index 6bcb33e..a369a08 100644 |
| --- a/mt7996/mcu.c |
| +++ b/mt7996/mcu.c |
| @@ -631,6 +631,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) |
| +{ |
| + 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; |
| + |
| + mbssid->max_indicator = vif->bss_conf.bssid_indicator; |
| + mbssid->mbss_idx = vif->bss_conf.bssid_index; |
| + mbssid->tx_bss_omac_idx = 0; |
| + |
| + return; |
| +} |
| + |
| static void |
| mt7996_mcu_bss_bmc_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, |
| struct mt7996_phy *phy) |
| @@ -895,6 +913,9 @@ int mt7996_mcu_add_bss_info(struct mt7996_phy *phy, |
| if (vif->bss_conf.he_support) |
| mt7996_mcu_bss_he_tlv(skb, vif, phy); |
| |
| + if (vif->bss_conf.bssid_indicator) |
| + mt7996_mcu_bss_mbssid_tlv(skb, vif, phy); |
| + |
| /* this tag is necessary no matter if the vif is MLD */ |
| mt7996_mcu_bss_mld_tlv(skb, vif); |
| } |
| @@ -2162,6 +2183,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; |
| + |
| + if (sub_elem->id || sub_elem->datalen < 4) |
| + continue; /* not a valid BSS profile */ |
| + |
| + /* 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, |
| @@ -2202,6 +2276,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)) |
| @@ -2229,7 +2306,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: |
| -- |
| 2.18.0 |
| |