Commit fe041bee authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: mt7921: move tx amsdu stats in mib_stats 



Move tx_amsdu histogram stats in mib_stats structure since registers are
clear-on-read

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 9e893d28

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

+12 −15
Original line number Diff line number Diff line
@@ -95,30 +95,27 @@ static int 
mt7921_tx_stats_show(struct seq_file *file, void *data)

{

	struct mt7921_dev *dev = file->private;

	int stat[8], i, n;

	struct mt7921_phy *phy = &dev->phy;

	struct mib_stats *mib = &phy->mib;

	int i;



	mt7921_mutex_acquire(dev);



	mt7921_ampdu_stat_read_phy(&dev->phy, file);

	mt7921_ampdu_stat_read_phy(phy, file);



	/* Tx amsdu info */

	seq_puts(file, "Tx MSDU stat:\n");

	for (i = 0, n = 0; i < ARRAY_SIZE(stat); i++) {

		stat[i] = mt76_rr(dev,  MT_PLE_AMSDU_PACK_MSDU_CNT(i));

		n += stat[i];

	}



	mt7921_mutex_release(dev);



	for (i = 0; i < ARRAY_SIZE(stat); i++) {

		seq_printf(file, "AMSDU pack count of %d MSDU in TXD: 0x%x ",

			   i + 1, stat[i]);

		if (n != 0)

			seq_printf(file, "(%d%%)\n", stat[i] * 100 / n);

	for (i = 0; i < ARRAY_SIZE(mib->tx_amsdu); i++) {

		seq_printf(file, "AMSDU pack count of %d MSDU in TXD: %8d ",

			   i + 1, mib->tx_amsdu[i]);

		if (mib->tx_amsdu_cnt)

			seq_printf(file, "(%3d%%)\n",

				   mib->tx_amsdu[i] * 100 / mib->tx_amsdu_cnt);

		else

			seq_puts(file, "\n");

	}



	mt7921_mutex_release(dev);



	return 0;

}

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

+6 −0
Original line number Diff line number Diff line
@@ -1375,6 +1375,12 @@ void mt7921_mac_update_mib_stats(struct mt7921_phy *phy) 
	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; i < ARRAY_SIZE(mib->tx_amsdu); i++) {

		val = mt76_rr(dev, MT_PLE_AMSDU_PACK_MSDU_CNT(i));

		mib->tx_amsdu[i] += val;

		mib->tx_amsdu_cnt += val;

	}



	for (i = 0, aggr1 = aggr0 + 4; i < 4; i++) {

		u32 val2;

drivers/net/wireless/mediatek/mt76/mt7921/main.c

+2 −2
Original line number Diff line number Diff line
@@ -958,8 +958,8 @@ void mt7921_get_et_stats(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	data[ei++] = mib->tx_bf_rx_fb_ht_cnt;



	/* Tx amsdu info (pack-count histogram) */

	for (i = 0; i < 8; i++)

		data[ei++] = mt76_rr(dev,  MT_PLE_AMSDU_PACK_MSDU_CNT(i));

	for (i = 0; i < ARRAY_SIZE(mib->tx_amsdu); i++)

		data[ei++] = mib->tx_amsdu[i];



	/* rx counters */

	data[ei++] = mib->rx_mpdu_cnt;

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

+3 −0
Original line number Diff line number Diff line
@@ -148,6 +148,9 @@ struct mib_stats { 
	u32 rx_ampdu_cnt;

	u32 rx_ampdu_bytes_cnt;

	u32 rx_ba_cnt;



	u32 tx_amsdu[8];

	u32 tx_amsdu_cnt;

};



struct mt7921_phy {