wifi: mt76: mt7996: add max mpdu len capability
Subsystems (2)
Shayne Chen
reviewerPATCH 1/9 wifi: mt76: mt7996: add max mpdu len capability
From: Peter Chiu <[email protected]>
Set max mpdu len to 11454 according to hardware capability. Without this patch, the max ampdu length would be 3895 and count not get expected performance.
--- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +3 -1
@@ -1310,7 +1310,9 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band, eht_cap_elem->mac_cap_info[0 ] =IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS | -IEEE80211_EHT_MAC_CAP0_OM_CONTROL ; +IEEE80211_EHT_MAC_CAP0_OM_CONTROL | +u8_encode_bits (IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454 , +IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK ); eht_cap_elem->phy_cap_info[0 ] = IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI |
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 2/9 wifi: mt76: mt7996: fix the capability of reception of EHT MU PPDU
From: Howard Hsu <[email protected]>
This commit includes two changes. First, enable "EHT MU PPDU With 4x EHT-LTF And 0.8us GI" in EHT Phy capabilities element since hardware can support. Second, fix the value of "Maximum number of supported EHT LTFs" in the same element, where the previous setting of 3 in Bit 3-4 was incorrect.
--- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +2 -3
@@ -1355,21 +1355,20 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK ; eht_cap_elem->phy_cap_info[4 ] = +IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI |u8_encode_bits (min_t (int, sts -1 ,2 ),IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK ); eht_cap_elem->phy_cap_info[5 ] =u8_encode_bits (IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US ,IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK ) | -u8_encode_bits (u8_get_bits (0x11 ,GENMASK (1 ,0 )), +u8_encode_bits (u8_get_bits (1 ,GENMASK (1 ,0 )),IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK ); val = width ==NL80211_CHAN_WIDTH_320 ?0xf : width ==NL80211_CHAN_WIDTH_160 ?0x7 : width ==NL80211_CHAN_WIDTH_80 ?0x3 :0x1 ; eht_cap_elem->phy_cap_info[6 ] = -u8_encode_bits (u8_get_bits (0x11 ,GENMASK (4 ,2 )), -IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK ) |u8_encode_bits (val,IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK ); val = u8_encode_bits(nss, IEEE80211_EHT_MCS_NSS_RX) |
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 3/9 wifi: mt76: mt7996: fix HE Phy capability
In reply to Shayne ChenFrom: Howard Hsu <[email protected]>
Set HE SU PPDU And HE MU PPDU With 4x HE-LTF And 0.8 us GI within HE PHY Capabilities element as 1 since hardware can support.
--- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +4 -2
@@ -1200,6 +1200,9 @@ mt7996_init_he_caps(struct mt7996_phy *phy, enum nl80211_band band, he_cap_elem->phy_cap_info[2 ] =IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ |IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ ; + he_cap_elem->phy_cap_info[7 ] = +IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI ; +switch (iftype) {case NL80211_IFTYPE_AP : he_cap_elem->mac_cap_info[0 ] |=IEEE80211_HE_MAC_CAP0_TWT_RES ;
@@ -1239,8 +1242,7 @@ mt7996_init_he_caps(struct mt7996_phy *phy, enum nl80211_band band,IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ; he_cap_elem->phy_cap_info[7 ] |= -IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP | -IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI ; +IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP ; he_cap_elem->phy_cap_info[8 ] |=IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G | IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 4/9 wifi: mt76: mt7996: fix incorrect indexing of MIB FW event
In reply to Shayne ChenFrom: Benjamin Lin <[email protected]>
Fix wrong calculation of the channel times due to incorrect interpretation from the FW event.
--- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 45 ++++++++++++------- 1 file changed, 29 insertions(+), 16 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +29 -16
@@ -3678,6 +3678,13 @@ int mt7996_mcu_get_chip_config(struct mt7996_dev *dev, u32 *cap) int mt7996_mcu_get_chan_mib_info(struct mt7996_phy *phy, bool chan_switch) { + enum { + IDX_TX_TIME, + IDX_RX_TIME, + IDX_OBSS_AIRTIME, + IDX_NON_WIFI_TIME, + IDX_NUM + }; struct { struct { u8 band;
@@ -3687,16 +3694,15 @@ int mt7996_mcu_get_chan_mib_info(struct mt7996_phy *phy, bool chan_switch)__le16 tag;__le16 len;__le32 offs; - } data[4 ]; + } data[IDX_NUM ]; }__packed req = { .hdr.band = phy->mt76->band_idx, }; -/* strict order */ static const u32 offs[] = { -UNI_MIB_TX_TIME , -UNI_MIB_RX_TIME , -UNI_MIB_OBSS_AIRTIME , -UNI_MIB_NON_WIFI_TIME , + [IDX_TX_TIME ] =UNI_MIB_TX_TIME , + [IDX_RX_TIME ] =UNI_MIB_RX_TIME , + [IDX_OBSS_AIRTIME ] =UNI_MIB_OBSS_AIRTIME , + [IDX_NON_WIFI_TIME ] =UNI_MIB_NON_WIFI_TIME , };struct mt76_channel_state *state = phy->mt76->chan_state;struct mt76_channel_state *state_ts = &phy->state_ts;
@@ -3705,7 +3711,7 @@ int mt7996_mcu_get_chan_mib_info(struct mt7996_phy *phy, bool chan_switch)struct sk_buff *skb;int i, ret; -for (i =0 ; i <4 ; i++) { +for (i =0 ; i <IDX_NUM ; i++) { req.data[i].tag =cpu_to_le16 (UNI_CMD_MIB_DATA ); req.data[i].len =cpu_to_le16 (sizeof (req.data[i])); req.data[i].offs =cpu_to_le32 (offs[i]);
@@ -3724,17 +3730,24 @@ int mt7996_mcu_get_chan_mib_info(struct mt7996_phy *phy, bool chan_switch) goto out;#define __res_u64 (s) le64_to_cpu(res[s].data) - state->cc_tx +=__res_u64 (1 ) - state_ts->cc_tx; - state->cc_bss_rx +=__res_u64 (2 ) - state_ts->cc_bss_rx; - state->cc_rx +=__res_u64 (2 ) +__res_u64 (3 ) - state_ts->cc_rx; - state->cc_busy +=__res_u64 (0 ) +__res_u64 (1 ) +__res_u64 (2 ) +__res_u64 (3 ) - + state->cc_tx +=__res_u64 (IDX_TX_TIME ) - state_ts->cc_tx; + state->cc_bss_rx +=__res_u64 (IDX_RX_TIME ) - state_ts->cc_bss_rx; + state->cc_rx +=__res_u64 (IDX_RX_TIME ) + +__res_u64 (IDX_OBSS_AIRTIME ) - + state_ts->cc_rx; + state->cc_busy +=__res_u64 (IDX_TX_TIME ) + +__res_u64 (IDX_RX_TIME ) + +__res_u64 (IDX_OBSS_AIRTIME ) + +__res_u64 (IDX_NON_WIFI_TIME ) - state_ts->cc_busy; - out: - state_ts->cc_tx =__res_u64 (1 ); - state_ts->cc_bss_rx =__res_u64 (2 ); - state_ts->cc_rx =__res_u64 (2 ) +__res_u64 (3 ); - state_ts->cc_busy =__res_u64 (0 ) +__res_u64 (1 ) +__res_u64 (2 ) +__res_u64 (3 ); + state_ts->cc_tx =__res_u64 (IDX_TX_TIME ); + state_ts->cc_bss_rx =__res_u64 (IDX_RX_TIME ); + state_ts->cc_rx =__res_u64 (IDX_RX_TIME ) +__res_u64 (IDX_OBSS_AIRTIME ); + state_ts->cc_busy =__res_u64 (IDX_TX_TIME ) + +__res_u64 (IDX_RX_TIME ) + +__res_u64 (IDX_OBSS_AIRTIME ) + +__res_u64 (IDX_NON_WIFI_TIME );#undef __res_u64dev_kfree_skb (skb);
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 5/9 wifi: mt76: connac: adjust phy capabilities based on band constraints
In reply to Shayne ChenFrom: Howard Hsu <[email protected]>
Adjust HE and EHT phy capabilities based on the band constraints. For 2g band, we shall not enable the capabilities above 40MHz.
--- .../net/wireless/mediatek/mt76/mt76_connac.h | 2 +- .../wireless/mediatek/mt76/mt76_connac_mac.c | 7 ++- .../net/wireless/mediatek/mt76/mt7915/init.c | 2 +- .../net/wireless/mediatek/mt76/mt7921/main.c | 2 +- .../net/wireless/mediatek/mt76/mt7925/main.c | 2 +- .../net/wireless/mediatek/mt76/mt7996/init.c | 47 +++++++++++++------ 6 files changed, 41 insertions(+), 21 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac.h +1 -1
@@ -405,7 +405,7 @@ mt76_connac_mutex_release(struct mt76_dev *dev, struct mt76_connac_pm *pm)mutex_unlock (&dev->mutex); } -void mt76_connac_gen_ppe_thresh (u8 *he_ppet,int nss); +void mt76_connac_gen_ppe_thresh (u8 *he_ppet,int nss,enum nl80211_band band);int mt76_connac_init_tx_queues (struct mt76_phy *phy,int idx,int n_desc,int ring_base,void *wed,u32 flags);
drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c +5 -2
@@ -9,10 +9,13 @@#define HE_PREP (f, m, v) le16_encode_bits(le32_get_bits(v, MT_CRXV_HE_##m),\ IEEE80211_RADIOTAP_HE_##f) -void mt76_connac_gen_ppe_thresh (u8 *he_ppet,int nss) +void mt76_connac_gen_ppe_thresh (u8 *he_ppet,int nss,enum nl80211_band band) {static const u8 ppet16_ppet8_ru3_ru0[] = {0x1c ,0xc7 ,0x71 }; -u8 i, ppet_bits, ppet_size, ru_bit_mask =0x7 ;/* HE80 */ +u8 i, ppet_bits, ppet_size, ru_bit_mask =0xf ; + +if (band ==NL80211_BAND_2GHZ ) + ru_bit_mask =0x3 ; he_ppet[0 ] =FIELD_PREP (IEEE80211_PPE_THRES_NSS_MASK , nss -1 ) | FIELD_PREP(IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK,
drivers/net/wireless/mediatek/mt76/mt7915/init.c +1 -1
@@ -1126,7 +1126,7 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,memset (he_cap->ppe_thres,0 ,sizeof (he_cap->ppe_thres));if (he_cap_elem->phy_cap_info[6 ] &IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ) { -mt76_connac_gen_ppe_thresh (he_cap->ppe_thres, nss); +mt76_connac_gen_ppe_thresh (he_cap->ppe_thres, nss, band); }else { he_cap_elem->phy_cap_info[9 ] |= u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,
drivers/net/wireless/mediatek/mt76/mt7921/main.c +1 -1
@@ -147,7 +147,7 @@ mt7921_init_he_caps(struct mt792x_phy *phy, enum nl80211_band band,memset (he_cap->ppe_thres,0 ,sizeof (he_cap->ppe_thres));if (he_cap_elem->phy_cap_info[6 ] &IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ) { -mt76_connac_gen_ppe_thresh (he_cap->ppe_thres, nss); +mt76_connac_gen_ppe_thresh (he_cap->ppe_thres, nss, band); }else { he_cap_elem->phy_cap_info[9 ] |= u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,
drivers/net/wireless/mediatek/mt76/mt7925/main.c +1 -1
@@ -130,7 +130,7 @@ mt7925_init_he_caps(struct mt792x_phy *phy, enum nl80211_band band,if (he_cap_elem->phy_cap_info[6 ] &IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ) { -mt76_connac_gen_ppe_thresh (he_cap->ppe_thres, nss); +mt76_connac_gen_ppe_thresh (he_cap->ppe_thres, nss, band); }else { he_cap_elem->phy_cap_info[9 ] |= u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,
drivers/net/wireless/mediatek/mt76/mt7996/init.c +32 -15
101 lines not on this page · raw message
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 6/9 wifi: mt76: mt7996: fix definition of tx descriptor
In reply to Shayne ChenFrom: Benjamin Lin <[email protected]>
For mt7992 chipsets, the definition of TXD.DW6.BIT10~15 has different interpretations on different frame types. Driver only needs to fill MSDU_CNT for non-management frames.
--- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +3 -2
@@ -826,6 +826,7 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, struct ieee80211_key_conf *key, int pid, enum mt76_txq_id qid, u32 changed) { + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_vif *vif = info->control.vif;u8 band_idx = (info->hw_queue &MT_TX_HW_QUEUE_PHY ) >>2 ;
@@ -893,8 +894,9 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, val =MT_TXD6_DIS_MAT |MT_TXD6_DAS ;if (is_mt7996 (&dev->mt76)) val |=FIELD_PREP (MT_TXD6_MSDU_CNT ,1 ); -else +else if (is_8023 || !ieee80211_is_mgmt (hdr->frame_control)) val |=FIELD_PREP (MT_TXD6_MSDU_CNT_V2 ,1 ); + txwi[6 ] =cpu_to_le32 (val); txwi[7 ] =0 ;
@@ -904,7 +906,6 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,mt7996_mac_write_txwi_80211 (dev, txwi, skb, key);if (txwi[1 ] &cpu_to_le32 (MT_TXD1_FIXED_RATE )) { -struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;bool mcast =ieee80211_is_data (hdr->frame_control) &&is_multicast_ether_addr (hdr->addr1);u8 idx =MT7996_BASIC_RATES_TBL ;
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 7/9 wifi: mt76: mt7996: fix ldpc setting
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
The non-AP interfaces would not use conf->vht_ldpc so they never set STA_CAP_VHT_LDPC even if peer-station support LDPC.
Check conf->vht_ldpc only for AP interface.
Without this patch, station only uses BCC to transmit packet in VHT mode.
--- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +1 -1
@@ -2066,7 +2066,7 @@ mt7996_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7996_dev *dev, cap |=STA_CAP_VHT_TX_STBC ;if (sta->deflink.vht_cap.cap &IEEE80211_VHT_CAP_RXSTBC_1 ) cap |=STA_CAP_VHT_RX_STBC ; -if (vif->bss_conf.vht_ldpc && +if ((vif->type !=NL80211_IFTYPE_AP || vif->bss_conf.vht_ldpc) && (sta->deflink.vht_cap.cap &IEEE80211_VHT_CAP_RXLDPC )) cap |=STA_CAP_VHT_LDPC ;
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 8/9 wifi: mt76: mt7996: fix beacon command during disabling
In reply to Shayne ChenFrom: Michael-CY Lee <[email protected]>
When stopping AP, mac80211 frees beacon template before it calls driver's stop_ap operation. In other words, on the path of stopping AP, ieee80211_beacon_get_template() must returns NULL in mt7996_mcu_add_beacon(). In such case mt7996 immediately returns -EINVAL without telling FW to disable the beacon.
This commit refactors mt7996_mcu_add_beacon() so that FW can be correctly informed when disabling AP interface.
--- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +15 -11
@@ -2520,7 +2520,7 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,struct sk_buff *skb, *rskb;struct tlv *tlv;struct bss_bcn_content_tlv *bcn; -int len; +int len, extra_len =0 ;if (link_conf->nontransmitted)return 0 ;
@@ -2534,28 +2534,32 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,return PTR_ERR (rskb); skb =ieee80211_beacon_get_template (hw, vif, &offs, link_conf->link_id); -if (!skb) { +if (link_conf->enable_beacon && !skb) {dev_kfree_skb (rskb);return -EINVAL ; } -if (skb->len >MT7996_MAX_BEACON_SIZE ) { -dev_err (dev->mt76.dev,"Bcn size limit exceed\n" ); -dev_kfree_skb (rskb); -dev_kfree_skb (skb); -return -EINVAL ; - } +if (skb) { +if (skb->len >MT7996_MAX_BEACON_SIZE ) { +dev_err (dev->mt76.dev,"Bcn size limit exceed\n" ); +dev_kfree_skb (rskb); +dev_kfree_skb (skb); +return -EINVAL ; + } - info =IEEE80211_SKB_CB (skb); - info->hw_queue |=FIELD_PREP (MT_TX_HW_QUEUE_PHY , mlink->band_idx); + extra_len = skb->len; + } - len =ALIGN (sizeof (*bcn) +MT_TXD_SIZE + skb->len,4 ); + len =ALIGN (sizeof (*bcn) +MT_TXD_SIZE + extra_len,4 ); tlv =mt7996_mcu_add_uni_tlv (rskb,UNI_BSS_INFO_BCN_CONTENT , len); bcn = (struct bss_bcn_content_tlv *)tlv; bcn->enable = link_conf->enable_beacon;if (!bcn->enable) goto out; + info =IEEE80211_SKB_CB (skb); + info->hw_queue |=FIELD_PREP (MT_TX_HW_QUEUE_PHY , mlink->band_idx); +mt7996_mcu_beacon_cont (dev, link_conf, rskb, skb, bcn, &offs);if (link_conf->bssid_indicator)mt7996_mcu_beacon_mbss (rskb, skb, bcn, &offs);
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 9/9 wifi: mt76: mt7996: add implicit beamforming support for mt7992
In reply to Shayne ChenFrom: Howard Hsu <[email protected]>
The configuration of mt7992 iBF has some differences to mt7996, rework related code to make it work.
Also, most of our chipsets support iBF only on HT and VHT mode, except mt7992 variant that has 5T on 5GHz band also supports iBF on HE and EHT mode.
--- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 77 ++++++++++++------- .../wireless/mediatek/mt76/mt7996/mt7996.h | 6 ++ 2 files changed, 55 insertions(+), 28 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +49 -28
@@ -1460,17 +1460,21 @@ mt7996_is_ebf_supported(struct mt7996_phy *phy, struct ieee80211_vif *vif, }static void -mt7996_mcu_sta_sounding_rate (struct sta_rec_bf *bf) +mt7996_mcu_sta_sounding_rate (struct sta_rec_bf *bf,struct mt7996_phy *phy) { bf->sounding_phy =MT_PHY_TYPE_OFDM ; bf->ndp_rate =0 ;/* mcs0 */ - bf->ndpa_rate =MT7996_CFEND_RATE_DEFAULT ;/* ofdm 24m */ +if (is_mt7996 (phy->mt76->dev)) + bf->ndpa_rate =MT7996_CFEND_RATE_DEFAULT ;/* ofdm 24m */ +else + bf->ndpa_rate =MT7992_CFEND_RATE_DEFAULT ;/* ofdm 6m */ + bf->rept_poll_rate =MT7996_CFEND_RATE_DEFAULT ;/* ofdm 24m */ }static void mt7996_mcu_sta_bfer_ht (struct ieee80211_sta *sta,struct mt7996_phy *phy, -struct sta_rec_bf *bf) +struct sta_rec_bf *bf,bool explicit) {struct ieee80211_mcs_info *mcs = &sta->deflink.ht_cap.mcs;u8 n =0 ;
@@ -1490,7 +1494,8 @@ mt7996_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct mt7996_phy *phy, bf->nrow =hweight8 (phy->mt76->antenna_mask) -1 ; bf->ncol =min_t (u8, bf->nrow, n); - bf->ibf_ncol = n; + bf->ibf_ncol = explicit ?min_t (u8,MT7996_IBF_MAX_NC , bf->ncol) : +min_t (u8,MT7996_IBF_MAX_NC , n); } static void
@@ -1508,7 +1513,7 @@ mt7996_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7996_phy *phy,if (explicit) {u8 sts, snd_dim; -mt7996_mcu_sta_sounding_rate (bf); +mt7996_mcu_sta_sounding_rate (bf, phy); sts =FIELD_GET (IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK , pc->cap);
@@ -1516,14 +1521,14 @@ mt7996_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7996_phy *phy, vc->cap); bf->nrow =min_t (u8,min_t (u8, snd_dim, sts), tx_ant); bf->ncol =min_t (u8, nss_mcs, bf->nrow); - bf->ibf_ncol = bf->ncol; + bf->ibf_ncol =min_t (u8,MT7996_IBF_MAX_NC , bf->ncol);if (sta->deflink.bandwidth ==IEEE80211_STA_RX_BW_160 ) bf->nrow =1 ; }else { bf->nrow = tx_ant; bf->ncol =min_t (u8, nss_mcs, bf->nrow); - bf->ibf_ncol = nss_mcs; + bf->ibf_ncol =min_t (u8,MT7996_IBF_MAX_NC , nss_mcs);if (sta->deflink.bandwidth ==IEEE80211_STA_RX_BW_160 ) bf->ibf_nrow =1 ;
@@ -1532,7 +1537,8 @@ mt7996_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7996_phy *phy,static void mt7996_mcu_sta_bfer_he (struct ieee80211_sta *sta,struct ieee80211_vif *vif, -struct mt7996_phy *phy,struct sta_rec_bf *bf) +struct mt7996_phy *phy,struct sta_rec_bf *bf, +bool explicit) {struct ieee80211_sta_he_cap *pc = &sta->deflink.he_cap;struct ieee80211_he_cap_elem *pe = &pc->he_cap_elem;
@@ -1548,7 +1554,7 @@ mt7996_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif, bf->tx_mode =MT_PHY_TYPE_HE_SU ; -mt7996_mcu_sta_sounding_rate (bf); +mt7996_mcu_sta_sounding_rate (bf, phy); bf->trigger_su =HE_PHY (CAP6_TRIG_SU_BEAMFORMING_FB , pe->phy_cap_info[6 ]);
@@ -1560,7 +1566,8 @@ mt7996_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif, pe->phy_cap_info[4]); bf->nrow =min_t (u8, snd_dim, sts); bf->ncol =min_t (u8, nss_mcs, bf->nrow); - bf->ibf_ncol = bf->ncol; + bf->ibf_ncol = explicit ?min_t (u8,MT7996_IBF_MAX_NC , bf->ncol) : +min_t (u8,MT7996_IBF_MAX_NC , nss_mcs);if (sta->deflink.bandwidth !=IEEE80211_STA_RX_BW_160 )return ;
@@ -1595,7 +1602,8 @@ mt7996_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,static void mt7996_mcu_sta_bfer_eht (struct ieee80211_sta *sta,struct ieee80211_vif *vif, -struct mt7996_phy *phy,struct sta_rec_bf *bf) +struct mt7996_phy *phy,struct sta_rec_bf *bf, +bool explicit) {struct ieee80211_sta_eht_cap *pc = &sta->deflink.eht_cap;struct ieee80211_eht_cap_elem_fixed *pe = &pc->eht_cap_elem;
@@ -1609,7 +1617,7 @@ mt7996_mcu_sta_bfer_eht(struct ieee80211_sta *sta, struct ieee80211_vif *vif, bf->tx_mode =MT_PHY_TYPE_EHT_MU ; -mt7996_mcu_sta_sounding_rate (bf); +mt7996_mcu_sta_sounding_rate (bf, phy); bf->trigger_su =EHT_PHY (CAP3_TRIG_SU_BF_FDBK , pe->phy_cap_info[3 ]); bf->trigger_mu =EHT_PHY (CAP3_TRIG_MU_BF_PART_BW_FDBK , pe->phy_cap_info[3 ]);
@@ -1618,7 +1626,8 @@ mt7996_mcu_sta_bfer_eht(struct ieee80211_sta *sta, struct ieee80211_vif *vif, (EHT_PHY (CAP1_BEAMFORMEE_SS_80MHZ_MASK , pe->phy_cap_info[1 ]) <<1 ); bf->nrow =min_t (u8, snd_dim, sts); bf->ncol =min_t (u8, nss_mcs, bf->nrow); - bf->ibf_ncol = bf->ncol; + bf->ibf_ncol = explicit ?min_t (u8,MT7996_IBF_MAX_NC , bf->ncol) : +min_t (u8,MT7996_IBF_MAX_NC , nss_mcs);if (sta->deflink.bandwidth <IEEE80211_STA_RX_BW_160 )return ;
@@ -1653,12 +1662,15 @@ static void mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb, struct ieee80211_vif *vif, struct ieee80211_sta *sta) { +#define EBF_MODE BIT(0) +#define IBF_MODE BIT(1) +#define BF_MAT_ORDER 4struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;struct mt7996_phy *phy = mvif->deflink.phy;int tx_ant =hweight16 (phy->mt76->chainmask) -1 ;struct sta_rec_bf *bf;struct tlv *tlv; - static const u8 matrix[4][4] = { + static const u8 matrix[BF_MAT_ORDER][BF_MAT_ORDER] = { {0, 0, 0, 0}, {1, 1, 0, 0}, /* 2x1, 2x2, 2x3, 2x4 */ {2, 4, 4, 0}, /* 3x1, 3x2, 3x3, 3x4 */
@@ -1676,35 +1688,44 @@ mt7996_mcu_sta_bfer_tlv(struct mt7996_dev *dev, struct sk_buff *skb, tlv =mt76_connac_mcu_add_tlv (skb,STA_REC_BF ,sizeof (*bf)); bf = (struct sta_rec_bf *)tlv; -/* he/eht: eBF only, in accordance with spec +/* he/eht: eBF only, except mt7992 that has 5T on 5GHz also supports iBF * vht: support eBF and iBF * ht: iBF only, since mac80211 lacks of eBF support */ -if (sta->deflink.eht_cap.has_eht && ebf) -mt7996_mcu_sta_bfer_eht (sta, vif, phy, bf); -else if (sta->deflink.he_cap.has_he && ebf) -mt7996_mcu_sta_bfer_he (sta, vif, phy, bf); +if (sta->deflink.eht_cap.has_eht) +mt7996_mcu_sta_bfer_eht (sta, vif, phy, bf, ebf); +else if (sta->deflink.he_cap.has_he) +mt7996_mcu_sta_bfer_he (sta, vif, phy, bf, ebf);else if (sta->deflink.vht_cap.vht_supported)mt7996_mcu_sta_bfer_vht (sta, phy, bf, ebf);else if (sta->deflink.ht_cap.ht_supported) -mt7996_mcu_sta_bfer_ht (sta, phy, bf); +mt7996_mcu_sta_bfer_ht (sta, phy, bf, ebf);else return ; - bf->bf_cap = ebf ? ebf : dev->ibf <<1 ; + bf->bf_cap = ebf ?EBF_MODE : (dev->ibf ?IBF_MODE :0 ); +if (is_mt7992 (&dev->mt76) && tx_ant ==4 ) + bf->bf_cap |=IBF_MODE ; bf->bw = sta->deflink.bandwidth; bf->ibf_dbw = sta->deflink.bandwidth; bf->ibf_nrow = tx_ant; -if (!ebf && sta->deflink.bandwidth <=IEEE80211_STA_RX_BW_40 && !bf->ncol) - bf->ibf_timeout =0x48 ; +if (sta->deflink.eht_cap.has_eht || sta->deflink.he_cap.has_he) + bf->ibf_timeout =is_mt7996 (&dev->mt76) ?MT7996_IBF_TIMEOUT : +MT7992_IBF_TIMEOUT ; +else if (!ebf && sta->deflink.bandwidth <=IEEE80211_STA_RX_BW_40 && !bf->ncol) + bf->ibf_timeout =MT7996_IBF_TIMEOUT_LEGACY ;else - bf->ibf_timeout =0x18 ; + bf->ibf_timeout =MT7996_IBF_TIMEOUT ; -if (ebf && bf->nrow != tx_ant) - bf->mem_20m = matrix[tx_ant][bf->ncol]; -else - bf->mem_20m = matrix[bf->nrow][bf->ncol]; +if (bf->ncol <BF_MAT_ORDER ) { +if (ebf) + bf->mem_20m = tx_ant <BF_MAT_ORDER ? + matrix[tx_ant][bf->ncol] :0 ; +else + bf->mem_20m = bf->nrow <BF_MAT_ORDER ? + matrix[bf->nrow][bf->ncol] :0 ; + }switch (sta->deflink.bandwidth) {case IEEE80211_STA_RX_BW_160 :
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +6 -0
@@ -68,6 +68,12 @@#define MT7996_CFEND_RATE_DEFAULT 0x49/* OFDM 24M */ #define MT7996_CFEND_RATE_11B 0x03/* 11B LP, 11M */ +#define MT7996_IBF_MAX_NC 2 +#define MT7996_IBF_TIMEOUT 0x18 +#define MT7996_IBF_TIMEOUT_LEGACY 0x48 + +#define MT7992_CFEND_RATE_DEFAULT 0x4b/* OFDM 6M */ +#define MT7992_IBF_TIMEOUT 0xff#define MT7996_SKU_RATE_NUM 417#define MT7996_SKU_PATH_NUM 494
Signature · 1 line
2.39.2