Commit aef16345 authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: mt7615: add more useful Tx mib counters 



Add ba_miss_cnt and ampdu_per in mib_stats.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b7825ca0

drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c

+4 −0
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+15 −5
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h

+2 −0
Original line number Diff line number Diff line
@@ -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 {

drivers/net/wireless/mediatek/mt76/mt7615/regs.h

+7 −0
Original line number Diff line number Diff line
@@ -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))