mt76: mt7915: set band1 TGID field in tx descriptor
Subsystems (2)
Shayne Chen
reviewerPATCH v2 1/3 mt76: mt7915: set band1 TGID field in tx descriptor
Set proper group index of tx descriptor for band1.
Signed-off-by Shayne Chen <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -2
@@ -1215,8 +1215,7 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi,FIELD_PREP (MT_TXD1_WLAN_IDX , wcid->idx) |FIELD_PREP (MT_TXD1_OWN_MAC , omac_idx); -if ((ext_phy || band_idx) && - q_idx >=MT_LMAC_ALTX0 && q_idx <=MT_LMAC_BCN0 ) +if (ext_phy || band_idx) val |=MT_TXD1_TGID ; txwi[1 ] =cpu_to_le32 (val);
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 2/3 mt76: mt7915: fix beamforming mib stats
Some of beamforming mib counters are moved to different offsets or registers in newer chipsets.
Fixes 99ad32a4ca3a ("mt76: mt7915: add support for MT7986")
Signed-off-by Shayne Chen <[email protected]>
---
v2: fix mib->tx_bf_rx_fb_bw value
--- .../net/wireless/mediatek/mt76/mt7915/mac.c | 73 ++++++++++++------- .../net/wireless/mediatek/mt76/mt7915/mmio.c | 2 + .../net/wireless/mediatek/mt76/mt7915/regs.h | 28 +++++-- 3 files changed, 69 insertions(+), 34 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +46 -27
@@ -2189,15 +2189,6 @@ void mt7915_mac_update_stats(struct mt7915_phy *phy) cnt =mt76_rr (dev,MT_MIB_SDR31 (phy->band_idx)); mib->rx_ba_cnt += cnt; - cnt =mt76_rr (dev,MT_MIB_SDR32 (phy->band_idx)); - mib->tx_pkt_ebf_cnt +=FIELD_GET (MT_MIB_SDR32_TX_PKT_EBF_CNT_MASK , cnt); - -if (is_mt7915 (&dev->mt76)) - cnt =mt76_rr (dev,MT_MIB_SDR33 (phy->band_idx)); - mib->tx_pkt_ibf_cnt +=is_mt7915 (&dev->mt76) ? -FIELD_GET (MT_MIB_SDR32_TX_PKT_IBF_CNT_MASK , cnt) : -FIELD_GET (MT_MIB_SDR32_TX_PKT_IBF_CNT_MASK_MT7916 , cnt); - cnt =mt76_rr (dev,MT_MIB_SDRMUBF (phy->band_idx)); mib->tx_bf_cnt +=FIELD_GET (MT_MIB_MU_BF_TX_CNT , cnt);
@@ -2210,24 +2201,10 @@ void mt7915_mac_update_stats(struct mt7915_phy *phy) cnt =mt76_rr (dev,MT_MIB_DR11 (phy->band_idx)); mib->tx_su_acked_mpdu_cnt += cnt; - cnt =mt76_rr (dev,MT_ETBF_TX_APP_CNT (phy->band_idx)); - mib->tx_bf_ibf_ppdu_cnt +=FIELD_GET (MT_ETBF_TX_IBF_CNT , cnt); - mib->tx_bf_ebf_ppdu_cnt +=FIELD_GET (MT_ETBF_TX_EBF_CNT , cnt); - - cnt =mt76_rr (dev,MT_ETBF_RX_FB_CNT (phy->band_idx)); - mib->tx_bf_rx_fb_all_cnt +=FIELD_GET (MT_ETBF_RX_FB_ALL , cnt); - mib->tx_bf_rx_fb_he_cnt +=FIELD_GET (MT_ETBF_RX_FB_HE , cnt); - mib->tx_bf_rx_fb_vht_cnt +=FIELD_GET (MT_ETBF_RX_FB_VHT , cnt); - mib->tx_bf_rx_fb_ht_cnt +=FIELD_GET (MT_ETBF_RX_FB_HT , cnt); - - cnt =mt76_rr (dev,MT_ETBF_RX_FB_CONT (phy->band_idx)); - mib->tx_bf_rx_fb_bw =FIELD_GET (MT_ETBF_RX_FB_BW , cnt); - mib->tx_bf_rx_fb_nc_cnt +=FIELD_GET (MT_ETBF_RX_FB_NC , cnt); - mib->tx_bf_rx_fb_nr_cnt +=FIELD_GET (MT_ETBF_RX_FB_NR , cnt); - - cnt =mt76_rr (dev,MT_ETBF_TX_NDP_BFRP (phy->band_idx)); - mib->tx_bf_fb_cpl_cnt +=FIELD_GET (MT_ETBF_TX_FB_CPL , cnt); - mib->tx_bf_fb_trig_cnt +=FIELD_GET (MT_ETBF_TX_FB_TRI , cnt); + cnt =mt76_rr (dev,MT_ETBF_PAR_RPT0 (phy->band_idx)); + mib->tx_bf_rx_fb_bw =FIELD_GET (MT_ETBF_PAR_RPT0_FB_BW , cnt); + mib->tx_bf_rx_fb_nc_cnt +=FIELD_GET (MT_ETBF_PAR_RPT0_FB_NC , cnt); + mib->tx_bf_rx_fb_nr_cnt +=FIELD_GET (MT_ETBF_PAR_RPT0_FB_NR , cnt);for (i =0 ; i <ARRAY_SIZE (mib->tx_amsdu); i++) { cnt =mt76_rr (dev,MT_PLE_AMSDU_PACK_MSDU_CNT (i));
@@ -2256,6 +2233,26 @@ void mt7915_mac_update_stats(struct mt7915_phy *phy) dev->mt76.aggr_stats[aggr1++] += val &0xffff ; dev->mt76.aggr_stats[aggr1++] += val >>16 ; } + + cnt =mt76_rr (dev,MT_MIB_SDR32 (phy->band_idx)); + mib->tx_pkt_ebf_cnt +=FIELD_GET (MT_MIB_SDR32_TX_PKT_EBF_CNT , cnt); + + cnt =mt76_rr (dev,MT_MIB_SDR33 (phy->band_idx)); + mib->tx_pkt_ibf_cnt +=FIELD_GET (MT_MIB_SDR33_TX_PKT_IBF_CNT , cnt); + + cnt =mt76_rr (dev,MT_ETBF_TX_APP_CNT (phy->band_idx)); + mib->tx_bf_ibf_ppdu_cnt +=FIELD_GET (MT_ETBF_TX_IBF_CNT , cnt); + mib->tx_bf_ebf_ppdu_cnt +=FIELD_GET (MT_ETBF_TX_EBF_CNT , cnt); + + cnt =mt76_rr (dev,MT_ETBF_TX_NDP_BFRP (phy->band_idx)); + mib->tx_bf_fb_cpl_cnt +=FIELD_GET (MT_ETBF_TX_FB_CPL , cnt); + mib->tx_bf_fb_trig_cnt +=FIELD_GET (MT_ETBF_TX_FB_TRI , cnt); + + cnt =mt76_rr (dev,MT_ETBF_RX_FB_CNT (phy->band_idx)); + mib->tx_bf_rx_fb_all_cnt +=FIELD_GET (MT_ETBF_RX_FB_ALL , cnt); + mib->tx_bf_rx_fb_he_cnt +=FIELD_GET (MT_ETBF_RX_FB_HE , cnt); + mib->tx_bf_rx_fb_vht_cnt +=FIELD_GET (MT_ETBF_RX_FB_VHT , cnt); + mib->tx_bf_rx_fb_ht_cnt +=FIELD_GET (MT_ETBF_RX_FB_HT , cnt); }else {for (i =0 ; i <2 ; i++) {/* rts count */
@@ -2284,6 +2281,28 @@ void mt7915_mac_update_stats(struct mt7915_phy *phy) dev->mt76.aggr_stats[aggr0++] +=FIELD_GET (GENMASK (15 ,0 ), val); dev->mt76.aggr_stats[aggr0++] +=FIELD_GET (GENMASK (31 ,16 ), val); } + + cnt =mt76_rr (dev,MT_MIB_SDR32 (phy->band_idx)); + mib->tx_pkt_ibf_cnt +=FIELD_GET (MT_MIB_SDR32_TX_PKT_IBF_CNT , cnt); + mib->tx_bf_ibf_ppdu_cnt +=FIELD_GET (MT_MIB_SDR32_TX_PKT_IBF_CNT , cnt); + mib->tx_pkt_ebf_cnt +=FIELD_GET (MT_MIB_SDR32_TX_PKT_EBF_CNT , cnt); + mib->tx_bf_ebf_ppdu_cnt +=FIELD_GET (MT_MIB_SDR32_TX_PKT_EBF_CNT , cnt); + + cnt =mt76_rr (dev,MT_MIB_BFCR7 (phy->band_idx)); + mib->tx_bf_fb_cpl_cnt +=FIELD_GET (MT_MIB_BFCR7_BFEE_TX_FB_CPL , cnt); + + cnt =mt76_rr (dev,MT_MIB_BFCR2 (phy->band_idx)); + mib->tx_bf_fb_trig_cnt +=FIELD_GET (MT_MIB_BFCR2_BFEE_TX_FB_TRIG , cnt); + + cnt =mt76_rr (dev,MT_MIB_BFCR0 (phy->band_idx)); + mib->tx_bf_rx_fb_vht_cnt +=FIELD_GET (MT_MIB_BFCR0_RX_FB_VHT , cnt); + mib->tx_bf_rx_fb_all_cnt +=FIELD_GET (MT_MIB_BFCR0_RX_FB_VHT , cnt); + mib->tx_bf_rx_fb_ht_cnt +=FIELD_GET (MT_MIB_BFCR0_RX_FB_HT , cnt); + mib->tx_bf_rx_fb_all_cnt +=FIELD_GET (MT_MIB_BFCR0_RX_FB_HT , cnt); + + cnt =mt76_rr (dev,MT_MIB_BFCR1 (phy->band_idx)); + mib->tx_bf_rx_fb_he_cnt +=FIELD_GET (MT_MIB_BFCR1_RX_FB_HE , cnt); + mib->tx_bf_rx_fb_all_cnt +=FIELD_GET (MT_MIB_BFCR1_RX_FB_HE , cnt); } }
drivers/net/wireless/mediatek/mt76/mt7915/mmio.c +2 -0
@@ -122,6 +122,7 @@ static const u32 mt7915_offs[] = { [PLE_PG_HIF_GROUP] = 0x110, [PLE_HIF_PG_INFO] = 0x114, [AC_OFFSET] = 0x040, + [ETBF_PAR_RPT0] = 0x068, };static const u32 mt7916_offs[] = {
@@ -194,6 +195,7 @@ static const u32 mt7916_offs[] = { [PLE_PG_HIF_GROUP] = 0x00c, [PLE_HIF_PG_INFO] = 0x388, [AC_OFFSET] = 0x080, + [ETBF_PAR_RPT0] = 0x100, };static const struct __map mt7915_reg_map[] = {
drivers/net/wireless/mediatek/mt76/mt7915/regs.h +21 -7
@@ -103,6 +103,7 @@ enum offs_rev {PLE_PG_HIF_GROUP ,PLE_HIF_PG_INFO ,AC_OFFSET , +ETBF_PAR_RPT0 , __MT_OFFS_MAX, };
@@ -223,10 +224,10 @@ enum offs_rev {#define MT_ETBF_TX_FB_CPL GENMASK(31, 16)#define MT_ETBF_TX_FB_TRI GENMASK(15, 0) -#define MT_ETBF_RX_FB_CONT (_band) MT_WF_ETBF(_band, 0x068) -#define MT_ETBF_RX_FB_BW GENMASK(7, 6) -#define MT_ETBF_RX_FB_NC GENMASK(5, 3) -#define MT_ETBF_RX_FB_NR GENMASK(2, 0) +#define MT_ETBF_PAR_RPT0 (_band) MT_WF_ETBF(_band, __OFFS(ETBF_PAR_RPT0)) +#define MT_ETBF_PAR_RPT0_FB_BW GENMASK(7, 6) +#define MT_ETBF_PAR_RPT0_FB_NC GENMASK(5, 3) +#define MT_ETBF_PAR_RPT0_FB_NR GENMASK(2, 0)#define MT_ETBF_TX_APP_CNT (_band) MT_WF_ETBF(_band, 0x0f0)#define MT_ETBF_TX_IBF_CNT GENMASK(31, 16)
@@ -367,11 +368,11 @@ enum offs_rev {#define MT_MIB_SDR31 (_band) MT_WF_MIB(_band, __OFFS(MIB_SDR31))#define MT_MIB_SDR32 (_band) MT_WF_MIB(_band, __OFFS(MIB_SDR32)) -#define MT_MIB_SDR32_TX_PKT_EBF_CNT_MASK GENMASK(15, 0) +#define MT_MIB_SDR32_TX_PKT_EBF_CNT GENMASK(15, 0) +#define MT_MIB_SDR32_TX_PKT_IBF_CNT GENMASK(31, 16)#define MT_MIB_SDR33 (_band) MT_WF_MIB(_band, 0x088) -#define MT_MIB_SDR32_TX_PKT_IBF_CNT_MASK GENMASK(15, 0) -#define MT_MIB_SDR32_TX_PKT_IBF_CNT_MASK_MT7916 GENMASK(31, 16) +#define MT_MIB_SDR33_TX_PKT_IBF_CNT GENMASK(15, 0)#define MT_MIB_SDRMUBF (_band) MT_WF_MIB(_band, __OFFS(MIB_SDRMUBF))#define MT_MIB_MU_BF_TX_CNT GENMASK(15, 0)
@@ -401,6 +402,19 @@ enum offs_rev { ((n) << 2))#define MT_MIB_ARNCR_RANGE (val, n) (((val) >> ((n) << 3)) & GENMASK(7, 0)) +#define MT_MIB_BFCR0 (_band) MT_WF_MIB(_band, 0x7b0) +#define MT_MIB_BFCR0_RX_FB_HT GENMASK(15, 0) +#define MT_MIB_BFCR0_RX_FB_VHT GENMASK(31, 16) + +#define MT_MIB_BFCR1 (_band) MT_WF_MIB(_band, 0x7b4) +#define MT_MIB_BFCR1_RX_FB_HE GENMASK(15, 0) + +#define MT_MIB_BFCR2 (_band) MT_WF_MIB(_band, 0x7b8) +#define MT_MIB_BFCR2_BFEE_TX_FB_TRIG GENMASK(15, 0) + +#define MT_MIB_BFCR7 (_band) MT_WF_MIB(_band, 0x7cc) +#define MT_MIB_BFCR7_BFEE_TX_FB_CPL GENMASK(15, 0) +/* WTBLON TOP */ #define MT_WTBLON_TOP_BASE 0x820d4000#define MT_WTBLON_TOP (ofs) (MT_WTBLON_TOP_BASE + (ofs))
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH v2 3/3 mt76: mt7915: fix phy cap in mt7915_set_stream_he_txbf_caps()
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
This patch fixes performance issue of beamforming tx on bandwidth 160MHz.
Fixes 99ad32a4ca3a ("mt76: mt7915: add support for MT7986")
Signed-off-by Peter Chiu <[email protected]>
Signed-off-by Shayne Chen <[email protected]>
--- .../net/wireless/mediatek/mt76/mt7915/init.c | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +20 -5
@@ -727,11 +727,18 @@ void mt7915_set_stream_vht_txbf_caps(struct mt7915_phy *phy) }static void -mt7915_set_stream_he_txbf_caps (struct ieee80211_sta_he_cap *he_cap, +mt7915_set_stream_he_txbf_caps (struct mt7915_dev *dev, +struct ieee80211_sta_he_cap *he_cap,int vif,int nss) {struct ieee80211_he_cap_elem *elem = &he_cap->he_cap_elem; -u8 c; +u8 c, nss_160; + +/* Can do 1/2 of NSS streams in 160Mhz mode for mt7915 */ +if (is_mt7915 (&dev->mt76) && !dev->dbdc_support) + nss_160 = nss /2 ; +else + nss_160 = nss;#ifdef CONFIG_MAC80211_MESH if (vif ==NL80211_IFTYPE_MESH_POINT )
@@ -785,13 +792,21 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,/* 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 ; + c =FIELD_PREP (IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK , + nss -1 ) | +FIELD_PREP (IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK , + nss_160 -1 ); elem->phy_cap_info[5 ] |= c; c =IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB ; elem->phy_cap_info[6 ] |= c; + +if (!is_mt7915 (&dev->mt76)) { + c =IEEE80211_HE_PHY_CAP7_STBC_TX_ABOVE_80MHZ | +IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ ; + elem->phy_cap_info[7 ] |= c; + } } static void
@@ -953,7 +968,7 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, he_mcs->rx_mcs_80p80 =cpu_to_le16 (mcs_map_160); he_mcs->tx_mcs_80p80 =cpu_to_le16 (mcs_map_160); -mt7915_set_stream_he_txbf_caps (he_cap, i, nss); +mt7915_set_stream_he_txbf_caps (dev, he_cap, i, nss);memset (he_cap->ppe_thres,0 ,sizeof (he_cap->ppe_thres)); if (he_cap_elem->phy_cap_info[6] &
Signature · 1 line
2.25.1