Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   greearb@candelatech.com
To:     linux-wireless@vger.kernel.org
Cc:     Ben Greear <greearb@candelatech.com>
Subject: [PATCH 07/15] mt76: mt7915:  ethtool group-5 rx stats information
Date:   Wed, 11 Aug 2021 14:44:31 -0700
Message-Id: <20210811214439.17458-8-greearb@candelatech.com>
In-Reply-To: <20210811214439.17458-1-greearb@candelatech.com>
References: <20210811214439.17458-1-greearb@candelatech.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Ben Greear <greearb@candelatech.com>

Add ethtool support for rx-nss, rx-bw, rx-mode stats.
These are only valid when the group-5 rx stats are
enabled.

Signed-off-by: Ben Greear <greearb@candelatech.com>
---
 .../net/wireless/mediatek/mt76/mt7915/mac.c   | 23 ++++++++++
 .../net/wireless/mediatek/mt76/mt7915/main.c  | 42 +++++++++++++++++++
 .../wireless/mediatek/mt76/mt7915/mt7915.h    | 10 +++++
 3 files changed, 75 insertions(+)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index f1cff26cbc36..697dbf62c35f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -424,6 +424,7 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
 	u8 qos_ctl = 0;
 	__le16 fc = 0;
 	int i, idx;
+	struct mt7915_sta_stats *mstats = NULL;
 
 	memset(status, 0, sizeof(*status));
 
@@ -451,6 +452,7 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
 		struct mt7915_sta *msta;
 
 		msta = container_of(status->wcid, struct mt7915_sta, wcid);
+		mstats = &msta->stats;
 		spin_lock_bh(&dev->sta_poll_lock);
 		if (list_empty(&msta->poll_list))
 			list_add_tail(&msta->poll_list, &dev->sta_poll_list);
@@ -654,8 +656,19 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
 				WARN_ON_ONCE(nss > 4);
 			}
 
+			if (mstats) {
+				if (nss > 3)
+					mstats->rx_nss[3]++;
+				else
+					mstats->rx_nss[nss - 1]++;
+
+				mstats->rx_mode[mode]++;
+			}
+
 			switch (FIELD_GET(MT_CRXV_FRAME_MODE, v2)) {
 			case IEEE80211_STA_RX_BW_20:
+				if (mstats)
+					mstats->rx_bw_20++;
 				break;
 			case IEEE80211_STA_RX_BW_40:
 				if (mode & MT_PHY_TYPE_HE_EXT_SU &&
@@ -663,14 +676,24 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
 					status->bw = RATE_INFO_BW_HE_RU;
 					status->he_ru =
 						NL80211_RATE_INFO_HE_RU_ALLOC_106;
+					if (mstats) {
+						mstats->rx_bw_he_ru++;
+						mstats->rx_ru_106++;
+					}
 				} else {
 					status->bw = RATE_INFO_BW_40;
+					if (mstats)
+						mstats->rx_bw_40++;
 				}
 				break;
 			case IEEE80211_STA_RX_BW_80:
 				status->bw = RATE_INFO_BW_80;
+				if (mstats)
+					mstats->rx_bw_80++;
 				break;
 			case IEEE80211_STA_RX_BW_160:
+				if (mstats)
+					mstats->rx_bw_160++;
 				status->bw = RATE_INFO_BW_160;
 				break;
 			default:
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 427b275f123a..1ce4260557c7 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -1123,6 +1123,27 @@ static const char mt7915_gstrings_stats[][ETH_GSTRING_LEN] = {
 	"v_tx_mcs_9",
 	"v_tx_mcs_10",
 	"v_tx_mcs_11",
+
+	/* per-vif rx counters */
+	"v_rx_nss1",
+	"v_rx_nss2",
+	"v_rx_nss3",
+	"v_rx_nss4",
+	"v_rx_mode_cck",
+	"v_rx_mode_ofdm",
+	"v_rx_mode_ht",
+	"v_rx_mode_ht_gf",
+	"v_rx_mode_vht",
+	"v_rx_mode_he_su",
+	"v_rx_mode_he_ext_su",
+	"v_rx_mode_he_tb",
+	"v_rx_mode_he_mu",
+	"v_rx_bw_20",
+	"v_rx_bw_40",
+	"v_rx_bw_80",
+	"v_rx_bw_160",
+	"v_rx_bw_he_ru",
+	"v_rx_ru_106",
 };
 
 #define MT7915_SSTATS_LEN ARRAY_SIZE(mt7915_gstrings_stats)
@@ -1190,6 +1211,27 @@ static void mt7915_ethtool_worker(void *wi_data, struct ieee80211_sta *sta)
 	for (q = 0; q < 12; q++)
 		data[ei++] += mstats->tx_mcs[q];
 
+	/* rx stats */
+	for (q = 0; q < ARRAY_SIZE(mstats->rx_nss); q++)
+		data[ei++] += mstats->rx_nss[q];
+
+	data[ei++] += mstats->rx_mode[MT_PHY_TYPE_CCK];
+	data[ei++] += mstats->rx_mode[MT_PHY_TYPE_OFDM];
+	data[ei++] += mstats->rx_mode[MT_PHY_TYPE_HT];
+	data[ei++] += mstats->rx_mode[MT_PHY_TYPE_HT_GF];
+	data[ei++] += mstats->rx_mode[MT_PHY_TYPE_VHT];
+	data[ei++] += mstats->rx_mode[MT_PHY_TYPE_HE_SU];
+	data[ei++] += mstats->rx_mode[MT_PHY_TYPE_HE_EXT_SU];
+	data[ei++] += mstats->rx_mode[MT_PHY_TYPE_HE_TB];
+	data[ei++] += mstats->rx_mode[MT_PHY_TYPE_HE_MU];
+
+	data[ei++] += mstats->rx_bw_20;
+	data[ei++] += mstats->rx_bw_40;
+	data[ei++] += mstats->rx_bw_80;
+	data[ei++] += mstats->rx_bw_160;
+	data[ei++] += mstats->rx_bw_he_ru;
+	data[ei++] += mstats->rx_ru_106;
+
 	wi->worker_stat_count = ei - wi->initial_stat_idx;
 }
 
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index b446a5c73aa5..1f0be4fbee35 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -73,6 +73,16 @@ struct mt7915_sta_stats {
 	unsigned long tx_bw[4]; /* 20, 40, 80, 160 */
 	unsigned long tx_nss[4]; /* 1, 2, 3, 4 */
 	unsigned long tx_mcs[16]; /* mcs idx */
+
+	/* This section requires group-5 in rxd to be enabled. */
+	u32 rx_nss[4]; /* rx-nss histogram */
+	u32 rx_mode[MT_PHY_TYPE_HE_LAST]; /* rx mode histogram */
+	u32 rx_bw_20;
+	u32 rx_bw_40;
+	u32 rx_bw_80;
+	u32 rx_bw_160;
+	u32 rx_bw_he_ru;
+	u32 rx_ru_106;
 };
 
 struct mt7915_sta_key_conf {
-- 
2.20.1