From: Mehmet Fide 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 --- 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 +#include #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