* [PATCH rtw-next v14 1/3] wifi: rtw88: download the beacon the reserved page was built with
2026-11-21 19:36 [PATCH rtw-next v14 0/3] wifi: rtw88: channel switch in AP mode Mehmet Fide
@ 2026-11-21 19:36 ` Mehmet Fide
2026-11-21 19:36 ` [PATCH rtw-next v14 2/3] wifi: rtw88: support channel switch in AP mode Mehmet Fide
2026-11-21 19:36 ` [PATCH rtw-next v14 3/3] wifi: rtw88: time the countdown downloads from the TBTT Mehmet Fide
2 siblings, 0 replies; 4+ messages in thread
From: Mehmet Fide @ 2026-11-21 19:36 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: as part of the
reserved page, and again on its own so that the firmware gets a TX
descriptor for the beacon instead of the whole page. The second
download fetches a new beacon from mac80211 instead of the one in the
page.
Each fetch advances the DTIM count and, during a channel switch, the
CSA countdown. Two fetches per update step a countdown of 2 past 1,
and mac80211 warns "beacon TX faster than countdown". Keep the beacon
from the page build and download that one. The hw scan, which downloads
the beacon without a page build, still fetches its own.
The hardware writes the DTIM count of an AP beacon itself
(BIT_TCR_UPDATE_TIMIE), so nothing on the air changes without a channel
switch, and 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 v14:
- dropped two comments that repeated the commit message, reworded
the commit message; rebased on the rtw88 firmware recovery fixes v4
Changes in v13:
- none, rebased on rtw-next
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 | 32 +++++++++++++++----------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index 09b5836540c4..4575073d0149 100644
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -1622,7 +1622,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;
@@ -1702,13 +1703,14 @@ 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
+ *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;
}
@@ -1723,11 +1725,11 @@ static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev, u32 *size)
return NULL;
}
-static int rtw_download_beacon(struct rtw_dev *rtwdev)
+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,
@@ -1744,7 +1746,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;
@@ -1754,18 +1757,20 @@ 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;
- 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;
@@ -1782,13 +1787,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;
@@ -2346,7 +2352,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 [flat|nested] 4+ messages in thread* [PATCH rtw-next v14 2/3] wifi: rtw88: support channel switch in AP mode
2026-11-21 19:36 [PATCH rtw-next v14 0/3] wifi: rtw88: channel switch in AP mode Mehmet Fide
2026-11-21 19:36 ` [PATCH rtw-next v14 1/3] wifi: rtw88: download the beacon the reserved page was built with Mehmet Fide
@ 2026-11-21 19:36 ` Mehmet Fide
2026-11-21 19:36 ` [PATCH rtw-next v14 3/3] wifi: rtw88: time the countdown downloads from the TBTT Mehmet Fide
2 siblings, 0 replies; 4+ messages in thread
From: Mehmet Fide @ 2026-11-21 19:36 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 driver does not set WIPHY_FLAG_HAS_CHANNEL_SWITCH, so hostapd's
CHAN_SWITCH is refused and an rtw88 AP can only change its channel by
restarting.
The firmware repeats the beacon of the first reserved page, so the
driver has to step the countdown. Set the flag, and when
BSS_CHANGED_BEACON brings a beacon with CSA, start a delayed work that
advances the count with ieee80211_beacon_update_cntdwn() and downloads
the page once per beacon interval. It calls ieee80211_csa_finish() one
interval after the count of 1 was downloaded, and repeats a failed
download with the same count. IBSS uses the same page and work.
The countdown stops when the AP stops, the interface is removed,
beaconing is disabled, on WoWLAN suspend and in rtw_core_stop(). It
starts again when beaconing is enabled, when a hardware restart replays
the beacon, and after a WoWLAN resume. csa_vif and the work are under
the driver mutex, and only the stop paths clear csa_vif.
During a countdown the page beacon is fetched with
ieee80211_beacon_get_template(), which leaves the count alone, so any
other download carries the current count. The TIM update, the PG backup
and the download on association are left to the next step. An AP that
stops with a station interface left downloads the page once more.
Scans are refused, as they would take the AP off its channel.
Signed-off-by: Mehmet Fide <mehmet.fide@screeningeagle.com>
---
drivers/net/wireless/realtek/rtw88/fw.c | 97 ++++++++++++++++++-
drivers/net/wireless/realtek/rtw88/fw.h | 5 +
drivers/net/wireless/realtek/rtw88/mac80211.c | 48 +++++++--
drivers/net/wireless/realtek/rtw88/main.c | 9 +-
drivers/net/wireless/realtek/rtw88/main.h | 6 ++
5 files changed, 154 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index 4575073d0149..059fe04014de 100644
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -1226,6 +1226,7 @@ static struct sk_buff *rtw_lps_pg_info_get(struct ieee80211_hw *hw)
static struct sk_buff *rtw_get_rsvd_page_skb(struct ieee80211_hw *hw,
struct rtw_rsvd_page *rsvd_pkt)
{
+ struct ieee80211_mutable_offsets offs = {};
struct ieee80211_vif *vif;
struct rtw_vif *rtwvif;
struct sk_buff *skb_new;
@@ -1249,7 +1250,14 @@ 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);
+ 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:
@@ -1800,14 +1808,97 @@ 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;
+}
+
+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);
+
+ 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 b14d7fffb98f..5b6aaa41bac8 100644
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -246,6 +246,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);
@@ -394,6 +398,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);
@@ -404,8 +409,10 @@ 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);
+ 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)
@@ -450,8 +457,12 @@ 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);
+ if (conf->csa_active)
+ rtw_fw_csa_start(rtwdev, vif, !!ret);
+ else
+ rtw_fw_csa_stop(rtwdev, vif);
}
if (changed & BSS_CHANGED_BEACON_ENABLED) {
@@ -461,6 +472,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, rtwdev->csa_retry);
}
if (changed & BSS_CHANGED_CQM)
rtw_fw_beacon_filter_config(rtwdev, true, vif);
@@ -504,11 +519,16 @@ 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 {
+ rtw_fw_download_rsvd_page(rtwdev);
+ rtw_send_rsvd_page_h2c(rtwdev);
+ }
mutex_unlock(&rtwdev->mutex);
}
@@ -640,7 +660,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:
@@ -857,12 +878,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;
@@ -871,12 +896,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;
@@ -907,20 +938,23 @@ 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);
+
+ 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 98a7741ccd0a..c98d4d6b9382 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -1556,11 +1556,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);
@@ -1573,6 +1575,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);
}
@@ -2176,6 +2181,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);
@@ -2296,7 +2302,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 2830a5a57d61..3db76133d7ab 100644
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -2096,6 +2096,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 [flat|nested] 4+ messages in thread* [PATCH rtw-next v14 3/3] wifi: rtw88: time the countdown downloads from the TBTT
2026-11-21 19:36 [PATCH rtw-next v14 0/3] wifi: rtw88: channel switch in AP mode Mehmet Fide
2026-11-21 19:36 ` [PATCH rtw-next v14 1/3] wifi: rtw88: download the beacon the reserved page was built with Mehmet Fide
2026-11-21 19:36 ` [PATCH rtw-next v14 2/3] wifi: rtw88: support channel switch in AP mode Mehmet Fide
@ 2026-11-21 19:36 ` Mehmet Fide
2 siblings, 0 replies; 4+ messages in thread
From: Mehmet Fide @ 2026-11-21 19:36 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 steps run one beacon interval apart with no relation to
the TBTT, and 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 also kept the next beacon out, so with a count of 2 no CSA
beacon went out.
Read the TSF and queue each step min(10 ms, interval / 4), but at least
5 ms, after the first TBTT that is at least min(10 ms, interval / 4)
away. A step that runs less than 5 ms after a TBTT, or less than that
margin before one, waits until after the TBTT. The first count is now
downloaded by the work too, not when mac80211 changes the beacon, so
the first CSA beacon carries the count after the first step, as with
drivers that fetch every beacon with ieee80211_beacon_get(). The replay
after a hardware restart still downloads at once.
A late download delays the switch by a beacon interval instead of
taking a count off the air; stations that took the switch time from an
earlier count then switch up to that interval before the AP. At short
intervals a USB download, 6 to 17 ms, can run past the next TBTT, and
the USB chips then send a count more than once.
The USB chips raise no TBTT interrupt, hence the TSF read. The beaconing
interface is always on port 0: rtw_core_port_switch() moves an AP
there, and an IBSS runs alone.
Signed-off-by: Mehmet Fide <mehmet.fide@screeningeagle.com>
---
drivers/net/wireless/realtek/rtw88/fw.c | 75 ++++++++++++++++---
drivers/net/wireless/realtek/rtw88/mac80211.c | 8 +-
drivers/net/wireless/realtek/rtw88/main.h | 1 -
drivers/net/wireless/realtek/rtw88/reg.h | 1 +
4 files changed, 71 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index 059fe04014de..47f99e0b4a50 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"
@@ -1815,15 +1816,60 @@ bool rtw_fw_csa_active(struct rtw_dev *rtwdev)
return !!rtwdev->csa_vif;
}
+#define RTW_CSA_TBTT_MARGIN_US 10000
+#define RTW_CSA_TBTT_AFTER_US 5000
+
+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;
+}
+
+static u32 rtw_fw_csa_margin(u32 interval)
+{
+ return min_t(u32, RTW_CSA_TBTT_MARGIN_US, interval / 4);
+}
+
+static u32 rtw_fw_csa_after(u32 interval)
+{
+ return max_t(u32, rtw_fw_csa_margin(interval), RTW_CSA_TBTT_AFTER_US);
+}
+
+static u32 rtw_fw_csa_hold(struct rtw_dev *rtwdev, u32 interval)
+{
+ u32 rem;
+
+ div_u64_rem(rtw_fw_read_tsf(rtwdev), interval, &rem);
+ if (rem < RTW_CSA_TBTT_AFTER_US)
+ return rtw_fw_csa_after(interval) - rem;
+ if (interval - rem < rtw_fw_csa_margin(interval))
+ return interval - rem + rtw_fw_csa_after(interval);
+
+ return 0;
+}
+
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_fw_csa_margin(interval))
+ delay += interval;
+ delay += rtw_fw_csa_after(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));
}
void rtw_fw_csa_start(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
@@ -1838,7 +1884,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);
}
@@ -1873,6 +1918,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);
@@ -1881,12 +1927,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 5b6aaa41bac8..46636b190dc3 100644
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -398,7 +398,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);
@@ -457,8 +457,10 @@ 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);
+ if (!conf->csa_active || changed & BSS_CHANGED_BEACON_ENABLED) {
+ ret = rtw_fw_download_rsvd_page(rtwdev);
+ rtw_send_rsvd_page_h2c(rtwdev);
+ }
if (conf->csa_active)
rtw_fw_csa_start(rtwdev, vif, !!ret);
else
diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 3db76133d7ab..b369a299bc3f 100644
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -2099,7 +2099,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 877b82640e91..3a2255422d78 100644
--- a/drivers/net/wireless/realtek/rtw88/reg.h
+++ b/drivers/net/wireless/realtek/rtw88/reg.h
@@ -507,6 +507,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 [flat|nested] 4+ messages in thread