* [PATCH rtw-next v12 1/3] wifi: rtw88: download the beacon the reserved page was built with
2026-11-17 23:26 [PATCH rtw-next v12 0/3] wifi: rtw88: channel switch in AP mode Mehmet Fide
@ 2026-11-17 23:26 ` Mehmet Fide
2026-11-17 23:26 ` [PATCH rtw-next v12 2/3] wifi: rtw88: support channel switch in AP mode Mehmet Fide
2026-11-17 23:26 ` [PATCH rtw-next v12 3/3] wifi: rtw88: time the countdown downloads from the TBTT Mehmet Fide
2 siblings, 0 replies; 10+ messages in thread
From: Mehmet Fide @ 2026-11-17 23:26 UTC (permalink / raw)
To: Ping-Ke Shih
Cc: Luka Gejak, Bitterblue Smith, linux-wireless, linux-kernel,
mehmet.fide
From: Mehmet Fide <mehmet.fide@screeningeagle.com>
rtw_fw_download_rsvd_page() downloads the beacon twice: once as part of
the reserved page and once more on its own, so that the firmware ends up
with a TX descriptor that describes the beacon rather than the whole
page. The second download fetched a new beacon from mac80211 instead of
downloading the one the page already holds.
Besides the extra work, every beacon fetch advances the DTIM count and,
while a channel switch is announced, the CSA countdown; doing it twice
per update steps a countdown that starts at 2 past 1, which mac80211
reports as "beacon TX faster than countdown". Hand the beacon skb out of
the page build and download that. The hw scan, which downloads the
beacon without a page build, keeps fetching its own.
Without a channel switch nothing on the air depends on it: the hardware
writes the DTIM count of an AP beacon itself (BIT_TCR_UPDATE_TIMIE), so
this is not marked as a fix.
Signed-off-by: Mehmet Fide <mehmet.fide@screeningeagle.com>
Reviewed-by: Luka Gejak <luka.gejak@linux.dev>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
---
Notes:
Changes in v12:
- the commit message says why this is not marked as a fix and what
mac80211 reports for the double fetch (Sashiko); no code change, the
tags are kept
- rebased on patches 1-4 of the rtw88 firmware recovery fixes v3
Changes in v11:
- none, rebased on rtw-next
Changes in v10:
- none, rebased on rtw-next
Changes in v9:
- none
Changes in v8:
- none
Changes in v7:
- none, rebased on rtw-next
Changes in v6:
- none
Changes in v5:
- none
Changes in v4:
- none, rebased on rtw-next
Changes in v3:
- the beacon out-pointer is initialised in the caller
drivers/net/wireless/realtek/rtw88/fw.c | 34 +++++++++++++++----------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index aa2daf2d1820..e0f3e1adb13f 100644
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -1625,7 +1625,8 @@ static int __rtw_build_rsvd_page_from_vifs(struct rtw_dev *rtwdev)
return 0;
}
-static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev, u32 *size)
+static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev, u32 *size,
+ struct sk_buff **beacon)
{
const struct rtw_chip_info *chip = rtwdev->chip;
struct ieee80211_hw *hw = rtwdev->hw;
@@ -1705,13 +1706,15 @@ static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev, u32 *size)
list_for_each_entry(rsvd_pkt, &rtwdev->rsvd_page_list, build_list) {
rtw_rsvd_page_list_to_buf(rtwdev, page_size, page_margin,
page, buf, rsvd_pkt);
- if (page == 0)
+ if (page == 0) {
page += rtw_len_to_page(rsvd_pkt->skb->len +
tx_desc_sz, page_size);
- else
+ /* the caller downloads it once more on its own */
+ *beacon = rsvd_pkt->skb;
+ } else {
page += rtw_len_to_page(rsvd_pkt->skb->len, page_size);
-
- kfree_skb(rsvd_pkt->skb);
+ kfree_skb(rsvd_pkt->skb);
+ }
rsvd_pkt->skb = NULL;
}
@@ -1726,11 +1729,12 @@ static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev, u32 *size)
return NULL;
}
-static int rtw_download_beacon(struct rtw_dev *rtwdev)
+/* the beacon the page was built with, or a fresh one for the hw scan */
+static int rtw_download_beacon(struct rtw_dev *rtwdev, struct sk_buff *beacon)
{
struct ieee80211_hw *hw = rtwdev->hw;
struct rtw_rsvd_page *rsvd_pkt;
- struct sk_buff *skb;
+ struct sk_buff *skb = beacon;
int ret = 0;
rsvd_pkt = list_first_entry_or_null(&rtwdev->rsvd_page_list,
@@ -1747,7 +1751,8 @@ static int rtw_download_beacon(struct rtw_dev *rtwdev)
return -EINVAL;
}
- skb = rtw_get_rsvd_page_skb(hw, rsvd_pkt);
+ if (!skb)
+ skb = rtw_get_rsvd_page_skb(hw, rsvd_pkt);
if (!skb) {
rtw_err(rtwdev, "failed to get beacon skb\n");
return -ENOMEM;
@@ -1757,21 +1762,23 @@ static int rtw_download_beacon(struct rtw_dev *rtwdev)
if (ret)
rtw_err(rtwdev, "failed to download drv rsvd page\n");
- dev_kfree_skb(skb);
+ if (!beacon)
+ dev_kfree_skb(skb);
return ret;
}
int rtw_fw_download_rsvd_page(struct rtw_dev *rtwdev)
{
- u8 *buf;
+ struct sk_buff *beacon = NULL;
u32 size;
+ u8 *buf;
int ret;
if (bitmap_empty(rtwdev->hw_port, RTW_PORT_NUM))
return 0;
- buf = rtw_build_rsvd_page(rtwdev, &size);
+ buf = rtw_build_rsvd_page(rtwdev, &size, &beacon);
if (!buf) {
rtw_err(rtwdev, "failed to build rsvd page pkt\n");
return -ENOMEM;
@@ -1788,13 +1795,14 @@ int rtw_fw_download_rsvd_page(struct rtw_dev *rtwdev)
* the beacon again to replace the TX desc header, and we will get
* a correct tx_desc for the beacon in the rsvd page.
*/
- ret = rtw_download_beacon(rtwdev);
+ ret = rtw_download_beacon(rtwdev, beacon);
if (ret) {
rtw_err(rtwdev, "failed to download beacon\n");
goto free;
}
free:
+ dev_kfree_skb(beacon);
kfree(buf);
return ret;
@@ -2352,7 +2360,7 @@ int rtw_hw_scan_offload(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
rtw_fw_set_scan_offload(rtwdev, &cs_option, rtwvif, &chan_list);
out:
if (rtwdev->ap_active) {
- ret = rtw_download_beacon(rtwdev);
+ ret = rtw_download_beacon(rtwdev, NULL);
if (ret)
rtw_err(rtwdev, "HW scan download beacon failed\n");
}
--
2.56.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH rtw-next v12 2/3] wifi: rtw88: support channel switch in AP mode
2026-11-17 23:26 [PATCH rtw-next v12 0/3] wifi: rtw88: channel switch in AP mode Mehmet Fide
2026-11-17 23:26 ` [PATCH rtw-next v12 1/3] wifi: rtw88: download the beacon the reserved page was built with Mehmet Fide
@ 2026-11-17 23:26 ` Mehmet Fide
2026-11-18 7:55 ` Mehmet Fide
2026-11-18 8:19 ` Luka Gejak
2026-11-17 23:26 ` [PATCH rtw-next v12 3/3] wifi: rtw88: time the countdown downloads from the TBTT Mehmet Fide
2 siblings, 2 replies; 10+ messages in thread
From: Mehmet Fide @ 2026-11-17 23:26 UTC (permalink / raw)
To: Ping-Ke Shih
Cc: Luka Gejak, Bitterblue Smith, linux-wireless, linux-kernel,
mehmet.fide
From: Mehmet Fide <mehmet.fide@screeningeagle.com>
hostapd's CHAN_SWITCH is refused because the driver does not announce
channel switch support, so an rtw88 AP can only change its channel by
being torn down and started again.
Declare WIPHY_FLAG_HAS_CHANNEL_SWITCH and start the countdown when
BSS_CHANGED_BEACON brings a beacon with CSA: the firmware repeats the
beacon held in the first reserved page, so while a switch is announced
the page is downloaded again every beacon interval to advance the
countdown. The work steps the count with ieee80211_beacon_update_cntdwn()
and calls ieee80211_csa_finish() one beacon interval after the count of
1 was downloaded; a download that fails is repeated with the same count,
so the switch does not complete before its last count was handed to the
firmware. IBSS shares the page and the work.
The work is a delayed work of the device and csa_vif names the
interface, both under the driver mutex. The driver clears csa_vif, the
work never does: the countdown is cancelled when the AP stops, when the
interface goes away, on WoWLAN suspend and in rtw_core_stop(), and while
beaconing is disabled, as for an IBSS that is left or for an off-channel
period; it starts again when beaconing is enabled with the switch still
announced. It is not started while the device is stopped. The work
itself only stops, at the end of the countdown or once mac80211 has
taken the beacon away. The BSS_CHANGED_BEACON replay after a hardware
restart resumes the countdown, a failed download of the replay is
repeated before the next step, and the driver resumes the countdown
after a WoWLAN resume, which mac80211 follows with no replay.
While a switch is announced the beacon of the page is fetched as a
template, which leaves the count as it is, so a download for another
reason, the replay after a hardware restart or the page of the WoWLAN
firmware, carries the count as the work left it. The TIM update, the PG
backup and the download on association are left to the work during a
countdown, its next download carries their changes. An AP that stops
downloads the page once more if a station interface stays behind. A
scan is refused: it would take the AP off the channel its stations
count down to.
Signed-off-by: Mehmet Fide <mehmet.fide@screeningeagle.com>
---
drivers/net/wireless/realtek/rtw88/fw.c | 100 +++++++++++++++++-
drivers/net/wireless/realtek/rtw88/fw.h | 5 +
drivers/net/wireless/realtek/rtw88/mac80211.c | 55 ++++++++--
drivers/net/wireless/realtek/rtw88/main.c | 9 +-
drivers/net/wireless/realtek/rtw88/main.h | 6 ++
5 files changed, 164 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index e0f3e1adb13f..0910a9c7d7bc 100644
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -1232,6 +1232,7 @@ static struct sk_buff *rtw_get_rsvd_page_skb(struct ieee80211_hw *hw,
struct ieee80211_vif *vif;
struct rtw_vif *rtwvif;
struct sk_buff *skb_new;
+ struct ieee80211_mutable_offsets offs = {};
struct cfg80211_ssid *ssid;
u16 tim_offset = 0;
@@ -1252,7 +1253,15 @@ static struct sk_buff *rtw_get_rsvd_page_skb(struct ieee80211_hw *hw,
switch (rsvd_pkt->type) {
case RSVD_BEACON:
- skb_new = ieee80211_beacon_get_tim(hw, vif, &tim_offset, NULL, 0);
+ /* only the countdown work advances the count */
+ if (vif->bss_conf.csa_active) {
+ skb_new = ieee80211_beacon_get_template(hw, vif, &offs,
+ 0);
+ tim_offset = offs.tim_offset;
+ } else {
+ skb_new = ieee80211_beacon_get_tim(hw, vif, &tim_offset,
+ NULL, 0);
+ }
rsvd_pkt->tim_offset = tim_offset;
break;
case RSVD_PS_POLL:
@@ -1808,14 +1817,99 @@ int rtw_fw_download_rsvd_page(struct rtw_dev *rtwdev)
return ret;
}
+bool rtw_fw_csa_active(struct rtw_dev *rtwdev)
+{
+ lockdep_assert_held(&rtwdev->mutex);
+
+ return !!rtwdev->csa_vif;
+}
+
+/* paced from the first download: a late one does not delay the next */
+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;
+
+ 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)));
+}
+
+void rtw_fw_csa_start(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
+ bool retry)
+{
+ lockdep_assert_held(&rtwdev->mutex);
+
+ if (rtwdev->csa_vif == vif ||
+ !test_bit(RTW_FLAG_RUNNING, rtwdev->flags))
+ return;
+
+ 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);
+}
+
+void rtw_fw_csa_stop(struct rtw_dev *rtwdev, struct ieee80211_vif *vif)
+{
+ lockdep_assert_held(&rtwdev->mutex);
+
+ if (!vif || rtwdev->csa_vif != vif)
+ return;
+
+ rtwdev->csa_vif = NULL;
+ cancel_delayed_work(&rtwdev->csa_beacon_work);
+}
+
void rtw_fw_update_beacon_work(struct work_struct *work)
{
struct rtw_dev *rtwdev = container_of(work, struct rtw_dev,
update_beacon_work);
mutex_lock(&rtwdev->mutex);
- rtw_fw_download_rsvd_page(rtwdev);
- rtw_send_rsvd_page_h2c(rtwdev);
+
+ /* the countdown's next download carries the TIM */
+ if (!rtw_fw_csa_active(rtwdev)) {
+ rtw_fw_download_rsvd_page(rtwdev);
+ rtw_send_rsvd_page_h2c(rtwdev);
+ }
+
+ mutex_unlock(&rtwdev->mutex);
+}
+
+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;
+ u8 count;
+
+ mutex_lock(&rtwdev->mutex);
+
+ vif = rtwdev->csa_vif;
+ 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;
+ }
+
+ count = ieee80211_beacon_update_cntdwn(vif, 0);
+ if (!count)
+ goto out;
+ rtwdev->csa_count = count;
+ }
+
+ rtwdev->csa_retry = !!rtw_fw_download_rsvd_page(rtwdev);
+ if (!rtwdev->csa_retry)
+ rtw_send_rsvd_page_h2c(rtwdev);
+ rtw_fw_csa_queue(rtwdev, vif);
+
+out:
mutex_unlock(&rtwdev->mutex);
}
diff --git a/drivers/net/wireless/realtek/rtw88/fw.h b/drivers/net/wireless/realtek/rtw88/fw.h
index 48ad9ceab6ea..14bcddbd786d 100644
--- a/drivers/net/wireless/realtek/rtw88/fw.h
+++ b/drivers/net/wireless/realtek/rtw88/fw.h
@@ -863,7 +863,12 @@ void rtw_add_rsvd_page_pno(struct rtw_dev *rtwdev,
void rtw_add_rsvd_page_sta(struct rtw_dev *rtwdev,
struct rtw_vif *rtwvif);
int rtw_fw_download_rsvd_page(struct rtw_dev *rtwdev);
+bool rtw_fw_csa_active(struct rtw_dev *rtwdev);
+void rtw_fw_csa_start(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
+ bool retry);
+void rtw_fw_csa_stop(struct rtw_dev *rtwdev, struct ieee80211_vif *vif);
void rtw_fw_update_beacon_work(struct work_struct *work);
+void rtw_fw_csa_beacon_work(struct work_struct *work);
void rtw_send_rsvd_page_h2c(struct rtw_dev *rtwdev);
int rtw_dump_drv_rsvd_page(struct rtw_dev *rtwdev,
u32 offset, u32 size, u32 *buf);
diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
index ffd86f08185b..20969dd689df 100644
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -240,6 +240,10 @@ static void rtw_ops_remove_interface(struct ieee80211_hw *hw,
mutex_lock(&rtwdev->mutex);
+ rtw_fw_csa_stop(rtwdev, vif);
+ if (rtwdev->csa_wow_vif == vif)
+ rtwdev->csa_wow_vif = NULL;
+
rtw_leave_lps_deep(rtwdev);
rtw_txq_cleanup(rtwdev, vif->txq);
@@ -388,6 +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;
mutex_lock(&rtwdev->mutex);
@@ -398,8 +403,11 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,
if (vif->cfg.assoc) {
rtw_coex_connect_notify(rtwdev, COEX_ASSOCIATE_FINISH);
- rtw_fw_download_rsvd_page(rtwdev);
- rtw_send_rsvd_page_h2c(rtwdev);
+ /* a station associating while the AP counts down */
+ if (!rtw_fw_csa_active(rtwdev)) {
+ rtw_fw_download_rsvd_page(rtwdev);
+ rtw_send_rsvd_page_h2c(rtwdev);
+ }
rtw_fw_default_port(rtwdev, rtwvif);
rtw_coex_media_status_notify(rtwdev, vif->cfg.assoc);
if (rtw_bf_support)
@@ -439,8 +447,16 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,
if (changed & BSS_CHANGED_BEACON) {
rtw_set_dtim_period(rtwdev, conf->dtim_period);
- rtw_fw_download_rsvd_page(rtwdev);
+ 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.
+ */
+ if (conf->csa_active)
+ rtw_fw_csa_start(rtwdev, vif, !!ret);
+ else
+ rtw_fw_csa_stop(rtwdev, vif);
}
if (changed & BSS_CHANGED_BEACON_ENABLED) {
@@ -450,6 +466,10 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,
else
rtw_write32_clr(rtwdev, REG_FWHW_TXQ_CTRL,
BIT_EN_BCNQ_DL);
+ if (!conf->enable_beacon)
+ rtw_fw_csa_stop(rtwdev, vif);
+ else if (conf->csa_active)
+ rtw_fw_csa_start(rtwdev, vif, false);
}
if (changed & BSS_CHANGED_CQM)
rtw_fw_beacon_filter_config(rtwdev, true, vif);
@@ -493,11 +513,17 @@ static void rtw_ops_stop_ap(struct ieee80211_hw *hw,
struct rtw_dev *rtwdev = hw->priv;
mutex_lock(&rtwdev->mutex);
+ rtw_fw_csa_stop(rtwdev, vif);
rtw_write32_clr(rtwdev, REG_TCR, BIT_TCR_UPDATE_HGQMD);
rtw_write16(rtwdev, REG_ATIMWND, ATIMWND_DEFAULT);
rtwdev->ap_active = false;
- if (!rtw_core_check_sta_active(rtwdev))
+ if (!rtw_core_check_sta_active(rtwdev)) {
rtw_clear_op_chan(rtwdev);
+ } else {
+ /* what a countdown may have held back */
+ rtw_fw_download_rsvd_page(rtwdev);
+ rtw_send_rsvd_page_h2c(rtwdev);
+ }
mutex_unlock(&rtwdev->mutex);
}
@@ -629,7 +655,8 @@ static int rtw_ops_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
}
/* download new cam settings for PG to backup */
- if (rtw_get_lps_deep_mode(rtwdev) == LPS_DEEP_MODE_PG)
+ if (rtw_get_lps_deep_mode(rtwdev) == LPS_DEEP_MODE_PG &&
+ !rtw_fw_csa_active(rtwdev))
rtw_fw_download_rsvd_page(rtwdev);
out:
@@ -846,12 +873,16 @@ static int rtw_ops_suspend(struct ieee80211_hw *hw,
struct cfg80211_wowlan *wowlan)
{
struct rtw_dev *rtwdev = hw->priv;
+ struct ieee80211_vif *csa_vif;
int ret;
mutex_lock(&rtwdev->mutex);
+ csa_vif = rtwdev->csa_vif;
+ rtw_fw_csa_stop(rtwdev, csa_vif);
ret = rtw_wow_suspend(rtwdev, wowlan);
if (ret)
rtw_err(rtwdev, "failed to suspend for wow %d\n", ret);
+ rtwdev->csa_wow_vif = ret ? NULL : csa_vif;
mutex_unlock(&rtwdev->mutex);
return ret ? 1 : 0;
@@ -860,12 +891,18 @@ static int rtw_ops_suspend(struct ieee80211_hw *hw,
static int rtw_ops_resume(struct ieee80211_hw *hw)
{
struct rtw_dev *rtwdev = hw->priv;
+ struct ieee80211_vif *csa_vif;
int ret;
mutex_lock(&rtwdev->mutex);
ret = rtw_wow_resume(rtwdev);
if (ret)
rtw_err(rtwdev, "failed to resume for wow %d\n", ret);
+ csa_vif = rtwdev->csa_wow_vif;
+ rtwdev->csa_wow_vif = NULL;
+ if (!ret && csa_vif && csa_vif->bss_conf.csa_active &&
+ csa_vif->bss_conf.enable_beacon)
+ rtw_fw_csa_start(rtwdev, csa_vif, false);
mutex_unlock(&rtwdev->mutex);
return ret ? 1 : 0;
@@ -896,20 +933,24 @@ static int rtw_ops_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct rtw_dev *rtwdev = hw->priv;
int ret;
+ guard(mutex)(&rtwdev->mutex);
+
+ /* a scan takes the AP off the channel its stations count down to */
+ if (rtw_fw_csa_active(rtwdev))
+ return -EBUSY;
+
if (!rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_SCAN_OFFLOAD))
return 1;
if (test_bit(RTW_FLAG_SCANNING, rtwdev->flags))
return -EBUSY;
- mutex_lock(&rtwdev->mutex);
rtw_hw_scan_start(rtwdev, vif, req);
ret = rtw_hw_scan_offload(rtwdev, vif, true);
if (ret) {
rtw_hw_scan_abort(rtwdev);
rtw_err(rtwdev, "HW scan failed with status: %d\n", ret);
}
- mutex_unlock(&rtwdev->mutex);
return ret;
}
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index 48abf0daf402..38bf6100a0dd 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -1557,11 +1557,13 @@ void rtw_core_stop(struct rtw_dev *rtwdev)
clear_bit(RTW_FLAG_RUNNING, rtwdev->flags);
clear_bit(RTW_FLAG_FW_RUNNING, rtwdev->flags);
+ rtwdev->csa_vif = NULL;
mutex_unlock(&rtwdev->mutex);
cancel_work_sync(&rtwdev->c2h_work);
cancel_work_sync(&rtwdev->update_beacon_work);
+ cancel_delayed_work_sync(&rtwdev->csa_beacon_work);
cancel_delayed_work_sync(&rtwdev->watch_dog_work);
cancel_delayed_work_sync(&coex->bt_relink_work);
cancel_delayed_work_sync(&coex->bt_reenable_work);
@@ -1574,6 +1576,9 @@ void rtw_core_stop(struct rtw_dev *rtwdev)
mutex_lock(&rtwdev->mutex);
+ rtwdev->csa_vif = NULL;
+ cancel_delayed_work(&rtwdev->csa_beacon_work);
+
rtwdev->chip->ops->power_off(rtwdev);
}
@@ -2177,6 +2182,7 @@ int rtw_core_init(struct rtw_dev *rtwdev)
INIT_WORK(&rtwdev->ips_work, rtw_ips_work);
INIT_WORK(&rtwdev->fw_recovery_work, rtw_fw_recovery_work);
INIT_WORK(&rtwdev->update_beacon_work, rtw_fw_update_beacon_work);
+ INIT_DELAYED_WORK(&rtwdev->csa_beacon_work, rtw_fw_csa_beacon_work);
INIT_WORK(&rtwdev->ba_work, rtw_txq_ba_work);
skb_queue_head_init(&rtwdev->c2h_queue);
skb_queue_head_init(&rtwdev->coex.queue);
@@ -2297,7 +2303,8 @@ int rtw_register_hw(struct rtw_dev *rtwdev, struct ieee80211_hw *hw)
hw->wiphy->available_antennas_rx = hal->antenna_rx;
hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS |
- WIPHY_FLAG_TDLS_EXTERNAL_SETUP;
+ WIPHY_FLAG_TDLS_EXTERNAL_SETUP |
+ WIPHY_FLAG_HAS_CHANNEL_SWITCH;
hw->wiphy->features |= NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;
hw->wiphy->max_scan_ssids = RTW_SCAN_MAX_SSIDS;
diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 6034187ed29e..0444fd46028e 100644
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -2095,6 +2095,12 @@ struct rtw_dev {
struct work_struct ips_work;
struct work_struct fw_recovery_work;
struct work_struct update_beacon_work;
+ 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;
/* used to protect txqs list */
spinlock_t txq_lock;
--
2.56.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH rtw-next v12 3/3] wifi: rtw88: time the countdown downloads from the TBTT
2026-11-17 23:26 [PATCH rtw-next v12 0/3] wifi: rtw88: channel switch in AP mode Mehmet Fide
2026-11-17 23:26 ` [PATCH rtw-next v12 1/3] wifi: rtw88: download the beacon the reserved page was built with Mehmet Fide
2026-11-17 23:26 ` [PATCH rtw-next v12 2/3] wifi: rtw88: support channel switch in AP mode Mehmet Fide
@ 2026-11-17 23:26 ` Mehmet Fide
2 siblings, 0 replies; 10+ messages in thread
From: Mehmet Fide @ 2026-11-17 23:26 UTC (permalink / raw)
To: Ping-Ke Shih
Cc: Luka Gejak, Bitterblue Smith, linux-wireless, linux-kernel,
mehmet.fide
From: Mehmet Fide <mehmet.fide@screeningeagle.com>
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@screeningeagle.com>
---
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
^ permalink raw reply related [flat|nested] 10+ messages in thread