wifi: mt76: mt7915: rework tx bytes counting when WED is active

Concurrent binding/non-binding skbs could be handled anywhere which leads
to mixed byte counting, so switch to use PPDU TxS reporting regardless Tx
paths when WED is active.

Fixes: 43eaa3689507 ("wifi: mt76: add PPDU based TxS support for WED device")
Co-developed-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index f6346a4..3501f05 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -521,8 +521,6 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
                q_idx = wmm_idx * MT76_CONNAC_MAX_WMM_SETS +
                        mt76_connac_lmac_mapping(skb_get_queue_mapping(skb));
 
-               /* counting non-offloading skbs */
-               wcid->stats.tx_bytes += skb->len;
                /* mt7915 WA only counts WED path */
                if (is_mt7915(dev) && mtk_wed_device_active(&dev->mmio.wed))
                        wcid->stats.tx_packets++;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index 8d6e096..30c552a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -499,6 +499,12 @@ mt7915_mac_init_band(struct mt7915_dev *dev, u8 band)
        set = FIELD_PREP(MT_WTBLOFF_TOP_RSCR_RCPI_MODE, 0) |
              FIELD_PREP(MT_WTBLOFF_TOP_RSCR_RCPI_PARAM, 0x3);
        mt76_rmw(dev, MT_WTBLOFF_TOP_RSCR(band), mask, set);
+
+       /* MT_TXD5_TX_STATUS_HOST (MPDU format) has higher priority than
+        * MT_AGG_ACR_PPDU_TXS2H (PPDU format) even though ACR bit is set.
+        */
+       if (mtk_wed_device_active(&dev->mt76.mmio.wed))
+               mt76_set(dev, MT_AGG_ACR4(band), MT_AGG_ACR_PPDU_TXS2H);
 }
 
 static void

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
index 45f3558..2fa059a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
@@ -545,8 +545,6 @@ static u32 mt7915_rmw(struct mt76_dev *mdev, u32 offset, u32 mask, u32 val)
 static int mt7915_mmio_wed_offload_enable(struct mtk_wed_device *wed)
 {
        struct mt7915_dev *dev;
-       struct mt7915_phy *phy;
-       int ret;
 
        dev = container_of(wed, struct mt7915_dev, mt76.mmio.wed);
 
@@ -554,43 +552,19 @@ static int mt7915_mmio_wed_offload_enable(struct mtk_wed_device *wed)
        dev->mt76.token_size = wed->wlan.token_start;
        spin_unlock_bh(&dev->mt76.token_lock);
 
-       ret = wait_event_timeout(dev->mt76.tx_wait,
-                                !dev->mt76.wed_token_count, HZ);
-       if (!ret)
-               return -EAGAIN;
-
-       phy = &dev->phy;
-       mt76_set(dev, MT_AGG_ACR4(phy->mt76->band_idx), MT_AGG_ACR_PPDU_TXS2H);
-
-       phy = dev->mt76.phys[MT_BAND1] ? dev->mt76.phys[MT_BAND1]->priv : NULL;
-       if (phy)
-               mt76_set(dev, MT_AGG_ACR4(phy->mt76->band_idx),
-                        MT_AGG_ACR_PPDU_TXS2H);
-
-       return 0;
+       return !wait_event_timeout(dev->mt76.tx_wait,
+                                  !dev->mt76.wed_token_count, HZ);
 }
 
 static void mt7915_mmio_wed_offload_disable(struct mtk_wed_device *wed)
 {
        struct mt7915_dev *dev;
-       struct mt7915_phy *phy;
 
        dev = container_of(wed, struct mt7915_dev, mt76.mmio.wed);
 
        spin_lock_bh(&dev->mt76.token_lock);
        dev->mt76.token_size = MT7915_TOKEN_SIZE;
        spin_unlock_bh(&dev->mt76.token_lock);
-
-       /* MT_TXD5_TX_STATUS_HOST (MPDU format) has higher priority than
-        * MT_AGG_ACR_PPDU_TXS2H (PPDU format) even though ACR bit is set.
-        */
-       phy = &dev->phy;
-       mt76_clear(dev, MT_AGG_ACR4(phy->mt76->band_idx), MT_AGG_ACR_PPDU_TXS2H);
-
-       phy = dev->mt76.phys[MT_BAND1] ? dev->mt76.phys[MT_BAND1]->priv : NULL;
-       if (phy)
-               mt76_clear(dev, MT_AGG_ACR4(phy->mt76->band_idx),
-                          MT_AGG_ACR_PPDU_TXS2H);
 }
 
 static void mt7915_mmio_wed_release_rx_buf(struct mtk_wed_device *wed)

diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index 72b3ec7..e9b9728 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -121,6 +121,7 @@ int
 mt76_tx_status_skb_add(struct mt76_dev *dev, struct mt76_wcid *wcid,
                       struct sk_buff *skb)
 {
+       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct mt76_tx_cb *cb = mt76_tx_skb_cb(skb);
        int pid;
@@ -134,8 +135,14 @@ mt76_tx_status_skb_add(struct mt76_dev *dev, struct mt76_wcid *wcid,
                return MT_PACKET_ID_NO_ACK;
 
        if (!(info->flags & (IEEE80211_TX_CTL_REQ_TX_STATUS |
-                            IEEE80211_TX_CTL_RATE_CTRL_PROBE)))
+                            IEEE80211_TX_CTL_RATE_CTRL_PROBE))) {
+               if (mtk_wed_device_active(&dev->mmio.wed) &&
+                   ((info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) ||
+                    ieee80211_is_data(hdr->frame_control)))
+                       return MT_PACKET_ID_WED;
+
                return MT_PACKET_ID_NO_SKB;
+       }
 
        spin_lock_bh(&dev->status_lock);