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

wifi: mt76: mt7915: move mib_stats structure in mt76.h 



mib_stats structure is shared by mostly all chipsets. Move it to shared
code.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 692031b9

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

+63 −0
Original line number Diff line number Diff line
@@ -857,6 +857,69 @@ struct mt76_dev { 
	};

};



/* per-phy stats.  */

struct mt76_mib_stats {

	u32 ack_fail_cnt;

	u32 fcs_err_cnt;

	u32 rts_cnt;

	u32 rts_retries_cnt;

	u32 ba_miss_cnt;

	u32 tx_bf_cnt;

	u32 tx_mu_bf_cnt;

	u32 tx_mu_mpdu_cnt;

	u32 tx_mu_acked_mpdu_cnt;

	u32 tx_su_acked_mpdu_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_eht_cnt;

	u32 tx_bf_rx_fb_he_cnt;

	u32 tx_bf_rx_fb_vht_cnt;

	u32 tx_bf_rx_fb_ht_cnt;



	u32 tx_bf_rx_fb_bw; /* value of last sample, not cumulative */

	u32 tx_bf_rx_fb_nc_cnt;

	u32 tx_bf_rx_fb_nr_cnt;

	u32 tx_bf_fb_cpl_cnt;

	u32 tx_bf_fb_trig_cnt;



	u32 tx_ampdu_cnt;

	u32 tx_stop_q_empty_cnt;

	u32 tx_mpdu_attempts_cnt;

	u32 tx_mpdu_success_cnt;

	u32 tx_pkt_ebf_cnt;

	u32 tx_pkt_ibf_cnt;



	u32 tx_rwp_fail_cnt;

	u32 tx_rwp_need_cnt;



	/* rx stats */

	u32 rx_fifo_full_cnt;

	u32 channel_idle_cnt;

	u32 primary_cca_busy_time;

	u32 secondary_cca_busy_time;

	u32 primary_energy_detect_time;

	u32 cck_mdrdy_time;

	u32 ofdm_mdrdy_time;

	u32 green_mdrdy_time;

	u32 rx_vector_mismatch_cnt;

	u32 rx_delimiter_fail_cnt;

	u32 rx_mrdy_cnt;

	u32 rx_len_mismatch_cnt;

	u32 rx_mpdu_cnt;

	u32 rx_ampdu_cnt;

	u32 rx_ampdu_bytes_cnt;

	u32 rx_ampdu_valid_subframe_cnt;

	u32 rx_ampdu_valid_subframe_bytes_cnt;

	u32 rx_pfdrop_cnt;

	u32 rx_vec_queue_overflow_drop_cnt;

	u32 rx_ba_cnt;



	u32 tx_amsdu[8];

	u32 tx_amsdu_cnt;

};



struct mt76_power_limits {

	s8 cck[4];

