mt76: mt7615: add more useful Tx mib counters

Add ba_miss_cnt and ampdu_per in mib_stats.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c
index 980e7e3cf37e27130f07221f15ddca8d951c3fe8..641bfada575618eec93148dcfa78cacbbf55574e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c
@@ -150,6 +150,10 @@ mt7615_ampdu_stat_read_phy(struct mt7615_phy *phy,
        for (i = 0; i < ARRAY_SIZE(bound); i++)
                seq_printf(file, "%8d | ", dev->mt76.aggr_stats[i + range]);
        seq_puts(file, "\n");
+
+       seq_printf(file, "BA miss count: %d\n", phy->mib.ba_miss_cnt);
+       seq_printf(file, "PER: %ld.%1ld%%\n",
+                  phy->mib.aggr_per / 10, phy->mib.aggr_per % 10);
 }
 
 static int

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index f30dc015e88e43f2480ea4f9a4375d945d185518..5451c0b8c9f2f334d49d61879c6d26a362687368 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -1754,20 +1754,30 @@ mt7615_mac_update_mib_stats(struct mt7615_phy *phy)
        struct mib_stats *mib = &phy->mib;
        bool ext_phy = phy != &dev->phy;
        int i, aggr;
+       u32 val, val2;
 
        memset(mib, 0, sizeof(*mib));
 
        mib->fcs_err_cnt = mt76_get_field(dev, MT_MIB_SDR3(ext_phy),
                                          MT_MIB_SDR3_FCS_ERR_MASK);
 
+       val = mt76_get_field(dev, MT_MIB_SDR14(ext_phy),
+                            MT_MIB_AMPDU_MPDU_COUNT);
+       val2 = mt76_get_field(dev, MT_MIB_SDR15(ext_phy),
+                             MT_MIB_AMPDU_ACK_COUNT);
+       mib->aggr_per = 1000 * (val - val2) / val;
+
        aggr = ext_phy ? ARRAY_SIZE(dev->mt76.aggr_stats) / 2 : 0;
        for (i = 0; i < 4; i++) {
-               u32 val, val2;
+               val = mt76_rr(dev, MT_MIB_MB_SDR1(ext_phy, i));
+
+               val2 = FIELD_GET(MT_MIB_ACK_FAIL_COUNT_MASK, val);
+               if (val2 > mib->ack_fail_cnt)
+                       mib->ack_fail_cnt = val2;
 
-               val = mt76_get_field(dev, MT_MIB_MB_SDR1(ext_phy, i),
-                                    MT_MIB_ACK_FAIL_COUNT_MASK);
-               if (val > mib->ack_fail_cnt)
-                       mib->ack_fail_cnt = val;
+               val2 = FIELD_GET(MT_MIB_BA_MISS_COUNT_MASK, val);
+               if (val2 > mib->ba_miss_cnt)
+                       mib->ba_miss_cnt = val2;
 
                val = mt76_rr(dev, MT_MIB_MB_SDR0(ext_phy, i));
                val2 = FIELD_GET(MT_MIB_RTS_RETRIES_COUNT_MASK, val);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 00007076921732195c942d17f7686203ed7ebf5f..052031d25f38ff69eaafbbb9f8421d78e1ae84db 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -117,6 +117,8 @@ struct mib_stats {
        u16 fcs_err_cnt;
        u16 rts_cnt;
        u16 rts_retries_cnt;
+       u16 ba_miss_cnt;
+       unsigned long aggr_per;
 };
 
 struct mt7615_phy {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
index 58aaa57fb451707b0aba89ffefc2f82cce226468..29c56b0723cd068ec5896c1caadcf698bbfd99e4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
@@ -389,6 +389,12 @@ enum mt7615_reg_base {
 #define MT_MIB_SDR9(_band)             MT_WF_MIB(_band, 0x02c)
 #define MT_MIB_SDR9_BUSY_MASK          GENMASK(23, 0)
 
+#define MT_MIB_SDR14(_band)            MT_WF_MIB(_band, 0x040)
+#define MT_MIB_AMPDU_MPDU_COUNT                GENMASK(23, 0)
+
+#define MT_MIB_SDR15(_band)            MT_WF_MIB(_band, 0x044)
+#define MT_MIB_AMPDU_ACK_COUNT         GENMASK(23, 0)
+
 #define MT_MIB_SDR16(_band)            MT_WF_MIB(_band, 0x048)
 #define MT_MIB_SDR16_BUSY_MASK         GENMASK(23, 0)
 
@@ -402,6 +408,7 @@ enum mt7615_reg_base {
 #define MT_MIB_RTS_COUNT_MASK          GENMASK(15, 0)
 
 #define MT_MIB_MB_SDR1(_band, n)       MT_WF_MIB(_band, 0x104 + ((n) << 4))
+#define MT_MIB_BA_MISS_COUNT_MASK      GENMASK(15, 0)
 #define MT_MIB_ACK_FAIL_COUNT_MASK     GENMASK(31, 16)
 
 #define MT_TX_AGG_CNT(_band, n)                MT_WF_MIB(_band, 0xa8 + ((n) << 2))