* [PATCH 1/3] wifi: mt76: mt7915: move mib_stats structure in mt76.h
2023-05-12 22:29 [PATCH 0/3] wifi: mt76: move mib_stats structure in mt76.h Lorenzo Bianconi
@ 2023-05-12 22:29 ` Lorenzo Bianconi
2023-05-16 15:03 ` Simon Horman
2023-07-14 16:00 ` Ben Greear
2023-05-12 22:29 ` [PATCH 2/3] wifi: mt76: mt7996: rely on mib_stats shared definition Lorenzo Bianconi
2023-05-12 22:29 ` [PATCH 3/3] wifi: mt76: mt7921: " Lorenzo Bianconi
2 siblings, 2 replies; 11+ messages in thread
From: Lorenzo Bianconi @ 2023-05-12 22:29 UTC (permalink / raw)
To: nbd; +Cc: lorenzo.bianconi, linux-wireless
mib_stats structure is shared by mostly all chipsets. Move it to shared
code.
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt76.h | 63 +++++++++++++++++++
.../wireless/mediatek/mt76/mt7915/debugfs.c | 4 +-
.../net/wireless/mediatek/mt76/mt7915/mac.c | 2 +-
.../net/wireless/mediatek/mt76/mt7915/main.c | 4 +-
.../wireless/mediatek/mt76/mt7915/mt7915.h | 63 +------------------
5 files changed, 69 insertions(+), 67 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 75b5c2c56a92..45bf1022a051 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -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];
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index 879884ead660..dd5c494efa5f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -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);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 7df8d95fc3fb..9f5f15e219ac 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1747,8 +1747,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;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 2ada2806de66..19973e7c639f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -843,7 +843,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;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index b3ead3530740..50ddf6d3c60a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -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
--
2.40.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 1/3] wifi: mt76: mt7915: move mib_stats structure in mt76.h
2023-05-12 22:29 ` [PATCH 1/3] wifi: mt76: mt7915: " Lorenzo Bianconi
@ 2023-05-16 15:03 ` Simon Horman
2023-07-14 16:00 ` Ben Greear
1 sibling, 0 replies; 11+ messages in thread
From: Simon Horman @ 2023-05-16 15:03 UTC (permalink / raw)
To: Lorenzo Bianconi; +Cc: nbd, lorenzo.bianconi, linux-wireless
On Sat, May 13, 2023 at 12:29:53AM +0200, Lorenzo Bianconi wrote:
> mib_stats structure is shared by mostly all chipsets. Move it to shared
> code.
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/3] wifi: mt76: mt7915: move mib_stats structure in mt76.h
2023-05-12 22:29 ` [PATCH 1/3] wifi: mt76: mt7915: " Lorenzo Bianconi
2023-05-16 15:03 ` Simon Horman
@ 2023-07-14 16:00 ` Ben Greear
2023-07-15 11:54 ` Lorenzo Bianconi
1 sibling, 1 reply; 11+ messages in thread
From: Ben Greear @ 2023-07-14 16:00 UTC (permalink / raw)
To: Lorenzo Bianconi, nbd; +Cc: lorenzo.bianconi, linux-wireless
On 5/12/23 15:29, Lorenzo Bianconi wrote:
> mib_stats structure is shared by mostly all chipsets. Move it to shared
> code.
In case this thing hasn't been pushed upstream yet, then a suggestion:
Create a struct mt76_mib_stats_common class that has the common counters,
and then per-driver can have that struct as first member of its mib stats.
I have added a lot of per-driver stats that never made it upstream
and are not fully shared across different drivers.
Thanks,
Ben
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/net/wireless/mediatek/mt76/mt76.h | 63 +++++++++++++++++++
> .../wireless/mediatek/mt76/mt7915/debugfs.c | 4 +-
> .../net/wireless/mediatek/mt76/mt7915/mac.c | 2 +-
> .../net/wireless/mediatek/mt76/mt7915/main.c | 4 +-
> .../wireless/mediatek/mt76/mt7915/mt7915.h | 63 +------------------
> 5 files changed, 69 insertions(+), 67 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
> index 75b5c2c56a92..45bf1022a051 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
> @@ -857,6 +857,69 @@ struct mt76_dev {
> };
> };
>
> +/* per-phy stats. */
> +struct mt76_mib_stats {
> + u32 ack_fail_cnt;
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/3] wifi: mt76: mt7915: move mib_stats structure in mt76.h
2023-07-14 16:00 ` Ben Greear
@ 2023-07-15 11:54 ` Lorenzo Bianconi
2023-07-16 0:00 ` Ben Greear
0 siblings, 1 reply; 11+ messages in thread
From: Lorenzo Bianconi @ 2023-07-15 11:54 UTC (permalink / raw)
To: Ben Greear; +Cc: Lorenzo Bianconi, nbd, linux-wireless
[-- Attachment #1: Type: text/plain, Size: 1728 bytes --]
> On 5/12/23 15:29, Lorenzo Bianconi wrote:
> > mib_stats structure is shared by mostly all chipsets. Move it to shared
> > code.
>
> In case this thing hasn't been pushed upstream yet, then a suggestion:
>
> Create a struct mt76_mib_stats_common class that has the common counters,
> and then per-driver can have that struct as first member of its mib stats.
>
> I have added a lot of per-driver stats that never made it upstream
> and are not fully shared across different drivers.
I would say mt76_mib_stats is quite a general name. I think we can do somothing
like (if it is really necessary):
struct mt7915_mib_stats {
struct mt76_mib_stats mt76;
...
};
Regards,
Lorenzo
>
> Thanks,
> Ben
>
> >
> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> > ---
> > drivers/net/wireless/mediatek/mt76/mt76.h | 63 +++++++++++++++++++
> > .../wireless/mediatek/mt76/mt7915/debugfs.c | 4 +-
> > .../net/wireless/mediatek/mt76/mt7915/mac.c | 2 +-
> > .../net/wireless/mediatek/mt76/mt7915/main.c | 4 +-
> > .../wireless/mediatek/mt76/mt7915/mt7915.h | 63 +------------------
> > 5 files changed, 69 insertions(+), 67 deletions(-)
> >
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
> > index 75b5c2c56a92..45bf1022a051 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt76.h
> > +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
> > @@ -857,6 +857,69 @@ struct mt76_dev {
> > };
> > };
> > +/* per-phy stats. */
> > +struct mt76_mib_stats {
> > + u32 ack_fail_cnt;
>
> --
> Ben Greear <greearb@candelatech.com>
> Candela Technologies Inc http://www.candelatech.com
>
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/3] wifi: mt76: mt7915: move mib_stats structure in mt76.h
2023-07-15 11:54 ` Lorenzo Bianconi
@ 2023-07-16 0:00 ` Ben Greear
2023-07-16 2:39 ` Ryder Lee
0 siblings, 1 reply; 11+ messages in thread
From: Ben Greear @ 2023-07-16 0:00 UTC (permalink / raw)
To: Lorenzo Bianconi; +Cc: Lorenzo Bianconi, nbd, linux-wireless
On 7/15/23 4:54 AM, Lorenzo Bianconi wrote:
>> On 5/12/23 15:29, Lorenzo Bianconi wrote:
>>> mib_stats structure is shared by mostly all chipsets. Move it to shared
>>> code.
>>
>> In case this thing hasn't been pushed upstream yet, then a suggestion:
>>
>> Create a struct mt76_mib_stats_common class that has the common counters,
>> and then per-driver can have that struct as first member of its mib stats.
>>
>> I have added a lot of per-driver stats that never made it upstream
>> and are not fully shared across different drivers.
>
> I would say mt76_mib_stats is quite a general name. I think we can do somothing
> like (if it is really necessary):
>
> struct mt7915_mib_stats {
> struct mt76_mib_stats mt76;
> ...
> };
Maybe:
struct mt7915_mib_stats {
struct mt76_mib_stats common;
...
};
I also noticed that Ryder added a few of my patches that extended the
stats, so I think there are probably a lot of stats in that struct
that are not set on the 7921 driver and probably older drivers too.
To me, unset stats are confusing, so I'd prefer to put stats that are mostly
common in a common struct, and have per-driver stats just found in the driver
itself.
Thanks,
Ben
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/3] wifi: mt76: mt7915: move mib_stats structure in mt76.h
2023-07-16 0:00 ` Ben Greear
@ 2023-07-16 2:39 ` Ryder Lee
0 siblings, 0 replies; 11+ messages in thread
From: Ryder Lee @ 2023-07-16 2:39 UTC (permalink / raw)
To: lorenzo.bianconi@redhat.com, greearb@candelatech.com
Cc: linux-wireless@vger.kernel.org, nbd@nbd.name, lorenzo@kernel.org
On Sat, 2023-07-15 at 17:00 -0700, Ben Greear wrote:
>
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> On 7/15/23 4:54 AM, Lorenzo Bianconi wrote:
> >> On 5/12/23 15:29, Lorenzo Bianconi wrote:
> >>> mib_stats structure is shared by mostly all chipsets. Move it to
> shared
> >>> code.
> >>
> >> In case this thing hasn't been pushed upstream yet, then a
> suggestion:
> >>
> >> Create a struct mt76_mib_stats_common class that has the common
> counters,
> >> and then per-driver can have that struct as first member of its
> mib stats.
> >>
> >> I have added a lot of per-driver stats that never made it upstream
> >> and are not fully shared across different drivers.
> >
> > I would say mt76_mib_stats is quite a general name. I think we can
> do somothing
> > like (if it is really necessary):
> >
> > struct mt7915_mib_stats {
> > struct mt76_mib_stats mt76;
> > ...
> > };
>
> Maybe:
>
> struct mt7915_mib_stats {
> struct mt76_mib_stats common;
> ...
> };
>
> I also noticed that Ryder added a few of my patches that extended the
> stats, so I think there are probably a lot of stats in that struct
> that are not set on the 7921 driver and probably older drivers too.
>
> To me, unset stats are confusing, so I'd prefer to put stats that are
> mostly
> common in a common struct, and have per-driver stats just found in
> the driver
> itself.
>
Myabe you can add a patch for per-driver stuff. I just extended the
stat for mt7915 and lore also sent this patch for common struct, but
ended up merging together.
Ryder
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/3] wifi: mt76: mt7996: rely on mib_stats shared definition
2023-05-12 22:29 [PATCH 0/3] wifi: mt76: move mib_stats structure in mt76.h Lorenzo Bianconi
2023-05-12 22:29 ` [PATCH 1/3] wifi: mt76: mt7915: " Lorenzo Bianconi
@ 2023-05-12 22:29 ` Lorenzo Bianconi
2023-05-16 15:03 ` Simon Horman
2023-05-12 22:29 ` [PATCH 3/3] wifi: mt76: mt7921: " Lorenzo Bianconi
2 siblings, 1 reply; 11+ messages in thread
From: Lorenzo Bianconi @ 2023-05-12 22:29 UTC (permalink / raw)
To: nbd; +Cc: lorenzo.bianconi, linux-wireless
Get rid of private copy of mib_stats structure.
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
.../wireless/mediatek/mt76/mt7996/debugfs.c | 4 +-
.../net/wireless/mediatek/mt76/mt7996/mac.c | 2 +-
.../net/wireless/mediatek/mt76/mt7996/main.c | 4 +-
.../wireless/mediatek/mt76/mt7996/mt7996.h | 56 +------------------
4 files changed, 6 insertions(+), 60 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c
index 513ab4ba41c9..4d40ec7ff57f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c
@@ -474,10 +474,10 @@ mt7996_ampdu_stat_read_phy(struct mt7996_phy *phy, struct seq_file *file)
static void
mt7996_txbf_stat_read_phy(struct mt7996_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: ");
@@ -523,7 +523,7 @@ mt7996_tx_stats_show(struct seq_file *file, void *data)
{
struct mt7996_phy *phy = file->private;
struct mt7996_dev *dev = phy->dev;
- struct mib_stats *mib = &phy->mib;
+ struct mt76_mib_stats *mib = &phy->mib;
int i;
u32 attempts, success, per;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index 130eb7b4fd91..7905070afc2c 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -2186,8 +2186,8 @@ void mt7996_reset(struct mt7996_dev *dev)
void mt7996_mac_update_stats(struct mt7996_phy *phy)
{
+ struct mt76_mib_stats *mib = &phy->mib;
struct mt7996_dev *dev = phy->dev;
- struct mib_stats *mib = &phy->mib;
u8 band_idx = phy->mt76->band_idx;
u32 cnt;
int i;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index 0975774fe244..0773293a0121 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -793,7 +793,7 @@ mt7996_get_stats(struct ieee80211_hw *hw,
{
struct mt7996_phy *phy = mt7996_hw_phy(hw);
struct mt7996_dev *dev = mt7996_hw_dev(hw);
- struct mib_stats *mib = &phy->mib;
+ struct mt76_mib_stats *mib = &phy->mib;
mutex_lock(&dev->mt76.mutex);
@@ -1198,11 +1198,11 @@ void mt7996_get_et_stats(struct ieee80211_hw *hw,
struct mt7996_dev *dev = mt7996_hw_dev(hw);
struct mt7996_phy *phy = mt7996_hw_phy(hw);
struct mt7996_vif *mvif = (struct mt7996_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 mt7996_ampdu_stat_read_phy, etc */
int i, ei = 0;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 4d7dcb95a620..348d3ad3f9e7 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -130,60 +130,6 @@ struct mt7996_vif {
u8 beacon_rates_idx;
};
-/* 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_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;
- /* BF counter is PPDU-based, so remove MPDU-based BF counter */
-
- u32 tx_rwp_fail_cnt;
- u32 tx_rwp_need_cnt;
-
- /* rx stats */
- u32 rx_fifo_full_cnt;
- u32 channel_idle_cnt;
- u32 rx_vector_mismatch_cnt;
- u32 rx_delimiter_fail_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 mt7996_crash_data {
guid_t guid;
@@ -222,7 +168,7 @@ struct mt7996_phy {
u32 rx_ampdu_ts;
u32 ampdu_ref;
- struct mib_stats mib;
+ struct mt76_mib_stats mib;
struct mt76_channel_state state_ts;
};
--
2.40.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/3] wifi: mt76: mt7921: rely on mib_stats shared definition
2023-05-12 22:29 [PATCH 0/3] wifi: mt76: move mib_stats structure in mt76.h Lorenzo Bianconi
2023-05-12 22:29 ` [PATCH 1/3] wifi: mt76: mt7915: " Lorenzo Bianconi
2023-05-12 22:29 ` [PATCH 2/3] wifi: mt76: mt7996: rely on mib_stats shared definition Lorenzo Bianconi
@ 2023-05-12 22:29 ` Lorenzo Bianconi
2023-05-16 15:04 ` Simon Horman
2 siblings, 1 reply; 11+ messages in thread
From: Lorenzo Bianconi @ 2023-05-12 22:29 UTC (permalink / raw)
To: nbd; +Cc: lorenzo.bianconi, linux-wireless
Get rid of private copy of mib_stats structure.
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
.../wireless/mediatek/mt76/mt7921/debugfs.c | 2 +-
.../net/wireless/mediatek/mt76/mt7921/mac.c | 2 +-
.../net/wireless/mediatek/mt76/mt7921/main.c | 4 +--
.../wireless/mediatek/mt76/mt7921/mt7921.h | 31 +------------------
4 files changed, 5 insertions(+), 34 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
index d6b6edba2fec..d6c66e775536 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
@@ -95,7 +95,7 @@ mt7921_tx_stats_show(struct seq_file *file, void *data)
{
struct mt7921_dev *dev = file->private;
struct mt7921_phy *phy = &dev->phy;
- struct mib_stats *mib = &phy->mib;
+ struct mt76_mib_stats *mib = &phy->mib;
int i;
mt7921_mutex_acquire(dev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 1675bf520481..c2f6035fa96a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -952,8 +952,8 @@ EXPORT_SYMBOL_GPL(mt7921_reset);
void mt7921_mac_update_mib_stats(struct mt7921_phy *phy)
{
+ struct mt76_mib_stats *mib = &phy->mib;
struct mt7921_dev *dev = phy->dev;
- struct mib_stats *mib = &phy->mib;
int i, aggr0 = 0, aggr1;
u32 val;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 0c9a472bc81a..ce09ba05de82 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -996,7 +996,7 @@ mt7921_get_stats(struct ieee80211_hw *hw,
struct ieee80211_low_level_stats *stats)
{
struct mt7921_phy *phy = mt7921_hw_phy(hw);
- struct mib_stats *mib = &phy->mib;
+ struct mt76_mib_stats *mib = &phy->mib;
mt7921_mutex_acquire(phy->dev);
@@ -1134,7 +1134,7 @@ void mt7921_get_et_stats(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
int stats_size = ARRAY_SIZE(mt7921_gstrings_stats);
struct mt7921_phy *phy = mt7921_hw_phy(hw);
struct mt7921_dev *dev = phy->dev;
- struct mib_stats *mib = &phy->mib;
+ struct mt76_mib_stats *mib = &phy->mib;
struct mt76_ethtool_worker_info wi = {
.data = data,
.idx = mvif->mt76.idx,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 149acb1662d5..76dc2538b915 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -179,35 +179,6 @@ struct mt7921_vif {
struct ieee80211_chanctx_conf *ctx;
};
-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_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_ampdu_cnt;
- u32 tx_mpdu_attempts_cnt;
- u32 tx_mpdu_success_cnt;
- u32 tx_pkt_ebf_cnt;
- u32 tx_pkt_ibf_cnt;
-
- u32 rx_mpdu_cnt;
- u32 rx_ampdu_cnt;
- u32 rx_ampdu_bytes_cnt;
- u32 rx_ba_cnt;
-
- u32 tx_amsdu[8];
- u32 tx_amsdu_cnt;
-};
-
enum {
MT7921_CLC_POWER,
MT7921_CLC_CHAN,
@@ -247,7 +218,7 @@ struct mt7921_phy {
u32 rx_ampdu_ts;
u32 ampdu_ref;
- struct mib_stats mib;
+ struct mt76_mib_stats mib;
u8 sta_work_count;
--
2.40.1
^ permalink raw reply related [flat|nested] 11+ messages in thread