mt76: mt7915: fix max_mpdu_size in mt7915_mcu_sta_amsdu_tlv()
Subsystems (2)
PATCH 1/1 mt76: mt7915: fix max_mpdu_size in mt7915_mcu_sta_amsdu_tlv()
The maximum max_mpdu_size of mt7915 is 7991, whereas mt7916 can support 11454.
Fixes b443e55fb5b37 ("mt76: mt7915: add Tx A-MSDU offloading support")
Signed-off-by Peter Chiu <[email protected]>
--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +21 -5
@@ -986,8 +986,8 @@ mt7915_mcu_sta_vht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) }static void -mt7915_mcu_sta_amsdu_tlv (struct sk_buff *skb,struct ieee80211_vif *vif, -struct ieee80211_sta *sta) +mt7915_mcu_sta_amsdu_tlv (struct mt7915_dev *dev,struct sk_buff *skb, +struct ieee80211_vif *vif,struct ieee80211_sta *sta) {struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;struct sta_rec_amsdu *amsdu;
@@ -1004,9 +1004,25 @@ mt7915_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, amsdu = (struct sta_rec_amsdu *)tlv; amsdu->max_amsdu_num =8 ; amsdu->amsdu_en = true; - amsdu->max_mpdu_size = sta->max_amsdu_len >= -IEEE80211_MAX_MPDU_LEN_VHT_7991 ; msta->wcid.amsdu = true; + +switch (sta->max_amsdu_len) { +case IEEE80211_MAX_MPDU_LEN_VHT_11454 : +if (!is_mt7915 (&dev->mt76)) { + amsdu->max_mpdu_size = +IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 ; +return ; + } + fallthrough; +case IEEE80211_MAX_MPDU_LEN_HT_7935 : +case IEEE80211_MAX_MPDU_LEN_VHT_7991 : + amsdu->max_mpdu_size =IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 ; +return ; +default : + amsdu->max_mpdu_size =IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 ; +return ; + } + } static int
@@ -1686,7 +1702,7 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif,if (sta && sta->ht_cap.ht_supported) {/* starec amsdu */ -mt7915_mcu_sta_amsdu_tlv (skb, vif, sta); +mt7915_mcu_sta_amsdu_tlv (dev, skb, vif, sta);/* starec he */ mt7915_mcu_sta_he_tlv (skb, sta, vif);/* starec muru */
Signature · 1 line
2.29.2
PATCH 1/1 mt76: mt7915: fix mcs_map in mt7915_mcu_set_sta_he_mcs()
Should use peer's bandwidth instead of chandef->width to get correct mcs_map.
Fixes 76be6c076c077 ("mt76: mt7915: add .set_bitrate_mask() callback")
Signed-off-by Peter Chiu <[email protected]>
--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +8 -21
@@ -86,24 +86,12 @@ mt7915_mcu_get_sta_nss(u16 mcs_map)static void mt7915_mcu_set_sta_he_mcs (struct ieee80211_sta *sta,__le16 *he_mcs, -const u16 *mask) +u16 mcs_map) {struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv; -struct cfg80211_chan_def *chandef = &msta->vif->phy->mt76->chandef; +enum nl80211_band band = msta->vif->phy->mt76->chandef.chan->band; +const u16 *mask = msta->vif->bitrate_mask.control[band].he_mcs;int nss, max_nss = sta->rx_nss >3 ?4 : sta->rx_nss; -u16 mcs_map; - -switch (chandef->width) { -case NL80211_CHAN_WIDTH_80P80 : - mcs_map =le16_to_cpu (sta->he_cap.he_mcs_nss_supp.rx_mcs_80p80); -break ; -case NL80211_CHAN_WIDTH_160 : - mcs_map =le16_to_cpu (sta->he_cap.he_mcs_nss_supp.rx_mcs_160); -break ; -default : - mcs_map =le16_to_cpu (sta->he_cap.he_mcs_nss_supp.rx_mcs_80); -break ; - }for (nss =0 ; nss < max_nss; nss++) {int mcs;
@@ -760,11 +748,9 @@ static void mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, struct ieee80211_vif *vif) { - struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv; struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;struct ieee80211_he_cap_elem *elem = &sta->he_cap.he_cap_elem; -enum nl80211_band band = msta->vif->phy->mt76->chandef.chan->band; -const u16 *mcs_mask = msta->vif->bitrate_mask.control[band].he_mcs; +struct ieee80211_he_mcs_nss_supp mcs_map;struct sta_rec_he *he;struct tlv *tlv;u32 cap =0 ;
@@ -854,22 +840,23 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, he->he_cap =cpu_to_le32 (cap); + mcs_map = sta->he_cap.he_mcs_nss_supp;switch (sta->bandwidth) {case IEEE80211_STA_RX_BW_160 :if (elem->phy_cap_info[0 ] &IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G )mt7915_mcu_set_sta_he_mcs (sta, &he->max_nss_mcs[CMD_HE_MCS_BW8080 ], - mcs_mask); +le16_to_cpu (mcs_map.rx_mcs_80p80));mt7915_mcu_set_sta_he_mcs (sta, &he->max_nss_mcs[CMD_HE_MCS_BW160 ], - mcs_mask); +le16_to_cpu (mcs_map.rx_mcs_160)); fallthrough;default :mt7915_mcu_set_sta_he_mcs (sta, &he->max_nss_mcs[CMD_HE_MCS_BW80 ], - mcs_mask); +le16_to_cpu (mcs_map.rx_mcs_80));break ; }
Signature · 1 line
2.29.2