From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.44 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794957990; b=rlggLEtEqs34y3odAYHk12D2WjZ7+qarl5OXwpvCDCTzA/kZAYo17PnHUJ//F7VjQ5sB W630n4l0UZNCQOSEDPl/h3xn5o1g/uVZgA9JXhNCkllMyzMIH+9paGSqTRPcNgm/2INMl tlS2twjvvqGJSGCtKQbyH5ypsWOWQz+TFniVnHxix7yhzJqujQ3rodneiroIr80ZeuJKW UzJN0lSYcHqyTTCKgY/ux6al03+/fXau6jFCrKZ+UR6vvyCIRAnFd2Qulf5yoAtqXJ2l6 oDFSC7Wm4oKRLX8j60xe1up9BSW/rb1U2hetWMcU8tXuj8lRQ5a1rkxo0YyQd6i3ueQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794957990; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=CpVv0fCc2FhBmOvGcDrk/ZVJ+VZJ8XQOFf0q1428W0s=; b=sy0Bgmerm0WN39byh8Yqq75JuJJXQlphkLE4UR1lEYe3PY0e9zGb2v+bt+hqid8C6L/M NvXA+wAdIMbZyCDKV9zvlzor5P5itqgOmTqHiMT8t5ZEGjMvGfh0ztAItdBp6Su33pCn9 Kl0mtkyBIco+Zd2URRHT545S4Rr++KoEXLNtiaoW8aUC0S2QR1SHvy47xmYeJyHU+80nV GEgmbFpZ/Ds6/1C/PcWWRNeIQavjpcfUsRHUnTqML2Xcgnep5Vt/eMPkwuCOua/tMueRJ gGyK/d9HHmtpAuZXnyiN4btYCTanyzRz60mZktDudeon64XpIrQrSMMgP21T9fPaZng== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=jKBVPDRa; arc=none smtp.remote-ip=209.85.128.44 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6AC6606A334 for ; Tue, 17 Nov 2026 23:26:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A6AC6606A334 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.a=rsa-sha256 header.s=20260707 header.b=jKBVPDRa Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4a210470b49so3146025e9.2 for ; Tue, 17 Nov 2026 15:26:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794957988; x=1795562788; 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=CpVv0fCc2FhBmOvGcDrk/ZVJ+VZJ8XQOFf0q1428W0s=; b=jKBVPDRacLX/gTwfuGojXITILndBx/xsRsg3BWtgJyEJGrsc6H1YX4zIhREDJpeYTM BKbll1LN1t+4mzjqWL6cJ6hg5IKV23aIoqpMEdp9WP+6EnggD11Q6s99lO+9zvskgsdI WwVfjxf3OXN2ApX0f4qAXrOVLkIgN/cp8MZ62dTDxWrcZl0M2Zn4bpRjKZemUBkBoQCK bBCkMkeueaQNPCY3BhxtXI3CexCCJNos1uaQEGXn2EkoLclIHBfIFWYiQ128dbazpR5T tfWfJ87FMe1la0NIk4VWOk8GGnmiE7Ybh3gKhNPlEine+LpUxWJK7FqJ4kx6j92Y/B7Y km9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794957988; x=1795562788; 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=CpVv0fCc2FhBmOvGcDrk/ZVJ+VZJ8XQOFf0q1428W0s=; b=dfjCqvpJKaAw0IczG/RDdTQHFEFSSBqrvus9V4jLqbpD+QVyBrvynuFzRK3Ozygxo3 P7bGRanrD1eIrEixq4P6tmRViRTBWHMpgrsbKNeM/9UwmmZzstAI2UKapeNarQCzSf1K cNqPuJUYiHrGivgLfKkg4R7xkEOhoTfWDQwnXVyRank/4axegy5GEQF8Y/oflsRvgIMB AfQvHPueXhJ8oV/VxASLHCAsqWQGlOqSn/NCQCxl2nY8L1WQcbzOYWY9E6Hu8VdGvZHp 19J40vu4aAzYkU9J3yLhFF0lhTCEsNyyGKqzQYUnDOZYglRtNSCkjAxoN6wZh1RckJjv hHHA== X-Forwarded-Encrypted: i=1; AL+hErGz/inlQx+kJDWKSx6Kg27xganwxYE6buJkE/Fau08Bdyg2CdKJIde1+EYPcoka9jDIprfyf/9J/73UlNQ=@vger.kernel.org X-Gm-Message-State: APuU4Z9n06VlB3WgRL50VC/SHv/HuC8wJure1MiCSRR5g8XjX/COOZMR r1/N+qfOMuceSf9EerNIJSdnR5UIamP9snBAns5JSoxfrwczMuqA6cEk X-Gm-Gg: AYBFou2Tu2vVUZjDF63LteOnhXbLlil8CYZ7XpeAUPacbXAKJKhdVMlPMb+nqZtD3Dl tkXBMCm1rSxLIT6p67fnYKPAkDm6qq5zulN6FYM7FInnhgJbaeAzH/BhbLRHRqNT9BxYkIzS8XU RXzofxY8nVs8YqaHheRPfU6e7kTr0Gy4RZCr/9Su6Pza47g7i5XDcDIKHgNA/XgyKt9UlyLdbbY uJkr2ibZWnXxnlyy1BVAsz524M89S7sZYLFlX82WEr8gDMhhz+FQjxsjJkM45bWb+cg/O7MKaW3 Xkh9NdOyeOHByF5MAZgko/5aS2NDa2pIW8FHHh2oylPvUjHfe2szpWMO8+rYBmAtjGUWEO5o95Q jjhP9b077nKhug9+wpmbPIUDm8wa5epCNnqF76vj5fQjTLPeWfvet+oOvAGizZtVu/+jYaYecu8 X7AlYwoBtZIg1yMPpyatAGPeEtdDFkXuj0QP3i0ZUNFofzfwZrU9ido4UbXSmWVNOXqHTwFlIAO nzr4LiVj+DU+ZUe1yVVj7yGuLDyQ1HXxPzOHL+hgjZ+Nojrq7WsYfL7ySoU5/PpSKxenRj3flSy IxHw4Q0WfUtDmtOdsR9mrLKhOgRDg3AIMpFu+yDjiwCeKx/bzP+KsqLl X-Received: by 2002:a05:600c:8b8b:b0:4a6:30c3:1114 with SMTP id 5b1f17b1804b1-4bb7da19d2emr12424685e9.12.1794957987877; Tue, 17 Nov 2026 15:26:27 -0800 (PST) Received: from deb05.proceq.com ([213.160.61.66]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4bb7d2b979bsm20013915e9.11.2026.11.17.15.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 15:26:27 -0800 (PST) From: Mehmet Fide To: Ping-Ke Shih Cc: Luka Gejak , Bitterblue Smith , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, mehmet.fide@screeningeagle.com Subject: [PATCH rtw-next v12 2/3] wifi: rtw88: support channel switch in AP mode Date: Wed, 18 Nov 2026 00:26:23 +0100 Message-ID: <20261117232624.1956815-3-mehmet.fide@gmail.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261117232624.1956815-1-mehmet.fide@gmail.com> References: <20261117232624.1956815-1-mehmet.fide@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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 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 --- 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