[PATCH rtw-next v12 3/3] wifi: rtw88: time the countdown downloads from the TBTT
From: Mehmet Fide
Date: Tue Nov 17 2026 - 18:26:38 EST
From: Mehmet Fide <mehmet.fide@xxxxxxxxxxxxxxxxxx>
The countdown downloads are queued one beacon interval apart, with no
relation to the TBTT. A download that runs late past the next TBTT
leaves a count out of the air.
Read the TSF after each download and queue the next step 10 ms after the
first TBTT that is at least 10 ms away. Every count that was downloaded,
the first one too, then has a TBTT to go out at; a download that runs
late delays the switch by a beacon interval instead of taking a count
off the air, and stations that took the time of the switch from an
earlier count then switch up to that interval before the AP. As with a
driver that fetches each beacon with ieee80211_beacon_get(), the first
CSA beacon carries the count after the first step.
The first count is downloaded the same way, not when mac80211 changes
the beacon: a download close to a TBTT keeps beacons off the air. On an
RTL8821CU and an RTL8822CU a TBTT during the download sent no beacon or
the old one. On an RTL8822CE a TBTT up to about 100 us before the
download sent none and the next beacon stayed out too, and with a count
of 2 no CSA beacon went out. A step, the one that finishes the switch
too, that would run less than 5 ms after a TBTT or less than 10 ms
before one waits until 10 ms after that TBTT instead; with a beacon
interval of 20 ms or less there is no room for that and the steps are
not held. The switch completes up to one beacon interval later. The
replay after a hardware restart still downloads at once.
The USB chips raise no TBTT interrupt, so the TSF register is read. The
beaconing interface is always on port 0: rtw_core_port_switch() moves
an AP there, an IBSS runs alone.
Signed-off-by: Mehmet Fide <mehmet.fide@xxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/realtek/rtw88/fw.c | 70 ++++++++++++++++---
drivers/net/wireless/realtek/rtw88/mac80211.c | 9 ++-
drivers/net/wireless/realtek/rtw88/main.h | 1 -
drivers/net/wireless/realtek/rtw88/reg.h | 1 +
4 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index 0910a9c7d7bc..755c35747559 100644
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -3,6 +3,7 @@
*/
#include <linux/iopoll.h>
+#include <linux/math64.h>
#include "main.h"
#include "coex.h"
@@ -1824,16 +1825,54 @@ bool rtw_fw_csa_active(struct rtw_dev *rtwdev)
return !!rtwdev->csa_vif;
}
-/* paced from the first download: a late one does not delay the next */
+#define RTW_CSA_TBTT_MARGIN_US 10000
+
+static u64 rtw_fw_read_tsf(struct rtw_dev *rtwdev)
+{
+ u32 hi, lo, tmp;
+
+ hi = rtw_read32(rtwdev, REG_TSFTR + 4);
+ lo = rtw_read32(rtwdev, REG_TSFTR);
+ tmp = rtw_read32(rtwdev, REG_TSFTR + 4);
+ if (tmp != hi) {
+ hi = tmp;
+ lo = rtw_read32(rtwdev, REG_TSFTR);
+ }
+
+ return ((u64)hi << 32) | lo;
+}
+
+/* how long to wait so that a step does not run next to a TBTT */
+static u32 rtw_fw_csa_hold(struct rtw_dev *rtwdev, u32 interval)
+{
+ u32 rem;
+
+ if (interval <= 2 * RTW_CSA_TBTT_MARGIN_US)
+ return 0;
+
+ div_u64_rem(rtw_fw_read_tsf(rtwdev), interval, &rem);
+ if (rem < RTW_CSA_TBTT_MARGIN_US / 2)
+ return RTW_CSA_TBTT_MARGIN_US - rem;
+ if (interval - rem < RTW_CSA_TBTT_MARGIN_US)
+ return interval - rem + RTW_CSA_TBTT_MARGIN_US;
+
+ return 0;
+}
+
+/* after the first TBTT that can send what was downloaded last */
static void rtw_fw_csa_queue(struct rtw_dev *rtwdev, struct ieee80211_vif *vif)
{
u32 interval = ieee80211_tu_to_usec(vif->bss_conf.beacon_int);
- s64 delay;
+ u32 delay, rem;
+
+ div_u64_rem(rtw_fw_read_tsf(rtwdev), interval, &rem);
+ delay = interval - rem;
+ if (delay < RTW_CSA_TBTT_MARGIN_US)
+ delay += interval;
- rtwdev->csa_due = ktime_add_us(rtwdev->csa_due, interval);
- delay = ktime_us_delta(rtwdev->csa_due, ktime_get());
ieee80211_queue_delayed_work(rtwdev->hw, &rtwdev->csa_beacon_work,
- usecs_to_jiffies(max(delay, 0)));
+ usecs_to_jiffies(delay +
+ RTW_CSA_TBTT_MARGIN_US));
}
void rtw_fw_csa_start(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
@@ -1848,7 +1887,6 @@ void rtw_fw_csa_start(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
rtwdev->csa_vif = vif;
rtwdev->csa_retry = retry;
rtwdev->csa_count = ieee80211_beacon_cntdwn_is_complete(vif, 0) ? 1 : 0;
- rtwdev->csa_due = ktime_get();
rtw_fw_csa_queue(rtwdev, vif);
}
@@ -1884,6 +1922,7 @@ void rtw_fw_csa_beacon_work(struct work_struct *work)
struct rtw_dev *rtwdev = container_of(work, struct rtw_dev,
csa_beacon_work.work);
struct ieee80211_vif *vif;
+ u32 hold;
u8 count;
mutex_lock(&rtwdev->mutex);
@@ -1892,12 +1931,21 @@ void rtw_fw_csa_beacon_work(struct work_struct *work)
if (!vif || !vif->bss_conf.csa_active)
goto out;
- if (!rtwdev->csa_retry) {
- if (rtwdev->csa_count == 1) {
- ieee80211_csa_finish(vif, 0);
- goto out;
- }
+ hold = rtw_fw_csa_hold(rtwdev,
+ ieee80211_tu_to_usec(vif->bss_conf.beacon_int));
+ if (hold) {
+ ieee80211_queue_delayed_work(rtwdev->hw,
+ &rtwdev->csa_beacon_work,
+ usecs_to_jiffies(hold));
+ goto out;
+ }
+
+ if (!rtwdev->csa_retry && rtwdev->csa_count == 1) {
+ ieee80211_csa_finish(vif, 0);
+ goto out;
+ }
+ if (!rtwdev->csa_retry) {
count = ieee80211_beacon_update_cntdwn(vif, 0);
if (!count)
goto out;
diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
index 20969dd689df..b918e7041abe 100644
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -392,7 +392,7 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,
struct rtw_coex *coex = &rtwdev->coex;
struct rtw_coex_stat *coex_stat = &coex->stat;
u32 config = 0;
- int ret;
+ int ret = 0;
mutex_lock(&rtwdev->mutex);
@@ -447,8 +447,11 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,
if (changed & BSS_CHANGED_BEACON) {
rtw_set_dtim_period(rtwdev, conf->dtim_period);
- ret = rtw_fw_download_rsvd_page(rtwdev);
- rtw_send_rsvd_page_h2c(rtwdev);
+ /* the countdown downloads its beacons after a TBTT */
+ if (!conf->csa_active || changed & BSS_CHANGED_BEACON_ENABLED) {
+ ret = rtw_fw_download_rsvd_page(rtwdev);
+ rtw_send_rsvd_page_h2c(rtwdev);
+ }
/*
* A beacon with CSA starts the countdown, also when a restart
* replays it. A beacon without CSA ends it.
diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 0444fd46028e..dc3f6d05ac44 100644
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -2098,7 +2098,6 @@ struct rtw_dev {
struct delayed_work csa_beacon_work;
struct ieee80211_vif *csa_vif;
struct ieee80211_vif *csa_wow_vif;
- ktime_t csa_due;
u8 csa_count;
bool csa_retry;
diff --git a/drivers/net/wireless/realtek/rtw88/reg.h b/drivers/net/wireless/realtek/rtw88/reg.h
index afcdb66fdb9a..3ff4ae0885ef 100644
--- a/drivers/net/wireless/realtek/rtw88/reg.h
+++ b/drivers/net/wireless/realtek/rtw88/reg.h
@@ -506,6 +506,7 @@
#define REG_USTIME_TSF 0x055C
#define REG_BCN_MAX_ERR 0x055D
#define REG_RXTSF_OFFSET_CCK 0x055E
+#define REG_TSFTR 0x0560
#define REG_MISC_CTRL 0x0577
#define BIT_EN_FREE_CNT BIT(3)
#define BIT_DIS_SECOND_CCA (BIT(0) | BIT(1))
--
2.56.0