From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794049264; b=nJIqR75Uug7mDhI5CcagjDfDIId7PndLs4lMWkTHOYfoyu7x7Y3wB8bztCkMhbnut3TY zj9RpzxYZ0rMcQZyFmAHpwnI1O6NaWnh6uIWStGbBa/ARUR1A/vaGPZ46QFWBCaVcvHI+ /WA1kRQblvfqgDpz7YnSJBIJh+PsTck8ldWJqekMycKP8aKSnUKF7i/B2LCVAvRs4ShSy jaYda5wxZOa3PASMomYw9Ca0jOVDykV1y29FdHOn+vp3ldQTTfhm4ntOtW+HIAfgtRgBq xOST8WNsNO/jjlMLNvQ/APJGsvvZcAmK+IBPGTO6ZQKhJz4Y5ylPLNU/ysltqtQNKUg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794049264; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=EbwejzzLnYiPGq3Jib/oWkApcl1o6ibomRNfH7AskTg=; b=x4sC5rRcoi9TrQMMAMXdo34MsXk8a1s2f6G/0bu7pLA3w3gnlCAPc3/rLZum16pN5aNj ySKT41izy5bzFR8lp+ZbArOUsbofWuhuAPs1nHIeovF9WKj/YmUENYlTNQuYN+/qfNQd1 uCkE883wLYXMFBq15rf+DP0Tt+plExlf6CF0StV5bOyahal6JVF0TP7M+1bFPUJA+Uzbs mk/qlr+7l4u0AUse94LbLF467PGt+CaFuRqCJCz3LqFBH/DzG1h8VLOpwJpJkhDSVnJjq pUlu6YyTZCHJZGisTndGODrP23mu8MPO16o9xtQB0psFOtrlBxxPkjxh3qOjSiXWu8g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b="c810/3tj"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84FB5606A326 for ; Sat, 7 Nov 2026 11:01:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=c810/3tj Received: by smtp.kernel.org (Postfix) with ESMTPSA id DAB981F0089F; Sat, 7 Nov 2026 11:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794049264; bh=EbwejzzLnYiPGq3Jib/oWkApcl1o6ibomRNfH7AskTg=; h=From:To:Cc:Subject:Date; b=c810/3tjFlYGglpGYwaVGh7YPOaRIt8OHIiWChuGYl666MzoUlMSnNaZtPxoHD4mX Gl+MQDPVVOMQDm3TowB7R0TJJhXXS9yzLjGRcQ1TG2a7Ifm1R5wR8jONMMvURW1b8x /HZwCA3i8RQwN04x5viW0dedBgvQC6XEQbgsB1GIqz+t40jSHnJcZM1kVrptCmLW9a pxGWfXpeoaa8UAAR5xvh4CU6NQ4bHW1oHpSDRxv3WsoI3jj+vsArq71wuCaTSmofD9 WpnsQMOxhA+6KPPROaTyicO92/SWuMkLaUqXGkE4xq07ksJMXIeQI8m1GsQEXvWNT0 3RKl2E7AhR+ZQ== From: Sasha Levin To: pkshih@realtek.com, luka.gejak@linux.dev, pepe.schlehofer@gmail.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] wifi: rtw88: TX report with long timeout for non-PCIE devices" failed to apply to 5.15-stable tree Date: Sat, 7 Nov 2026 06:01:02 -0500 Message-ID: <20261107060102-failed-5.15-7cde94dab0e7@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 7cde94dab0e74434ccc0a387d7ad373fb3becda0 # git commit -s git send-email --to '' --in-reply-to '20261107060102-failed-5.15-7cde94dab0e7@kernel.org' --subject-prefix 'PATCH 5.15.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 7cde94dab0e74434ccc0a387d7ad373fb3becda0 Mon Sep 17 00:00:00 2001 From: Ping-Ke Shih Date: Thu, 24 Sep 2026 08:46:37 +0800 Subject: [PATCH] wifi: rtw88: TX report with long timeout for non-PCIE devices 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/ Cc: stable@vger.kernel.org Signed-off-by: Ping-Ke Shih Reviewed-by: Luka Gejak Tested-by: Josef Schlehofer Link: https://patch.msgid.link/20260924004637.9958-1-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 4e110a457e71d..701ed7c4f3f75 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 d34cdeca16f19..168f48e87853d 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; -- 2.53.0