mt76: mt7915: enable HE UL MU-MIMO
Subsystems (2)
Shayne Chen
reviewerPATCH v3 1/4 mt76: mt7915: enable HE UL MU-MIMO
Enable HE UL MU-MIMO in sta_rec_muru, which works on both ap and station mode.
For sending trigger frames, one of the conditions fw uses is to check if mib rx airtime meets the threshold.
There's a main control of mib rx airtime report register in fw, so we need to enable the register by mcu cmd instead of directly writing it, otherwise it will still be disabled by fw.
---
v2: refine mt7915_mcu_sta_muru_tlv()
v3: split patches and rebase to staging tree
--- .../net/wireless/mediatek/mt76/mt7915/init.c | 2 - .../net/wireless/mediatek/mt76/mt7915/mcu.c | 46 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7915/mcu.h | 1 + .../net/wireless/mediatek/mt76/mt7915/regs.h | 1 - 4 files changed, 47 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +0 -2
@@ -386,8 +386,6 @@ mt7915_mac_init_band(struct mt7915_dev *dev, u8 band)FIELD_PREP (MT_MDP_RCFR1_RX_DROPPED_MCAST ,MT_MDP_TO_HIF );mt76_rmw (dev,MT_MDP_BNRCFR1 (band), mask, set); -mt76_set (dev,MT_WF_RMAC_MIB_AIRTIME0 (band),MT_WF_RMAC_MIB_RXTIME_EN ); -mt76_rmw_field (dev,MT_DMA_DCR0 (band),MT_DMA_DCR0_MAX_RX_LEN ,1536 );/* disable rx rate report by default due to hw issues */ mt76_clear (dev,MT_DMA_DCR0 (band),MT_DMA_DCR0_RXD_G5_EN );
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +46 -0
64 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +1 -0
@@ -271,6 +271,7 @@ enum {MCU_EXT_CMD_MAC_INIT_CTRL =0x46 ,MCU_EXT_CMD_RX_HDR_TRANS =0x47 ,MCU_EXT_CMD_MUAR_UPDATE =0x48 , +MCU_EXT_CMD_RX_AIRTIME_CTRL =0x4a ,MCU_EXT_CMD_SET_RX_PATH =0x4e ,MCU_EXT_CMD_TX_POWER_FEATURE_CTRL =0x58 , MCU_EXT_CMD_GET_MIB_INFO = 0x5a,
drivers/net/wireless/mediatek/mt76/mt7915/regs.h +0 -1
@@ -364,7 +364,6 @@#define MT_WF_RMAC_MIB_AIRTIME0 (_band) MT_WF_RMAC(_band, 0x0380)#define MT_WF_RMAC_MIB_RXTIME_CLR BIT(31) -#define MT_WF_RMAC_MIB_RXTIME_EN BIT(30)/* WFDMA0 */ #define MT_WFDMA0_BASE 0xd4000
Signature · 1 line
2.29.2
Shayne Chen
reviewerPATCH v3 2/4 mt76: mt7915: rework mt7915_mcu_sta_muru_tlv()
Re-order and modify conditions for MU DL/UL and ofdma DL fields, and also clean up some unnecessary zero settings.
--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +21 -21
@@ -1520,22 +1520,37 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,struct sta_rec_muru *muru;struct tlv *tlv; -if (!sta->vht_cap.vht_supported && !sta->he_cap.has_he) +if (vif->type !=NL80211_IFTYPE_STATION && + vif->type !=NL80211_IFTYPE_AP ) +return ; + +if (!sta->vht_cap.vht_supported)return ; tlv =mt7915_mcu_add_tlv (skb,STA_REC_MURU ,sizeof (*muru)); muru = (struct sta_rec_muru *)tlv; - muru->cfg.ofdma_dl_en = true; -/* A non-AP HE station must support MU beamformee */ - muru->cfg.mimo_dl_en = (vif->type ==NL80211_IFTYPE_STATION && - vif->bss_conf.he_support) || - mvif->cap.he_mu_ebfer || + muru->cfg.mimo_dl_en = mvif->cap.he_mu_ebfer || mvif->cap.vht_mu_ebfer || mvif->cap.vht_mu_ebfee; + + muru->mimo_dl.vht_mu_bfee = + !!(sta->vht_cap.cap &IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE ); + +if (!sta->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->cfg.mimo_ul_en = true; + 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->cfg.ofdma_dl_en = true; 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 =
@@ -1544,9 +1559,6 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,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_dl.lt16_sigb =0 ; - muru->ofdma_dl.rx_su_comp_sigb =0 ; - muru->ofdma_dl.rx_su_non_comp_sigb =0 ; muru->ofdma_ul.t_frame_dur =HE_MAC (CAP1_TF_MAC_PAD_DUR_MASK , elem->mac_cap_info[1 ]);
@@ -1554,18 +1566,6 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,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 ]); - muru->ofdma_ul.he_2x996_tone =0 ; - muru->ofdma_ul.rx_t_frame_11ac =0 ; - - muru->mimo_dl.vht_mu_bfee = - !!(sta->vht_cap.cap &IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE ); - 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 ]); } static void
Signature · 1 line
2.29.2
Shayne Chen
reviewerPATCH v3 3/4 mt76: mt7915: fix missing HE phy cap
In reply to Shayne ChenFix missing HE phy cap related to vif and starec setting.
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 12 +++++++++--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +9 -3
@@ -626,7 +626,6 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap, int vif, int nss) {struct ieee80211_he_cap_elem *elem = &he_cap->he_cap_elem; -struct ieee80211_he_mcs_nss_supp *mcs = &he_cap->he_mcs_nss_supp;u8 c;#ifdef CONFIG_MAC80211_MESH
@@ -678,8 +677,11 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap, elem->phy_cap_info[3 ] |=IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER ; elem->phy_cap_info[4 ] |=IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER ; -/* num_snd_dim */ - c = (nss -1 ) | (max_t (int,le16_to_cpu (mcs->tx_mcs_160),1 ) <<3 ); +/* num_snd_dim +* for mt7915, max supported nss is 2 for bw > 80MHz +*/ + c = (nss -1 ) | +IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2 ; elem->phy_cap_info[5 ] |= c; c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |
@@ -787,7 +789,11 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK |IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK ; he_cap_elem->phy_cap_info[6 ] |= +IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ; + he_cap_elem->phy_cap_info[9 ] |= +IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU | +IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU ;break ;case NL80211_IFTYPE_STATION : he_cap_elem->mac_cap_info[1] |=
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +4 -4
@@ -1396,6 +1396,10 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ) cap |= STA_REC_HE_CAP_LE_EQ_80M_RX_STBC; +if (elem->phy_cap_info[6 ] & +IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB ) + cap |=STA_REC_HE_CAP_TRIG_CQI_FK ; +if (elem->phy_cap_info[6 ] &IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE ) cap |=STA_REC_HE_CAP_PARTIAL_BW_EXT_RANGE ;
@@ -1420,10 +1424,6 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, IEEE80211_HE_PHY_CAP8_HE_ER_SU_1XLTF_AND_08_US_GI) cap |= STA_REC_HE_CAP_ER_SU_PPDU_1LTF_8US_GI; -if (elem->phy_cap_info[9 ] & -IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK ) - cap |=STA_REC_HE_CAP_TRIG_CQI_FK ; -if (elem->phy_cap_info[9 ] &IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU ) cap |=STA_REC_HE_CAP_TX_1024QAM_UNDER_RU242 ;
Signature · 1 line
2.29.2
Shayne Chen
reviewerPATCH v3 4/4 mt76: mt7915: change max rx len limit of hw modules
In reply to Shayne ChenUpdate max rx len of some hw modules, which aligns out vendor SDK. In normal modes, we exchange MPDU 7991 cap with peers; however, this won't play a part in sniffer mode.
To prevent packets which exceed the max MPDU size from entering specific rx path in hw, we need to set a proper limit to filter them out.
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +2 -2
@@ -386,7 +386,7 @@ mt7915_mac_init_band(struct mt7915_dev *dev, u8 band)FIELD_PREP (MT_MDP_RCFR1_RX_DROPPED_MCAST ,MT_MDP_TO_HIF );mt76_rmw (dev,MT_MDP_BNRCFR1 (band), mask, set); -mt76_rmw_field (dev,MT_DMA_DCR0 (band),MT_DMA_DCR0_MAX_RX_LEN ,1536 ); +mt76_rmw_field (dev,MT_DMA_DCR0 (band),MT_DMA_DCR0_MAX_RX_LEN ,0x680 );/* disable rx rate report by default due to hw issues */ mt76_clear (dev,MT_DMA_DCR0 (band),MT_DMA_DCR0_RXD_G5_EN ); }
@@ -395,7 +395,7 @@ static void mt7915_mac_init(struct mt7915_dev *dev) {int i; -mt76_rmw_field (dev,MT_MDP_DCR1 ,MT_MDP_DCR1_MAX_RX_LEN ,1536 ); +mt76_rmw_field (dev,MT_MDP_DCR1 ,MT_MDP_DCR1_MAX_RX_LEN ,0x400 );/* enable hardware de-agg */ mt76_set (dev,MT_MDP_DCR0 ,MT_MDP_DCR0_DAMSDU_EN );
Signature · 1 line
2.29.2