2023-01-04 09:22:56

by Ryder Lee

[permalink] [raw]
Subject: [PATCH v2] wifi: mt76: fix WED TxS reporting

The previous commit forgot to remove a leftover check and set wrong bitmask
that led to unexpected tx_stat reporting.

Fixes: 43eaa3689507 ("wifi: mt76: add PPDU based TxS support for WED device")
Reported-By: Sujuan Chen <[email protected]>
Signed-off-by: Ryder Lee <[email protected]>
---
changes since v2 - correct bitmask
---
drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h | 10 ++++------
drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 3 ---
2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h
index f33171bcd343..39cdadcb3d07 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h
@@ -159,12 +159,10 @@ enum {
#define MT_TXS4_TIMESTAMP GENMASK(31, 0)

/* PPDU based TXS */
-#define MT_TXS5_MPDU_TX_BYTE GENMASK(22, 0)
-#define MT_TXS5_MPDU_TX_CNT GENMASK(31, 23)
-
-#define MT_TXS6_MPDU_FAIL_CNT GENMASK(31, 23)
-
-#define MT_TXS7_MPDU_RETRY_CNT GENMASK(31, 23)
+#define MT_TXS5_MPDU_TX_BYTE GENMASK(23, 0)
+#define MT_TXS5_MPDU_TX_CNT GENMASK(31, 24)
+#define MT_TXS6_MPDU_FAIL_CNT GENMASK(31, 24)
+#define MT_TXS7_MPDU_RETRY_CNT GENMASK(31, 24)

/* RXD DW1 */
#define MT_RXD1_NORMAL_WLAN_IDX GENMASK(9, 0)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index f0d5a3603902..1a6def77db57 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1061,9 +1061,6 @@ static void mt7915_mac_add_txs(struct mt7915_dev *dev, void *data)
u16 wcidx;
u8 pid;

- if (le32_get_bits(txs_data[0], MT_TXS0_TXS_FORMAT) > 1)
- return;
-
wcidx = le32_get_bits(txs_data[2], MT_TXS2_WCID);
pid = le32_get_bits(txs_data[3], MT_TXS3_PID);

--
2.18.0