wifi: mt76: only mark tx-status-failed frames as ACKed on mt76x0/2

[ Upstream commit 0c5a89ceddc1728a40cb3313948401dd70e3c649 ]

The interrupt status polling is unreliable, which can cause status events
to get lost. On all newer chips, txs-timeout is an indication that the
packet was either never sent, or never acked.
Fixes issues with inactivity polling.

Link: https://patch.msgid.link/20250311103646.43346-6-nbd@nbd.name
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 05651efb549ecf35a20a56528919ac9c9c8823d6..8714418f3906c8d13208959a14c4c955e3be82b0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -491,6 +491,7 @@ struct mt76_hw_cap {
 #define MT_DRV_RX_DMA_HDR              BIT(3)
 #define MT_DRV_HW_MGMT_TXQ             BIT(4)
 #define MT_DRV_AMSDU_OFFLOAD           BIT(5)
+#define MT_DRV_IGNORE_TXS_FAILED       BIT(6)
 
 struct mt76_driver_ops {
        u32 drv_flags;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
index b456ccd00d581ffc983bed78f7578572e203db11..11c16d1fc70fc0ab3af4fbe8625c09c38adfd985 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
@@ -156,7 +156,8 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        static const struct mt76_driver_ops drv_ops = {
                .txwi_size = sizeof(struct mt76x02_txwi),
                .drv_flags = MT_DRV_TX_ALIGNED4_SKBS |
-                            MT_DRV_SW_RX_AIRTIME,
+                            MT_DRV_SW_RX_AIRTIME |
+                            MT_DRV_IGNORE_TXS_FAILED,
                .survey_flags = SURVEY_INFO_TIME_TX,
                .update_survey = mt76x02_update_channel,
                .set_channel = mt76x0_set_channel,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index b031c500b74156bb4b354c779054d8ad4f123c99..90e5666c0857dc64a72b005d0cfcb7717f45230a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -214,7 +214,8 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,
                         const struct usb_device_id *id)
 {
        static const struct mt76_driver_ops drv_ops = {
-               .drv_flags = MT_DRV_SW_RX_AIRTIME,
+               .drv_flags = MT_DRV_SW_RX_AIRTIME |
+                            MT_DRV_IGNORE_TXS_FAILED,
                .survey_flags = SURVEY_INFO_TIME_TX,
                .update_survey = mt76x02_update_channel,
                .set_channel = mt76x0_set_channel,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
index 727bfdd00b40007a72e0bdbcd0f29705f11545f4..2303019670e2c0d143aa0904aa553d2df84e47ad 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
@@ -22,7 +22,8 @@ mt76x2e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        static const struct mt76_driver_ops drv_ops = {
                .txwi_size = sizeof(struct mt76x02_txwi),
                .drv_flags = MT_DRV_TX_ALIGNED4_SKBS |
-                            MT_DRV_SW_RX_AIRTIME,
+                            MT_DRV_SW_RX_AIRTIME |
+                            MT_DRV_IGNORE_TXS_FAILED,
                .survey_flags = SURVEY_INFO_TIME_TX,
                .update_survey = mt76x02_update_channel,
                .set_channel = mt76x2e_set_channel,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
index a4f4d12f904e7cc697f3233f40152ecaa598a4e5..84ef80ab4afbfa8da9df6cfda1d9e0b09dbaf35c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
@@ -30,7 +30,8 @@ static int mt76x2u_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
        static const struct mt76_driver_ops drv_ops = {
-               .drv_flags = MT_DRV_SW_RX_AIRTIME,
+               .drv_flags = MT_DRV_SW_RX_AIRTIME |
+                            MT_DRV_IGNORE_TXS_FAILED,
                .survey_flags = SURVEY_INFO_TIME_TX,
                .update_survey = mt76x02_update_channel,
                .set_channel = mt76x2u_set_channel,

diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index af0c50c983ec11d7cbf9836a8cf006daf2d9e7d8..513916469ca2f62a80e9675ffd8ea927d2bd0b86 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -100,7 +100,8 @@ __mt76_tx_status_skb_done(struct mt76_dev *dev, struct sk_buff *skb, u8 flags,
                return;
 
        /* Tx status can be unreliable. if it fails, mark the frame as ACKed */
-       if (flags & MT_TX_CB_TXS_FAILED) {
+       if (flags & MT_TX_CB_TXS_FAILED &&
+           (dev->drv->drv_flags & MT_DRV_IGNORE_TXS_FAILED)) {
                info->status.rates[0].count = 0;
                info->status.rates[0].idx = -1;
                info->flags |= IEEE80211_TX_STAT_ACK;