	s8 ofdm[8];

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

+2 −2
Original line number Diff line number Diff line
@@ -719,10 +719,10 @@ mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy, 
static void

mt7915_txbf_stat_read_phy(struct mt7915_phy *phy, struct seq_file *s)

{

	struct mt76_mib_stats *mib = &phy->mib;

	static const char * const bw[] = {

		"BW20", "BW40", "BW80", "BW160"

	};

	struct mib_stats *mib = &phy->mib;



	/* Tx Beamformer monitor */

	seq_puts(s, "\nTx Beamformer applied PPDU counts: ");
@@ -768,7 +768,7 @@ mt7915_tx_stats_show(struct seq_file *file, void *data) 
{

	struct mt7915_phy *phy = file->private;

	struct mt7915_dev *dev = phy->dev;

	struct mib_stats *mib = &phy->mib;

	struct mt76_mib_stats *mib = &phy->mib;

	int i;



	mutex_lock(&dev->mt76.mutex);

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

+1 −1
Original line number Diff line number Diff line
@@ -1765,8 +1765,8 @@ void mt7915_reset(struct mt7915_dev *dev) 


void mt7915_mac_update_stats(struct mt7915_phy *phy)

{

	struct mt76_mib_stats *mib = &phy->mib;

	struct mt7915_dev *dev = phy->dev;

	struct mib_stats *mib = &phy->mib;

	int i, aggr0 = 0, aggr1, cnt;

	u8 band = phy->mt76->band_idx;

	u32 val;

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

+2 −2
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ mt7915_get_stats(struct ieee80211_hw *hw, 
{

	struct mt7915_phy *phy = mt7915_hw_phy(hw);

	struct mt7915_dev *dev = mt7915_hw_dev(hw);

	struct mib_stats *mib = &phy->mib;

	struct mt76_mib_stats *mib = &phy->mib;



	mutex_lock(&dev->mt76.mutex);
@@ -1327,11 +1327,11 @@ void mt7915_get_et_stats(struct ieee80211_hw *hw, 
	struct mt7915_dev *dev = mt7915_hw_dev(hw);

	struct mt7915_phy *phy = mt7915_hw_phy(hw);

	struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;

	struct mt76_mib_stats *mib = &phy->mib;

	struct mt76_ethtool_worker_info wi = {

		.data = data,

		.idx = mvif->mt76.idx,

	};

	struct mib_stats *mib = &phy->mib;

	/* See mt7915_ampdu_stat_read_phy, etc */

	int i, ei = 0, stats_size;

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

+1 −62
Original line number Diff line number Diff line
@@ -157,67 +157,6 @@ struct mt7915_vif { 
	struct cfg80211_bitrate_mask bitrate_mask;

};



/* per-phy stats.  */

struct mib_stats {

	u32 ack_fail_cnt;

	u32 fcs_err_cnt;

	u32 rts_cnt;

	u32 rts_retries_cnt;

	u32 ba_miss_cnt;

	u32 tx_bf_cnt;

	u32 tx_mu_mpdu_cnt;

	u32 tx_mu_acked_mpdu_cnt;

	u32 tx_su_acked_mpdu_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_bf_rx_fb_bw; /* value of last sample, not cumulative */

	u32 tx_bf_rx_fb_nc_cnt;

	u32 tx_bf_rx_fb_nr_cnt;

	u32 tx_bf_fb_cpl_cnt;

	u32 tx_bf_fb_trig_cnt;



	u32 tx_ampdu_cnt;

	u32 tx_stop_q_empty_cnt;

	u32 tx_mpdu_attempts_cnt;

	u32 tx_mpdu_success_cnt;

	u32 tx_pkt_ebf_cnt;

	u32 tx_pkt_ibf_cnt;



	u32 tx_rwp_fail_cnt;

	u32 tx_rwp_need_cnt;



	/* rx stats */

	u32 rx_fifo_full_cnt;

	u32 channel_idle_cnt;

	u32 primary_cca_busy_time;

	u32 secondary_cca_busy_time;

	u32 primary_energy_detect_time;

	u32 cck_mdrdy_time;

	u32 ofdm_mdrdy_time;

	u32 green_mdrdy_time;

	u32 rx_vector_mismatch_cnt;

	u32 rx_delimiter_fail_cnt;

	u32 rx_mrdy_cnt;

	u32 rx_len_mismatch_cnt;

	u32 rx_mpdu_cnt;

	u32 rx_ampdu_cnt;

	u32 rx_ampdu_bytes_cnt;

	u32 rx_ampdu_valid_subframe_cnt;

	u32 rx_ampdu_valid_subframe_bytes_cnt;

	u32 rx_pfdrop_cnt;

	u32 rx_vec_queue_overflow_drop_cnt;

	u32 rx_ba_cnt;



	u32 tx_amsdu[8];

	u32 tx_amsdu_cnt;

};



/* crash-dump */

struct mt7915_crash_data {

	guid_t guid;
@@ -263,7 +202,7 @@ struct mt7915_phy { 
	u32 rx_ampdu_ts;

	u32 ampdu_ref;



	struct mib_stats mib;

	struct mt76_mib_stats mib;

	struct mt76_channel_state state_ts;



#ifdef CONFIG_NL80211_TESTMODE