From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBADF39CCE0 for ; Tue, 13 Oct 2026 07:30:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791876621; cv=none; b=sk0XGRw1BKYITe31wXu0vYy5qRKl2bntFXRhuhj5z4IJUN2xxwFMYJdIv5NzHcqBrtkd3sCYrku/8zbtH39lrRslogZx4SlPauchq/Bdu153aQfGalbAf/7Xw7/UtKGt++Wi9oELWlLEF+1RNJkVVFuthVP1oQjgZqY8PxT+Ovk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791876621; c=relaxed/simple; bh=umYqJW6bQ+OgxJxwZ0SoTeuHK2qOMXmQZlxnOkbd1as=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nY3ZgM8Tc+QEfrFTQSL5tAyRifDrtPkjsCH4/UGXjQZbNbaLKhXXhZV36+BPuXLvnPu9XqvnIAqxcfo7V7BXBZzOc9OedIT3McJqTJJYN90/iGn4ZS74gooMvLNPPfPcG/hsbvxGkaHy8j23L1/FAwVtIwSAm5hSocWSTaHripc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=rxJOzqGy; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rxJOzqGy" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4a161d9b8c7so17912395e9.3 for ; Tue, 13 Oct 2026 00:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791876617; x=1792481417; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=GAaSmL36pbn+wiMORbVWa1k4WLRGqoIpdR7TsaVw+P4=; b=rxJOzqGyfzT4f+6sTu2yhb/ZDKZF8jemu9lJ72TZXwe5izKg+HsmudmTW1AZpdhFNV UysGPaKvLVr+o3WqRHyuEqqn3hB8PrIck2fxM5xJ/+KfEo6wG45ZgM+1gGLn1N0LTuLb 97UZOpBTgl+ympV3CUNz+ecENQXBvU5ZHI+jFhipd8mqBc0v6pb9i4OyfBIwmc/eefRH x3mdnI6sdUcgRFrj66US80nlKcijPbUXt1XC6aRJgnQeLBbfY+ZVP829tlp+F0d15LGb 7YSAHTQuak0G1mgc6cB7uwhzX1NqYm2nS5S7vvbcuU5Tb3bh+rFCYawbk7SKa8oi9M8q H22w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791876617; x=1792481417; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=GAaSmL36pbn+wiMORbVWa1k4WLRGqoIpdR7TsaVw+P4=; b=JORCjQnNN5o57a9EYEx+NWv2J751reTbpQKkxK/SCDy0B/QyKcVuLx/1Z7h734zEqD cWtUlgDgtwjR1HaCxPUCQ4laHBua3NHS1D4Gw6cjQMCIXEWFXx88WwUmEXXSe3sHk4l3 uZ106SK3VbdcZuQnigJST4RSQM5zdkmapBYHYD5qduZ4eS1ZPXWIzZnt9T7WFfdprFir pl+LUliwzKTrKLnxVviyfZanLM3u7ysYbVgZyBY9kmSbEemwCsjufcgq2fdIYcQmGBq9 tiq0TZU+1Ig4V+dNHoPBkH0hYc1yI3PsuSQzn0UP7y5nstWq4LMgZEO0s+XhIklTuGpr zNYA== X-Forwarded-Encrypted: i=1; AKwUvBxZDzXQEcPVT5JqMJjtDbgIVrKb99UeQxeeUiHICqKRY/R4bSszP4UJJqwVHbRwnhoxn/mwzhlMvILgw3Q=@vger.kernel.org X-Gm-Message-State: AFq9FYLq+ZFTRtjT8brXVAzsWrIl7fa457eqxHSb6lGXxhUWxoYc07xb Ia54FLKD1fnkyGbO01SpLNRH4fgxAogezGvgIYkyU3Kx3dEmYGSCCPJQ X-Gm-Gg: AYBFou0fJGXo9cCBPGlh/696gxMRgjPklSKzQGx1BXNTEiNOs/ZxsbZuFFQ4L4+qBsX tFMfzNLe3JRSQqeOaK1f08CUH52kxOJaz+P33Hp2+NC5GC49WmU5WlF7iBlVBsJleTAbJlv/I7q BYXe9Q8SSK1X6N1rIdokijnf2ozjpIWRWnjeihCjMkFw41AjWoR1WRZ3PTUKP2DZaBKsAuJbhx5 +bIXWLFGhZ9FHcvDX7SaRD23naw5uuyN0PhKPHP7JOd1xahWPjdgDv/oQYEi0nCYYRzIF1wlEmB XHnBro1poPLZmACVKB9XZAXMEiLt0CKmwGd4vQLTFzU7vHWTxfk/JTrgpW/hQ/c231dlRjPkxLq d9TYPSV8kS9CmfoUfY15YfTt/UHsi6LEZdDhE6DfybllTle38gN5l9hzb+QZIQJUnwCtyRYBCXW U5Dog8l9CUaKXkYxuJSnqJQtS+9UYZPFaSJbaNfpsaYm5T7CDRWtTrCYKoHg2W42EupyeStoTvZ z5y X-Received: by 2002:a05:600c:c0c6:b0:4a1:96cd:2f6b with SMTP id 5b1f17b1804b1-4a196cd31fbmr128258425e9.2.1791876616399; Tue, 13 Oct 2026 00:30:16 -0700 (PDT) Received: from deb05.proceq.com ([213.160.61.66]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a18bf3e044sm332839925e9.14.2026.10.13.00.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 00:30:15 -0700 (PDT) From: Mehmet Fide To: Ping-Ke Shih Cc: Bitterblue Smith , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, mehmet.fide@screeningeagle.com Subject: [PATCH rtw-next v6 2/2] wifi: rtw88: support channel switch in AP mode Date: Tue, 13 Oct 2026 09:30:10 +0200 Message-ID: <20261013073010.358756-3-mehmet.fide@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261013073010.358756-1-mehmet.fide@gmail.com> References: <20261013073010.358756-1-mehmet.fide@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mehmet Fide 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 implement channel_switch_beacon: 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, and ieee80211_csa_finish() is called once it completes. 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 countdown is cancelled when the AP stops, when the interface goes away, on WoWLAN suspend and in rtw_core_stop(); the BSS_CHANGED_BEACON replay after a hardware restart resumes it. The other page downloads during a countdown, the TIM update, the PG backup and the one on association, are skipped since every beacon fetch advances it; the next countdown download carries their changes. A scan is refused: it would take the AP off the channel its stations count down to. Signed-off-by: Mehmet Fide --- Notes: Changes in v6: - the countdown work is an ieee80211 delayed work under the driver mutex, csa_vif is driver state under the mutex; no wiphy lock in rtw88 (Ping-Ke) - rtw_core_stop() cancels the work and clears csa_vif, which covers the IPS path and the firmware recovery (Ping-Ke) - the downloads are paced from the first one with an absolute due time: queued after each download, the countdown drifted by about 10 ms per beacon interval on the ordered mac80211 workqueue, and a station switched ahead of the AP on a count of 50 - the BSS_CHANGED_BEACON path says why it starts the countdown (the replay after a hardware restart) and stops it when the beacon comes back without a switch announced (Ping-Ke) Changes in v5: - rtw_fw_csa_active/start/stop() assert the wiphy lock - hw_scan() takes the mutex with guard() - the ASSOC path says why it skips the download: the STA+AP combination Changes in v4: - the work and csa_vif live in rtw_dev; no lookup through the reserved page - the countdown is stopped before a firmware recovery restarts the hardware - a scan is refused while a switch is announced - one beacon fetch per interval during the countdown drivers/net/wireless/realtek/rtw88/fw.c | 81 ++++++++++++++++++- drivers/net/wireless/realtek/rtw88/fw.h | 4 + drivers/net/wireless/realtek/rtw88/mac80211.c | 39 +++++++-- drivers/net/wireless/realtek/rtw88/main.c | 6 +- drivers/net/wireless/realtek/rtw88/main.h | 3 + 5 files changed, 125 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c index 3cd17a3bb494..07412aacd7d9 100644 --- a/drivers/net/wireless/realtek/rtw88/fw.c +++ b/drivers/net/wireless/realtek/rtw88/fw.c @@ -1802,14 +1802,91 @@ 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) +{ + lockdep_assert_held(&rtwdev->mutex); + + if (rtwdev->csa_vif == vif) + return; + + rtwdev->csa_vif = vif; + 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); + + /* a fetch advances the countdown, the 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; + + mutex_lock(&rtwdev->mutex); + + vif = rtwdev->csa_vif; + if (!vif) + goto out; + + if (!vif->bss_conf.csa_active) { + rtwdev->csa_vif = NULL; + goto out; + } + + if (!ieee80211_beacon_cntdwn_is_complete(vif, 0)) { + rtw_fw_download_rsvd_page(rtwdev); + rtw_send_rsvd_page_h2c(rtwdev); + rtw_fw_csa_queue(rtwdev, vif); + } else { + rtwdev->csa_vif = NULL; + ieee80211_csa_finish(vif, 0); + } + +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..d8e58e4ed836 100644 --- a/drivers/net/wireless/realtek/rtw88/fw.h +++ b/drivers/net/wireless/realtek/rtw88/fw.h @@ -863,7 +863,11 @@ 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); +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 2a9b09fa76e7..182aecc76820 100644 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c @@ -237,6 +237,8 @@ static void rtw_ops_remove_interface(struct ieee80211_hw *hw, mutex_lock(&rtwdev->mutex); + rtw_fw_csa_stop(rtwdev, vif); + rtw_leave_lps_deep(rtwdev); rtw_txq_cleanup(rtwdev, vif->txq); @@ -395,8 +397,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) @@ -438,6 +443,11 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, rtw_set_dtim_period(rtwdev, conf->dtim_period); rtw_fw_download_rsvd_page(rtwdev); rtw_send_rsvd_page_h2c(rtwdev); + /* restart replay resumes it, a beacon without CSA ends it */ + if (conf->csa_active) + rtw_fw_csa_start(rtwdev, vif); + else + rtw_fw_csa_stop(rtwdev, vif); } if (changed & BSS_CHANGED_BEACON_ENABLED) { @@ -490,6 +500,7 @@ 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; @@ -556,6 +567,17 @@ static int rtw_ops_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, return 0; } +static void rtw_ops_channel_switch_beacon(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct cfg80211_chan_def *chandef) +{ + struct rtw_dev *rtwdev = hw->priv; + + mutex_lock(&rtwdev->mutex); + rtw_fw_csa_start(rtwdev, vif); + mutex_unlock(&rtwdev->mutex); +} + static int rtw_ops_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, struct ieee80211_vif *vif, struct ieee80211_sta *sta, struct ieee80211_key_conf *key) @@ -626,7 +648,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,6 +869,7 @@ static int rtw_ops_suspend(struct ieee80211_hw *hw, int ret; mutex_lock(&rtwdev->mutex); + rtw_fw_csa_stop(rtwdev, rtwdev->csa_vif); ret = rtw_wow_suspend(rtwdev, wowlan); if (ret) rtw_err(rtwdev, "failed to suspend for wow %d\n", ret); @@ -893,20 +917,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; } @@ -973,6 +1001,7 @@ const struct ieee80211_ops rtw_ops = { .sta_add = rtw_ops_sta_add, .sta_remove = rtw_ops_sta_remove, .set_tim = rtw_ops_set_tim, + .channel_switch_beacon = rtw_ops_channel_switch_beacon, .set_key = rtw_ops_set_key, .ampdu_action = rtw_ops_ampdu_action, .can_aggregate_in_amsdu = rtw_ops_can_aggregate_in_amsdu, diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index 0f23498b5c96..48e8cad221b9 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1550,11 +1550,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); @@ -2170,6 +2172,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); @@ -2293,7 +2296,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 d59f6e323adf..bc3ebfec11ae 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -2094,6 +2094,9 @@ 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; + ktime_t csa_due; /* used to protect txqs list */ spinlock_t txq_lock; -- 2.55.0