[PATCH rtw-next] wifi: rtw88: TX report with long timeout for non-PCIE devices

[PATCH rtw-next] wifi: rtw88: TX report with long timeout for non-PCIE devices

[Ping-Ke Shih]

Many USB and SDIO devices can't report TX status within 500 ms, and
extending to 2500 ms as tested USB/SDIO devices can fix the problem [1].
To avoid adding chip ID one by one, and this change looks harmless.
Keep PCIE using short timeout, and others use long timeout.

[1] https://lore.kernel.org/linux-wireless/20260921165343.8131-1-pepe.schlehofer@gmail.com/

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
 drivers/net/wireless/realtek/rtw88/tx.c | 10 +++++-----
 drivers/net/wireless/realtek/rtw88/tx.h |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c
index 4e110a457e71..701ed7c4f3f7 100644
--- a/drivers/net/wireless/realtek/rtw88/tx.c
+++ b/drivers/net/wireless/realtek/rtw88/tx.c
@@ -196,7 +196,7 @@ void rtw_tx_report_purge_timer(struct timer_list *t)
 void rtw_tx_report_enqueue(struct rtw_dev *rtwdev, struct sk_buff *skb, u8 sn)
 {
 	struct rtw_tx_report *tx_report = &rtwdev->tx_report;
-	unsigned long timeout = RTW_TX_PROBE_TIMEOUT;
+	unsigned long timeout;
 	unsigned long flags;
 	u8 *drv_data;
 
@@ -208,10 +208,10 @@ void rtw_tx_report_enqueue(struct rtw_dev *rtwdev, struct sk_buff *skb, u8 sn)
 	__skb_queue_tail(&tx_report->queue, skb);
 	spin_unlock_irqrestore(&tx_report->q_lock, flags);
 
-	if ((rtwdev->chip->id == RTW_CHIP_TYPE_8723D &&
-	     rtwdev->hci.type == RTW_HCI_TYPE_USB) ||
-	    rtw_is_8723bs(rtwdev))
-		timeout = msecs_to_jiffies(2500);
+	if (rtwdev->hci.type == RTW_HCI_TYPE_PCIE)
+		timeout = RTW_TX_PROBE_TIMEOUT_SHORT;
+	else
+		timeout = RTW_TX_PROBE_TIMEOUT_LONG;
 
 	mod_timer(&tx_report->purge_timer, jiffies + timeout);
 }
diff --git a/drivers/net/wireless/realtek/rtw88/tx.h b/drivers/net/wireless/realtek/rtw88/tx.h
index d34cdeca16f1..168f48e87853 100644
--- a/drivers/net/wireless/realtek/rtw88/tx.h
+++ b/drivers/net/wireless/realtek/rtw88/tx.h
@@ -7,7 +7,8 @@
 
 #define RTK_TX_MAX_AGG_NUM_MASK		0x1f
 
