mt76: mt7921: add some more MIB counters

This is a preliminary patch to introduce ethtool stats support to mt7921
driver.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index f5b179601030ecad047aaa96963c6321582298bb..8a5b92b1e0555307191ed547d1711eee45d1d503 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -1326,6 +1326,7 @@ void mt7921_mac_update_mib_stats(struct mt7921_phy *phy)
        struct mt7921_dev *dev = phy->dev;
        struct mib_stats *mib = &phy->mib;
        int i, aggr0 = 0, aggr1;
+       u32 val;
 
        mib->fcs_err_cnt += mt76_get_field(dev, MT_MIB_SDR3(0),
                                           MT_MIB_SDR3_FCS_ERR_MASK);
@@ -1338,8 +1339,31 @@ void mt7921_mac_update_mib_stats(struct mt7921_phy *phy)
        mib->rts_retries_cnt += mt76_get_field(dev, MT_MIB_MB_BSDR1(0),
                                               MT_MIB_RTS_FAIL_COUNT_MASK);
 
+       mib->tx_ampdu_cnt += mt76_rr(dev, MT_MIB_SDR12(0));
+       mib->tx_mpdu_attempts_cnt += mt76_rr(dev, MT_MIB_SDR14(0));
+       mib->tx_mpdu_success_cnt += mt76_rr(dev, MT_MIB_SDR15(0));
+
+       val = mt76_rr(dev, MT_MIB_SDR32(0));
+       mib->tx_pkt_ebf_cnt += FIELD_GET(MT_MIB_SDR9_EBF_CNT_MASK, val);
+       mib->tx_pkt_ibf_cnt += FIELD_GET(MT_MIB_SDR9_IBF_CNT_MASK, val);
+
+       val = mt76_rr(dev, MT_ETBF_TX_APP_CNT(0));
+       mib->tx_bf_ibf_ppdu_cnt += FIELD_GET(MT_ETBF_TX_IBF_CNT, val);
+       mib->tx_bf_ebf_ppdu_cnt += FIELD_GET(MT_ETBF_TX_EBF_CNT, val);
+
+       val = mt76_rr(dev, MT_ETBF_RX_FB_CNT(0));
+       mib->tx_bf_rx_fb_all_cnt += FIELD_GET(MT_ETBF_RX_FB_ALL, val);
+       mib->tx_bf_rx_fb_he_cnt += FIELD_GET(MT_ETBF_RX_FB_HE, val);
+       mib->tx_bf_rx_fb_vht_cnt += FIELD_GET(MT_ETBF_RX_FB_VHT, val);
+       mib->tx_bf_rx_fb_ht_cnt += FIELD_GET(MT_ETBF_RX_FB_HT, val);
+
+       mib->rx_mpdu_cnt += mt76_rr(dev, MT_MIB_SDR5(0));
+       mib->rx_ampdu_cnt += mt76_rr(dev, MT_MIB_SDR22(0));
+       mib->rx_ampdu_bytes_cnt += mt76_rr(dev, MT_MIB_SDR23(0));
+       mib->rx_ba_cnt += mt76_rr(dev, MT_MIB_SDR31(0));
+
        for (i = 0, aggr1 = aggr0 + 4; i < 4; i++) {
-               u32 val, val2;
+               u32 val2;
 
                val = mt76_rr(dev, MT_TX_AGG_CNT(0, i));
                val2 = mt76_rr(dev, MT_TX_AGG_CNT2(0, i));

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index eebf367be29640230ddb0df1c85b122cee2db28e..86c741569a9bb1e560c30eac839a962c1ef11e46 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -129,6 +129,24 @@ struct mib_stats {
        u32 rts_cnt;
        u32 rts_retries_cnt;
        u32 ba_miss_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_ampdu_cnt;
+       u32 tx_mpdu_attempts_cnt;
+       u32 tx_mpdu_success_cnt;
+       u32 tx_pkt_ebf_cnt;
+       u32 tx_pkt_ibf_cnt;
+
+       u32 rx_mpdu_cnt;
+       u32 rx_ampdu_cnt;
+       u32 rx_ampdu_bytes_cnt;
+       u32 rx_ba_cnt;
 };
 
 struct mt7921_phy {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h
index cb6069024320fefaf2142aeab74f6ebe03891b3f..cbd38122c510f82e886584f8a88f0ad4ddb65125 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h
@@ -92,6 +92,20 @@
 #define MT_LPON_TCR_SW_MODE            GENMASK(1, 0)
 #define MT_LPON_TCR_SW_WRITE           BIT(0)
 
+/* ETBF: band 0(0x24000), band 1(0xa4000) */
+#define MT_WF_ETBF_BASE(_band)         ((_band) ? 0x820fa000 : 0x820ea000)
+#define MT_WF_ETBF(_band, ofs)         (MT_WF_ETBF_BASE(_band) + (ofs))
+
+#define MT_ETBF_TX_APP_CNT(_band)      MT_WF_ETBF(_band, 0x150)
+#define MT_ETBF_TX_IBF_CNT             GENMASK(31, 16)
+#define MT_ETBF_TX_EBF_CNT             GENMASK(15, 0)
+
+#define MT_ETBF_RX_FB_CNT(_band)       MT_WF_ETBF(_band, 0x158)
+#define MT_ETBF_RX_FB_ALL              GENMASK(31, 24)
+#define MT_ETBF_RX_FB_HE               GENMASK(23, 16)
+#define MT_ETBF_RX_FB_VHT              GENMASK(15, 8)
+#define MT_ETBF_RX_FB_HT               GENMASK(7, 0)
+
 /* MIB: band 0(0x24800), band 1(0xa4800) */
 #define MT_WF_MIB_BASE(_band)          ((_band) ? 0x820fd000 : 0x820ed000)
 #define MT_WF_MIB(_band, ofs)          (MT_WF_MIB_BASE(_band) + (ofs))
@@ -103,12 +117,26 @@
 #define MT_MIB_SDR3(_band)             MT_WF_MIB(_band, 0x698)
 #define MT_MIB_SDR3_FCS_ERR_MASK       GENMASK(31, 16)
 
+#define MT_MIB_SDR5(_band)             MT_WF_MIB(_band, 0x780)
+
 #define MT_MIB_SDR9(_band)             MT_WF_MIB(_band, 0x02c)
 #define MT_MIB_SDR9_BUSY_MASK          GENMASK(23, 0)
 
+#define MT_MIB_SDR12(_band)            MT_WF_MIB(_band, 0x558)
+#define MT_MIB_SDR14(_band)            MT_WF_MIB(_band, 0x564)
+#define MT_MIB_SDR15(_band)            MT_WF_MIB(_band, 0x568)
+
 #define MT_MIB_SDR16(_band)            MT_WF_MIB(_band, 0x048)
 #define MT_MIB_SDR16_BUSY_MASK         GENMASK(23, 0)
 
+#define MT_MIB_SDR22(_band)            MT_WF_MIB(_band, 0x770)
+#define MT_MIB_SDR23(_band)            MT_WF_MIB(_band, 0x774)
+#define MT_MIB_SDR31(_band)            MT_WF_MIB(_band, 0x55c)
+
+#define MT_MIB_SDR32(_band)            MT_WF_MIB(_band, 0x7a8)
+#define MT_MIB_SDR9_IBF_CNT_MASK       GENMASK(31, 16)
+#define MT_MIB_SDR9_EBF_CNT_MASK       GENMASK(15, 0)
+
 #define MT_MIB_SDR34(_band)            MT_WF_MIB(_band, 0x090)
 #define MT_MIB_MU_BF_TX_CNT            GENMASK(15, 0)