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

wifi: mt76: move aggr_stats array in mt76_phy 



Move aggregation stats array per-phy instead of share it between multiple
interfaces. This is a preliminary patch to add mt7996 driver support.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -693,6 +693,8 @@ struct mt76_phy { 
	enum mt76_dfs_state dfs_state;

	ktime_t survey_time;



	u32 aggr_stats[32];



	struct mt76_hw_cap cap;

	struct mt76_sband sband_2g;

	struct mt76_sband sband_5g;
@@ -781,8 +783,6 @@ struct mt76_dev { 


	u32 rev;



	u32 aggr_stats[32];



	struct tasklet_struct pre_tbtt_tasklet;

	int beacon_int;

	u8 beacon_mask;

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ mt7603_ampdu_stat_show(struct seq_file *file, void *data) 
			   bound[i], bound[i + 1]);

	seq_puts(file, "\nCount:  ");

	for (i = 0; i < ARRAY_SIZE(bound); i++)

		seq_printf(file, "%8d | ", dev->mt76.aggr_stats[i]);

		seq_printf(file, "%8d | ", dev->mphy.aggr_stats[i]);

	seq_puts(file, "\n");



	return 0;

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

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void mt7603_mac_reset_counters(struct mt7603_dev *dev) 
	for (i = 0; i < 2; i++)

		mt76_rr(dev, MT_TX_AGG_CNT(i));



	memset(dev->mt76.aggr_stats, 0, sizeof(dev->mt76.aggr_stats));

	memset(dev->mphy.aggr_stats, 0, sizeof(dev->mphy.aggr_stats));

}



void mt7603_mac_set_timing(struct mt7603_dev *dev)
@@ -1827,8 +1827,8 @@ void mt7603_mac_work(struct work_struct *work) 
	for (i = 0, idx = 0; i < 2; i++) {

		u32 val = mt76_rr(dev, MT_TX_AGG_CNT(i));



		dev->mt76.aggr_stats[idx++] += val & 0xffff;

		dev->mt76.aggr_stats[idx++] += val >> 16;

		dev->mphy.aggr_stats[idx++] += val & 0xffff;

		dev->mphy.aggr_stats[idx++] += val >> 16;

	}



	if (dev->mphy.mac_work_count == 10)

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

+2 −4
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ mt7615_ampdu_stat_read_phy(struct mt7615_phy *phy, 
{

	struct mt7615_dev *dev = file->private;

	u32 reg = is_mt7663(&dev->mt76) ? MT_MIB_ARNG(0) : MT_AGG_ASRCR0;

	bool ext_phy = phy != &dev->phy;

	int bound[7], i, range;



	if (!phy)
@@ -292,7 +291,7 @@ mt7615_ampdu_stat_read_phy(struct mt7615_phy *phy, 
	for (i = 0; i < 3; i++)

		bound[i + 4] = MT_AGG_ASRCR_RANGE(range, i) + 1;



	seq_printf(file, "\nPhy %d\n", ext_phy);

	seq_printf(file, "\nPhy %d\n", phy != &dev->phy);



	seq_printf(file, "Length: %8d | ", bound[0]);

	for (i = 0; i < ARRAY_SIZE(bound) - 1; i++)
@@ -300,9 +299,8 @@ mt7615_ampdu_stat_read_phy(struct mt7615_phy *phy, 
			   bound[i], bound[i + 1]);

	seq_puts(file, "\nCount:  ");



	range = ext_phy ? ARRAY_SIZE(dev->mt76.aggr_stats) / 2 : 0;

	for (i = 0; i < ARRAY_SIZE(bound); i++)

		seq_printf(file, "%8d | ", dev->mt76.aggr_stats[i + range]);

		seq_printf(file, "%8d | ", phy->mt76->aggr_stats[i]);

	seq_puts(file, "\n");



	seq_printf(file, "BA miss count: %d\n", phy->mib.ba_miss_cnt);

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

+4 −5
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void mt7615_mac_reset_counters(struct mt7615_phy *phy) 
		mt76_rr(dev, MT_TX_AGG_CNT(1, i));

	}



	memset(dev->mt76.aggr_stats, 0, sizeof(dev->mt76.aggr_stats));

	memset(phy->mt76->aggr_stats, 0, sizeof(phy->mt76->aggr_stats));

	phy->mt76->survey_time = ktime_get_boottime();



	/* reset airtime counters */
@@ -2012,7 +2012,7 @@ mt7615_mac_update_mib_stats(struct mt7615_phy *phy) 
	struct mt7615_dev *dev = phy->dev;

	struct mib_stats *mib = &phy->mib;

	bool ext_phy = phy != &dev->phy;

	int i, aggr;

	int i, aggr = 0;

	u32 val, val2;



	mib->fcs_err_cnt += mt76_get_field(dev, MT_MIB_SDR3(ext_phy),
@@ -2026,7 +2026,6 @@ mt7615_mac_update_mib_stats(struct mt7615_phy *phy) 
		mib->aggr_per = 1000 * (val - val2) / val;

	}



	aggr = ext_phy ? ARRAY_SIZE(dev->mt76.aggr_stats) / 2 : 0;

	for (i = 0; i < 4; i++) {

		val = mt76_rr(dev, MT_MIB_MB_SDR1(ext_phy, i));

		mib->ba_miss_cnt += FIELD_GET(MT_MIB_BA_MISS_COUNT_MASK, val);
@@ -2039,8 +2038,8 @@ mt7615_mac_update_mib_stats(struct mt7615_phy *phy) 
						  val);



		val = mt76_rr(dev, MT_TX_AGG_CNT(ext_phy, i));

		dev->mt76.aggr_stats[aggr++] += val & 0xffff;

		dev->mt76.aggr_stats[aggr++] += val >> 16;

		phy->mt76->aggr_stats[aggr++] += val & 0xffff;

		phy->mt76->aggr_stats[aggr++] += val >> 16;

	}

}