-#define RTW_TX_PROBE_TIMEOUT		msecs_to_jiffies(500)
+#define RTW_TX_PROBE_TIMEOUT_SHORT	msecs_to_jiffies(500)
+#define RTW_TX_PROBE_TIMEOUT_LONG	msecs_to_jiffies(2500)
 
 struct rtw_tx_desc {
 	__le32 w0;

base-commit: 2f77c66694108785a1f6ae6c5de06453e7f7a91f
-- 
2.25.1

Re: [PATCH rtw-next] wifi: rtw88: TX report with long timeout for non-PCIE devices

[luka.gejak]

On Thu, 24 Sep 2026 08:46:37 +0800, Ping-Ke Shih <pkshih@realtek.com> wrote:

> 
> Many USB and SDIO devices can't report TX status within 500 ms, and
> extending to 2500 ms as tested USB/SDIO devices can fix the problem [1].
> To avoid adding chip ID one by one, and this change looks harmless.
> Keep PCIE using short timeout, and others use long timeout.
> 
> [1] https://lore.kernel.org/linux-wireless/20260921165343.8131-1-pepe.schlehofer@gmail.com/
> 
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
> ---
>  drivers/net/wireless/realtek/rtw88/tx.c | 10 +++++-----
>  drivers/net/wireless/realtek/rtw88/tx.h |  3 ++-
>  2 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c
> index 4e110a457e71..701ed7c4f3f7 100644
> --- a/drivers/net/wireless/realtek/rtw88/tx.c
> +++ b/drivers/net/wireless/realtek/rtw88/tx.c
> @@ -196,7 +196,7 @@ void rtw_tx_report_purge_timer(struct timer_list *t)
>  void rtw_tx_report_enqueue(struct rtw_dev *rtwdev, struct sk_buff *skb, u8 sn)
>  {
>  	struct rtw_tx_report *tx_report = &rtwdev->tx_report;
> -	unsigned long timeout = RTW_TX_PROBE_TIMEOUT;
> +	unsigned long timeout;
>  	unsigned long flags;
>  	u8 *drv_data;
>  
> @@ -208,10 +208,10 @@ void rtw_tx_report_enqueue(struct rtw_dev *rtwdev, struct sk_buff *skb, u8 sn)
>  	__skb_queue_tail(&tx_report->queue, skb);
>  	spin_unlock_irqrestore(&tx_report->q_lock, flags);
>  
> -	if ((rtwdev->chip->id == RTW_CHIP_TYPE_8723D &&
> -	     rtwdev->hci.type == RTW_HCI_TYPE_USB) ||
> -	    rtw_is_8723bs(rtwdev))
> -		timeout = msecs_to_jiffies(2500);
> +	if (rtwdev->hci.type == RTW_HCI_TYPE_PCIE)
> +		timeout = RTW_TX_PROBE_TIMEOUT_SHORT;
> +	else
> +		timeout = RTW_TX_PROBE_TIMEOUT_LONG;
>  
>  	mod_timer(&tx_report->purge_timer, jiffies + timeout);
>  }
> diff --git a/drivers/net/wireless/realtek/rtw88/tx.h b/drivers/net/wireless/realtek/rtw88/tx.h
> index d34cdeca16f1..168f48e87853 100644
> --- a/drivers/net/wireless/realtek/rtw88/tx.h
> +++ b/drivers/net/wireless/realtek/rtw88/tx.h
> @@ -7,7 +7,8 @@
>  
>  #define RTK_TX_MAX_AGG_NUM_MASK		0x1f
>  
> -#define RTW_TX_PROBE_TIMEOUT		msecs_to_jiffies(500)
> +#define RTW_TX_PROBE_TIMEOUT_SHORT	msecs_to_jiffies(500)
> +#define RTW_TX_PROBE_TIMEOUT_LONG	msecs_to_jiffies(2500)
>  
>  struct rtw_tx_desc {
>  	__le32 w0;
> 
> base-commit: 2f77c66694108785a1f6ae6c5de06453e7f7a91f
> -- 
> 2.25.1
> 
Hi Ping-Ke,

I support this change and have tested it on my rtl8723bs.

Reviewed-by: Luka Gejak <luka.gejak@linux.dev>

Best regards,
Luka Gejak

RE: [PATCH rtw-next] wifi: rtw88: TX report with long timeout for non-PCIE devices

[Ping-Ke Shih]

Ping-Ke Shih <pkshih@realtek.com> wrote:
> 
> Many USB and SDIO devices can't report TX status within 500 ms, and
> extending to 2500 ms as tested USB/SDIO devices can fix the problem [1].
> To avoid adding chip ID one by one, and this change looks harmless.
> Keep PCIE using short timeout, and others use long timeout.
> 
> [1] https://lore.kernel.org/linux-wireless/20260921165343.8131-1-pepe.schlehofer@gmail.com/
> 
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>

Pick Tested-by from [2].

Tested-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

and Cc stable by request. However, it'd be conflict with previous commits.
If so, I'll send a patch after this patch becomes mainland. 

Cc: stable@vger.kernel.org

[2] https://lore.kernel.org/linux-wireless/91FCAEB4-16A4-411A-A436-0803F89F3B7D@gmail.com/

Re: [PATCH rtw-next] wifi: rtw88: TX report with long timeout for non-PCIE devices

[Ping-Ke Shih]

Ping-Ke Shih <pkshih@realtek.com> wrote:

> Many USB and SDIO devices can't report TX status within 500 ms, and
> extending to 2500 ms as tested USB/SDIO devices can fix the problem [1].
> To avoid adding chip ID one by one, and this change looks harmless.
> Keep PCIE using short timeout, and others use long timeout.
> 
> [1] https://lore.kernel.org/linux-wireless/20260921165343.8131-1-pepe.schlehofer@gmail.com/
> 
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
> Reviewed-by: Luka Gejak <luka.gejak@linux.dev>
> Tested-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

1 patch(es) applied to rtw-next branch of rtw.git, thanks.

7cde94dab0e7 wifi: rtw88: TX report with long timeout for non-PCIE devices

---
https://github.com/pkshih/rtw.git