wifi: mt76: mt7996: add muru support

Add sta_rec_muru() fw command to support MU-MIMO and OFDMA features.

Signed-off-by: MeiChia Chiu <meichia.chiu@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 dcbb608..4543e5b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -519,7 +519,8 @@ struct sta_rec_muru {
                u8 uo_ra;
                u8 he_2x996_tone;
                u8 rx_t_frame_11ac;
-               u8 rsv[3];
+               u8 rx_ctrl_frame_to_mbss;
+               u8 rsv[2];
        } ofdma_ul;
 
        struct {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index 20519bf..611f645 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -1101,6 +1101,59 @@ mt7996_mcu_sta_amsdu_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
        }
 }
 
+static void
+mt7996_mcu_sta_muru_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
+                       struct ieee80211_vif *vif, struct ieee80211_sta *sta)
+{
+       struct ieee80211_he_cap_elem *elem = &sta->deflink.he_cap.he_cap_elem;
+       struct sta_rec_muru *muru;
+       struct tlv *tlv;
+
+       if (vif->type != NL80211_IFTYPE_STATION &&
+           vif->type != NL80211_IFTYPE_AP)
+               return;
+
+       tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_MURU, sizeof(*muru));
+
+       muru = (struct sta_rec_muru *)tlv;
+       muru->cfg.mimo_dl_en = vif->bss_conf.eht_mu_beamformer ||
+                              vif->bss_conf.he_mu_beamformer ||
+                              vif->bss_conf.vht_mu_beamformer ||
+                              vif->bss_conf.vht_mu_beamformee;
+       muru->cfg.ofdma_dl_en = true;
+
+       if (sta->deflink.vht_cap.vht_supported)
+               muru->mimo_dl.vht_mu_bfee =
+                       !!(sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);
+
+       if (!sta->deflink.he_cap.has_he)
+               return;
+
+       muru->mimo_dl.partial_bw_dl_mimo =
+               HE_PHY(CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO, elem->phy_cap_info[6]);
+
+       muru->mimo_ul.full_ul_mimo =
+               HE_PHY(CAP2_UL_MU_FULL_MU_MIMO, elem->phy_cap_info[2]);
+       muru->mimo_ul.partial_ul_mimo =
+               HE_PHY(CAP2_UL_MU_PARTIAL_MU_MIMO, elem->phy_cap_info[2]);
+
+       muru->ofdma_dl.punc_pream_rx =
+               HE_PHY(CAP1_PREAMBLE_PUNC_RX_MASK, elem->phy_cap_info[1]);
+       muru->ofdma_dl.he_20m_in_40m_2g =
+               HE_PHY(CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G, elem->phy_cap_info[8]);
+       muru->ofdma_dl.he_20m_in_160m =
+               HE_PHY(CAP8_20MHZ_IN_160MHZ_HE_PPDU, elem->phy_cap_info[8]);
+       muru->ofdma_dl.he_80m_in_160m =
+               HE_PHY(CAP8_80MHZ_IN_160MHZ_HE_PPDU, elem->phy_cap_info[8]);
+
+       muru->ofdma_ul.t_frame_dur =
+               HE_MAC(CAP1_TF_MAC_PAD_DUR_MASK, elem->mac_cap_info[1]);
+       muru->ofdma_ul.mu_cascading =
+               HE_MAC(CAP2_MU_CASCADING, elem->mac_cap_info[2]);
+       muru->ofdma_ul.uo_ra =
+               HE_MAC(CAP3_OFDMA_RA, elem->mac_cap_info[3]);
+}
+
 static inline bool
 mt7996_is_ebf_supported(struct mt7996_phy *phy, struct ieee80211_vif *vif,
                        struct ieee80211_sta *sta, bool bfee)
@@ -1778,7 +1831,8 @@ int mt7996_mcu_add_sta(struct mt7996_dev *dev, struct ieee80211_vif *vif,
                mt7996_mcu_sta_he_6g_tlv(skb, sta);
                /* starec eht */
                mt7996_mcu_sta_eht_tlv(skb, sta);
-               /* TODO: starec muru */
+               /* starec muru */
+               mt7996_mcu_sta_muru_tlv(dev, skb, vif, sta);
                /* starec bfee */
                mt7996_mcu_sta_bfee_tlv(dev, skb, vif, sta);
                /* starec hdr trans */