wifi: rtw89: adjust RFK and monitor states for MCC
Ping-Ke Shih
maintainercover wifi: rtw89: adjust RFK and monitor states for MCC
This is third patchset to prepare more materials for MCC. It includes group 6/7 patches below that aims to adjust RFK (RF calibrations) behavior to fit MCC situation and add a track work to monitor states including MAC ID bitmap of connected stations, beacon offset, P2P PS, and BT timeslot.
<<< Below commit message is kept as first patchset for reference >>>
TDMA-based MCC (STA+P2P) is a kind of multiple interfaces concurrence. Basically, driver is to calculate timeslot pattern and firmware follows the pattern to switch channels. Since BT-coexistence is also a TDMA-based mechanism, also consider BT timeslot into pattern if BT devices present.
To easier to review these 20+ patches, I summary basic purpose of these patches below by group, and submit them by small patchset one by one.
Group 1. [DONE] get BT timeslot from coex mechanism
Group 2. [DONE] adjust some stuff related to driver channel context Group 3. [DONE] P2P NoA infrastructure to add the IE to beacon when playing GO Group 4. [DONE] adjust driver to support 2 channel context
Group 5. [DONE] calculate timeslot patterns and trigger firmware to switch
channels followed the patterns
Group 6. [CURRENT] disable some dynamic tracking mechanism of RF calibration when
MCC is running.
Group 7. [CURRENT] monitor states and adjust timeslot patterns. For example, if
BT device leaves, we can reassign the slot to WiFi.
Group 8. Remain-on-channel and hardware scan are related to channel
context, so need some treatments to work with MCC properly.
Group 9. Finally, we declare 8852C to support MCC
Zong-Zhe Yang (8):
wifi: rtw89: 52c: rfk: refine MCC channel info notification
wifi: rtw89: rfk: disable driver tracking during MCC
wifi: rtw89: 52c: rfk: disable DPK during MCC
wifi: rtw89: mcc: update role bitmap when changed
wifi: rtw89: mcc: track beacon offset and update when needed
wifi: rtw89: mcc: deal with P2P PS change
wifi: rtw89: mcc: deal with BT slot change
wifi: rtw89: mcc: deal with beacon NoA if GO exists
drivers/net/wireless/realtek/rtw89/chan.c | 336 +++++++++++++++++- drivers/net/wireless/realtek/rtw89/chan.h | 6 + drivers/net/wireless/realtek/rtw89/core.c | 29 +- drivers/net/wireless/realtek/rtw89/core.h | 15 + drivers/net/wireless/realtek/rtw89/fw.c | 7 +- drivers/net/wireless/realtek/rtw89/fw.h | 5 + drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac80211.c | 3 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 7 + .../net/wireless/realtek/rtw89/rtw8852c_rfk.c | 84 ++++- .../net/wireless/realtek/rtw89/rtw8852c_rfk.h | 3 + 11 files changed, 477 insertions(+), 19 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/8 wifi: rtw89: 52c: rfk: refine MCC channel info notification
From: Zong-Zhe Yang <[email protected]>
RF calibration will notify FW to backup the calibration result after it is done on a channel. For MCC (multi-channel concurrency) flow, when we at RTW89_ENTITY_MODE_MCC_PREPARE mode, RF calibration should execute on second channel of MCC, i.e. RTW89_SUB_ENTITY_1, and then, notify FW to backup the result for the second one.
Originally, the RF calibration flow only fit single channel case. We are planning to support MCC on RTL8852C, so we refine its RF calibration flow to fit MCC case.
--- drivers/net/wireless/realtek/rtw89/fw.c | 7 +-- .../net/wireless/realtek/rtw89/rtw8852c_rfk.c | 51 +++++++++++++++---- 2 files changed, 46 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +4 -3
@@ -3220,11 +3220,11 @@ int rtw89_fw_h2c_rf_reg(struct rtw89_dev *rtwdev,int rtw89_fw_h2c_rf_ntfy_mcc (struct rtw89_dev *rtwdev) { -const struct rtw89_chan *chan =rtw89_chan_get (rtwdev,RTW89_SUB_ENTITY_0 );struct rtw89_rfk_mcc_info *rfk_mcc = &rtwdev->rfk_mcc;struct rtw89_fw_h2c_rf_get_mccch *mccch;struct sk_buff *skb;int ret; +u8 idx; skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,sizeof (*mccch));if (!skb) {
@@ -3234,12 +3234,13 @@ int rtw89_fw_h2c_rf_ntfy_mcc(struct rtw89_dev *rtwdev)skb_put (skb,sizeof (*mccch)); mccch = (struct rtw89_fw_h2c_rf_get_mccch *)skb->data; + idx = rfk_mcc->table_idx; mccch->ch_0 =cpu_to_le32 (rfk_mcc->ch[0 ]); mccch->ch_1 =cpu_to_le32 (rfk_mcc->ch[1 ]); mccch->band_0 =cpu_to_le32 (rfk_mcc->band[0 ]); mccch->band_1 =cpu_to_le32 (rfk_mcc->band[1 ]); - mccch->current_channel =cpu_to_le32 (chan->channel); - mccch->current_band_type =cpu_to_le32 (chan->band_type); + mccch->current_channel =cpu_to_le32 (rfk_mcc->ch[idx]); + mccch->current_band_type =cpu_to_le32 (rfk_mcc->band[idx]); rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C, H2C_CAT_OUTSRC, H2C_CL_OUTSRC_RF_FW_NOTIFY,
drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c +42 -9
69 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH 1/8] wifi: rtw89: 52c: rfk: refine MCC channel info notification
Quoted 8 lines · Ping-Ke Shih
From: Zong-Zhe Yang <[email protected]>
RF calibration will notify FW to backup the calibration result after it is done on a channel. For MCC (multi-channel concurrency) flow, when we at
RTW89_ENTITY_MODE_MCC_PREPAREmode, RF calibration should execute on second channel of MCC, i.e.RTW89_SUB_ENTITY_1, and then, notify FW to backup the result for the second one.
Quoted 6 lines
Originally, the RF calibration flow only fit single channel case. We are planning to support MCC on RTL8852C, so we refine its RF calibration flow to fit MCC case.
Signed-off-by Zong-Zhe Yang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
8 patches applied to wireless-next.git, thanks.
74b45618f534 wifi: rtw89: 52c: rfk: refine MCC channel info notification c83ff9a3a2ca wifi: rtw89: rfk: disable driver tracking during MCC 6e9d6f8254ee wifi: rtw89: 52c: rfk: disable DPK during MCC 31e415e3d08a wifi: rtw89: mcc: update role bitmap when changed 5f69aabab126 wifi: rtw89: mcc: track beacon offset and update when needed 15fe9b731953 wifi: rtw89: mcc: deal with P2P PS change 9ecb40ef5281 wifi: rtw89: mcc: deal with BT slot change 97211e026313 wifi: rtw89: mcc: deal with beacon NoA if GO exists
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH 2/8 wifi: rtw89: rfk: disable driver tracking during MCC
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
After MCC (multi-channel concurrency) is started, FW will control channel changes and use the corresponding backup of RF calibration result. And, driver RF calibration (RF-K) won't be able to keep up with the speed at which the channels are changing. So, even if we keep tracking it in driver, the RF-K result might not be good either. To save these unnecessary things, we disable driver RF-K tracking during MCC.
--- drivers/net/wireless/realtek/rtw89/core.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +12 -1
@@ -2662,6 +2662,17 @@ static void rtw89_enter_lps_track(struct rtw89_dev *rtwdev)rtw89_vif_enter_lps (rtwdev, rtwvif); } +static void rtw89_core_rfk_track (struct rtw89_dev *rtwdev) +{ +enum rtw89_entity_mode mode; + + mode =rtw89_get_entity_mode (rtwdev); +if (mode ==RTW89_ENTITY_MODE_MCC ) +return ; + +rtw89_chip_rfk_track (rtwdev); +} +void rtw89_traffic_stats_init (struct rtw89_dev *rtwdev,struct rtw89_traffic_stats *stats) {
@@ -2704,7 +2715,7 @@ static void rtw89_track_work(struct work_struct *work)rtw89_phy_stat_track (rtwdev);rtw89_phy_env_monitor_track (rtwdev);rtw89_phy_dig (rtwdev); -rtw89_chip_rfk_track (rtwdev); +rtw89_core_rfk_track (rtwdev);rtw89_phy_ra_update (rtwdev);rtw89_phy_cfo_track (rtwdev);rtw89_phy_tx_path_div_track (rtwdev);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/8 wifi: rtw89: 52c: rfk: disable DPK during MCC
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
DPK is one kind of RF calibration. When MCC (multi-channel concurrency) start/stop, DPK needs to do extra things to be off/on. We add a chanctx callback type, RTW89_CHANCTX_CALLBACK_RFK, and register it for RTL8852C to deal with DPK according to MCC states.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 7 ++++ .../net/wireless/realtek/rtw89/rtw8852c_rfk.c | 33 +++++++++++++++++-- .../net/wireless/realtek/rtw89/rtw8852c_rfk.h | 3 ++ 4 files changed, 42 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -3429,6 +3429,7 @@ enum rtw89_chanctx_state {enum rtw89_chanctx_callbacks {RTW89_CHANCTX_CALLBACK_PLACEHOLDER , +RTW89_CHANCTX_CALLBACK_RFK ,NUM_OF_RTW89_CHANCTX_CALLBACKS , };
drivers/net/wireless/realtek/rtw89/rtw8852c.c +7 -0
@@ -2,6 +2,7 @@/* Copyright(c) 2019-2022 Realtek Corporation */ +#include "chan.h" #include "coex.h" #include "debug.h" #include "fw.h"
@@ -1776,6 +1777,7 @@ static void rtw8852c_rfk_init(struct rtw89_dev *rtwdev) rtwdev->is_tssi_mode[RF_PATH_B ] = false;memset (rfk_mcc,0 ,sizeof (*rfk_mcc));rtw8852c_lck_init (rtwdev); +rtw8852c_dpk_init (rtwdev);rtw8852c_rck (rtwdev);rtw8852c_dack (rtwdev);
@@ -2748,6 +2750,10 @@ static int rtw8852c_mac_disable_bb_rf(struct rtw89_dev *rtwdev)return 0 ; } +static const struct rtw89_chanctx_listener rtw8852c_chanctx_listener = { + .callbacks[RTW89_CHANCTX_CALLBACK_RFK ] = rtw8852c_rfk_chanctx_cb, +}; +#ifdef CONFIG_PM static const struct wiphy_wowlan_support rtw_wowlan_stub_8852c = { .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
@@ -2841,6 +2847,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .byr_table = &rtw89_8852c_byr_table, .dflt_parms = &rtw89_8852c_dflt_parms, .rfe_parms_conf = NULL, + .chanctx_listener = &rtw8852c_chanctx_listener, .txpwr_factor_rf = 2, .txpwr_factor_mac = 1, .dig_table = NULL,
drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c +31 -2
@@ -4265,6 +4265,14 @@ void rtw8852c_rx_dck_track(struct rtw89_dev *rtwdev)rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_RXDCK ,BTC_WRFK_STOP ); } +void rtw8852c_dpk_init (struct rtw89_dev *rtwdev) +{ +struct rtw89_dpk_info *dpk = &rtwdev->dpk; + + dpk->is_dpk_enable = true; + dpk->is_dpk_reload_en = false; +} +void rtw8852c_dpk (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx) {u32 tx_en;
@@ -4274,8 +4282,6 @@ void rtw8852c_dpk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx)rtw89_chip_stop_sch_tx (rtwdev, phy_idx, &tx_en,RTW89_SCH_TX_SEL_ALL );_wait_rx_mode (rtwdev,_kpath (rtwdev, phy_idx)); - rtwdev->dpk.is_dpk_enable = true; - rtwdev->dpk.is_dpk_reload_en = false;_dpk (rtwdev, phy_idx, false);rtw89_chip_resume_sch_tx (rtwdev, phy_idx, tx_en);
@@ -4413,3 +4419,26 @@ void rtw8852c_wifi_scan_notify(struct rtw89_dev *rtwdev,else rtw8852c_tssi_default_txagc (rtwdev, phy_idx, false); } + +void rtw8852c_rfk_chanctx_cb (struct rtw89_dev *rtwdev, +enum rtw89_chanctx_state state) +{ +struct rtw89_dpk_info *dpk = &rtwdev->dpk; +u8 path; + +switch (state) { +case RTW89_CHANCTX_STATE_MCC_START : + dpk->is_dpk_enable = false; +for (path =0 ; path <RTW8852C_DPK_RF_PATH ; path++) +_dpk_onoff (rtwdev, path, false); +break ; +case RTW89_CHANCTX_STATE_MCC_STOP : + dpk->is_dpk_enable = true; +for (path =0 ; path <RTW8852C_DPK_RF_PATH ; path++) +_dpk_onoff (rtwdev, path, false); +rtw8852c_dpk (rtwdev,RTW89_PHY_0 ); +break ; +default : +break ; + } +}
drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h +3 -0
@@ -13,6 +13,7 @@ void rtw8852c_dack(struct rtw89_dev *rtwdev);void rtw8852c_iqk (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx);void rtw8852c_rx_dck (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx,bool is_afe);void rtw8852c_rx_dck_track (struct rtw89_dev *rtwdev); +void rtw8852c_dpk_init (struct rtw89_dev *rtwdev);void rtw8852c_dpk (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy);void rtw8852c_dpk_track (struct rtw89_dev *rtwdev);void rtw8852c_tssi (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy);
@@ -25,5 +26,7 @@ void rtw8852c_set_channel_rf(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx);void rtw8852c_lck_init (struct rtw89_dev *rtwdev);void rtw8852c_lck_track (struct rtw89_dev *rtwdev); +void rtw8852c_rfk_chanctx_cb (struct rtw89_dev *rtwdev, +enum rtw89_chanctx_state state);#endif
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/8 wifi: rtw89: mcc: update role bitmap when changed
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Each MCC (multi-channel concurrency) role maintains a bitmap of mac IDs. The bitmap is supposed to contain the two points below.
* mac ID of itself
* mac ID(s) of STA(s) connecting to it
Under STA+GC mode, the bitmaps of both roles should not change. However, under STA+GO mode, the bitmap of GO may change due to P2P clients which connect/disconnect to/from it.
FW controls (TDMA-based) MCC things via mac IDs in bitmap of each role. For example, mac IDs are required by FW when it wants to pause role1's TX in role0 slot.
So, to sync between driver and FW, we update the new mac ID bitmap of GO to FW once it's changed.
--- drivers/net/wireless/realtek/rtw89/chan.c | 74 ++++++++++++++++++++++- drivers/net/wireless/realtek/rtw89/chan.h | 3 + drivers/net/wireless/realtek/rtw89/core.c | 4 ++ drivers/net/wireless/realtek/rtw89/core.h | 8 +++ 4 files changed, 88 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/chan.c +73 -1
@@ -191,6 +191,7 @@ void rtw89_entity_init(struct rtw89_dev *rtwdev)struct rtw89_hal *hal = &rtwdev->hal;bitmap_zero (hal->entity_map,NUM_OF_RTW89_SUB_ENTITY ); +bitmap_zero (hal->changes,NUM_OF_RTW89_CHANCTX_CHANGES );atomic_set (&hal->roc_entity_idx,RTW89_SUB_ENTITY_IDLE );rtw89_config_default_chandef (rtwdev); }
@@ -1436,15 +1437,66 @@ static void rtw89_mcc_stop(struct rtw89_dev *rtwdev)rtw89_chanctx_notify (rtwdev,RTW89_CHANCTX_STATE_MCC_STOP ); } +static int rtw89_mcc_upd_map_iterator (struct rtw89_dev *rtwdev, +struct rtw89_mcc_role *mcc_role, +unsigned int ordered_idx, +void *data) +{ +struct rtw89_mcc_info *mcc = &rtwdev->mcc; +struct rtw89_mcc_role upd = { + .rtwvif = mcc_role->rtwvif, + }; +int ret; + +if (!mcc_role->is_go) +return 0 ; + +rtw89_mcc_fill_role_macid_bitmap (rtwdev, &upd); +if (memcmp (mcc_role->macid_bitmap, upd.macid_bitmap, +sizeof (mcc_role->macid_bitmap)) ==0 ) +return 0 ; + + ret =rtw89_fw_h2c_mcc_macid_bitmap (rtwdev, mcc->group, + upd.rtwvif->mac_id, + upd.macid_bitmap); +if (ret) { +rtw89_debug (rtwdev,RTW89_DBG_CHAN , +"MCC h2c failed to update macid bitmap: %d\n" , ret); +return ret; + } + +memcpy (mcc_role->macid_bitmap, upd.macid_bitmap, +sizeof (mcc_role->macid_bitmap)); +return 0 ; +} + +static void rtw89_mcc_update_macid_bitmap (struct rtw89_dev *rtwdev) +{ +struct rtw89_mcc_info *mcc = &rtwdev->mcc; + +if (mcc->mode !=RTW89_MCC_MODE_GO_STA ) +return ; + +rtw89_iterate_mcc_roles (rtwdev, rtw89_mcc_upd_map_iterator,NULL ); +} +void rtw89_chanctx_work (struct work_struct *work) { struct rtw89_dev *rtwdev = container_of(work, struct rtw89_dev, chanctx_work.work); +struct rtw89_hal *hal = &rtwdev->hal;enum rtw89_entity_mode mode; +u32 changed =0 ;int ret; +int i;mutex_lock (&rtwdev->mutex); +for (i =0 ; i <NUM_OF_RTW89_CHANCTX_CHANGES ; i++) { +if (test_and_clear_bit (i, hal->changes)) + changed |=BIT (i); + } + mode =rtw89_get_entity_mode (rtwdev);switch (mode) {case RTW89_ENTITY_MODE_MCC_PREPARE :
@@ -1455,6 +1507,10 @@ void rtw89_chanctx_work(struct work_struct *work)if (ret)rtw89_warn (rtwdev,"failed to start MCC: %d\n" , ret);break ; +case RTW89_ENTITY_MODE_MCC : +if (changed &BIT (RTW89_CHANCTX_REMOTE_STA_CHANGE )) +rtw89_mcc_update_macid_bitmap (rtwdev); +break ;default :break ; }
@@ -1462,8 +1518,10 @@ void rtw89_chanctx_work(struct work_struct *work)mutex_unlock (&rtwdev->mutex); } -void rtw89_queue_chanctx_work (struct rtw89_dev *rtwdev) +void rtw89_queue_chanctx_change (struct rtw89_dev *rtwdev, +enum rtw89_chanctx_changes change) { +struct rtw89_hal *hal = &rtwdev->hal;enum rtw89_entity_mode mode;u32 delay;
@@ -1474,6 +1532,15 @@ void rtw89_queue_chanctx_work(struct rtw89_dev *rtwdev)case RTW89_ENTITY_MODE_MCC_PREPARE : delay =ieee80211_tu_to_usec (RTW89_CHANCTX_TIME_MCC_PREPARE );break ; +case RTW89_ENTITY_MODE_MCC : + delay =ieee80211_tu_to_usec (RTW89_CHANCTX_TIME_MCC ); +break ; + } + +if (change !=RTW89_CHANCTX_CHANGE_DFLT ) { +rtw89_debug (rtwdev,RTW89_DBG_CHAN ,"set chanctx change %d\n" , + change); +set_bit (change, hal->changes); } rtw89_debug(rtwdev, RTW89_DBG_CHAN,
@@ -1483,6 +1550,11 @@ void rtw89_queue_chanctx_work(struct rtw89_dev *rtwdev) usecs_to_jiffies(delay)); } +void rtw89_queue_chanctx_work (struct rtw89_dev *rtwdev) +{ +rtw89_queue_chanctx_change (rtwdev,RTW89_CHANCTX_CHANGE_DFLT ); +} +int rtw89_chanctx_ops_add (struct rtw89_dev *rtwdev,struct ieee80211_chanctx_conf *ctx) {
drivers/net/wireless/realtek/rtw89/chan.h +3 -0
@@ -9,6 +9,7 @@/* The dwell time in TU before doing rtw89_chanctx_work(). */ #define RTW89_CHANCTX_TIME_MCC_PREPARE 100 +#define RTW89_CHANCTX_TIME_MCC 100/* various MCC setting time in TU */ #define RTW89_MCC_LONG_TRIGGER_TIME 300
@@ -75,6 +76,8 @@ void rtw89_entity_init(struct rtw89_dev *rtwdev);enum rtw89_entity_mode rtw89_entity_recalc (struct rtw89_dev *rtwdev);void rtw89_chanctx_work (struct work_struct *work);void rtw89_queue_chanctx_work (struct rtw89_dev *rtwdev); +void rtw89_queue_chanctx_change (struct rtw89_dev *rtwdev, +enum rtw89_chanctx_changes change);int rtw89_chanctx_ops_add (struct rtw89_dev *rtwdev,struct ieee80211_chanctx_conf *ctx); void rtw89_chanctx_ops_remove(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/core.c +4 -0
@@ -2934,6 +2934,8 @@ int rtw89_core_sta_add(struct rtw89_dev *rtwdev,rtw89_warn (rtwdev,"failed to send h2c role info\n" );return ret; } + +rtw89_queue_chanctx_change (rtwdev,RTW89_CHANCTX_REMOTE_STA_CHANGE ); }return 0 ;
@@ -3099,6 +3101,8 @@ int rtw89_core_sta_remove(struct rtw89_dev *rtwdev,rtw89_warn (rtwdev,"failed to send h2c role info\n" );return ret; } + +rtw89_queue_chanctx_change (rtwdev,RTW89_CHANCTX_REMOTE_STA_CHANGE ); }return 0 ;
drivers/net/wireless/realtek/rtw89/core.h +8 -0
@@ -3787,6 +3787,13 @@ struct rtw89_chanctx_cfg {enum rtw89_sub_entity_idx idx; }; +enum rtw89_chanctx_changes { +RTW89_CHANCTX_REMOTE_STA_CHANGE , + +NUM_OF_RTW89_CHANCTX_CHANGES , +RTW89_CHANCTX_CHANGE_DFLT =NUM_OF_RTW89_CHANCTX_CHANGES , +}; +enum rtw89_entity_mode {RTW89_ENTITY_MODE_SCC ,RTW89_ENTITY_MODE_MCC_PREPARE ,
@@ -3818,6 +3825,7 @@ struct rtw89_hal {bool support_igi;atomic_t roc_entity_idx; +DECLARE_BITMAP (changes,NUM_OF_RTW89_CHANCTX_CHANGES );DECLARE_BITMAP (entity_map,NUM_OF_RTW89_SUB_ENTITY );struct rtw89_sub_entity sub[NUM_OF_RTW89_SUB_ENTITY ];struct cfg80211_chan_def roc_chandef;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/8 wifi: rtw89: mcc: track beacon offset and update when needed
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
In MCC STA+GC mode, the offset between TBTTs of remote AP and remote GO might change. If the change is larger than tolerance, we should update MCC after re-calculating parameters for new things. So, we track that in rtw89_track_work() now. And, we add MCC update flow to tell FW either to change durations of roles or to replace entire pattern according to how MCC plans BT slot.
--- drivers/net/wireless/realtek/rtw89/chan.c | 145 +++++++++++++++++++++- drivers/net/wireless/realtek/rtw89/chan.h | 3 + drivers/net/wireless/realtek/rtw89/core.c | 1 + drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.h | 5 + 5 files changed, 153 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +143 -2
@@ -1297,7 +1297,7 @@ static int __mcc_fw_add_bt_role(struct rtw89_dev *rtwdev)return 0 ; } -static int __mcc_fw_start (struct rtw89_dev *rtwdev) +static int __mcc_fw_start (struct rtw89_dev *rtwdev,bool replace) {struct rtw89_mcc_info *mcc = &rtwdev->mcc;struct rtw89_mcc_role *ref = &mcc->role_ref;
@@ -1308,6 +1308,12 @@ static int __mcc_fw_start(struct rtw89_dev *rtwdev)struct rtw89_fw_mcc_start_req req = {};int ret; +if (replace) { + req.old_group = mcc->group; + req.old_group_action =RTW89_FW_MCC_OLD_GROUP_ACT_REPLACE ; + mcc->group =RTW89_MCC_NEXT_GROUP (mcc->group); + } + req.group = mcc->group;switch (pattern->plan) {
@@ -1376,6 +1382,47 @@ static int __mcc_fw_start(struct rtw89_dev *rtwdev)return 0 ; } +static int __mcc_fw_set_duration_no_bt (struct rtw89_dev *rtwdev,bool sync_changed) +{ +struct rtw89_mcc_info *mcc = &rtwdev->mcc; +struct rtw89_mcc_config *config = &mcc->config; +struct rtw89_mcc_sync *sync = &config->sync; +struct rtw89_mcc_role *ref = &mcc->role_ref; +struct rtw89_mcc_role *aux = &mcc->role_aux; +struct rtw89_fw_mcc_duration req = { + .group = mcc->group, + .btc_in_group = false, + .start_macid = ref->rtwvif->mac_id, + .macid_x = ref->rtwvif->mac_id, + .macid_y = aux->rtwvif->mac_id, + .duration_x = ref->duration, + .duration_y = aux->duration, + .start_tsf_high = config->start_tsf >>32 , + .start_tsf_low = config->start_tsf, + }; +int ret; + + ret =rtw89_fw_h2c_mcc_set_duration (rtwdev, &req); +if (ret) { +rtw89_debug (rtwdev,RTW89_DBG_CHAN , +"MCC h2c failed to set duration: %d\n" , ret); +return ret; + } + +if (!sync->enable || !sync_changed) +return 0 ; + + ret =rtw89_fw_h2c_mcc_sync (rtwdev, mcc->group, sync->macid_src, + sync->macid_tgt, sync->offset); +if (ret) { +rtw89_debug (rtwdev,RTW89_DBG_CHAN , +"MCC h2c failed to trigger sync: %d\n" , ret); +return ret; + } + +return 0 ; +} +static int rtw89_mcc_start (struct rtw89_dev *rtwdev) {struct rtw89_mcc_info *mcc = &rtwdev->mcc;
@@ -1407,7 +1454,7 @@ static int rtw89_mcc_start(struct rtw89_dev *rtwdev)if (ret)return ret; - ret =__mcc_fw_start (rtwdev); + ret =__mcc_fw_start (rtwdev, false);if (ret)return ret;
@@ -1437,6 +1484,75 @@ static void rtw89_mcc_stop(struct rtw89_dev *rtwdev)rtw89_chanctx_notify (rtwdev,RTW89_CHANCTX_STATE_MCC_STOP ); } +static int rtw89_mcc_update (struct rtw89_dev *rtwdev) +{ +struct rtw89_mcc_info *mcc = &rtwdev->mcc; +struct rtw89_mcc_config *config = &mcc->config; +struct rtw89_mcc_config old_cfg = *config; +bool sync_changed; +int ret; + +if (rtwdev->scanning) +rtw89_hw_scan_abort (rtwdev, rtwdev->scan_info.scanning_vif); + +rtw89_debug (rtwdev,RTW89_DBG_CHAN ,"MCC update\n" ); + + ret =rtw89_mcc_fill_config (rtwdev); +if (ret) +return ret; + +if (old_cfg.pattern.plan !=RTW89_MCC_PLAN_NO_BT || + config->pattern.plan !=RTW89_MCC_PLAN_NO_BT ) { + ret =__mcc_fw_start (rtwdev, true); +if (ret) +return ret; + }else { +if (memcmp (&old_cfg.sync, &config->sync,sizeof (old_cfg.sync)) ==0 ) + sync_changed = false; +else + sync_changed = true; + + ret =__mcc_fw_set_duration_no_bt (rtwdev, sync_changed); +if (ret) +return ret; + } + +return 0 ; +} + +static void rtw89_mcc_track (struct rtw89_dev *rtwdev) +{ +struct rtw89_mcc_info *mcc = &rtwdev->mcc; +struct rtw89_mcc_config *config = &mcc->config; +struct rtw89_mcc_pattern *pattern = &config->pattern; +s16 tolerance; +u16 bcn_ofst; +u16 diff; + +if (mcc->mode !=RTW89_MCC_MODE_GC_STA ) +return ; + + bcn_ofst =rtw89_mcc_get_bcn_ofst (rtwdev); +if (bcn_ofst > config->beacon_offset) { + diff = bcn_ofst - config->beacon_offset; +if (pattern->tob_aux <0 ) + tolerance = -pattern->tob_aux; +else + tolerance = pattern->toa_aux; + }else { + diff = config->beacon_offset - bcn_ofst; +if (pattern->toa_aux <0 ) + tolerance = -pattern->toa_aux; +else + tolerance = pattern->tob_aux; + } + +if (diff <= tolerance) +return ; + +rtw89_queue_chanctx_change (rtwdev,RTW89_CHANCTX_BCN_OFFSET_CHANGE ); +} + static int rtw89_mcc_upd_map_iterator(struct rtw89_dev *rtwdev, struct rtw89_mcc_role *mcc_role, unsigned int ordered_idx,
@@ -1485,6 +1601,7 @@ void rtw89_chanctx_work(struct work_struct *work) struct rtw89_dev *rtwdev = container_of(work, struct rtw89_dev, chanctx_work.work);struct rtw89_hal *hal = &rtwdev->hal; +bool update_mcc_pattern = false;enum rtw89_entity_mode mode;u32 changed =0 ;int ret;
@@ -1508,8 +1625,16 @@ void rtw89_chanctx_work(struct work_struct *work)rtw89_warn (rtwdev,"failed to start MCC: %d\n" , ret);break ;case RTW89_ENTITY_MODE_MCC : +if (changed &BIT (RTW89_CHANCTX_BCN_OFFSET_CHANGE )) + update_mcc_pattern = true;if (changed &BIT (RTW89_CHANCTX_REMOTE_STA_CHANGE ))rtw89_mcc_update_macid_bitmap (rtwdev); +if (update_mcc_pattern) { + ret =rtw89_mcc_update (rtwdev); +if (ret) +rtw89_warn (rtwdev,"failed to update MCC: %d\n" , + ret); + }break ;default :break ;
@@ -1555,6 +1680,22 @@ void rtw89_queue_chanctx_work(struct rtw89_dev *rtwdev)rtw89_queue_chanctx_change (rtwdev,RTW89_CHANCTX_CHANGE_DFLT ); } +void rtw89_chanctx_track (struct rtw89_dev *rtwdev) +{ +enum rtw89_entity_mode mode; + +lockdep_assert_held (&rtwdev->mutex); + + mode =rtw89_get_entity_mode (rtwdev); +switch (mode) { +case RTW89_ENTITY_MODE_MCC : +rtw89_mcc_track (rtwdev); +break ; +default : +break ; + } +} +int rtw89_chanctx_ops_add (struct rtw89_dev *rtwdev,struct ieee80211_chanctx_conf *ctx) {
drivers/net/wireless/realtek/rtw89/chan.h +3 -0
@@ -26,6 +26,8 @@ (RTW89_MCC_EARLY_RX_BCN_TIME + RTW89_MCC_MIN_RX_BCN_TIME)#define RTW89_MCC_DFLT_GROUP 0 +#define RTW89_MCC_NEXT_GROUP (cur) (((cur) + 1) % 4) +#define RTW89_MCC_DFLT_TX_NULL_EARLY 3#define RTW89_MCC_DFLT_COURTESY_SLOT 3
@@ -78,6 +80,7 @@ void rtw89_chanctx_work(struct work_struct *work);void rtw89_queue_chanctx_work (struct rtw89_dev *rtwdev);void rtw89_queue_chanctx_change (struct rtw89_dev *rtwdev,enum rtw89_chanctx_changes change); +void rtw89_chanctx_track (struct rtw89_dev *rtwdev);int rtw89_chanctx_ops_add (struct rtw89_dev *rtwdev,struct ieee80211_chanctx_conf *ctx); void rtw89_chanctx_ops_remove(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/core.c +1 -0
@@ -2722,6 +2722,7 @@ static void rtw89_track_work(struct work_struct *work)rtw89_phy_antdiv_track (rtwdev);rtw89_phy_ul_tb_ctrl_track (rtwdev);rtw89_tas_track (rtwdev); +rtw89_chanctx_track (rtwdev);if (rtwdev->lps_enabled && !rtwdev->btc.lps)rtw89_enter_lps_track (rtwdev);
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -3789,6 +3789,7 @@ struct rtw89_chanctx_cfg {enum rtw89_chanctx_changes {RTW89_CHANCTX_REMOTE_STA_CHANGE , +RTW89_CHANCTX_BCN_OFFSET_CHANGE ,NUM_OF_RTW89_CHANCTX_CHANGES ,RTW89_CHANCTX_CHANGE_DFLT =NUM_OF_RTW89_CHANCTX_CHANGES ,
drivers/net/wireless/realtek/rtw89/fw.h +5 -0
@@ -2931,6 +2931,11 @@ static inline void RTW89_SET_FWCMD_ADD_MCC_COURTESY_TARGET(void *cmd, u32 val)le32p_replace_bits ((__le32 *)cmd +3 , val,GENMASK (23 ,16 )); } +enum rtw89_fw_mcc_old_group_actions { +RTW89_FW_MCC_OLD_GROUP_ACT_NONE =0 , +RTW89_FW_MCC_OLD_GROUP_ACT_REPLACE =1 , +}; +struct rtw89_fw_mcc_start_req {u32 group:2 ;u32 btc_in_group:1 ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/8 wifi: rtw89: mcc: deal with P2P PS change
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
MCC fills duration limit of a role according to NoA description. If P2P PS changes during MCC, we don't process P2P PS via normal flow. Instead, we re-fill duration limit of the role for new NoA description, and then we do MCC update.
--- drivers/net/wireless/realtek/rtw89/chan.c | 25 ++++++++++++++++++- drivers/net/wireless/realtek/rtw89/core.c | 10 ++++++++ drivers/net/wireless/realtek/rtw89/core.h | 2 ++ drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- 4 files changed, 37 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +24 -1
@@ -1596,6 +1596,26 @@ static void rtw89_mcc_update_macid_bitmap(struct rtw89_dev *rtwdev)rtw89_iterate_mcc_roles (rtwdev, rtw89_mcc_upd_map_iterator,NULL ); } +static int rtw89_mcc_upd_lmt_iterator (struct rtw89_dev *rtwdev, +struct rtw89_mcc_role *mcc_role, +unsigned int ordered_idx, +void *data) +{ +memset (&mcc_role->limit,0 ,sizeof (mcc_role->limit)); +rtw89_mcc_fill_role_limit (rtwdev, mcc_role); +return 0 ; +} + +static void rtw89_mcc_update_limit (struct rtw89_dev *rtwdev) +{ +struct rtw89_mcc_info *mcc = &rtwdev->mcc; + +if (mcc->mode !=RTW89_MCC_MODE_GC_STA ) +return ; + +rtw89_iterate_mcc_roles (rtwdev, rtw89_mcc_upd_lmt_iterator,NULL ); +} +void rtw89_chanctx_work (struct work_struct *work) { struct rtw89_dev *rtwdev = container_of(work, struct rtw89_dev,
@@ -1625,10 +1645,13 @@ void rtw89_chanctx_work(struct work_struct *work)rtw89_warn (rtwdev,"failed to start MCC: %d\n" , ret);break ;case RTW89_ENTITY_MODE_MCC : -if (changed &BIT (RTW89_CHANCTX_BCN_OFFSET_CHANGE )) +if (changed &BIT (RTW89_CHANCTX_BCN_OFFSET_CHANGE ) || + changed &BIT (RTW89_CHANCTX_P2P_PS_CHANGE )) update_mcc_pattern = true;if (changed &BIT (RTW89_CHANCTX_REMOTE_STA_CHANGE ))rtw89_mcc_update_macid_bitmap (rtwdev); +if (changed &BIT (RTW89_CHANCTX_P2P_PS_CHANGE )) +rtw89_mcc_update_limit (rtwdev);if (update_mcc_pattern) { ret =rtw89_mcc_update (rtwdev);if (ret)
drivers/net/wireless/realtek/rtw89/core.c +10 -0
@@ -2673,6 +2673,16 @@ static void rtw89_core_rfk_track(struct rtw89_dev *rtwdev)rtw89_chip_rfk_track (rtwdev); } +void rtw89_core_update_p2p_ps (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif) +{ +enum rtw89_entity_mode mode =rtw89_get_entity_mode (rtwdev); + +if (mode ==RTW89_ENTITY_MODE_MCC ) +rtw89_queue_chanctx_change (rtwdev,RTW89_CHANCTX_P2P_PS_CHANGE ); +else +rtw89_process_p2p_ps (rtwdev, vif); +} +void rtw89_traffic_stats_init (struct rtw89_dev *rtwdev,struct rtw89_traffic_stats *stats) {
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -3790,6 +3790,7 @@ struct rtw89_chanctx_cfg {enum rtw89_chanctx_changes {RTW89_CHANCTX_REMOTE_STA_CHANGE ,RTW89_CHANCTX_BCN_OFFSET_CHANGE , +RTW89_CHANCTX_P2P_PS_CHANGE ,NUM_OF_RTW89_CHANCTX_CHANGES ,RTW89_CHANCTX_CHANGE_DFLT =NUM_OF_RTW89_CHANCTX_CHANGES ,
@@ -5526,6 +5527,7 @@ void rtw89_core_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, bool hw_scan);void rtw89_reg_6ghz_power_recalc (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif,bool active); +void rtw89_core_update_p2p_ps (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif);void rtw89_core_ntfy_btc_event (struct rtw89_dev *rtwdev,enum rtw89_btc_hmsg event);#endif
drivers/net/wireless/realtek/rtw89/mac80211.c +1 -1
@@ -445,7 +445,7 @@ static void rtw89_ops_bss_info_changed(struct ieee80211_hw *hw,rtw89_mac_bf_set_gid_table (rtwdev, vif, conf);if (changed &BSS_CHANGED_P2P_PS ) -rtw89_process_p2p_ps (rtwdev, vif); +rtw89_core_update_p2p_ps (rtwdev, vif);if (changed &BSS_CHANGED_CQM )rtw89_fw_h2c_set_bcn_fltr_cfg (rtwdev, vif, true);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/8 wifi: rtw89: mcc: deal with BT slot change
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
When receiving request of adjusting BT slot from coex. mechanism, we need to fetch the new BT slot and use the new one to calculate MCC (multi-channel concurrency) pattern. Then, we update the new MCC pattern to FW.
--- drivers/net/wireless/realtek/rtw89/chan.c | 5 ++++- drivers/net/wireless/realtek/rtw89/core.c | 1 + drivers/net/wireless/realtek/rtw89/core.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/chan.c +4 -1
@@ -1646,12 +1646,15 @@ void rtw89_chanctx_work(struct work_struct *work)break ;case RTW89_ENTITY_MODE_MCC :if (changed &BIT (RTW89_CHANCTX_BCN_OFFSET_CHANGE ) || - changed &BIT (RTW89_CHANCTX_P2P_PS_CHANGE )) + changed &BIT (RTW89_CHANCTX_P2P_PS_CHANGE ) || + changed &BIT (RTW89_CHANCTX_BT_SLOT_CHANGE )) update_mcc_pattern = true;if (changed &BIT (RTW89_CHANCTX_REMOTE_STA_CHANGE ))rtw89_mcc_update_macid_bitmap (rtwdev);if (changed &BIT (RTW89_CHANCTX_P2P_PS_CHANGE ))rtw89_mcc_update_limit (rtwdev); +if (changed &BIT (RTW89_CHANCTX_BT_SLOT_CHANGE )) +rtw89_mcc_fill_bt_role (rtwdev);if (update_mcc_pattern) { ret =rtw89_mcc_update (rtwdev);if (ret)
drivers/net/wireless/realtek/rtw89/core.c +1 -0
@@ -3529,6 +3529,7 @@ void rtw89_core_ntfy_btc_event(struct rtw89_dev *rtwdev, enum rtw89_btc_hmsg eve bt_req_len =rtw89_coex_query_bt_req_len (rtwdev,RTW89_PHY_0 );rtw89_debug (rtwdev,RTW89_DBG_BTC ,"coex updates BT req len to %d TU\n" , bt_req_len); +rtw89_queue_chanctx_change (rtwdev,RTW89_CHANCTX_BT_SLOT_CHANGE );break ;default :if (event <NUM_OF_RTW89_BTC_HMSG )
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -3791,6 +3791,7 @@ enum rtw89_chanctx_changes {RTW89_CHANCTX_REMOTE_STA_CHANGE ,RTW89_CHANCTX_BCN_OFFSET_CHANGE ,RTW89_CHANCTX_P2P_PS_CHANGE , +RTW89_CHANCTX_BT_SLOT_CHANGE ,NUM_OF_RTW89_CHANCTX_CHANGES , RTW89_CHANCTX_CHANGE_DFLT = NUM_OF_RTW89_CHANCTX_CHANGES,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/8 wifi: rtw89: mcc: deal with beacon NoA if GO exists
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
In MCC STA+GO mode, we calculate NoA information and fill it into the beacon of P2P GO. Since NoA uses only 32 bits to describe time things, we need to deal with renewal when TSF[63:32] is carried. We trigger FW to notify that. Then, we can update NoA information for new time period once we get notification from FW.
--- drivers/net/wireless/realtek/rtw89/chan.c | 93 ++++++++++++++++++- drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac80211.c | 1 + 4 files changed, 96 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/chan.c +92 -1
@@ -1423,6 +1423,89 @@ static int __mcc_fw_set_duration_no_bt(struct rtw89_dev *rtwdev, bool sync_changreturn 0 ; } +static void rtw89_mcc_handle_beacon_noa (struct rtw89_dev *rtwdev,bool enable) +{ +struct rtw89_mcc_info *mcc = &rtwdev->mcc; +struct rtw89_mcc_role *ref = &mcc->role_ref; +struct rtw89_mcc_role *aux = &mcc->role_aux; +struct rtw89_mcc_config *config = &mcc->config; +struct rtw89_mcc_pattern *pattern = &config->pattern; +struct ieee80211_p2p_noa_desc noa_desc = {}; +u64 start_time = config->start_tsf; +u32 interval = config->mcc_interval; +struct rtw89_vif *rtwvif_go; +u32 duration; + +if (mcc->mode !=RTW89_MCC_MODE_GO_STA ) +return ; + +if (ref->is_go) { + rtwvif_go = ref->rtwvif; + start_time +=ieee80211_tu_to_usec (ref->duration); + duration = config->mcc_interval - ref->duration; + }else if (aux->is_go) { + rtwvif_go = aux->rtwvif; + start_time +=ieee80211_tu_to_usec (pattern->tob_ref) + +ieee80211_tu_to_usec (config->beacon_offset) + +ieee80211_tu_to_usec (pattern->toa_aux); + duration = config->mcc_interval - aux->duration; + }else { +rtw89_debug (rtwdev,RTW89_DBG_CHAN , +"MCC find no GO: skip updating beacon NoA\n" ); +return ; + } + +rtw89_p2p_noa_renew (rtwvif_go); + +if (enable) { + noa_desc.start_time =cpu_to_le32 (start_time); + noa_desc.interval =cpu_to_le32 (ieee80211_tu_to_usec (interval)); + noa_desc.duration =cpu_to_le32 (ieee80211_tu_to_usec (duration)); + noa_desc.count =255 ; +rtw89_p2p_noa_append (rtwvif_go, &noa_desc); + } + +/* without chanctx, we cannot get beacon from mac80211 stack */ +if (!rtwvif_go->chanctx_assigned) +return ; + +rtw89_fw_h2c_update_beacon (rtwdev, rtwvif_go); +} + +static void rtw89_mcc_start_beacon_noa (struct rtw89_dev *rtwdev) +{ +struct rtw89_mcc_info *mcc = &rtwdev->mcc; +struct rtw89_mcc_role *ref = &mcc->role_ref; +struct rtw89_mcc_role *aux = &mcc->role_aux; + +if (mcc->mode !=RTW89_MCC_MODE_GO_STA ) +return ; + +if (ref->is_go) +rtw89_fw_h2c_tsf32_toggle (rtwdev, ref->rtwvif, true); +else if (aux->is_go) +rtw89_fw_h2c_tsf32_toggle (rtwdev, aux->rtwvif, true); + +rtw89_mcc_handle_beacon_noa (rtwdev, true); +} + +static void rtw89_mcc_stop_beacon_noa (struct rtw89_dev *rtwdev) +{ +struct rtw89_mcc_info *mcc = &rtwdev->mcc; +struct rtw89_mcc_role *ref = &mcc->role_ref; +struct rtw89_mcc_role *aux = &mcc->role_aux; + +if (mcc->mode !=RTW89_MCC_MODE_GO_STA ) +return ; + +if (ref->is_go) +rtw89_fw_h2c_tsf32_toggle (rtwdev, ref->rtwvif, false); +else if (aux->is_go) +rtw89_fw_h2c_tsf32_toggle (rtwdev, aux->rtwvif, false); + +rtw89_mcc_handle_beacon_noa (rtwdev, false); +} +static int rtw89_mcc_start (struct rtw89_dev *rtwdev) {struct rtw89_mcc_info *mcc = &rtwdev->mcc;
@@ -1459,6 +1542,8 @@ static int rtw89_mcc_start(struct rtw89_dev *rtwdev)return ret;rtw89_chanctx_notify (rtwdev,RTW89_CHANCTX_STATE_MCC_START ); + +rtw89_mcc_start_beacon_noa (rtwdev);return 0 ; }
@@ -1482,6 +1567,8 @@ static void rtw89_mcc_stop(struct rtw89_dev *rtwdev) "MCC h2c failed to delete group: %d\n", ret);rtw89_chanctx_notify (rtwdev,RTW89_CHANCTX_STATE_MCC_STOP ); + +rtw89_mcc_stop_beacon_noa (rtwdev); }static int rtw89_mcc_update (struct rtw89_dev *rtwdev)
@@ -1517,6 +1604,7 @@ static int rtw89_mcc_update(struct rtw89_dev *rtwdev)return ret; } +rtw89_mcc_handle_beacon_noa (rtwdev, true);return 0 ; }
@@ -1647,7 +1735,8 @@ void rtw89_chanctx_work(struct work_struct *work)case RTW89_ENTITY_MODE_MCC :if (changed &BIT (RTW89_CHANCTX_BCN_OFFSET_CHANGE ) || changed &BIT (RTW89_CHANCTX_P2P_PS_CHANGE ) || - changed &BIT (RTW89_CHANCTX_BT_SLOT_CHANGE )) + changed &BIT (RTW89_CHANCTX_BT_SLOT_CHANGE ) || + changed &BIT (RTW89_CHANCTX_TSF32_TOGGLE_CHANGE )) update_mcc_pattern = true;if (changed &BIT (RTW89_CHANCTX_REMOTE_STA_CHANGE ))rtw89_mcc_update_macid_bitmap (rtwdev);
@@ -1809,6 +1898,7 @@ int rtw89_chanctx_ops_assign_vif(struct rtw89_dev *rtwdev,struct rtw89_chanctx_cfg *cfg = (struct rtw89_chanctx_cfg *)ctx->drv_priv; rtwvif->sub_entity_idx = cfg->idx; + rtwvif->chanctx_assigned = true;return 0 ; }
@@ -1817,4 +1907,5 @@ void rtw89_chanctx_ops_unassign_vif(struct rtw89_dev *rtwdev, struct ieee80211_chanctx_conf *ctx) { rtwvif->sub_entity_idx =RTW89_SUB_ENTITY_0 ; + rtwvif->chanctx_assigned = false; }
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -2930,6 +2930,7 @@ struct rtw89_vif {struct list_head list;struct rtw89_dev *rtwdev;struct rtw89_roc roc; +bool chanctx_assigned;/* only valid when running with chanctx_ops */ enum rtw89_sub_entity_idx sub_entity_idx;enum rtw89_reg_6ghz_power reg_6ghz_power;
@@ -3792,6 +3793,7 @@ enum rtw89_chanctx_changes {RTW89_CHANCTX_BCN_OFFSET_CHANGE ,RTW89_CHANCTX_P2P_PS_CHANGE ,RTW89_CHANCTX_BT_SLOT_CHANGE , +RTW89_CHANCTX_TSF32_TOGGLE_CHANGE ,NUM_OF_RTW89_CHANCTX_CHANGES , RTW89_CHANCTX_CHANGE_DFLT = NUM_OF_RTW89_CHANCTX_CHANGES,
drivers/net/wireless/realtek/rtw89/mac.c +1 -0
@@ -4488,6 +4488,7 @@ static void rtw89_mac_c2h_tsf32_toggle_rpt(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len) { +rtw89_queue_chanctx_change (rtwdev, RTW89_CHANCTX_TSF32_TOGGLE_CHANGE); } static void
drivers/net/wireless/realtek/rtw89/mac80211.c +1 -0
@@ -145,6 +145,7 @@ static int rtw89_ops_add_interface(struct ieee80211_hw *hw, rtwvif->mac_idx =RTW89_MAC_0 ; rtwvif->phy_idx =RTW89_PHY_0 ; rtwvif->sub_entity_idx =RTW89_SUB_ENTITY_0 ; + rtwvif->chanctx_assigned = false; rtwvif->hit_rule =0 ; rtwvif->reg_6ghz_power =RTW89_REG_6GHZ_POWER_DFLT ;ether_addr_copy (rtwvif->mac_addr, vif->addr);
Signature · 1 line
2.25.1