wifi: rtw89: drop TIMING_BEACON_ONLY and sync beacon TSF by self

Some of our calculation during concurrent mode depend on last beacon
TSF. Originally, we just set IEEE80211_HW_TIMING_BEACON_ONLY and get
what we want from mac80211. But, IEEE80211_HW_TIMING_BEACON_ONLY will
be restricted once we declare MLO.

Since we are about to consider the MLO stuffs, so sync beacon TSF by
ourselves now and unset IEEE80211_HW_TIMING_BEACON_ONLY.

Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240206030624.23382-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/chan.c b/drivers/net/wireless/realtek/rtw89/chan.c
index 21449cb9b069a232a616ec76fccab890f5f5fce7..2a95f9db83f9ce54ca568b72f850cd6ce8e20e15 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/chan.c
+++ b/drivers/net/wireless/realtek/rtw89/chan.c
@@ -320,19 +320,12 @@ int rtw89_iterate_mcc_roles(struct rtw89_dev *rtwdev,
        return 0;
 }
 
-/* For now, IEEE80211_HW_TIMING_BEACON_ONLY can make things simple to ensure
- * correctness of MCC calculation logic below. We have noticed that once driver
- * declares WIPHY_FLAG_SUPPORTS_MLO, the use of IEEE80211_HW_TIMING_BEACON_ONLY
- * will be restricted. We will make an alternative in driver when it is ready
- * for MLO.
- */
 static u32 rtw89_mcc_get_tbtt_ofst(struct rtw89_dev *rtwdev,
                                   struct rtw89_mcc_role *role, u64 tsf)
 {
        struct rtw89_vif *rtwvif = role->rtwvif;
-       struct ieee80211_vif *vif = rtwvif_to_vif(rtwvif);
        u32 bcn_intvl_us = ieee80211_tu_to_usec(role->beacon_interval);
-       u64 sync_tsf = vif->bss_conf.sync_tsf;
+       u64 sync_tsf = READ_ONCE(rtwvif->sync_bcn_tsf);
        u32 remainder;
 
        if (tsf < sync_tsf) {

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 650c507c8ed3720ad04f541c07bade116b57e8bf..95ace26a8f66d3d17116f4a2f1169966345eb32f 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -1868,6 +1868,17 @@ static void rtw89_core_cancel_6ghz_probe_tx(struct rtw89_dev *rtwdev,
                ieee80211_queue_work(rtwdev->hw, &rtwdev->cancel_6ghz_probe_work);
 }
 
+static void rtw89_vif_sync_bcn_tsf(struct rtw89_vif *rtwvif,
+                                  struct ieee80211_hdr *hdr, size_t len)
+{
+       struct ieee80211_mgmt *mgmt = (typeof(mgmt))hdr;
+
+       if (len < offsetof(typeof(*mgmt), u.beacon.variable))
+               return;
+
+       WRITE_ONCE(rtwvif->sync_bcn_tsf, le64_to_cpu(mgmt->u.beacon.timestamp));
+}
+
 static void rtw89_vif_rx_stats_iter(void *data, u8 *mac,
                                    struct ieee80211_vif *vif)
 {
@@ -1898,8 +1909,10 @@ static void rtw89_vif_rx_stats_iter(void *data, u8 *mac,
                return;
 
        if (ieee80211_is_beacon(hdr->frame_control)) {
-               if (vif->type == NL80211_IFTYPE_STATION)
+               if (vif->type == NL80211_IFTYPE_STATION) {
+                       rtw89_vif_sync_bcn_tsf(rtwvif, hdr, skb->len);
                        rtw89_fw_h2c_rssi_offload(rtwdev, phy_ppdu);
+               }
                pkt_stat->beacon_nr++;
        }
 
@@ -4447,9 +4460,6 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev)
        ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);
        ieee80211_hw_set(hw, WANT_MONITOR_VIF);
 
-       /* ref: description of rtw89_mcc_get_tbtt_ofst() in chan.c */
-       ieee80211_hw_set(hw, TIMING_BEACON_ONLY);
-
        if (chip->support_bandwidths & BIT(NL80211_CHAN_WIDTH_160))
                ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW);
 

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 713383b6d818ce3d3db78c9eabe7915f84dabe50..75269c1d94cc42bf436c4fc4761b33706c9ad5b9 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -3044,6 +3044,7 @@ struct rtw89_vif {
        u8 bcn_hit_cond;
        u8 hit_rule;
        u8 last_noa_nr;
+       u64 sync_bcn_tsf;
        bool offchan;
        bool trigger;
        bool lsig_txop;

diff --git a/drivers/net/wireless/realtek/rtw89/mac80211.c b/drivers/net/wireless/realtek/rtw89/mac80211.c
index b61c5be8cae3c2b10f93a0fc37de0c051f807c65..31d1ffb16e83eca393b207c193049f65c08324a1 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw89/mac80211.c
@@ -449,6 +449,7 @@ static void rtw89_ops_bss_info_changed(struct ieee80211_hw *hw,
                ether_addr_copy(rtwvif->bssid, conf->bssid);
                rtw89_cam_bssid_changed(rtwdev, rtwvif);
                rtw89_fw_h2c_cam(rtwdev, rtwvif, NULL, NULL);
+               WRITE_ONCE(rtwvif->sync_bcn_tsf, 0);
        }
 
        if (changed & BSS_CHANGED_BEACON)