* [PATCH 01/12] wifi: mt76: mt7915: print out hw revision
@ 2023-10-25 19:03 greearb
2023-10-25 19:03 ` [PATCH 02/12] wifi: mt76: mt7915: cache sgi in wcid greearb
` (7 more replies)
0 siblings, 8 replies; 10+ messages in thread
From: greearb @ 2023-10-25 19:03 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
Help determine what version of silicon is in use.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
I've posted similar patches previously, these are rebased on top of
wireless-next. I've lots more, including similar patches for other
mt76 drivers, but hoping I can get some of this upstream before posting
others.
drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
index e7d8e03f826f..11919e5774a7 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
@@ -851,7 +851,7 @@ static int mt7915_mmio_init(struct mt76_dev *mdev,
mdev->rev = (device_id << 16) |
(mt76_rr(dev, MT_HW_REV) & 0xff);
- dev_dbg(mdev->dev, "ASIC revision: %04x\n", mdev->rev);
+ dev_info(mdev->dev, "ASIC revision: %04x\n", mdev->rev);
return 0;
}
--
2.40.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 02/12] wifi: mt76: mt7915: cache sgi in wcid.
2023-10-25 19:03 [PATCH 01/12] wifi: mt76: mt7915: print out hw revision greearb
@ 2023-10-25 19:03 ` greearb
2023-10-25 19:03 ` [PATCH 03/12] wifi: mt76: mt7915: allow processing TXS for 'NO_SKB' pkt-ids greearb
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: greearb @ 2023-10-25 19:03 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
Explicitly cache short_gi and he_gi in wcid, don't try to store
it in the wcid.rate object. Slightly less confusing and less fragile
when TXS starts parsing lots of frames.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
drivers/net/wireless/mediatek/mt76/mt76.h | 5 +++++
drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c | 6 ++++--
drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 9 +++++++--
drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 9 +++++++--
4 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index ea828ba0b83a..9b30d4aab952 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -316,8 +316,13 @@ struct mt76_wcid {
struct ewma_signal rssi;
int inactive_count;
+ /* cached rate, updated from mac_sta_poll() and from TXS callback logic,
+ * in 7915 at least.
+ */
struct rate_info rate;
unsigned long ampdu_state;
+ bool rate_short_gi; /* cached HT/VHT short_gi, from mac_sta_poll() */
+ u8 rate_he_gi; /* cached HE GI, from mac_sta_poll() */
u16 idx;
u8 hw_key_idx;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index 93402d2c2538..c080b60327b1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -657,7 +657,7 @@ bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
return false;
rate.flags = RATE_INFO_FLAGS_MCS;
- if (wcid->rate.flags & RATE_INFO_FLAGS_SHORT_GI)
+ if (wcid->rate_short_gi)
rate.flags |= RATE_INFO_FLAGS_SHORT_GI;
break;
case MT_PHY_TYPE_VHT:
@@ -665,6 +665,8 @@ bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
return false;
rate.flags = RATE_INFO_FLAGS_VHT_MCS;
+ if (wcid->rate_short_gi)
+ rate.flags |= RATE_INFO_FLAGS_SHORT_GI;
break;
case MT_PHY_TYPE_HE_SU:
case MT_PHY_TYPE_HE_EXT_SU:
@@ -673,7 +675,7 @@ bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
if (rate.mcs > 11)
return false;
- rate.he_gi = wcid->rate.he_gi;
+ rate.he_gi = wcid->rate_he_gi;
rate.he_dcm = FIELD_GET(MT_TX_RATE_DCM, txrate);
rate.flags = RATE_INFO_FLAGS_HE_MCS;
break;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 2222fb9aa103..488faeb44e76 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -202,12 +202,16 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)
u8 offs = 24 + 2 * bw;
rate->he_gi = (val & (0x3 << offs)) >> offs;
+ msta->wcid.rate_he_gi = rate->he_gi; /* cache for later */
} else if (rate->flags &
(RATE_INFO_FLAGS_VHT_MCS | RATE_INFO_FLAGS_MCS)) {
- if (val & BIT(12 + bw))
+ if (val & BIT(12 + bw)) {
rate->flags |= RATE_INFO_FLAGS_SHORT_GI;
- else
+ msta->wcid.rate_short_gi = 1;
+ } else {
rate->flags &= ~RATE_INFO_FLAGS_SHORT_GI;
+ msta->wcid.rate_short_gi = 0;
+ }
}
/* get signal strength of resp frames (CTS/BA/ACK) */
@@ -2115,6 +2119,7 @@ mt7915_dfs_init_radar_specs(struct mt7915_phy *phy)
radar_specs = &jp_radar_specs;
break;
default:
+ WARN_ON_ONCE(true);
return -EINVAL;
}
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 867e14f6b93a..90e738126bf7 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -137,12 +137,17 @@ static void mt7921_mac_sta_poll(struct mt792x_dev *dev)
u8 offs = MT_WTBL_TXRX_RATE_G2_HE + 2 * bw;
rate->he_gi = (val & (0x3 << offs)) >> offs;
+ msta->wcid.rate_he_gi = rate->he_gi; /* cache for later */
} else if (rate->flags &
(RATE_INFO_FLAGS_VHT_MCS | RATE_INFO_FLAGS_MCS)) {
- if (val & BIT(MT_WTBL_TXRX_RATE_G2 + bw))
+ if (val & BIT(MT_WTBL_TXRX_RATE_G2 + bw)) {
rate->flags |= RATE_INFO_FLAGS_SHORT_GI;
- else
+ msta->wcid.rate_short_gi = 1;
+ }
+ else {
rate->flags &= ~RATE_INFO_FLAGS_SHORT_GI;
+ msta->wcid.rate_short_gi = 0;
+ }
}
/* get signal strength of resp frames (CTS/BA/ACK) */
--
2.40.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 03/12] wifi: mt76: mt7915: allow processing TXS for 'NO_SKB' pkt-ids
2023-10-25 19:03 [PATCH 01/12] wifi: mt76: mt7915: print out hw revision greearb
2023-10-25 19:03 ` [PATCH 02/12] wifi: mt76: mt7915: cache sgi in wcid greearb
@ 2023-10-25 19:03 ` greearb
2023-10-25 19:03 ` [PATCH 04/12] wifi: mt76: mt7915: debugfs hook to enable TXS for NO_SKB pkt-ids greearb
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: greearb @ 2023-10-25 19:03 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
This will let us update stats and wcid.rate for every TXS
callback we receive for a particular wcid.
For now, the TXS is not requested for NO_SKB frames, however.
That will be allowed in next patch.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 488faeb44e76..92d5b0fc99d1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1015,7 +1015,7 @@ static void mt7915_mac_add_txs(struct mt7915_dev *dev, void *data)
wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID);
pid = le32_get_bits(txs_data[3], MT_TXS3_PID);
- if (pid < MT_PACKET_ID_WED)
+ if (pid < MT_PACKET_ID_NO_SKB)
return;
if (wcidx >= mt7915_wtbl_size(dev))
--
2.40.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 04/12] wifi: mt76: mt7915: debugfs hook to enable TXS for NO_SKB pkt-ids
2023-10-25 19:03 [PATCH 01/12] wifi: mt76: mt7915: print out hw revision greearb
2023-10-25 19:03 ` [PATCH 02/12] wifi: mt76: mt7915: cache sgi in wcid greearb
2023-10-25 19:03 ` [PATCH 03/12] wifi: mt76: mt7915: allow processing TXS for 'NO_SKB' pkt-ids greearb
@ 2023-10-25 19:03 ` greearb
2023-10-25 19:03 ` [PATCH 05/12] wifi: mt76: mt7915: report tx-retries greearb
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: greearb @ 2023-10-25 19:03 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
This lets user turn on/off this feature. Enabling gives better
tx-rate related stats, but will cause extra driver and (maybe)
firmware work. Not sure if it actually affects performance or
not.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
drivers/net/wireless/mediatek/mt76/debugfs.c | 25 +++++++++++++++++++
drivers/net/wireless/mediatek/mt76/mt76.h | 6 +++++
.../wireless/mediatek/mt76/mt76_connac_mac.c | 3 ++-
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/debugfs.c b/drivers/net/wireless/mediatek/mt76/debugfs.c
index 8012732e3bb8..7d92cfb0a501 100644
--- a/drivers/net/wireless/mediatek/mt76/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/debugfs.c
@@ -89,6 +89,30 @@ static int mt76_rx_queues_read(struct seq_file *s, void *data)
return 0;
}
+static int
+mt7915_txs_for_no_skb_set(void *data, u64 val)
+{
+ struct mt76_dev *dev = data;
+
+ dev->txs_for_no_skb_enabled = !!val;
+
+ return 0;
+}
+
+static int
+mt7915_txs_for_no_skb_get(void *data, u64 *val)
+{
+ struct mt76_dev *dev = data;
+
+ *val = dev->txs_for_no_skb_enabled;
+
+ return 0;
+}
+
+DEFINE_DEBUGFS_ATTRIBUTE(fops_txs_for_no_skb, mt7915_txs_for_no_skb_get,
+ mt7915_txs_for_no_skb_set, "%lld\n");
+
+
void mt76_seq_puts_array(struct seq_file *file, const char *str,
s8 *val, int len)
{
@@ -116,6 +140,7 @@ mt76_register_debugfs_fops(struct mt76_phy *phy,
debugfs_create_file_unsafe("regval", 0600, dir, dev, fops);
debugfs_create_file_unsafe("napi_threaded", 0600, dir, dev,
&fops_napi_threaded);
+ debugfs_create_file("force_txs", 0600, dir, dev, &fops_txs_for_no_skb);
debugfs_create_blob("eeprom", 0400, dir, &dev->eeprom);
if (dev->otp.data)
debugfs_create_blob("otp", 0400, dir, &dev->otp);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 9b30d4aab952..d00a2da8d2f1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -860,6 +860,12 @@ struct mt76_dev {
u8 csa_complete;
+ /* Should we request TXS for MT_PACKET_ID_NO_SKB? Doing so gives better
+ * costs but causes a great deal more TXS packet processing by driver and
+ * creation by firmware, so may be a performance drag.
+ */
+ bool txs_for_no_skb_enabled;
+
u32 rxfilter;
#ifdef CONFIG_NL80211_TESTMODE
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index c080b60327b1..ab9a4d9fecdb 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -541,7 +541,8 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
txwi[4] = 0;
val = FIELD_PREP(MT_TXD5_PID, pid);
- if (pid >= MT_PACKET_ID_FIRST) {
+ if (pid >= MT_PACKET_ID_FIRST ||
+ (pid == MT_PACKET_ID_NO_SKB && dev->txs_for_no_skb_enabled)) {
val |= MT_TXD5_TX_STATUS_HOST;
amsdu_en = amsdu_en && !is_mt7921(dev);
}
--
2.40.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 05/12] wifi: mt76: mt7915: report tx-retries
2023-10-25 19:03 [PATCH 01/12] wifi: mt76: mt7915: print out hw revision greearb
` (2 preceding siblings ...)
2023-10-25 19:03 ` [PATCH 04/12] wifi: mt76: mt7915: debugfs hook to enable TXS for NO_SKB pkt-ids greearb
@ 2023-10-25 19:03 ` greearb
2023-10-25 19:03 ` [PATCH 06/12] wifi: mt76: mt7915: add support for tx-overrides greearb
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: greearb @ 2023-10-25 19:03 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
mac80211 stack will only report tx-status for skb claiming to be
ampdu heads, so lie a bit in mt7915 and set the flag so that mac80211
will record status for each skb.
mt7915 appears to report retry status on an individual per-skb manner,
so that method above seems to work.
Re-constitute the txinfo status rate info so that the rix and flags
is also at least close to correct. No direct way to report HE
rates that way, so mac80211 might could use some tweaking in
the ieee80211_tx_status_ext to take both info and status->rate
into account.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
drivers/net/wireless/mediatek/mt76/mac80211.c | 4 +
drivers/net/wireless/mediatek/mt76/mt76.h | 8 +-
.../net/wireless/mediatek/mt76/mt76_connac.h | 3 +-
.../wireless/mediatek/mt76/mt76_connac2_mac.h | 1 +
.../wireless/mediatek/mt76/mt76_connac_mac.c | 76 ++++++++++++++++++-
.../net/wireless/mediatek/mt76/mt7915/init.c | 1 +
.../net/wireless/mediatek/mt76/mt7915/mac.c | 27 ++++---
.../net/wireless/mediatek/mt76/mt7915/main.c | 6 +-
.../net/wireless/mediatek/mt76/mt7915/mcu.c | 9 ++-
.../net/wireless/mediatek/mt76/mt7921/mac.c | 14 ++--
.../net/wireless/mediatek/mt76/mt7925/mac.c | 3 +-
.../net/wireless/mediatek/mt76/mt792x_core.c | 4 +
.../net/wireless/mediatek/mt76/mt7996/main.c | 2 +-
.../net/wireless/mediatek/mt76/mt7996/mcu.c | 4 +-
drivers/net/wireless/mediatek/mt76/tx.c | 13 +++-
15 files changed, 137 insertions(+), 38 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index cb76053973aa..11651e5c9488 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -1776,6 +1776,10 @@ void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
wi->sta_count++;
+ data[ei++] += stats->tx_attempts;
+ data[ei++] += stats->tx_failed;
+ data[ei++] += stats->tx_retries;
+ data[ei++] += stats->tx_mpdu_ok;
data[ei++] += stats->tx_mode[MT_PHY_TYPE_CCK];
data[ei++] += stats->tx_mode[MT_PHY_TYPE_OFDM];
data[ei++] += stats->tx_mode[MT_PHY_TYPE_HT];
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index d00a2da8d2f1..a9f3f66b4e3d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -274,13 +274,15 @@ enum mt76_phy_type {
struct mt76_sta_stats {
u64 tx_mode[__MT_PHY_TYPE_MAX];
u64 tx_bw[5]; /* 20, 40, 80, 160, 320 */
+ /* frames that succeeded, perhaps after retry */
+ unsigned long tx_mpdu_ok;
u64 tx_nss[4]; /* 1, 2, 3, 4 */
u64 tx_mcs[16]; /* mcs idx */
u64 tx_bytes;
/* WED TX */
- u32 tx_packets; /* unit: MSDU */
- u32 tx_retries;
- u32 tx_failed;
+ unsigned long tx_attempts; /* Counting any retries. unit: MSDU */
+ unsigned long tx_retries; /* number of times frames were retried */
+ unsigned long tx_failed; /* failed even after retries */
/* WED RX */
u64 rx_bytes;
u32 rx_packets;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
index 1f29d8cd900c..6d5cf5e92885 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
@@ -428,7 +428,8 @@ int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
void mt76_connac2_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi);
void mt76_connac2_txwi_free(struct mt76_dev *dev, struct mt76_txwi_cache *t,
struct ieee80211_sta *sta,
- struct list_head *free_list);
+ struct list_head *free_list,
+ u32 tx_cnt, u32 tx_status, u32 ampdu);
void mt76_connac2_tx_token_put(struct mt76_dev *dev);
/* connac3 */
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h
index bd2a92467a97..6b280a639a74 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h
@@ -37,6 +37,7 @@ enum {
#define MT_TX_FREE_COUNT GENMASK(12, 0)
/* 0: success, others: dropped */
#define MT_TX_FREE_STATUS GENMASK(14, 13)
+#define MT_TX_FREE_HEAD_OF_PAGE BIT(15)
#define MT_TX_FREE_MSDU_ID GENMASK(30, 16)
#define MT_TX_FREE_PAIR BIT(31)
/* will support this field in further revision */
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index ab9a4d9fecdb..c8619dab15be 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -509,8 +509,10 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
mt76_connac_lmac_mapping(skb_get_queue_mapping(skb));
/* mt7915 WA only counts WED path */
- if (is_mt7915(dev) && mtk_wed_device_active(&dev->mmio.wed))
- wcid->stats.tx_packets++;
+ if (is_mt7915(dev) && mtk_wed_device_active(&dev->mmio.wed)) {
+ wcid->stats.tx_attempts++;
+ wcid->stats.tx_mpdu_ok++;
+ }
}
val = FIELD_PREP(MT_TXD0_TX_BYTES, skb->len + sz_txd) |
@@ -1130,16 +1132,21 @@ EXPORT_SYMBOL_GPL(mt76_connac2_tx_check_aggr);
void mt76_connac2_txwi_free(struct mt76_dev *dev, struct mt76_txwi_cache *t,
struct ieee80211_sta *sta,
- struct list_head *free_list)
+ struct list_head *free_list,
+ u32 tx_cnt, u32 tx_status, u32 ampdu)
{
struct mt76_wcid *wcid;
__le32 *txwi;
u16 wcid_idx;
+ struct ieee80211_tx_info *info;
+ struct ieee80211_tx_rate *rate;
mt76_connac_txp_skb_unmap(dev, t);
if (!t->skb)
goto out;
+ rcu_read_lock(); /* protect wcid access */
+
txwi = (__le32 *)mt76_get_txwi_ptr(dev, t);
if (sta) {
wcid = (struct mt76_wcid *)sta->drv_priv;
@@ -1162,6 +1169,67 @@ void mt76_connac2_txwi_free(struct mt76_dev *dev, struct mt76_txwi_cache *t,
if (sta && likely(t->skb->protocol != cpu_to_be16(ETH_P_PAE)))
mt76_connac2_tx_check_aggr(sta, txwi);
+ info = IEEE80211_SKB_CB(t->skb);
+
+ rate = &info->status.rates[0];
+ rate->idx = -1; /* will over-write below if we found wcid */
+ info->status.rates[1].idx = -1; /* terminate rate list */
+
+ /* force TX_STAT_AMPDU to be set, or mac80211 will ignore status */
+ if (ampdu || (info->flags & IEEE80211_TX_CTL_AMPDU)) {
+ info->flags |= IEEE80211_TX_STAT_AMPDU | IEEE80211_TX_CTL_AMPDU;
+ info->status.ampdu_len = 1;
+ }
+
+ /* update info status based on cached wcid rate info since
+ * txfree path doesn't give us a lot of info.
+ */
+ if (wcid) {
+ struct mt76_sta_stats *stats = &wcid->stats;
+
+ if (wcid->rate.flags & RATE_INFO_FLAGS_MCS) {
+ rate->flags |= IEEE80211_TX_RC_MCS;
+ rate->idx = wcid->rate.mcs + wcid->rate.nss * 8;
+ } else if (wcid->rate.flags & RATE_INFO_FLAGS_VHT_MCS) {
+ rate->flags |= IEEE80211_TX_RC_VHT_MCS;
+ rate->idx = (wcid->rate.nss << 4) | wcid->rate.mcs;
+ } else if (wcid->rate.flags & RATE_INFO_FLAGS_HE_MCS) {
+ rate->idx = (wcid->rate.nss << 4) | wcid->rate.mcs;
+ } else {
+ rate->idx = wcid->rate.mcs;
+ }
+ switch (wcid->rate.bw) {
+ case RATE_INFO_BW_160:
+ rate->flags |= IEEE80211_TX_RC_160_MHZ_WIDTH;
+ break;
+ case RATE_INFO_BW_80:
+ rate->flags |= IEEE80211_TX_RC_80_MHZ_WIDTH;
+ break;
+ case RATE_INFO_BW_40:
+ rate->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
+ break;
+ }
+
+ stats->tx_attempts += tx_cnt;
+ stats->tx_retries += tx_cnt - 1;
+
+ if (tx_status == 0)
+ stats->tx_mpdu_ok++;
+ else
+ stats->tx_failed++;
+ }
+
+ rcu_read_unlock();
+
+ /* Apply the values that this txfree path reports */
+ rate->count = tx_cnt;
+ if (tx_status == 0) {
+ info->flags |= IEEE80211_TX_STAT_ACK;
+ info->status.ampdu_ack_len = 1;
+ } else {
+ info->flags &= ~IEEE80211_TX_STAT_ACK;
+ }
+
__mt76_tx_complete_skb(dev, wcid_idx, t->skb, free_list);
out:
t->skb = NULL;
@@ -1176,7 +1244,7 @@ void mt76_connac2_tx_token_put(struct mt76_dev *dev)
spin_lock_bh(&dev->token_lock);
idr_for_each_entry(&dev->token, txwi, id) {
- mt76_connac2_txwi_free(dev, txwi, NULL, NULL);
+ mt76_connac2_txwi_free(dev, txwi, NULL, NULL, 1, 0, 1);
dev->token_count--;
}
spin_unlock_bh(&dev->token_lock);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index 9f500151b293..fce4318a1031 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -342,6 +342,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
struct mt7915_dev *dev = phy->dev;
hw->queues = 4;
+ hw->max_report_rates = 1;
hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;
hw->max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;
hw->netdev_features = NETIF_F_RXCSUM;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 92d5b0fc99d1..ad20d10201b4 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -904,6 +904,7 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len)
for (cur_info = tx_info; count < total; cur_info++) {
u32 msdu, info;
u8 i;
+ u32 tx_cnt = 0, tx_status = 0, ampdu = 1;
if (WARN_ON_ONCE((void *)cur_info >= end))
return;
@@ -933,21 +934,14 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len)
}
if (!mtk_wed_device_active(&mdev->mmio.wed) && wcid) {
- u32 tx_retries = 0, tx_failed = 0;
-
if (v3 && (info & MT_TX_FREE_MPDU_HEADER_V3)) {
- tx_retries =
- FIELD_GET(MT_TX_FREE_COUNT_V3, info) - 1;
- tx_failed = tx_retries +
- !!FIELD_GET(MT_TX_FREE_STAT_V3, info);
+ tx_cnt = FIELD_GET(MT_TX_FREE_COUNT_V3, info);
+ tx_status = FIELD_GET(MT_TX_FREE_STAT_V3, info);
} else if (!v3 && (info & MT_TX_FREE_MPDU_HEADER)) {
- tx_retries =
- FIELD_GET(MT_TX_FREE_COUNT, info) - 1;
- tx_failed = tx_retries +
- !!FIELD_GET(MT_TX_FREE_STAT, info);
+ tx_cnt = FIELD_GET(MT_TX_FREE_COUNT, info);
+ tx_status = FIELD_GET(MT_TX_FREE_STAT, info);
+ ampdu = FIELD_GET(MT_TX_FREE_HEAD_OF_PAGE, info);
}
- wcid->stats.tx_retries += tx_retries;
- wcid->stats.tx_failed += tx_failed;
}
if (v3 && (info & MT_TX_FREE_MPDU_HEADER_V3))
@@ -966,7 +960,9 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len)
if (!txwi)
continue;
- mt76_connac2_txwi_free(mdev, txwi, sta, &free_list);
+ mt76_connac2_txwi_free(mdev, txwi, sta, &free_list, tx_cnt, tx_status, ampdu);
+ /* don't count retries twice, in case we are v3 */
+ tx_cnt = 1;
}
}
@@ -998,7 +994,10 @@ mt7915_mac_tx_free_v0(struct mt7915_dev *dev, void *data, int len)
if (!txwi)
continue;
- mt76_connac2_txwi_free(mdev, txwi, NULL, &free_list);
+ /* TODO: Can we report tx_cnt, status, ampdu in this path? */
+ mt76_connac2_txwi_free(mdev, txwi, NULL, &free_list,
+ 1 /* tx_cnt */, 0 /* tx-status-ok */,
+ 1/* ampdu */);
}
mt7915_mac_tx_free_done(dev, &free_list, wake);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index a3fd54cc1911..e22d1d35161e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -1113,7 +1113,7 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES64);
if (!mt7915_mcu_wed_wa_tx_stats(phy->dev, msta->wcid.idx)) {
- sinfo->tx_packets = msta->wcid.stats.tx_packets;
+ sinfo->tx_packets = msta->wcid.stats.tx_mpdu_ok;
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS);
}
@@ -1358,6 +1358,10 @@ static const char mt7915_gstrings_stats[][ETH_GSTRING_LEN] = {
"ul_hetrig_4mu_cnt",
/* per vif counters */
+ "v_tx_mpdu_attempts", /* counting any retries */
+ "v_tx_mpdu_fail", /* frames that failed even after retry */
+ "v_tx_mpdu_retry", /* number of times frames were retried */
+ "v_tx_mpdu_ok", /* frames that succeeded, perhaps after retry */
"v_tx_mode_cck",
"v_tx_mode_ofdm",
"v_tx_mode_ht",
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index b22f06d4411a..3a4eec00ccb1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -3841,10 +3841,13 @@ int mt7915_mcu_wed_wa_tx_stats(struct mt7915_dev *dev, u16 wlan_idx)
rcu_read_lock();
wcid = rcu_dereference(dev->mt76.wcid[wlan_idx]);
- if (wcid)
- wcid->stats.tx_packets += le32_to_cpu(res->tx_packets);
- else
+ if (wcid) {
+ /* TODO: Nice if this path reported retries and failures */
+ wcid->stats.tx_attempts += le32_to_cpu(res->tx_packets);
+ wcid->stats.tx_mpdu_ok += le32_to_cpu(res->tx_packets);
+ } else {
ret = -EINVAL;
+ }
rcu_read_unlock();
out:
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 90e738126bf7..f3d61e77fa4a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -512,7 +512,7 @@ static void mt7921_mac_tx_free(struct mt792x_dev *dev, void *data, int len)
for (i = 0; i < count; i++) {
u32 msdu, info = le32_to_cpu(tx_info[i]);
- u8 stat;
+ u32 tx_status, tx_cnt, ampdu;
/* 1'b1: new wcid pair.
* 1'b0: msdu_id with the same 'wcid pair' as above.
@@ -538,19 +538,17 @@ static void mt7921_mac_tx_free(struct mt792x_dev *dev, void *data, int len)
}
msdu = FIELD_GET(MT_TX_FREE_MSDU_ID, info);
- stat = FIELD_GET(MT_TX_FREE_STATUS, info);
- if (wcid) {
- wcid->stats.tx_retries +=
- FIELD_GET(MT_TX_FREE_COUNT, info) - 1;
- wcid->stats.tx_failed += !!stat;
- }
+ /* 0 = success, 1 dropped-by-hw, 2 dropped-by-cpu */
+ tx_status = FIELD_GET(MT_TX_FREE_STATUS, info);
+ tx_cnt = FIELD_GET(MT_TX_FREE_COUNT, info);
+ ampdu = FIELD_GET(MT_TX_FREE_HEAD_OF_PAGE, info);
txwi = mt76_token_release(mdev, msdu, &wake);
if (!txwi)
continue;
- mt76_connac2_txwi_free(mdev, txwi, sta, &free_list);
+ mt76_connac2_txwi_free(mdev, txwi, sta, &free_list, tx_cnt, tx_status, ampdu);
}
if (wake)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c
index 1b9fbd9a140d..3cd771ac35d1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c
@@ -751,7 +751,8 @@ mt7925_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
/* counting non-offloading skbs */
wcid->stats.tx_bytes += skb->len;
- wcid->stats.tx_packets++;
+ wcid->stats.tx_attempts++;
+ wcid->stats.tx_mpdu_ok++;
}
val = FIELD_PREP(MT_TXD0_TX_BYTES, skb->len + sz_txd) |
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_core.c b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
index 502be22dbe36..f92a43d5f5b0 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
@@ -338,6 +338,10 @@ static const char mt792x_gstrings_stats[][ETH_GSTRING_LEN] = {
"rx_ampdu_bytes_cnt",
"rx_ba_cnt",
/* per vif counters */
+ "v_tx_mpdu_attempts", /* counting any retries */
+ "v_tx_mpdu_fail", /* frames that failed even after retry */
+ "v_tx_mpdu_retry", /* number of times frames were retried */
+ "v_tx_mpdu_ok", /* frames that succeeded, perhaps after retry */
"v_tx_mode_cck",
"v_tx_mode_ofdm",
"v_tx_mode_ht",
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index 09c7a28a3d51..7bc25e52c054 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -1008,7 +1008,7 @@ static void mt7996_sta_statistics(struct ieee80211_hw *hw,
sinfo->rx_bytes = msta->wcid.stats.rx_bytes;
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES64);
- sinfo->tx_packets = msta->wcid.stats.tx_packets;
+ sinfo->tx_packets = msta->wcid.stats.tx_mpdu_ok;
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS);
sinfo->rx_packets = msta->wcid.stats.rx_packets;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index bf917beb9439..3ac6667907f6 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -486,7 +486,9 @@ mt7996_mcu_rx_all_sta_info_event(struct mt7996_dev *dev, struct sk_buff *skb)
if (!wcid)
break;
- wcid->stats.tx_packets +=
+ wcid->stats.tx_mpdu_ok +=
+ le32_to_cpu(res->msdu_cnt[i].tx_msdu_cnt);
+ wcid->stats.tx_attempts +=
le32_to_cpu(res->msdu_cnt[i].tx_msdu_cnt);
wcid->stats.rx_packets +=
le32_to_cpu(res->msdu_cnt[i].rx_msdu_cnt);
diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index 1809b03292c3..81c16a1c1fbe 100644
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -67,6 +67,7 @@ mt76_tx_status_unlock(struct mt76_dev *dev, struct sk_buff_head *list)
wcid = rcu_dereference(dev->wcid[cb->wcid]);
if (wcid) {
status.sta = wcid_to_sta(wcid);
+ rs.try_count = 1;
if (status.sta && (wcid->rate.flags || wcid->rate.legacy)) {
rs.rate_idx = wcid->rate;
status.rates = &rs;
@@ -243,15 +244,25 @@ void __mt76_tx_complete_skb(struct mt76_dev *dev, u16 wcid_idx, struct sk_buff *
struct ieee80211_tx_status status = {
.skb = skb,
.free_list = free_list,
+ .info = IEEE80211_SKB_CB(skb),
};
struct mt76_wcid *wcid = NULL;
struct ieee80211_hw *hw;
struct sk_buff_head list;
+ struct ieee80211_rate_status status_rate = { 0 };
rcu_read_lock();
- if (wcid_idx < ARRAY_SIZE(dev->wcid))
+ if (wcid_idx < ARRAY_SIZE(dev->wcid)) {
wcid = rcu_dereference(dev->wcid[wcid_idx]);
+ if (wcid) {
+ status.rates = &status_rate;
+ status.n_rates = 1;
+ status_rate.rate_idx = wcid->rate;
+ status_rate.try_count = 1;
+ }
+ }
+
mt76_tx_check_non_aql(dev, wcid, skb);
--
2.40.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 06/12] wifi: mt76: mt7915: add support for tx-overrides
2023-10-25 19:03 [PATCH 01/12] wifi: mt76: mt7915: print out hw revision greearb
` (3 preceding siblings ...)
2023-10-25 19:03 ` [PATCH 05/12] wifi: mt76: mt7915: report tx-retries greearb
@ 2023-10-25 19:03 ` greearb
2023-10-25 19:03 ` [PATCH 07/12] wifi: mt76: mt7915: support enabling rx group-5 status greearb
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: greearb @ 2023-10-25 19:03 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
Allow setting fixied rate on transmit without using full testmode
logic.
The goal of tx-overrides is to allow receiver sensitivity and other
types of testing. Assumption is that the packets we care about
are larger data frames, so exclude smaller packets and non
data packets.
Setting transmit count to '0' means transmit once, but flag
the packet as no-ack.
Allows adjusting the tx power from default value, from -8 to +8
dbm. Adjusting above 0 is probably not a good idea.
The station wtbl logic to read rate-ctrl settings does not work when
fixed rates are used. So, read sgi settings from the txo configuration
in this case.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
drivers/net/wireless/mediatek/mt76/mt76.h | 4 +
.../net/wireless/mediatek/mt76/mt76_connac.h | 2 +-
.../wireless/mediatek/mt76/mt76_connac_mac.c | 16 +-
.../wireless/mediatek/mt76/mt7915/debugfs.c | 225 ++++++++++++++++++
.../net/wireless/mediatek/mt76/mt7915/mac.c | 136 ++++++++---
.../wireless/mediatek/mt76/mt7915/mt7915.h | 2 +
6 files changed, 354 insertions(+), 31 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index a9f3f66b4e3d..7b141fbf3497 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -670,6 +670,7 @@ struct mt76_testmode_ops {
struct mt76_testmode_data {
enum mt76_testmode_state state;
+ u8 txo_active; /* tx overrides are active */
u32 param_set[DIV_ROUND_UP(NUM_MT76_TM_ATTRS, 32)];
struct sk_buff *tx_skb;
@@ -684,6 +685,9 @@ struct mt76_testmode_data {
u8 tx_rate_ldpc;
u8 tx_rate_stbc;
u8 tx_ltf;
+ u8 txbw; /* specify TX bandwidth: 0 20Mhz, 1 40Mhz, 2 80Mhz, 3 160Mhz */
+ u8 tx_xmit_count; /* 0 means no-ack, 1 means one transmit, etc */
+ u8 tx_dynbw; /* 0: dynamic bw disabled, 1: dynamic bw enabled */
u8 tx_antenna_mask;
u8 tx_spe_idx;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
index 6d5cf5e92885..6c052e6703a4 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
@@ -413,7 +413,7 @@ u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy,
struct ieee80211_vif *vif,
bool beacon, bool mcast);
bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
- __le32 *txs_data);
+ __le32 *txs_data, struct ieee80211_tx_info *info);
bool mt76_connac2_mac_add_txs_skb(struct mt76_dev *dev, struct mt76_wcid *wcid,
int pid, __le32 *txs_data);
void mt76_connac2_mac_decode_he_radiotap(struct mt76_dev *dev,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index c8619dab15be..ae52e10331c5 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -586,7 +586,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
EXPORT_SYMBOL_GPL(mt76_connac2_mac_write_txwi);
bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
- __le32 *txs_data)
+ __le32 *txs_data, struct ieee80211_tx_info *info)
{
struct mt76_sta_stats *stats = &wcid->stats;
struct ieee80211_supported_band *sband;
@@ -653,6 +653,8 @@ bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
rate.mcs = mt76_get_rate(mphy->dev, sband, rate.mcs, cck);
rate.legacy = sband->bitrates[rate.mcs].bitrate;
+ if (info)
+ info->status.rates[0].idx = rate.mcs;
break;
case MT_PHY_TYPE_HT:
case MT_PHY_TYPE_HT_GF:
@@ -662,6 +664,10 @@ bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
rate.flags = RATE_INFO_FLAGS_MCS;
if (wcid->rate_short_gi)
rate.flags |= RATE_INFO_FLAGS_SHORT_GI;
+ if (info) {
+ info->status.rates[0].idx = rate.mcs + rate.nss * 8;
+ info->status.rates[0].flags |= IEEE80211_TX_RC_MCS;
+ }
break;
case MT_PHY_TYPE_VHT:
if (rate.mcs > 9)
@@ -670,6 +676,10 @@ bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
rate.flags = RATE_INFO_FLAGS_VHT_MCS;
if (wcid->rate_short_gi)
rate.flags |= RATE_INFO_FLAGS_SHORT_GI;
+ if (info) {
+ info->status.rates[0].idx = (rate.nss << 4) | rate.mcs;
+ info->status.rates[0].flags |= IEEE80211_TX_RC_VHT_MCS;
+ }
break;
case MT_PHY_TYPE_HE_SU:
case MT_PHY_TYPE_HE_EXT_SU:
@@ -681,6 +691,8 @@ bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
rate.he_gi = wcid->rate_he_gi;
rate.he_dcm = FIELD_GET(MT_TX_RATE_DCM, txrate);
rate.flags = RATE_INFO_FLAGS_HE_MCS;
+ if (info)
+ info->status.rates[0].idx = (rate.nss << 4) | rate.mcs;
break;
default:
return false;
@@ -731,7 +743,7 @@ bool mt76_connac2_mac_add_txs_skb(struct mt76_dev *dev, struct mt76_wcid *wcid,
!!(info->flags & IEEE80211_TX_STAT_ACK);
info->status.rates[0].idx = -1;
- mt76_connac2_mac_fill_txs(dev, wcid, txs_data);
+ mt76_connac2_mac_fill_txs(dev, wcid, txs_data, info);
mt76_tx_status_skb_done(dev, skb, &list);
}
mt76_tx_status_unlock(dev, &list);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index 6c3696c8c700..f9309699f657 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -677,6 +677,229 @@ mt7915_fw_util_wa_show(struct seq_file *file, void *data)
DEFINE_SHOW_ATTRIBUTE(mt7915_fw_util_wa);
+struct mt7915_txo_worker_info {
+ char *buf;
+ int sofar;
+ int size;
+};
+
+static void mt7915_txo_worker(void *wi_data, struct ieee80211_sta *sta)
+{
+ struct mt7915_txo_worker_info *wi = wi_data;
+ struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
+ struct mt76_testmode_data *td = &msta->test;
+ struct ieee80211_vif *vif;
+ struct wireless_dev *wdev;
+
+ if (wi->sofar >= wi->size)
+ return; /* buffer is full */
+
+ vif = container_of((void *)msta->vif, struct ieee80211_vif, drv_priv);
+ wdev = ieee80211_vif_to_wdev(vif);
+
+ wi->sofar += scnprintf(wi->buf + wi->sofar, wi->size - wi->sofar,
+ "vdev (%s) active=%d tpc=%d sgi=%d mcs=%d nss=%d"
+ " pream=%d retries=%d dynbw=%d bw=%d\n",
+ wdev->netdev->name,
+ td->txo_active, td->tx_power[0],
+ td->tx_rate_sgi, td->tx_rate_idx,
+ td->tx_rate_nss, td->tx_rate_mode,
+ td->tx_xmit_count, td->tx_dynbw,
+ td->txbw);
+}
+
+static ssize_t mt7915_read_set_rate_override(struct file *file,
+ char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct mt7915_dev *dev = file->private_data;
+ struct ieee80211_hw *hw = dev->mphy.hw;
+ char *buf2;
+ int size = 8000;
+ int rv, sofar;
+ struct mt7915_txo_worker_info wi;
+ const char buf[] =
+ "This allows specify specif tx rate parameters for all DATA"
+ " frames on a vdev\n"
+ "To set a value, you specify the dev-name and key-value pairs:\n"
+ "tpc=10 sgi=1 mcs=x nss=x pream=x retries=x dynbw=0|1 bw=x enable=0|1\n"
+ "pream: 0=cck, 1=ofdm, 2=HT, 3=VHT, 4=HE_SU\n"
+ "cck-mcs: 0=1Mbps, 1=2Mbps, 3=5.5Mbps, 3=11Mbps\n"
+ "ofdm-mcs: 0=6Mbps, 1=9Mbps, 2=12Mbps, 3=18Mbps, 4=24Mbps, 5=36Mbps,"
+ " 6=48Mbps, 7=54Mbps\n"
+ "tpc: adjust power from defaults, in 1/2 db units 0 - 31, 16 is default\n"
+ "bw is 0-3 for 20-160\n"
+ " For example, wlan0:\n"
+ "echo \"wlan0 tpc=255 sgi=1 mcs=0 nss=1 pream=3 retries=1 dynbw=0 bw=0"
+ " active=1\" > ...mt76/set_rate_override\n";
+
+ buf2 = kzalloc(size, GFP_KERNEL);
+ if (!buf2)
+ return -ENOMEM;
+ strcpy(buf2, buf);
+ sofar = strlen(buf2);
+
+ wi.sofar = sofar;
+ wi.buf = buf2;
+ wi.size = size;
+
+ ieee80211_iterate_stations_atomic(hw, mt7915_txo_worker, &wi);
+
+ rv = simple_read_from_buffer(user_buf, count, ppos, buf2, wi.sofar);
+ kfree(buf2);
+ return rv;
+}
+
+/* Set the rates for specific types of traffic.
+ */
+static ssize_t mt7915_write_set_rate_override(struct file *file,
+ const char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct mt7915_dev *dev = file->private_data;
+ struct mt7915_sta *msta;
+ struct ieee80211_vif *vif;
+ struct mt76_testmode_data *td = NULL;
+ struct wireless_dev *wdev;
+ struct mt76_wcid *wcid;
+ struct mt76_phy *mphy = &dev->mt76.phy;
+ char buf[180];
+ char tmp[20];
+ char *tok;
+ int ret, i, j;
+ unsigned int vdev_id = 0xFFFF;
+ char *bufptr = buf;
+ long rc;
+ char dev_name_match[IFNAMSIZ + 2];
+
+ memset(buf, 0, sizeof(buf));
+
+ simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);
+
+ /* make sure that buf is null terminated */
+ buf[sizeof(buf) - 1] = 0;
+
+ /* drop the possible '\n' from the end */
+ if (buf[count - 1] == '\n')
+ buf[count - 1] = 0;
+
+ mutex_lock(&mphy->dev->mutex);
+
+ /* Ignore empty lines, 'echo' appends them sometimes at least. */
+ if (buf[0] == 0) {
+ ret = count;
+ goto exit;
+ }
+
+ /* String starts with vdev name, ie 'wlan0' Find the proper vif that
+ * matches the name.
+ */
+ for (i = 0; i < ARRAY_SIZE(dev->mt76.wcid_mask); i++) {
+ u32 mask = dev->mt76.wcid_mask[i];
+ u32 phy_mask = dev->mt76.wcid_phy_mask[i];
+
+ if (!mask)
+ continue;
+
+ for (j = i * 32; mask; j++, mask >>= 1, phy_mask >>= 1) {
+ if (!(mask & 1))
+ continue;
+
+ wcid = rcu_dereference(dev->mt76.wcid[j]);
+ if (!wcid)
+ continue;
+
+ msta = container_of(wcid, struct mt7915_sta, wcid);
+
+ vif = container_of((void *)msta->vif, struct ieee80211_vif, drv_priv);
+
+ wdev = ieee80211_vif_to_wdev(vif);
+
+ if (!wdev)
+ continue;
+
+ snprintf(dev_name_match, sizeof(dev_name_match) - 1, "%s ",
+ wdev->netdev->name);
+
+ if (strncmp(dev_name_match, buf, strlen(dev_name_match)) == 0) {
+ vdev_id = j;
+ td = &msta->test;
+ bufptr = buf + strlen(dev_name_match) - 1;
+ break;
+ }
+ }
+ }
+
+ if (vdev_id == 0xFFFF) {
+ if (strstr(buf, "active=0")) {
+ /* Ignore, we are disabling it anyway */
+ ret = count;
+ goto exit;
+ } else {
+ dev_info(dev->mt76.dev,
+ "mt7915: set-rate-override, unknown netdev name: %s\n", buf);
+ }
+ ret = -EINVAL;
+ goto exit;
+ }
+
+#define MT7915_PARSE_LTOK(a, b) \
+ do { \
+ tok = strstr(bufptr, " " #a "="); \
+ if (tok) { \
+ char *tspace; \
+ tok += 1; /* move past initial space */ \
+ strncpy(tmp, tok + strlen(#a "="), sizeof(tmp) - 1); \
+ tmp[sizeof(tmp) - 1] = 0; \
+ tspace = strstr(tmp, " "); \
+ if (tspace) \
+ *tspace = 0; \
+ if (kstrtol(tmp, 0, &rc) != 0) \
+ dev_info(dev->mt76.dev, \
+ "mt7915: set-rate-override: " #a \
+ "= could not be parsed, tmp: %s\n", \
+ tmp); \
+ else \
+ td->b = rc; \
+ } \
+ } while (0)
+
+ /* TODO: Allow configuring LTF? */
+ td->tx_ltf = 1; /* 0: HTLTF 3.2us, 1: HELTF, 6.4us, 2 HELTF 12,8us */
+
+ MT7915_PARSE_LTOK(tpc, tx_power[0]);
+ MT7915_PARSE_LTOK(sgi, tx_rate_sgi);
+ MT7915_PARSE_LTOK(mcs, tx_rate_idx);
+ MT7915_PARSE_LTOK(nss, tx_rate_nss);
+ MT7915_PARSE_LTOK(pream, tx_rate_mode);
+ MT7915_PARSE_LTOK(retries, tx_xmit_count);
+ MT7915_PARSE_LTOK(dynbw, tx_dynbw);
+ MT7915_PARSE_LTOK(bw, txbw);
+ MT7915_PARSE_LTOK(active, txo_active);
+
+ dev_info(dev->mt76.dev,
+ "mt7915: set-rate-overrides, vdev %i(%s) active=%d tpc=%d sgi=%d mcs=%d"
+ " nss=%d pream=%d retries=%d dynbw=%d bw=%d\n",
+ vdev_id, dev_name_match,
+ td->txo_active, td->tx_power[0], td->tx_rate_sgi, td->tx_rate_idx,
+ td->tx_rate_nss, td->tx_rate_mode, td->tx_xmit_count, td->tx_dynbw,
+ td->txbw);
+
+ ret = count;
+
+exit:
+ mutex_unlock(&mphy->dev->mutex);
+ return ret;
+}
+
+static const struct file_operations fops_set_rate_override = {
+ .read = mt7915_read_set_rate_override,
+ .write = mt7915_write_set_rate_override,
+ .open = simple_open,
+ .owner = THIS_MODULE,
+ .llseek = default_llseek,
+};
+
static void
mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy,
struct seq_file *file)
@@ -1245,6 +1468,8 @@ int mt7915_init_debugfs(struct mt7915_phy *phy)
debugfs_create_devm_seqfile(dev->mt76.dev, "rdd_monitor", dir,
mt7915_rdd_monitor);
}
+ debugfs_create_file("set_rate_override", 0600, dir,
+ dev, &fops_set_rate_override);
if (!ext_phy)
dev->debugfs_dir = dir;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index ad20d10201b4..5776d47afba9 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -173,6 +173,15 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)
rx_cur);
}
+ /* If we are in tx-override mode, then wtbl doesn't provide useful report
+ * for the SGI/LGI stuff, so just get it from the override struct.
+ */
+ if (msta->test.txo_active) {
+ msta->wcid.rate_he_gi = msta->test.tx_rate_sgi;
+ msta->wcid.rate_short_gi = msta->test.tx_rate_sgi;
+ continue;
+ }
+
/*
* We don't support reading GI info from txs packets.
* For accurate tx status reporting and AQL improvement,
@@ -610,21 +619,32 @@ mt7915_mac_fill_rx_vector(struct mt7915_dev *dev, struct sk_buff *skb)
}
static void
-mt7915_mac_write_txwi_tm(struct mt7915_phy *phy, __le32 *txwi,
+mt7915_mac_write_txwi_tm(struct mt7915_phy *phy, struct mt76_wcid *wcid, __le32 *txwi,
struct sk_buff *skb)
{
-#ifdef CONFIG_NL80211_TESTMODE
- struct mt76_testmode_data *td = &phy->mt76->test;
+ struct mt76_testmode_data *td;
const struct ieee80211_rate *r;
- u8 bw, mode, nss = td->tx_rate_nss;
- u8 rate_idx = td->tx_rate_idx;
+ struct mt7915_sta *msta;
+ u8 bw, mode, nss;
+ u8 rate_idx;
u16 rateval = 0;
u32 val;
bool cck = false;
int band;
+ int xmit_count = 1;
- if (skb != phy->mt76->test.tx_skb)
- return;
+ msta = container_of(wcid, struct mt7915_sta, wcid);
+
+ if (msta->test.txo_active) {
+ td = &msta->test;
+ } else {
+ if (skb != phy->mt76->test.tx_skb)
+ return;
+ td = &phy->mt76->test;
+ }
+
+ nss = td->tx_rate_nss;
+ rate_idx = td->tx_rate_idx;
switch (td->tx_rate_mode) {
case MT76_TM_TX_MODE_HT:
@@ -665,20 +685,24 @@ mt7915_mac_write_txwi_tm(struct mt7915_phy *phy, __le32 *txwi,
break;
}
- switch (phy->mt76->chandef.width) {
- case NL80211_CHAN_WIDTH_40:
- bw = 1;
- break;
- case NL80211_CHAN_WIDTH_80:
- bw = 2;
- break;
- case NL80211_CHAN_WIDTH_80P80:
- case NL80211_CHAN_WIDTH_160:
- bw = 3;
- break;
- default:
- bw = 0;
- break;
+ if (msta->test.txo_active) {
+ bw = td->txbw;
+ } else {
+ switch (phy->mt76->chandef.width) {
+ case NL80211_CHAN_WIDTH_40:
+ bw = 1;
+ break;
+ case NL80211_CHAN_WIDTH_80:
+ bw = 2;
+ break;
+ case NL80211_CHAN_WIDTH_80P80:
+ case NL80211_CHAN_WIDTH_160:
+ bw = 3;
+ break;
+ default:
+ bw = 0;
+ break;
+ }
}
if (td->tx_rate_stbc && nss == 1) {
@@ -692,10 +716,24 @@ mt7915_mac_write_txwi_tm(struct mt7915_phy *phy, __le32 *txwi,
txwi[2] |= cpu_to_le32(MT_TXD2_FIX_RATE);
- le32p_replace_bits(&txwi[3], 1, MT_TXD3_REM_TX_COUNT);
+ if (msta->test.txo_active) {
+ s8 txp = td->tx_power[0] - 16;
+
+ /* Support per-skb txpower, p.15 of tx doc, DW2 29:24. */
+ le32p_replace_bits(&txwi[2], txp, MT_TXD2_POWER_OFFSET);
+
+ xmit_count = td->tx_xmit_count;
+ if (xmit_count == 0) {
+ xmit_count = 1;
+ txwi[3] |= cpu_to_le32(MT_TXD3_NO_ACK);
+ }
+ }
+
+ le32p_replace_bits(&txwi[3], xmit_count, MT_TXD3_REM_TX_COUNT);
if (td->tx_rate_mode < MT76_TM_TX_MODE_HT)
txwi[3] |= cpu_to_le32(MT_TXD3_BA_DISABLE);
+ /* TODO: Take tx_dynbw into account in txo mode. */
val = MT_TXD6_FIXED_BW |
FIELD_PREP(MT_TXD6_BW, bw) |
FIELD_PREP(MT_TXD6_TX_RATE, rateval) |
@@ -719,9 +757,29 @@ mt7915_mac_write_txwi_tm(struct mt7915_phy *phy, __le32 *txwi,
txwi[3] &= ~cpu_to_le32(MT_TXD3_SN_VALID);
txwi[6] |= cpu_to_le32(val);
- txwi[7] |= cpu_to_le32(FIELD_PREP(MT_TXD7_SPE_IDX,
- phy->test.spe_idx));
-#endif
+
+ if (msta->test.txo_active) {
+ /* see mt7915_tm_set_tx_frames */
+ static const u8 spe_idx_map[] = {0, 0, 1, 0, 3, 2, 4, 0,
+ 9, 8, 6, 10, 16, 12, 18, 0};
+ u32 spe_idx;
+
+ if (td->tx_spe_idx) {
+ spe_idx = td->tx_spe_idx;
+ } else {
+ u8 tx_ant = td->tx_antenna_mask;
+
+ if (!tx_ant) {
+ /* use antenna mask that matches our nss */
+ tx_ant = GENMASK(nss - 1, 0);
+ }
+ spe_idx = spe_idx_map[tx_ant];
+ }
+ txwi[7] |= cpu_to_le32(FIELD_PREP(MT_TXD7_SPE_IDX, spe_idx));
+ } else {
+ txwi[7] |= cpu_to_le32(FIELD_PREP(MT_TXD7_SPE_IDX,
+ phy->test.spe_idx));
+ }
}
void mt7915_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
@@ -738,8 +796,30 @@ void mt7915_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
mt76_connac2_mac_write_txwi(dev, txwi, skb, wcid, key, pid, qid, changed);
- if (mt76_testmode_enabled(mphy))
- mt7915_mac_write_txwi_tm(mphy->priv, txwi, skb);
+#ifdef CONFIG_NL80211_TESTMODE
+ {
+ struct mt7915_sta *msta;
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+ __le16 fc;
+ bool is_8023 = info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP;
+
+ if (!is_8023)
+ fc = hdr->frame_control;
+
+ msta = container_of(wcid, struct mt7915_sta, wcid);
+ if (mt76_testmode_enabled(mphy) ||
+ (msta->test.txo_active &&
+ /* Only do txo overrides for (larger) data frames, this
+ * generally allows connection mgt frames to pass but still
+ * lets us force the data packets we care about.
+ */
+ skb->len >= 400 &&
+ (is_8023 ||
+ ((ieee80211_is_data_qos(fc) || ieee80211_is_data(fc)) &&
+ (!(ieee80211_is_qos_nullfunc(fc) || ieee80211_is_nullfunc(fc)))))))
+ mt7915_mac_write_txwi_tm(mphy->priv, wcid, txwi, skb);
+ }
+#endif
}
int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
@@ -1029,7 +1109,7 @@ static void mt7915_mac_add_txs(struct mt7915_dev *dev, void *data)
msta = container_of(wcid, struct mt7915_sta, wcid);
if (pid == MT_PACKET_ID_WED)
- mt76_connac2_mac_fill_txs(&dev->mt76, wcid, txs_data);
+ mt76_connac2_mac_fill_txs(&dev->mt76, wcid, txs_data, NULL);
else
mt76_connac2_mac_add_txs_skb(&dev->mt76, wcid, pid, txs_data);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index d317c523b23f..960435ad2c04 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -146,6 +146,8 @@ struct mt7915_sta {
unsigned long jiffies;
struct mt76_connac_sta_key_conf bip;
+ struct mt76_testmode_data test;
+
struct {
u8 flowid_mask;
struct mt7915_twt_flow flow[MT7915_MAX_STA_TWT_AGRT];
--
2.40.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 07/12] wifi: mt76: mt7915: support enabling rx group-5 status
2023-10-25 19:03 [PATCH 01/12] wifi: mt76: mt7915: print out hw revision greearb
` (4 preceding siblings ...)
2023-10-25 19:03 ` [PATCH 06/12] wifi: mt76: mt7915: add support for tx-overrides greearb
@ 2023-10-25 19:03 ` greearb
2023-10-25 19:03 ` [PATCH 08/12] wifi: mt76: mt7915: use nss for calculating rx-chains greearb
2023-10-25 19:03 ` [PATCH 09/12] wifi: mt76: mt7915: ethtool group-5 rx stats information greearb
7 siblings, 0 replies; 10+ messages in thread
From: greearb @ 2023-10-25 19:03 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
When enabled, this allows per-skb rx rate reporting.
Enabling this may degrade RX performance, so it remains
disabled by default.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
.../wireless/mediatek/mt76/mt7915/debugfs.c | 33 +++++++++++++++++++
.../net/wireless/mediatek/mt76/mt7915/init.c | 3 +-
.../net/wireless/mediatek/mt76/mt7915/main.c | 2 +-
.../wireless/mediatek/mt76/mt7915/mt7915.h | 5 +++
4 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index f9309699f657..cb4409bf49d2 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -900,6 +900,38 @@ static const struct file_operations fops_set_rate_override = {
.llseek = default_llseek,
};
+static int
+mt7915_rx_group_5_enable_set(void *data, u64 val)
+{
+ struct mt7915_dev *dev = data;
+
+ mutex_lock(&dev->mt76.mutex);
+
+ dev->rx_group_5_enable = !!val;
+
+ /* Enabled if we requested enabled OR if monitor mode is enabled. */
+ mt76_rmw_field(dev, MT_DMA_DCR0(0), MT_DMA_DCR0_RXD_G5_EN,
+ dev->rx_group_5_enable);
+ mt76_testmode_reset(dev->phy.mt76, true);
+
+ mutex_unlock(&dev->mt76.mutex);
+
+ return 0;
+}
+
+static int
+mt7915_rx_group_5_enable_get(void *data, u64 *val)
+{
+ struct mt7915_dev *dev = data;
+
+ *val = dev->rx_group_5_enable;
+
+ return 0;
+}
+
+DEFINE_DEBUGFS_ATTRIBUTE(fops_rx_group_5_enable, mt7915_rx_group_5_enable_get,
+ mt7915_rx_group_5_enable_set, "%lld\n");
+
static void
mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy,
struct seq_file *file)
@@ -1452,6 +1484,7 @@ int mt7915_init_debugfs(struct mt7915_phy *phy)
&mt7915_fw_util_wm_fops);
debugfs_create_file("fw_util_wa", 0400, dir, dev,
&mt7915_fw_util_wa_fops);
+ debugfs_create_file("rx_group_5_enable", 0600, dir, dev, &fops_rx_group_5_enable);
debugfs_create_file("implicit_txbf", 0600, dir, dev,
&fops_implicit_txbf);
debugfs_create_file("txpower_sku", 0400, dir, phy,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index fce4318a1031..a442d1e8b04e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -486,7 +486,8 @@ mt7915_mac_init_band(struct mt7915_dev *dev, u8 band)
mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_MAX_RX_LEN, 0x680);
/* mt7915: disable rx rate report by default due to hw issues */
- mt76_clear(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN);
+ mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN,
+ dev->rx_group_5_enable);
/* clear estimated value of EIFS for Rx duration & OBSS time */
mt76_wr(dev, MT_WF_RMAC_RSVD0(band), MT_WF_RMAC_RSVD0_EIFS_CLR);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index e22d1d35161e..bef8a3c17731 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -494,7 +494,7 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)
}
mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN,
- enabled);
+ dev->rx_group_5_enable);
mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_MDP_DCR0_RX_HDR_TRANS_EN,
!dev->monitor_mask);
mt76_testmode_reset(phy->mt76, true);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 960435ad2c04..dada69dff46b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -264,6 +264,11 @@ struct mt7915_dev {
u16 chainshift;
u32 hif_idx;
+ /* Should we enable group-5 rx descriptor logic? This may decrease RX
+ * throughput, but will give per skb rx rate information..
+ */
+ bool rx_group_5_enable;
+
struct work_struct init_work;
struct work_struct rc_work;
struct work_struct dump_work;
--
2.40.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 08/12] wifi: mt76: mt7915: use nss for calculating rx-chains
2023-10-25 19:03 [PATCH 01/12] wifi: mt76: mt7915: print out hw revision greearb
` (5 preceding siblings ...)
2023-10-25 19:03 ` [PATCH 07/12] wifi: mt76: mt7915: support enabling rx group-5 status greearb
@ 2023-10-25 19:03 ` greearb
2023-10-25 19:03 ` [PATCH 09/12] wifi: mt76: mt7915: ethtool group-5 rx stats information greearb
7 siblings, 0 replies; 10+ messages in thread
From: greearb @ 2023-10-25 19:03 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
When group-5 is enabled, we can find the actuall NSS used.
In that case, update the rx chains info so that the upper
stack can give better idea of actual antenna usage.
In case of stbc, the hardware already double nss, but rssi
is not reported properly (it is '17') for the secondary chains.
So, decrease nss in the status msg so that mac80211 does not try
to average the invalid RSSI.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
.../net/wireless/mediatek/mt76/mt76_connac.h | 2 +-
.../wireless/mediatek/mt76/mt76_connac_mac.c | 24 +++++++++++++++----
.../net/wireless/mediatek/mt76/mt7915/mac.c | 15 ++++++++++--
.../net/wireless/mediatek/mt76/mt7921/mac.c | 17 +++++++++++--
4 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
index 6c052e6703a4..774911c52686 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
@@ -424,7 +424,7 @@ int mt76_connac2_reverse_frag0_hdr_trans(struct ieee80211_vif *vif,
int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
struct mt76_rx_status *status,
struct ieee80211_supported_band *sband,
- __le32 *rxv, u8 *mode);
+ __le32 *rxv, u8 *mode, u8 *nss);
void mt76_connac2_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi);
void mt76_connac2_txwi_free(struct mt76_dev *dev, struct mt76_txwi_cache *t,
struct ieee80211_sta *sta,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index ae52e10331c5..ccd82943cdd1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -1014,10 +1014,10 @@ EXPORT_SYMBOL_GPL(mt76_connac2_reverse_frag0_hdr_trans);
int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
struct mt76_rx_status *status,
struct ieee80211_supported_band *sband,
- __le32 *rxv, u8 *mode)
+ __le32 *rxv, u8 *mode, u8 *nss)
{
u32 v0, v2;
- u8 stbc, gi, bw, dcm, nss;
+ u8 stbc, gi, bw, dcm;
int i, idx;
bool cck = false;
@@ -1025,7 +1025,7 @@ int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
v2 = le32_to_cpu(rxv[2]);
idx = i = FIELD_GET(MT_PRXV_TX_RATE, v0);
- nss = FIELD_GET(MT_PRXV_NSTS, v0) + 1;
+ *nss = FIELD_GET(MT_PRXV_NSTS, v0) + 1;
if (!is_mt7915(dev)) {
stbc = FIELD_GET(MT_PRXV_HT_STBC, v0);
@@ -1050,17 +1050,21 @@ int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
fallthrough;
case MT_PHY_TYPE_OFDM:
i = mt76_get_rate(dev, sband, i, cck);
+ if (stbc)
+ *nss = 2;
+ else
+ *nss = 1;
break;
case MT_PHY_TYPE_HT_GF:
case MT_PHY_TYPE_HT:
status->encoding = RX_ENC_HT;
+ *nss = i / 8 + 1;
if (gi)
status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
if (i > 31)
return -EINVAL;
break;
case MT_PHY_TYPE_VHT:
- status->nss = nss;
status->encoding = RX_ENC_VHT;
if (gi)
status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
@@ -1071,7 +1075,6 @@ int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
case MT_PHY_TYPE_HE_SU:
case MT_PHY_TYPE_HE_EXT_SU:
case MT_PHY_TYPE_HE_TB:
- status->nss = nss;
status->encoding = RX_ENC_HE;
i &= GENMASK(3, 0);
@@ -1112,6 +1115,17 @@ int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
if (*mode < MT_PHY_TYPE_HE_SU && gi)
status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
+ /* in case stbc is set, the nss value returned by hardware is already
+ * correct (ie, 2 instead of 1 for 1 spatial stream). But, at least in cases
+ * where we are configured for a single antenna, then the second chain RSSI is '17',
+ * which I take to mean 'not set'. To keep from adding this to the average rssi up in
+ * mac80211 rx logic, decrease nss here.
+ */
+ if (stbc)
+ *nss >>= 1;
+
+ status->nss = *nss;
+
return 0;
}
EXPORT_SYMBOL_GPL(mt76_connac2_mac_fill_rx_rate);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 5776d47afba9..be983a1bfe20 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -451,6 +451,8 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,
if (rxd1 & MT_RXD1_NORMAL_GROUP_3) {
u32 v0, v1;
int ret;
+ int i;
+ u8 nss;
rxv = rxd;
rxd += 2;
@@ -463,11 +465,14 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,
if (v0 & MT_PRXV_HT_AD_CODE)
status->enc_flags |= RX_ENC_FLAG_LDPC;
- status->chains = mphy->antenna_mask;
+ /* TODO: When group-5 is enabled, use nss (and stbc) to
+ * calculate chains properly for this particular skb.
+ */
status->chain_signal[0] = to_rssi(MT_PRXV_RCPI0, v1);
status->chain_signal[1] = to_rssi(MT_PRXV_RCPI1, v1);
status->chain_signal[2] = to_rssi(MT_PRXV_RCPI2, v1);
status->chain_signal[3] = to_rssi(MT_PRXV_RCPI3, v1);
+ nss = hweight8(mphy->antenna_mask);
/* RXD Group 5 - C-RXV */
if (rxd1 & MT_RXD1_NORMAL_GROUP_5) {
@@ -478,10 +483,16 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,
if (!is_mt7915(&dev->mt76) || (rxd1 & MT_RXD1_NORMAL_GROUP_5)) {
ret = mt76_connac2_mac_fill_rx_rate(&dev->mt76, status,
- sband, rxv, &mode);
+ sband, rxv, &mode,
+ &nss);
if (ret < 0)
return ret;
+ } else {
+ status->nss = nss;
}
+
+ for (i = 0; i < nss; i++)
+ status->chains |= BIT(i);
}
amsdu_info = FIELD_GET(MT_RXD4_NORMAL_PAYLOAD_FORMAT, rxd4);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index f3d61e77fa4a..52bbd7b98710 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -333,6 +333,7 @@ mt7921_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)
if (rxd1 & MT_RXD1_NORMAL_GROUP_3) {
u32 v0, v1;
int ret;
+ u8 nss;
rxv = rxd;
rxd += 2;
@@ -346,7 +347,7 @@ mt7921_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)
status->enc_flags |= RX_ENC_FLAG_LDPC;
ret = mt76_connac2_mac_fill_rx_rate(&dev->mt76, status, sband,
- rxv, &mode);
+ rxv, &mode, &nss);
if (ret < 0)
return ret;
@@ -366,12 +367,24 @@ mt7921_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)
return -EINVAL;
}
- status->chains = mphy->antenna_mask;
status->chain_signal[0] = to_rssi(MT_PRXV_RCPI0, v1);
status->chain_signal[1] = to_rssi(MT_PRXV_RCPI1, v1);
status->chain_signal[2] = to_rssi(MT_PRXV_RCPI2, v1);
status->chain_signal[3] = to_rssi(MT_PRXV_RCPI3, v1);
status->signal = -128;
+
+ if (nss == 1) {
+ if (status->chain_signal[0] >= status->chain_signal[1])
+ status->chains |= BIT(0);
+ else
+ status->chains |= BIT(1);
+ } else if (status->nss == 2) {
+ status->chains = BIT(0) | BIT(1);
+ } else {
+ WARN_ON_ONCE(1); /* this driver is for only 2x2 AFAIK */
+ status->chains = BIT(0);
+ }
+
for (i = 0; i < hweight8(mphy->antenna_mask); i++) {
if (!(status->chains & BIT(i)) ||
status->chain_signal[i] >= 0)
--
2.40.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 09/12] wifi: mt76: mt7915: ethtool group-5 rx stats information
2023-10-25 19:03 [PATCH 01/12] wifi: mt76: mt7915: print out hw revision greearb
` (6 preceding siblings ...)
2023-10-25 19:03 ` [PATCH 08/12] wifi: mt76: mt7915: use nss for calculating rx-chains greearb
@ 2023-10-25 19:03 ` greearb
7 siblings, 0 replies; 10+ messages in thread
From: greearb @ 2023-10-25 19:03 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
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>
---
drivers/net/wireless/mediatek/mt76/mac80211.c | 23 +++++++++++++++++-
drivers/net/wireless/mediatek/mt76/mt76.h | 9 +++++++
.../net/wireless/mediatek/mt76/mt76_connac.h | 3 ++-
.../wireless/mediatek/mt76/mt76_connac_mac.c | 24 ++++++++++++++++++-
.../net/wireless/mediatek/mt76/mt7915/mac.c | 4 +++-
.../net/wireless/mediatek/mt76/mt7915/main.c | 21 ++++++++++++++++
.../net/wireless/mediatek/mt76/mt7921/mac.c | 4 +++-
.../net/wireless/mediatek/mt76/mt792x_core.c | 21 ++++++++++++++++
8 files changed, 104 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 11651e5c9488..069e3f9f268d 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -1771,7 +1771,7 @@ EXPORT_SYMBOL_GPL(mt76_calculate_default_rate);
void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
struct mt76_sta_stats *stats, bool eht)
{
- int i, ei = wi->initial_stat_idx;
+ int i, q, ei = wi->initial_stat_idx;
u64 *data = wi->data;
wi->sta_count++;
@@ -1804,6 +1804,27 @@ void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
for (i = 0; i < 4; i++)
data[ei++] += stats->tx_nss[i];
+ /* rx stats */
+ for (q = 0; q < ARRAY_SIZE(stats->rx_nss); q++)
+ data[ei++] += stats->rx_nss[q];
+
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_CCK];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_OFDM];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HT];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HT_GF];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_VHT];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HE_SU];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HE_EXT_SU];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HE_TB];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HE_MU];
+
+ data[ei++] += stats->rx_bw_20;
+ data[ei++] += stats->rx_bw_40;
+ data[ei++] += stats->rx_bw_80;
+ data[ei++] += stats->rx_bw_160;
+ data[ei++] += stats->rx_bw_he_ru;
+ data[ei++] += stats->rx_ru_106;
+
wi->worker_stat_count = ei - wi->initial_stat_idx;
}
EXPORT_SYMBOL_GPL(mt76_ethtool_worker);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 7b141fbf3497..35a333ae3d84 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -288,6 +288,15 @@ struct mt76_sta_stats {
u32 rx_packets;
u32 rx_errors;
u32 rx_drops;
+ /* This section requires group-5 in rxd to be enabled for 7915. */
+ unsigned long rx_nss[4]; /* rx-nss histogram */
+ unsigned long rx_mode[__MT_PHY_TYPE_MAX]; /* rx mode histogram */
+ unsigned long rx_bw_20;
+ unsigned long rx_bw_40;
+ unsigned long rx_bw_80;
+ unsigned long rx_bw_160;
+ unsigned long rx_bw_he_ru;
+ unsigned long rx_ru_106;
};
enum mt76_wcid_flags {
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
index 774911c52686..8d501db26c5a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
@@ -424,7 +424,8 @@ int mt76_connac2_reverse_frag0_hdr_trans(struct ieee80211_vif *vif,
int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
struct mt76_rx_status *status,
struct ieee80211_supported_band *sband,
- __le32 *rxv, u8 *mode, u8 *nss);
+ __le32 *rxv, u8 *mode, u8 *nss,
+ struct mt76_sta_stats *stats);
void mt76_connac2_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi);
void mt76_connac2_txwi_free(struct mt76_dev *dev, struct mt76_txwi_cache *t,
struct ieee80211_sta *sta,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index ccd82943cdd1..d349329a8168 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -1014,7 +1014,8 @@ EXPORT_SYMBOL_GPL(mt76_connac2_reverse_frag0_hdr_trans);
int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
struct mt76_rx_status *status,
struct ieee80211_supported_band *sband,
- __le32 *rxv, u8 *mode, u8 *nss)
+ __le32 *rxv, u8 *mode, u8 *nss,
+ struct mt76_sta_stats *stats)
{
u32 v0, v2;
u8 stbc, gi, bw, dcm;
@@ -1090,6 +1091,8 @@ int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
switch (bw) {
case IEEE80211_STA_RX_BW_20:
+ if (stats)
+ stats->rx_bw_20++;
break;
case IEEE80211_STA_RX_BW_40:
if (*mode & MT_PHY_TYPE_HE_EXT_SU &&
@@ -1097,15 +1100,25 @@ int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
status->bw = RATE_INFO_BW_HE_RU;
status->he_ru =
NL80211_RATE_INFO_HE_RU_ALLOC_106;
+ if (stats) {
+ stats->rx_bw_he_ru++;
+ stats->rx_ru_106++;
+ }
} else {
status->bw = RATE_INFO_BW_40;
+ if (stats)
+ stats->rx_bw_40++;
}
break;
case IEEE80211_STA_RX_BW_80:
status->bw = RATE_INFO_BW_80;
+ if (stats)
+ stats->rx_bw_80++;
break;
case IEEE80211_STA_RX_BW_160:
status->bw = RATE_INFO_BW_160;
+ if (stats)
+ stats->rx_bw_160++;
break;
default:
return -EINVAL;
@@ -1126,6 +1139,15 @@ int mt76_connac2_mac_fill_rx_rate(struct mt76_dev *dev,
status->nss = *nss;
+ if (stats) {
+ if (*nss > 3)
+ stats->rx_nss[3]++;
+ else
+ stats->rx_nss[*nss - 1]++;
+ if (*mode < __MT_PHY_TYPE_MAX)
+ stats->rx_mode[*mode]++;
+ }
+
return 0;
}
EXPORT_SYMBOL_GPL(mt76_connac2_mac_fill_rx_rate);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index be983a1bfe20..40f3320edc02 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -307,6 +307,7 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,
u16 seq_ctrl = 0;
__le16 fc = 0;
int idx;
+ struct mt76_sta_stats *stats = NULL;
memset(status, 0, sizeof(*status));
@@ -339,6 +340,7 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,
if (status->wcid) {
msta = container_of(status->wcid, struct mt7915_sta, wcid);
+ stats = &status->wcid->stats;
spin_lock_bh(&dev->mt76.sta_poll_lock);
if (list_empty(&msta->wcid.poll_list))
list_add_tail(&msta->wcid.poll_list,
@@ -484,7 +486,7 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,
if (!is_mt7915(&dev->mt76) || (rxd1 & MT_RXD1_NORMAL_GROUP_5)) {
ret = mt76_connac2_mac_fill_rx_rate(&dev->mt76, status,
sband, rxv, &mode,
- &nss);
+ &nss, stats);
if (ret < 0)
return ret;
} else {
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index bef8a3c17731..05b633932e16 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -1391,6 +1391,27 @@ static const char mt7915_gstrings_stats[][ETH_GSTRING_LEN] = {
"v_tx_nss_2",
"v_tx_nss_3",
"v_tx_nss_4",
+
+ /* 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)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 52bbd7b98710..9f2c8a3a4202 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -189,6 +189,7 @@ mt7921_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)
__le16 fc = 0;
u8 mode = 0;
int i, idx;
+ struct mt76_sta_stats *stats = NULL;
memset(status, 0, sizeof(*status));
@@ -216,6 +217,7 @@ mt7921_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)
if (status->wcid) {
msta = container_of(status->wcid, struct mt792x_sta, wcid);
+ stats = &status->wcid->stats;
spin_lock_bh(&dev->mt76.sta_poll_lock);
if (list_empty(&msta->wcid.poll_list))
list_add_tail(&msta->wcid.poll_list,
@@ -347,7 +349,7 @@ mt7921_mac_fill_rx(struct mt792x_dev *dev, struct sk_buff *skb)
status->enc_flags |= RX_ENC_FLAG_LDPC;
ret = mt76_connac2_mac_fill_rx_rate(&dev->mt76, status, sband,
- rxv, &mode, &nss);
+ rxv, &mode, &nss, stats);
if (ret < 0)
return ret;
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_core.c b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
index f92a43d5f5b0..2607abc0d028 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
@@ -376,6 +376,27 @@ static const char mt792x_gstrings_stats[][ETH_GSTRING_LEN] = {
"v_tx_nss_2",
"v_tx_nss_3",
"v_tx_nss_4",
+
+ /* 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",
};
void mt792x_get_et_strings(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
--
2.40.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 09/12] wifi: mt76: mt7915: ethtool group-5 rx stats information
2022-07-27 23:01 [PATCH 01/12] wifi: mt76: mt7915: cache sgi in wcid greearb
@ 2022-07-27 23:01 ` greearb
0 siblings, 0 replies; 10+ messages in thread
From: greearb @ 2022-07-27 23:01 UTC (permalink / raw)
To: linux-wireless; +Cc: nbd, Ben Greear
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>
---
drivers/net/wireless/mediatek/mt76/mac80211.c | 23 ++++++++++++++-
drivers/net/wireless/mediatek/mt76/mt76.h | 10 +++++++
.../net/wireless/mediatek/mt76/mt7915/mac.c | 29 +++++++++++++++++--
.../net/wireless/mediatek/mt76/mt7915/main.c | 21 ++++++++++++++
.../net/wireless/mediatek/mt76/mt7921/main.c | 21 ++++++++++++++
5 files changed, 101 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 242e055fa475..574e2c54637a 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -1623,7 +1623,7 @@ EXPORT_SYMBOL_GPL(mt76_calculate_default_rate);
void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
struct mt76_sta_stats *stats)
{
- int i, ei = wi->initial_stat_idx;
+ int i, q, ei = wi->initial_stat_idx;
u64 *data = wi->data;
wi->sta_count++;
@@ -1648,6 +1648,27 @@ void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
for (i = 0; i < 12; i++)
data[ei++] += stats->tx_mcs[i];
+ /* rx stats */
+ for (q = 0; q < ARRAY_SIZE(stats->rx_nss); q++)
+ data[ei++] += stats->rx_nss[q];
+
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_CCK];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_OFDM];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HT];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HT_GF];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_VHT];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HE_SU];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HE_EXT_SU];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HE_TB];
+ data[ei++] += stats->rx_mode[MT_PHY_TYPE_HE_MU];
+
+ data[ei++] += stats->rx_bw_20;
+ data[ei++] += stats->rx_bw_40;
+ data[ei++] += stats->rx_bw_80;
+ data[ei++] += stats->rx_bw_160;
+ data[ei++] += stats->rx_bw_he_ru;
+ data[ei++] += stats->rx_ru_106;
+
wi->worker_stat_count = ei - wi->initial_stat_idx;
}
EXPORT_SYMBOL_GPL(mt76_ethtool_worker);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 682b554fbcb7..cbf1a30d3cc9 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -839,6 +839,16 @@ struct mt76_sta_stats {
u64 tx_bw[4]; /* 20, 40, 80, 160 */
u64 tx_nss[4]; /* 1, 2, 3, 4 */
u64 tx_mcs[16]; /* mcs idx */
+
+ /* This section requires group-5 in rxd to be enabled for 7915. */
+ u32 rx_nss[4]; /* rx-nss histogram */
+ u32 rx_mode[__MT_PHY_TYPE_HE_MAX]; /* 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 mt76_ethtool_worker_info {
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 1d2909c0c04c..ca6748d67ce0 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -487,7 +487,8 @@ static int
mt7915_mac_fill_rx_rate(struct mt7915_dev *dev,
struct mt76_rx_status *status,
struct ieee80211_supported_band *sband,
- __le32 *rxv, u8 *mode, u8 *nss)
+ __le32 *rxv, u8 *mode, u8 *nss,
+ struct mt76_sta_stats *stats)
{
u32 v0, v2;
u8 stbc, gi, bw, dcm;
@@ -555,6 +556,8 @@ mt7915_mac_fill_rx_rate(struct mt7915_dev *dev,
switch (bw) {
case IEEE80211_STA_RX_BW_20:
+ if (stats)
+ stats->rx_bw_20++;
break;
case IEEE80211_STA_RX_BW_40:
if (*mode & MT_PHY_TYPE_HE_EXT_SU &&
@@ -562,15 +565,26 @@ mt7915_mac_fill_rx_rate(struct mt7915_dev *dev,
status->bw = RATE_INFO_BW_HE_RU;
status->he_ru =
NL80211_RATE_INFO_HE_RU_ALLOC_106;
+ if (stats) {
+ stats->rx_bw_he_ru++;
+ stats->rx_ru_106++;
+ }
} else {
status->bw = RATE_INFO_BW_40;
+ if (stats)
+ stats->rx_bw_40++;
}
break;
case IEEE80211_STA_RX_BW_80:
status->bw = RATE_INFO_BW_80;
+ if (stats)
+ stats->rx_bw_80++;
+
break;
case IEEE80211_STA_RX_BW_160:
status->bw = RATE_INFO_BW_160;
+ if (stats)
+ stats->rx_bw_160++;
break;
default:
return -EINVAL;
@@ -591,6 +605,15 @@ mt7915_mac_fill_rx_rate(struct mt7915_dev *dev,
status->nss = *nss;
+ if (stats) {
+ if (*nss > 3)
+ stats->rx_nss[3]++;
+ else
+ stats->rx_nss[*nss - 1]++;
+ if (*mode < __MT_PHY_TYPE_HE_MAX)
+ stats->rx_mode[*mode]++;
+ }
+
return 0;
}
@@ -618,6 +641,7 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
u16 seq_ctrl = 0;
__le16 fc = 0;
int idx;
+ struct mt76_sta_stats *stats = NULL;
memset(status, 0, sizeof(*status));
@@ -652,6 +676,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);
+ stats = &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);
@@ -797,7 +822,7 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
if (!is_mt7915(&dev->mt76) || (rxd1 & MT_RXD1_NORMAL_GROUP_5)) {
ret = mt7915_mac_fill_rx_rate(dev, status, sband, rxv,
- &mode, &nss);
+ &mode, &nss, stats);
if (ret < 0)
return ret;
} else {
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 1e8f525fa669..db3c32eebb04 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -1187,6 +1187,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)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index ac78fcf285bf..a23dd8f44e28 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -1016,6 +1016,27 @@ static const char mt7921_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",
};
static void
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-10-25 19:04 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-25 19:03 [PATCH 01/12] wifi: mt76: mt7915: print out hw revision greearb
2023-10-25 19:03 ` [PATCH 02/12] wifi: mt76: mt7915: cache sgi in wcid greearb
2023-10-25 19:03 ` [PATCH 03/12] wifi: mt76: mt7915: allow processing TXS for 'NO_SKB' pkt-ids greearb
2023-10-25 19:03 ` [PATCH 04/12] wifi: mt76: mt7915: debugfs hook to enable TXS for NO_SKB pkt-ids greearb
2023-10-25 19:03 ` [PATCH 05/12] wifi: mt76: mt7915: report tx-retries greearb
2023-10-25 19:03 ` [PATCH 06/12] wifi: mt76: mt7915: add support for tx-overrides greearb
2023-10-25 19:03 ` [PATCH 07/12] wifi: mt76: mt7915: support enabling rx group-5 status greearb
2023-10-25 19:03 ` [PATCH 08/12] wifi: mt76: mt7915: use nss for calculating rx-chains greearb
2023-10-25 19:03 ` [PATCH 09/12] wifi: mt76: mt7915: ethtool group-5 rx stats information greearb
-- strict thread matches above, loose matches on Subject: below --
2022-07-27 23:01 [PATCH 01/12] wifi: mt76: mt7915: cache sgi in wcid greearb
2022-07-27 23:01 ` [PATCH 09/12] wifi: mt76: mt7915: ethtool group-5 rx stats information greearb
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).