wifi: mt76: mt7996: rework ampdu params setting

Add sta_rec_ht_uni struct to pass HT ampdu params to firmware. For VHT,
HE, and EHT mode, firmware will get the ampdu params by parsing the
corresponding capability.

Co-developed-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index 49c364785f2a8e63e3155acdd10f184b2c554802..5c86e28bcd216ccd2b3108f6d128933da43d1eb7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -1255,7 +1255,7 @@ mt7996_mcu_sta_eht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
 static void
 mt7996_mcu_sta_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
 {
-       struct sta_rec_ht *ht;
+       struct sta_rec_ht_uni *ht;
        struct tlv *tlv;
 
        if (!sta->deflink.ht_cap.ht_supported)
@@ -1263,8 +1263,12 @@ mt7996_mcu_sta_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
 
        tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HT, sizeof(*ht));
 
-       ht = (struct sta_rec_ht *)tlv;
+       ht = (struct sta_rec_ht_uni *)tlv;
        ht->ht_cap = cpu_to_le16(sta->deflink.ht_cap.cap);
+       ht->ampdu_param = u8_encode_bits(sta->deflink.ht_cap.ampdu_factor,
+                                        IEEE80211_HT_AMPDU_PARM_FACTOR) |
+                         u8_encode_bits(sta->deflink.ht_cap.ampdu_density,
+                                        IEEE80211_HT_AMPDU_PARM_DENSITY);
 }
 
 static void
@@ -1721,44 +1725,6 @@ mt7996_mcu_sta_bfee_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
        bfee->fb_identity_matrix = (nrow == 1 && tx_ant == 2);
 }
 
-static void
-mt7996_mcu_sta_phy_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
-                      struct ieee80211_vif *vif, struct ieee80211_sta *sta)
-{
-       struct sta_rec_phy *phy;
-       struct tlv *tlv;
-       u8 af = 0, mm = 0;
-
-       if (!sta->deflink.ht_cap.ht_supported && !sta->deflink.he_6ghz_capa.capa)
-               return;
-
-       tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_PHY, sizeof(*phy));
-
-       phy = (struct sta_rec_phy *)tlv;
-       if (sta->deflink.ht_cap.ht_supported) {
-               af = sta->deflink.ht_cap.ampdu_factor;
-               mm = sta->deflink.ht_cap.ampdu_density;
-       }
-
-       if (sta->deflink.vht_cap.vht_supported) {
-               u8 vht_af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK,
-                                     sta->deflink.vht_cap.cap);
-
-               af = max_t(u8, af, vht_af);
-       }
-
-       if (sta->deflink.he_6ghz_capa.capa) {
-               af = le16_get_bits(sta->deflink.he_6ghz_capa.capa,
-                                  IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP);
-               mm = le16_get_bits(sta->deflink.he_6ghz_capa.capa,
-                                  IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START);
-       }
-
-       phy->ampdu = FIELD_PREP(IEEE80211_HT_AMPDU_PARM_FACTOR, af) |
-                    FIELD_PREP(IEEE80211_HT_AMPDU_PARM_DENSITY, mm);
-       phy->max_ampdu_len = af;
-}
-
 static void
 mt7996_mcu_sta_hdrt_tlv(struct mt7996_dev *dev, struct sk_buff *skb)
 {
@@ -2167,8 +2133,6 @@ int mt7996_mcu_add_sta(struct mt7996_dev *dev, struct ieee80211_vif *vif,
 
        /* tag order is in accordance with firmware dependency. */
        if (sta) {
-               /* starec phy */
-               mt7996_mcu_sta_phy_tlv(dev, skb, vif, sta);
                /* starec hdrt mode */
                mt7996_mcu_sta_hdrt_tlv(dev, skb);
                /* starec bfer */

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h
index e23cc96c4dbcff03a448862089b70eb77f9ba7ff..1851528d10ca649a72431876913d5b7de7a908aa 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h
@@ -467,6 +467,15 @@ struct bss_mld_tlv {
        u8 __rsv[3];
 } __packed;
 
+struct sta_rec_ht_uni {
+       __le16 tag;
+       __le16 len;
+       __le16 ht_cap;
+       __le16 ht_cap_ext;
+       u8 ampdu_param;
+       u8 _rsv[3];
+} __packed;
+
 struct sta_rec_ba_uni {
        __le16 tag;
        __le16 len;
@@ -758,14 +767,13 @@ enum {
 #define MT7996_STA_UPDATE_MAX_SIZE     (sizeof(struct sta_req_hdr) +           \
                                         sizeof(struct sta_rec_basic) +         \
                                         sizeof(struct sta_rec_bf) +            \
-                                        sizeof(struct sta_rec_ht) +            \
+                                        sizeof(struct sta_rec_ht_uni) +        \
                                         sizeof(struct sta_rec_he_v2) +         \
                                         sizeof(struct sta_rec_ba_uni) +        \
                                         sizeof(struct sta_rec_vht) +           \
                                         sizeof(struct sta_rec_uapsd) +         \
                                         sizeof(struct sta_rec_amsdu) +         \
                                         sizeof(struct sta_rec_bfee) +          \
-                                        sizeof(struct sta_rec_phy) +           \
                                         sizeof(struct sta_rec_ra_uni) +        \
                                         sizeof(struct sta_rec_sec) +           \
                                         sizeof(struct sta_rec_ra_fixed_uni) +  \