On Jul 23, greearb@candelatech.com wrote: > From: Ben Greear > > These are clear-on-read, so accumulate them in the update_stats > polling method, then access them via the mib structure > when reading them from debugfs/ethtool. > > Signed-off-by: Ben Greear > --- > .../wireless/mediatek/mt76/mt7915/debugfs.c | 44 +++++++++---------- > .../net/wireless/mediatek/mt76/mt7915/mac.c | 19 ++++++++ > .../net/wireless/mediatek/mt76/mt7915/main.c | 28 +++++------- > .../wireless/mediatek/mt76/mt7915/mt7915.h | 15 +++++++ > 4 files changed, 66 insertions(+), 40 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c > index 35248d182728..91664ac63a8d 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c > @@ -146,46 +146,42 @@ mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy, > static void > mt7915_txbf_stat_read_phy(struct mt7915_phy *phy, struct seq_file *s) > { > - struct mt7915_dev *dev = s->private; > - bool ext_phy = phy != &dev->phy; > static const char * const bw[] = { > "BW20", "BW40", "BW80", "BW160" > }; > - int cnt; > - struct mib_stats *mib = &phy->mib; > + struct mib_stats *mib; > > if (!phy) > return; > > + mib = &phy->mib; please merge it in the previous patch > + > /* Tx Beamformer monitor */ > seq_puts(s, "\nTx Beamformer applied PPDU counts: "); > > - cnt = mt76_rr(dev, MT_ETBF_TX_APP_CNT(ext_phy)); > - seq_printf(s, "iBF: %ld, eBF: %ld\n", > - FIELD_GET(MT_ETBF_TX_IBF_CNT, cnt), > - FIELD_GET(MT_ETBF_TX_EBF_CNT, cnt)); > + seq_printf(s, "iBF: %d, eBF: %d\n", > + mib->tx_bf_ibf_ppdu_cnt, > + mib->tx_bf_ebf_ppdu_cnt); > > /* Tx Beamformer Rx feedback monitor */ > seq_puts(s, "Tx Beamformer Rx feedback statistics: "); > > - cnt = mt76_rr(dev, MT_ETBF_RX_FB_CNT(ext_phy)); > - seq_printf(s, "All: %ld, HE: %ld, VHT: %ld, HT: %ld, ", > - FIELD_GET(MT_ETBF_RX_FB_ALL, cnt), > - FIELD_GET(MT_ETBF_RX_FB_HE, cnt), > - FIELD_GET(MT_ETBF_RX_FB_VHT, cnt), > - FIELD_GET(MT_ETBF_RX_FB_HT, cnt)); > - cnt = mt76_rr(dev, MT_ETBF_RX_FB_CONT(ext_phy)); > - seq_printf(s, "%s, NC: %ld, NR: %ld\n", > - bw[FIELD_GET(MT_ETBF_RX_FB_BW, cnt)], > - FIELD_GET(MT_ETBF_RX_FB_NC, cnt), > - FIELD_GET(MT_ETBF_RX_FB_NR, cnt)); > + seq_printf(s, "All: %d, HE: %d, VHT: %d, HT: %d, ", > + mib->tx_bf_rx_fb_all_cnt, > + mib->tx_bf_rx_fb_he_cnt, > + mib->tx_bf_rx_fb_vht_cnt, > + mib->tx_bf_rx_fb_ht_cnt); > + > + seq_printf(s, "%s, NC: %d, NR: %d\n", > + bw[mib->tx_bf_rx_fb_bw], > + mib->tx_bf_rx_fb_nc_cnt, > + mib->tx_bf_rx_fb_nr_cnt); > > /* Tx Beamformee Rx NDPA & Tx feedback report */ > - cnt = mt76_rr(dev, MT_ETBF_TX_NDP_BFRP(ext_phy)); > - seq_printf(s, "Tx Beamformee successful feedback frames: %ld\n", > - FIELD_GET(MT_ETBF_TX_FB_CPL, cnt)); > - seq_printf(s, "Tx Beamformee feedback triggered counts: %ld\n", > - FIELD_GET(MT_ETBF_TX_FB_TRI, cnt)); > + seq_printf(s, "Tx Beamformee successful feedback frames: %d\n", > + mib->tx_bf_fb_cpl_cnt); > + seq_printf(s, "Tx Beamformee feedback triggered counts: %d\n", > + mib->tx_bf_fb_trig_cnt); > > /* Tx SU & MU counters */ > seq_printf(s, "Tx multi-user Beamforming counts: %d\n", > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c > index 064d754e0565..c395600b378a 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c > @@ -1906,6 +1906,25 @@ mt7915_mac_update_stats(struct mt7915_phy *phy) > cnt = mt76_rr(dev, MT_MIB_DR11(ext_phy)); > mib->tx_su_acked_mpdu_cnt += cnt; > > + cnt = mt76_rr(dev, MT_ETBF_TX_APP_CNT(ext_phy)); > + 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(ext_phy)); > + 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(ext_phy)); > + 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(ext_phy)); > + 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); > + > aggr0 = ext_phy ? ARRAY_SIZE(dev->mt76.aggr_stats) / 2 : 0; > for (i = 0, aggr1 = aggr0 + 4; i < 4; i++) { > u32 val; > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c > index be6444650afe..885e35bf0fe8 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c > @@ -1135,7 +1135,7 @@ void mt7915_get_et_stats(struct ieee80211_hw *hw, > > /* See mt7915_ampdu_stat_read_phy, etc */ > bool ext_phy = phy != &dev->phy; > - int i, j, n, cnt, next_ei; > + int i, j, n, next_ei; > int ei = 0; > > if (!phy) > @@ -1149,26 +1149,22 @@ void mt7915_get_et_stats(struct ieee80211_hw *hw, > data[ei++] = phy->mib.ba_miss_cnt; > > /* Tx Beamformer monitor */ > - cnt = mt76_rr(dev, MT_ETBF_TX_APP_CNT(ext_phy)); > - data[ei++] = FIELD_GET(MT_ETBF_TX_IBF_CNT, cnt); > - data[ei++] = FIELD_GET(MT_ETBF_TX_EBF_CNT, cnt); > + data[ei++] = mib->tx_bf_ibf_ppdu_cnt; > + data[ei++] = mib->tx_bf_ebf_ppdu_cnt; > > /* Tx Beamformer Rx feedback monitor */ > - cnt = mt76_rr(dev, MT_ETBF_RX_FB_CNT(ext_phy)); > - data[ei++] = FIELD_GET(MT_ETBF_RX_FB_ALL, cnt); > - data[ei++] = FIELD_GET(MT_ETBF_RX_FB_HE, cnt); > - data[ei++] = FIELD_GET(MT_ETBF_RX_FB_VHT, cnt); > - data[ei++] = FIELD_GET(MT_ETBF_RX_FB_HT, cnt); > + data[ei++] = mib->tx_bf_rx_fb_all_cnt; > + data[ei++] = mib->tx_bf_rx_fb_he_cnt; > + data[ei++] = mib->tx_bf_rx_fb_vht_cnt; > + data[ei++] = mib->tx_bf_rx_fb_ht_cnt; > > - cnt = mt76_rr(dev, MT_ETBF_RX_FB_CONT(ext_phy)); > - data[ei++] = FIELD_GET(MT_ETBF_RX_FB_BW, cnt); > - data[ei++] = FIELD_GET(MT_ETBF_RX_FB_NC, cnt); > - data[ei++] = FIELD_GET(MT_ETBF_RX_FB_NR, cnt); > + data[ei++] = mib->tx_bf_rx_fb_bw; > + data[ei++] = mib->tx_bf_rx_fb_nc_cnt; > + data[ei++] = mib->tx_bf_rx_fb_nr_cnt; > > /* Tx Beamformee Rx NDPA & Tx feedback report */ > - cnt = mt76_rr(dev, MT_ETBF_TX_NDP_BFRP(ext_phy)); > - data[ei++] = FIELD_GET(MT_ETBF_TX_FB_CPL, cnt); > - data[ei++] = FIELD_GET(MT_ETBF_TX_FB_TRI, cnt); > + data[ei++] = mib->tx_bf_fb_cpl_cnt; > + data[ei++] = mib->tx_bf_fb_trig_cnt; > > /* Tx SU & MU counters */ > data[ei++] = mib->tx_bf_cnt; > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h > index 26f2befc46dd..565766debb5e 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h > @@ -110,6 +110,7 @@ struct mt7915_vif { > struct cfg80211_bitrate_mask bitrate_mask; > }; > > +/* per-phy stats. */ > struct mib_stats { > u32 ack_fail_cnt; > u32 fcs_err_cnt; > @@ -120,6 +121,20 @@ struct mib_stats { > u32 tx_mu_mpdu_cnt; > u32 tx_mu_acked_mpdu_cnt; > u32 tx_su_acked_mpdu_cnt; > + u32 tx_bf_ibf_ppdu_cnt; > + u32 tx_bf_ebf_ppdu_cnt; > + > + u32 tx_bf_rx_fb_all_cnt; > + u32 tx_bf_rx_fb_he_cnt; > + u32 tx_bf_rx_fb_vht_cnt; > + u32 tx_bf_rx_fb_ht_cnt; > + > + u32 tx_bf_rx_fb_bw; /* value of last sample, not cumulative */ > + u32 tx_bf_rx_fb_nc_cnt; > + u32 tx_bf_rx_fb_nr_cnt; > + u32 tx_bf_fb_cpl_cnt; > + u32 tx_bf_fb_trig_cnt; > + > /* Add more stats here, updated from mac_update_stats */ > }; > > -- > 2.20.1 >