wifi: rtw89: fine tune STA + P2P concurrency
Ping-Ke Shih
maintainercover wifi: rtw89: fine tune STA + P2P concurrency
Mainly this patchset is to fine tune time slot assignment for STA + P2P concurrency. Since the TSF of connected AP is fixed and roaming is possible, it is not possible to arrange GO TSF with a fixed offset. Therefore, adjust time slot case by case to have better user experience.
The patch 1/12 is to enlarge time that driver determines AP is gone. In field, some AP stop issuing beacon somehow. With larger time, connection can stay over 24 hours.
The patch 2/12 is to update ACPI format for TAS, which we can specify to enable certain countries.
Kuan-Chung Chen (2):
wifi: rtw89: 8922a: increase beacon loss to 6 seconds
wifi: rtw89: acpi: introduce country specific TAS enabling
Zong-Zhe Yang (10):
wifi: rtw89: add suffix "_ax" to Wi-Fi 6 HW scan struct and func
wifi: rtw89: refactor flow that hw scan handles channel list
wifi: rtw89: mcc: make GO announce one-time NoA for HW scan process
wifi: rtw89: don't re-randomize TSF of AP/GO
wifi: rtw89: mcc: make GO+STA mode calculate dynamic beacon offset
wifi: rtw89: mcc: handle the case where NoA start time has passed
wifi: rtw89: mcc: update entire plan when courtesy config changes
wifi: rtw89: mcc: support courtesy mechanism on both roles at the same
time
wifi: rtw89: mcc: refine filling function of start TSF
wifi: rtw89: mcc: avoid that loose pattern sets negative timing for
auxiliary GO
drivers/net/wireless/realtek/rtw89/acpi.c | 45 +++ drivers/net/wireless/realtek/rtw89/acpi.h | 16 + drivers/net/wireless/realtek/rtw89/chan.c | 191 +++++------ drivers/net/wireless/realtek/rtw89/chan.h | 8 + drivers/net/wireless/realtek/rtw89/core.c | 4 +- drivers/net/wireless/realtek/rtw89/core.h | 18 +- drivers/net/wireless/realtek/rtw89/fw.c | 315 ++++++++++++++---- drivers/net/wireless/realtek/rtw89/fw.h | 23 +- drivers/net/wireless/realtek/rtw89/mac.c | 14 +- drivers/net/wireless/realtek/rtw89/mac.h | 5 +- drivers/net/wireless/realtek/rtw89/mac80211.c | 11 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 2 + drivers/net/wireless/realtek/rtw89/regd.c | 13 +- drivers/net/wireless/realtek/rtw89/sar.c | 14 +- drivers/net/wireless/realtek/rtw89/ser.c | 1 + 15 files changed, 479 insertions(+), 201 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/12 wifi: rtw89: 8922a: increase beacon loss to 6 seconds
From: Kuan-Chung Chen <[email protected]>
Intermittent beacon loss from specific AP triggers disconnection and reconnection. Increasing the beacon loss count will make the connection more stable.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 12 +++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 5 +++-- 3 files changed, 15 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4495,6 +4495,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_LPS_CH_INFO ,RTW89_FW_FEATURE_NO_PHYCAP_P1 ,RTW89_FW_FEATURE_NO_POWER_DIFFERENCE , + RTW89_FW_FEATURE_BEACON_LOSS_COUNT_V1, }; struct rtw89_fw_suit {
drivers/net/wireless/realtek/rtw89/fw.c +11 -1
@@ -850,6 +850,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8922A , lt,0 ,35 ,49 ,0 ,RFK_PRE_NOTIFY_V1 ),__CFG_FW_FEAT (RTL8922A , lt,0 ,35 ,51 ,0 ,NO_PHYCAP_P1 ),__CFG_FW_FEAT (RTL8922A , lt,0 ,35 ,64 ,0 ,NO_POWER_DIFFERENCE ), + __CFG_FW_FEAT(RTL8922A, ge, 0, 35, 71, 0, BEACON_LOSS_COUNT_V1), }; static void rtw89_fw_iterate_feature_cfg(struct rtw89_fw_info *fw,
@@ -4339,6 +4340,7 @@ int rtw89_fw_h2c_set_bcn_fltr_cfg(struct rtw89_dev *rtwdev,struct rtw89_h2c_bcnfltr *h2c;u32 len =sizeof (*h2c);struct sk_buff *skb; +u8 max_cnt, cnt;int ret;if (!RTW89_CHK_FW_FEATURE (BEACON_FILTER , &rtwdev->fw))
@@ -4367,12 +4369,20 @@ int rtw89_fw_h2c_set_bcn_fltr_cfg(struct rtw89_dev *rtwdev,skb_put (skb, len); h2c = (struct rtw89_h2c_bcnfltr *)skb->data; +if (RTW89_CHK_FW_FEATURE (BEACON_LOSS_COUNT_V1 , &rtwdev->fw)) + max_cnt =BIT (7 ) -1 ; +else + max_cnt =BIT (4 ) -1 ; + + cnt =min (RTW89_BCN_LOSS_CNT , max_cnt); + h2c->w0 =le32_encode_bits (connect,RTW89_H2C_BCNFLTR_W0_MON_RSSI ) |le32_encode_bits (connect,RTW89_H2C_BCNFLTR_W0_MON_BCN ) |le32_encode_bits (connect,RTW89_H2C_BCNFLTR_W0_MON_EN ) |le32_encode_bits (RTW89_BCN_FLTR_OFFLOAD_MODE_DEFAULT ,RTW89_H2C_BCNFLTR_W0_MODE ) | -le32_encode_bits (RTW89_BCN_LOSS_CNT ,RTW89_H2C_BCNFLTR_W0_BCN_LOSS_CNT ) | +le32_encode_bits (cnt >>4 ,RTW89_H2C_BCNFLTR_W0_BCN_LOSS_CNT_H3 ) | +le32_encode_bits (cnt &0xf ,RTW89_H2C_BCNFLTR_W0_BCN_LOSS_CNT_L4 ) |le32_encode_bits (hyst,RTW89_H2C_BCNFLTR_W0_RSSI_HYST ) |le32_encode_bits (thold +MAX_RSSI , RTW89_H2C_BCNFLTR_W0_RSSI_THRESHOLD) |
drivers/net/wireless/realtek/rtw89/fw.h +3 -2
@@ -333,7 +333,7 @@ struct rtw89_fw_macid_pause_sleep_grp {#define RTW89_SCAN_LIST_LIMIT_AX RTW89_SCAN_LIST_LIMIT(RTW89_MAC_CHINFO_SIZE)#define RTW89_SCAN_LIST_LIMIT_BE RTW89_SCAN_LIST_LIMIT(RTW89_MAC_CHINFO_SIZE_BE) -#define RTW89_BCN_LOSS_CNT 10 +#define RTW89_BCN_LOSS_CNT 60struct rtw89_mac_chinfo {u8 period;
@@ -3813,7 +3813,8 @@ struct rtw89_h2c_bcnfltr {#define RTW89_H2C_BCNFLTR_W0_MON_BCN BIT(1)#define RTW89_H2C_BCNFLTR_W0_MON_EN BIT(2)#define RTW89_H2C_BCNFLTR_W0_MODE GENMASK(4, 3) -#define RTW89_H2C_BCNFLTR_W0_BCN_LOSS_CNT GENMASK(11, 8) +#define RTW89_H2C_BCNFLTR_W0_BCN_LOSS_CNT_H3 GENMASK(7, 5) +#define RTW89_H2C_BCNFLTR_W0_BCN_LOSS_CNT_L4 GENMASK(11, 8)#define RTW89_H2C_BCNFLTR_W0_RSSI_HYST GENMASK(15, 12)#define RTW89_H2C_BCNFLTR_W0_RSSI_THRESHOLD GENMASK(23, 16)#define RTW89_H2C_BCNFLTR_W0_MAC_ID GENMASK(31, 24)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 01/12] wifi: rtw89: 8922a: increase beacon loss to 6 seconds
Quoted 8 lines · Ping-Ke Shih
From: Kuan-Chung Chen <[email protected]>
Intermittent beacon loss from specific AP triggers disconnection and reconnection. Increasing the beacon loss count will make the connection more stable.
Signed-off-by Kuan-Chung Chen <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
12 patch(es) applied to rtw-next branch of rtw.git, thanks.
74f754da761b wifi: rtw89: 8922a: increase beacon loss to 6 seconds df6da0b81e2f wifi: rtw89: acpi: introduce country specific TAS enabling 27982c908240 wifi: rtw89: add suffix "_ax" to Wi-Fi 6 HW scan struct and func 57a5fbe39a18 wifi: rtw89: refactor flow that hw scan handles channel list 98019abbf97d wifi: rtw89: mcc: make GO announce one-time NoA for HW scan process 13bd2b36f22f wifi: rtw89: don't re-randomize TSF of AP/GO50f9dc17a181 wifi: rtw89: mcc: make GO+STA mode calculate dynamic beacon offset b8a2f9e0fab9 wifi: rtw89: mcc: handle the case where NoA start time has passed 584a423e7527 wifi: rtw89: mcc: update entire plan when courtesy config changes ab67677712c0 wifi: rtw89: mcc: support courtesy mechanism on both roles at the same time 1cc8a27bf621 wifi: rtw89: mcc: refine filling function of start TSF 6644a416727c wifi: rtw89: mcc: avoid that loose pattern sets negative timing for auxiliary GO
Ping-Ke Shih
maintainerPATCH 2/12 wifi: rtw89: acpi: introduce country specific TAS enabling
In reply to Ping-Ke ShihFrom: Kuan-Chung Chen <[email protected]>
A new ACPI table entry format for TAS is defined, which includes a "specific country" field. In this field, determine which country can enable TAS.
--- drivers/net/wireless/realtek/rtw89/acpi.c | 45 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/acpi.h | 16 ++++++++ drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/regd.c | 13 ++++++- drivers/net/wireless/realtek/rtw89/sar.c | 14 +++++-- 5 files changed, 84 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/acpi.c +45 -0
@@ -236,6 +236,49 @@ int rtw89_acpi_dsm_get_policy_6ghz_sp(struct rtw89_dev *rtwdev,return 0 ; } +static bool chk_acpi_policy_tas_sig (const struct rtw89_acpi_policy_tas *p) +{ +return p->signature[0 ] ==0x52 && + p->signature[1 ] ==0x54 && + p->signature[2 ] ==0x4B && + p->signature[3 ] ==0x05 ; +} + +static int rtw89_acpi_dsm_get_policy_tas (struct rtw89_dev *rtwdev, +union acpi_object *obj, +struct rtw89_acpi_policy_tas **policy) +{ +const struct rtw89_acpi_policy_tas *ptr; +u32 buf_len; + +if (obj->type !=ACPI_TYPE_BUFFER ) { +rtw89_debug (rtwdev,RTW89_DBG_ACPI , +"acpi: expect buffer but type: %d\n" , obj->type); +return -EINVAL ; + } + + buf_len = obj->buffer.length; +if (buf_len <sizeof (*ptr)) { +rtw89_debug (rtwdev,RTW89_DBG_ACPI ,"%s: invalid buffer length: %u\n" , + __func__, buf_len); +return -EINVAL ; + } + + ptr = (typeof (ptr ))obj->buffer.pointer; +if (!chk_acpi_policy_tas_sig (ptr)) { +rtw89_debug (rtwdev,RTW89_DBG_ACPI ,"%s: bad signature\n" , __func__); +return -EINVAL ; + } + + *policy =kmemdup (ptr,sizeof (*ptr),GFP_KERNEL ); +if (!*policy) +return -ENOMEM ; + +rtw89_hex_dump (rtwdev,RTW89_DBG_ACPI ,"policy_tas: " , *policy, +sizeof (*ptr)); +return 0 ; +} +int rtw89_acpi_evaluate_dsm (struct rtw89_dev *rtwdev,enum rtw89_acpi_dsm_func func,struct rtw89_acpi_dsm_result *res)
@@ -257,6 +300,8 @@ int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev,else if (func ==RTW89_ACPI_DSM_FUNC_6GHZ_SP_SUP ) ret =rtw89_acpi_dsm_get_policy_6ghz_sp (rtwdev, obj, &res->u.policy_6ghz_sp); +else if (func ==RTW89_ACPI_DSM_FUNC_TAS_EN ) + ret =rtw89_acpi_dsm_get_policy_tas (rtwdev, obj, &res->u.policy_tas);else ret =rtw89_acpi_dsm_get_value (rtwdev, obj, &res->u.value);
drivers/net/wireless/realtek/rtw89/acpi.h +16 -0
@@ -31,6 +31,13 @@ enum rtw89_acpi_policy_mode { RTW89_ACPI_POLICY_ALLOW = 1, }; +enum rtw89_acpi_conf_tas { +RTW89_ACPI_CONF_TAS_US =BIT (0 ), +RTW89_ACPI_CONF_TAS_CA =BIT (1 ), +RTW89_ACPI_CONF_TAS_KR =BIT (2 ), +RTW89_ACPI_CONF_TAS_OTHERS =BIT (7 ), +}; +struct rtw89_acpi_country_code {/* below are allowed: * * ISO alpha2 country code
@@ -59,12 +66,21 @@ struct rtw89_acpi_policy_6ghz_sp {u8 rsvd; } __packed; +struct rtw89_acpi_policy_tas { +u8 signature[4 ]; +u8 revision; +u8 enable; +u8 enabled_countries; +u8 rsvd[3 ]; +} __packed; +struct rtw89_acpi_dsm_result {union {u8 value;/* caller needs to free it after using */ struct rtw89_acpi_policy_6ghz *policy_6ghz;struct rtw89_acpi_policy_6ghz_sp *policy_6ghz_sp; +struct rtw89_acpi_policy_tas *policy_tas; } u; };
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4753,6 +4753,7 @@ enum rtw89_tas_state {struct rtw89_tas_info {u16 tx_ratio_history[RTW89_TAS_TX_RATIO_WINDOW ];u64 txpwr_history[RTW89_TAS_TXPWR_WINDOW ]; +u8 enabled_countries;u8 txpwr_head_idx;u8 txpwr_tail_idx;u8 tx_ratio_idx;
drivers/net/wireless/realtek/rtw89/regd.c +12 -1
@@ -758,11 +758,22 @@ static void rtw89_regd_apply_policy_tas(struct rtw89_dev *rtwdev)struct rtw89_regulatory_info *regulatory = &rtwdev->regulatory;const struct rtw89_regd *regd = regulatory->regd;struct rtw89_tas_info *tas = &rtwdev->tas; +u8 tas_country;if (!tas->enable)return ; - tas->block_regd = !test_bit (RTW89_REGD_FUNC_TAS , regd->func_bitmap); +if (memcmp ("US" , regd->alpha2,2 ) ==0 ) + tas_country =RTW89_ACPI_CONF_TAS_US ; +else if (memcmp ("CA" , regd->alpha2,2 ) ==0 ) + tas_country =RTW89_ACPI_CONF_TAS_CA ; +else if (memcmp ("KR" , regd->alpha2,2 ) ==0 ) + tas_country =RTW89_ACPI_CONF_TAS_KR ; +else + tas_country =RTW89_ACPI_CONF_TAS_OTHERS ; + + tas->block_regd = !(tas->enabled_countries & tas_country && +test_bit (RTW89_REGD_FUNC_TAS , regd->func_bitmap)); }static void rtw89_regd_apply_policy_ant_gain (struct rtw89_dev *rtwdev)
drivers/net/wireless/realtek/rtw89/sar.c +10 -4
@@ -695,9 +695,9 @@ static void rtw89_tas_init(struct rtw89_dev *rtwdev) {const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_tas_info *tas = &rtwdev->tas; +const struct rtw89_acpi_policy_tas *ptr;struct rtw89_acpi_dsm_result res = {};int ret; -u8 val;if (!chip->support_tas)return ;
@@ -709,8 +709,9 @@ static void rtw89_tas_init(struct rtw89_dev *rtwdev)return ; } - val = res.u.value; -switch (val) { + ptr = res.u.policy_tas; + +switch (ptr->enable) {case 0 : tas->enable = false;break ;
@@ -723,8 +724,13 @@ static void rtw89_tas_init(struct rtw89_dev *rtwdev)if (!tas->enable) {rtw89_debug (rtwdev,RTW89_DBG_SAR ,"TAS not enable\n" ); -return ; + goto out; } + + tas->enabled_countries = ptr->enabled_countries; + +out: +kfree (ptr); }void rtw89_tas_reset (struct rtw89_dev *rtwdev,bool force)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/12 wifi: rtw89: add suffix "_ax" to Wi-Fi 6 HW scan struct and func
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
These stuffs have no suffix, but not universal, and only work for Wi-Fi 6. Since the corresponding HW scan struct/func of Wi-Fi 7 have suffix "_be", to avoid misunderstanding and improve readability, also add suffix "_ax" to these Wi-Fi 6 stuffs.
(No logic is changed.)
--- drivers/net/wireless/realtek/rtw89/fw.c | 36 ++++++++++++------------- drivers/net/wireless/realtek/rtw89/fw.h | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +18 -18
@@ -5308,12 +5308,12 @@ int rtw89_fw_h2c_add_pkt_offload(struct rtw89_dev *rtwdev, u8 *id, }static -int rtw89_fw_h2c_scan_list_offload (struct rtw89_dev *rtwdev,int ch_num, -struct list_head *chan_list) +int rtw89_fw_h2c_scan_list_offload_ax (struct rtw89_dev *rtwdev,int ch_num, +struct list_head *chan_list) {struct rtw89_wait_info *wait = &rtwdev->mac.fw_ofld_wait;struct rtw89_h2c_chinfo_elem *elem; -struct rtw89_mac_chinfo *ch_info; +struct rtw89_mac_chinfo_ax *ch_info;struct rtw89_h2c_chinfo *h2c;struct sk_buff *skb;unsigned int cond;
@@ -6648,10 +6648,10 @@ static int rtw89_hw_scan_update_probe_req(struct rtw89_dev *rtwdev,return 0 ; } -static int rtw89_update_6ghz_rnr_chan (struct rtw89_dev *rtwdev, -struct ieee80211_scan_ies *ies, -struct cfg80211_scan_request *req, -struct rtw89_mac_chinfo *ch_info) +static int rtw89_update_6ghz_rnr_chan_ax (struct rtw89_dev *rtwdev, +struct ieee80211_scan_ies *ies, +struct cfg80211_scan_request *req, +struct rtw89_mac_chinfo_ax *ch_info) {struct rtw89_vif_link *rtwvif_link = rtwdev->scan_info.scanning_vif;struct list_head *pkt_list = rtwdev->scan_info.pkt_list;
@@ -6723,7 +6723,7 @@ static int rtw89_update_6ghz_rnr_chan(struct rtw89_dev *rtwdev,static void rtw89_pno_scan_add_chan_ax (struct rtw89_dev *rtwdev,int chan_type,int ssid_num, -struct rtw89_mac_chinfo *ch_info) +struct rtw89_mac_chinfo_ax *ch_info) {struct rtw89_wow_param *rtw_wow = &rtwdev->wow;struct rtw89_pktofld_info *info;
@@ -6771,9 +6771,9 @@ static void rtw89_pno_scan_add_chan_ax(struct rtw89_dev *rtwdev, } } -static void rtw89_hw_scan_add_chan (struct rtw89_dev *rtwdev,int chan_type, -int ssid_num, -struct rtw89_mac_chinfo *ch_info) +static void rtw89_hw_scan_add_chan_ax (struct rtw89_dev *rtwdev,int chan_type, +int ssid_num, +struct rtw89_mac_chinfo_ax *ch_info) {struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info;struct rtw89_vif_link *rtwvif_link = rtwdev->scan_info.scanning_vif;
@@ -6804,7 +6804,7 @@ static void rtw89_hw_scan_add_chan(struct rtw89_dev *rtwdev, int chan_type, } } - ret =rtw89_update_6ghz_rnr_chan (rtwdev, ies, req, ch_info); + ret =rtw89_update_6ghz_rnr_chan_ax (rtwdev, ies, req, ch_info);if (ret)rtw89_warn (rtwdev,"RNR fails: %d\n" , ret);
@@ -6960,7 +6960,7 @@ int rtw89_pno_scan_add_chan_list_ax(struct rtw89_dev *rtwdev, {struct rtw89_wow_param *rtw_wow = &rtwdev->wow;struct cfg80211_sched_scan_request *nd_config = rtw_wow->nd_config; -struct rtw89_mac_chinfo *ch_info, *tmp; +struct rtw89_mac_chinfo_ax *ch_info, *tmp;struct ieee80211_channel *channel;struct list_head chan_list;int list_len;
@@ -6994,7 +6994,7 @@ int rtw89_pno_scan_add_chan_list_ax(struct rtw89_dev *rtwdev,rtw89_pno_scan_add_chan_ax (rtwdev, type, nd_config->n_match_sets, ch_info);list_add_tail (&ch_info->list, &chan_list); } - ret =rtw89_fw_h2c_scan_list_offload (rtwdev, list_len, &chan_list); + ret =rtw89_fw_h2c_scan_list_offload_ax (rtwdev, list_len, &chan_list); out:list_for_each_entry_safe (ch_info, tmp, &chan_list, list) {
@@ -7010,7 +7010,7 @@ int rtw89_hw_scan_add_chan_list_ax(struct rtw89_dev *rtwdev, {struct rtw89_vif *rtwvif = rtwvif_link->rtwvif;struct cfg80211_scan_request *req = rtwvif->scan_req; -struct rtw89_mac_chinfo *ch_info, *tmp; +struct rtw89_mac_chinfo_ax *ch_info, *tmp;struct ieee80211_channel *channel;struct list_head chan_list;bool random_seq = req->flags &NL80211_SCAN_FLAG_RANDOM_SN ;
@@ -7049,7 +7049,7 @@ int rtw89_hw_scan_add_chan_list_ax(struct rtw89_dev *rtwdev, type =RTW89_CHAN_DFS ; else type =RTW89_CHAN_ACTIVE ; -rtw89_hw_scan_add_chan (rtwdev, type, req->n_ssids, ch_info); +rtw89_hw_scan_add_chan_ax (rtwdev, type, req->n_ssids, ch_info);if (connected && off_chan_time + ch_info->period >RTW89_OFF_CHAN_TIME ) {
@@ -7063,7 +7063,7 @@ int rtw89_hw_scan_add_chan_list_ax(struct rtw89_dev *rtwdev, type =RTW89_CHAN_OPERATE ; tmp->period = req->duration_mandatory ? req->duration :RTW89_CHANNEL_TIME ; -rtw89_hw_scan_add_chan (rtwdev, type,0 , tmp); +rtw89_hw_scan_add_chan_ax (rtwdev, type,0 , tmp);list_add_tail (&tmp->list, &chan_list); off_chan_time =0 ; list_len++;
@@ -7072,7 +7072,7 @@ int rtw89_hw_scan_add_chan_list_ax(struct rtw89_dev *rtwdev, off_chan_time += ch_info->period; } rtwdev->scan_info.last_chan_idx = idx; - ret =rtw89_fw_h2c_scan_list_offload (rtwdev, list_len, &chan_list); + ret =rtw89_fw_h2c_scan_list_offload_ax (rtwdev, list_len, &chan_list); out:list_for_each_entry_safe (ch_info, tmp, &chan_list, list) {
drivers/net/wireless/realtek/rtw89/fw.h +1 -1
@@ -335,7 +335,7 @@ struct rtw89_fw_macid_pause_sleep_grp {#define RTW89_BCN_LOSS_CNT 60 -struct rtw89_mac_chinfo { +struct rtw89_mac_chinfo_ax {u8 period;u8 dwell_time;u8 central_ch;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/12 wifi: rtw89: refactor flow that hw scan handles channel list
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
FW has a limited amount of channels that can be dealt with by one HW scan H2C command. Based on the limit, channels in scan request might be parsed into SW structure piece by piece along with multiple HW scan H2C commands. But, in order to estimate things of entire HW scan process, it's required to have the whole parsed channel list when HW scan is going to start. So, tweak HW scan flow to prepare the whole channel list ahead. Still, each HW scan H2C command takes allowed amount of channels from the list according to the limit.
--- drivers/net/wireless/realtek/rtw89/core.c | 4 +- drivers/net/wireless/realtek/rtw89/core.h | 3 +- drivers/net/wireless/realtek/rtw89/fw.c | 190 ++++++++++++++---- drivers/net/wireless/realtek/rtw89/fw.h | 16 +- drivers/net/wireless/realtek/rtw89/mac.c | 6 +- drivers/net/wireless/realtek/rtw89/mac.h | 5 +- drivers/net/wireless/realtek/rtw89/mac80211.c | 10 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 2 + 8 files changed, 179 insertions(+), 57 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +1 -3
@@ -4862,6 +4862,7 @@ int rtw89_core_init(struct rtw89_dev *rtwdev)continue ;INIT_LIST_HEAD (&rtwdev->scan_info.pkt_list[band]); } +INIT_LIST_HEAD (&rtwdev->scan_info.chan_list);INIT_WORK (&rtwdev->ba_work, rtw89_core_ba_work);INIT_WORK (&rtwdev->txq_work, rtw89_core_txq_work);INIT_DELAYED_WORK (&rtwdev->txq_reinvoke_work, rtw89_core_txq_reinvoke_work);
@@ -4947,9 +4948,6 @@ void rtw89_core_scan_start(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvstruct rtw89_bb_ctx *bb =rtw89_get_bb_ctx (rtwdev, rtwvif_link->phy_idx); rtwdev->scanning = true; -rtw89_leave_lps (rtwdev); -if (hw_scan) -rtw89_leave_ips_by_hwflags (rtwdev);ether_addr_copy (rtwvif_link->mac_addr, mac_addr);rtw89_btc_ntfy_scan_start (rtwdev, rtwvif_link->phy_idx, chan->band_type);
drivers/net/wireless/realtek/rtw89/core.h +2 -1
@@ -5422,9 +5422,10 @@ struct rtw89_early_h2c {struct rtw89_hw_scan_info {struct rtw89_vif_link *scanning_vif;struct list_head pkt_list[NUM_NL80211_BANDS ]; +struct list_head chan_list;struct rtw89_chan op_chan; +bool connected;bool abort; -u32 last_chan_idx; };enum rtw89_phy_bb_gain_band {
drivers/net/wireless/realtek/rtw89/fw.c +146 -44
360 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +11 -5
@@ -4716,9 +4716,9 @@ int rtw89_fw_msg_reg(struct rtw89_dev *rtwdev, struct rtw89_mac_c2h_info *c2h_info);int rtw89_fw_h2c_fw_log (struct rtw89_dev *rtwdev,bool enable);void rtw89_fw_st_dbg_dump (struct rtw89_dev *rtwdev); -void rtw89_hw_scan_start (struct rtw89_dev *rtwdev, -struct rtw89_vif_link *rtwvif_link, -struct ieee80211_scan_request *scan_req); +int rtw89_hw_scan_start (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct ieee80211_scan_request *scan_req);void rtw89_hw_scan_complete (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,bool aborted);
@@ -4727,12 +4727,18 @@ int rtw89_hw_scan_offload(struct rtw89_dev *rtwdev, bool enable);void rtw89_hw_scan_abort (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link); +int rtw89_hw_scan_prep_chan_list_ax (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link); +void rtw89_hw_scan_free_chan_list_ax (struct rtw89_dev *rtwdev);int rtw89_hw_scan_add_chan_list_ax (struct rtw89_dev *rtwdev, -struct rtw89_vif_link *rtwvif_link,bool connected); +struct rtw89_vif_link *rtwvif_link);int rtw89_pno_scan_add_chan_list_ax (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link); +int rtw89_hw_scan_prep_chan_list_be (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link); +void rtw89_hw_scan_free_chan_list_be (struct rtw89_dev *rtwdev);int rtw89_hw_scan_add_chan_list_be (struct rtw89_dev *rtwdev, -struct rtw89_vif_link *rtwvif_link,bool connected); +struct rtw89_vif_link *rtwvif_link);int rtw89_pno_scan_add_chan_list_be (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link);int rtw89_fw_h2c_trigger_cpu_exception (struct rtw89_dev *rtwdev);
drivers/net/wireless/realtek/rtw89/mac.c +4 -2
@@ -4899,11 +4899,11 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb,struct rtw89_vif_link *rtwvif_link = rtwdev->scan_info.scanning_vif;struct rtw89_vif *rtwvif;struct rtw89_chan new; -u32 last_chan = rtwdev->scan_info.last_chan_idx, report_tsf;u16 actual_period, expect_period;u8 reason, status, tx_fail, band;u8 mac_idx, sw_def, fw_def;u8 ver =U8_MAX ; +u32 report_tsf;u16 chan;int ret;
@@ -4962,7 +4962,7 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb,return ;if (rtwvif_link && rtwvif->scan_req && - last_chan < rtwvif->scan_req->n_channels) { + !list_empty (&rtwdev->scan_info.chan_list)) { ret =rtw89_hw_scan_offload (rtwdev, rtwvif_link, true);if (ret) {rtw89_hw_scan_abort (rtwdev, rtwvif_link);
@@ -6889,6 +6889,8 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .is_txq_empty = mac_is_txq_empty_ax, + .prep_chan_list = rtw89_hw_scan_prep_chan_list_ax, + .free_chan_list = rtw89_hw_scan_free_chan_list_ax, .add_chan_list = rtw89_hw_scan_add_chan_list_ax, .add_chan_list_pno = rtw89_pno_scan_add_chan_list_ax, .scan_offload = rtw89_fw_h2c_scan_offload_ax,
drivers/net/wireless/realtek/rtw89/mac.h +4 -1
@@ -1031,8 +1031,11 @@ struct rtw89_mac_gen_def {bool (*is_txq_empty)(struct rtw89_dev *rtwdev); +int (*prep_chan_list)(struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link); +void (*free_chan_list)(struct rtw89_dev *rtwdev);int (*add_chan_list)(struct rtw89_dev *rtwdev, -struct rtw89_vif_link *rtwvif_link,bool connected); +struct rtw89_vif_link *rtwvif_link);int (*add_chan_list_pno)(struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link); int (*scan_offload)(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/mac80211.c +9 -1
@@ -1159,6 +1159,8 @@ static void rtw89_ops_sw_scan_start(struct ieee80211_hw *hw,return ; } +rtw89_leave_lps (rtwdev); +rtw89_core_scan_start (rtwdev, rtwvif_link, mac_addr, false); }
@@ -1211,7 +1213,13 @@ static int rtw89_ops_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,return -ENOLINK ; } -rtw89_hw_scan_start (rtwdev, rtwvif_link, req); +rtw89_leave_lps (rtwdev); +rtw89_leave_ips_by_hwflags (rtwdev); + + ret =rtw89_hw_scan_start (rtwdev, rtwvif_link, req); +if (ret) +return ret; + ret =rtw89_hw_scan_offload (rtwdev, rtwvif_link, true);if (ret) {rtw89_hw_scan_abort (rtwdev, rtwvif_link);
drivers/net/wireless/realtek/rtw89/mac_be.c +2 -0
@@ -2636,6 +2636,8 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .is_txq_empty = mac_is_txq_empty_be, + .prep_chan_list = rtw89_hw_scan_prep_chan_list_be, + .free_chan_list = rtw89_hw_scan_free_chan_list_be, .add_chan_list = rtw89_hw_scan_add_chan_list_be, .add_chan_list_pno = rtw89_pno_scan_add_chan_list_be, .scan_offload = rtw89_fw_h2c_scan_offload_be,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/12 wifi: rtw89: mcc: make GO announce one-time NoA for HW scan process
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Since FW cannot handle HW scan process and MCC (multi-channel concurrency) mode simultaneously, if a HW scan is requested during MCC, MCC mode will be paused temporarily. Then, the GO role if any might be absent. So, calculate an estimated time for the requested HW scan process and search for existing GO roles to fill one-time NoA.
--- drivers/net/wireless/realtek/rtw89/fw.c | 79 +++++++++++++++++++++++++ 1 file changed, 79 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +79 -0
@@ -7313,11 +7313,87 @@ static int rtw89_hw_scan_prehandle(struct rtw89_dev *rtwdev,return ret; } +static void rtw89_hw_scan_update_link_beacon_noa (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +u16 tu) +{ +struct ieee80211_p2p_noa_desc noa_desc = {}; +u64 tsf; +int ret; + + ret =rtw89_mac_port_get_tsf (rtwdev, rtwvif_link, &tsf); +if (ret) { +rtw89_warn (rtwdev,"%s: failed to get tsf\n" , __func__); +return ; + } + + noa_desc.start_time =cpu_to_le32 (tsf); + noa_desc.interval =cpu_to_le32 (ieee80211_tu_to_usec (tu)); + noa_desc.duration =cpu_to_le32 (ieee80211_tu_to_usec (tu)); + noa_desc.count =1 ; + +rtw89_p2p_noa_renew (rtwvif_link); +rtw89_p2p_noa_append (rtwvif_link, &noa_desc); +rtw89_chip_h2c_update_beacon (rtwdev, rtwvif_link); +} + +static void rtw89_hw_scan_update_beacon_noa (struct rtw89_dev *rtwdev, +const struct cfg80211_scan_request *req) +{ +const struct rtw89_entity_mgnt *mgnt = &rtwdev->hal.entity_mgnt; +const struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info; +const struct rtw89_chip_info *chip = rtwdev->chip; +struct rtw89_mac_chinfo_ax *chinfo_ax; +struct rtw89_mac_chinfo_be *chinfo_be; +struct rtw89_vif_link *rtwvif_link; +struct list_head *pos, *tmp; +struct ieee80211_vif *vif; +struct rtw89_vif *rtwvif; +u16 tu =0 ; + +lockdep_assert_wiphy (rtwdev->hw->wiphy); + +list_for_each_safe (pos, tmp, &scan_info->chan_list) { +switch (chip->chip_gen) { +case RTW89_CHIP_AX : + chinfo_ax =list_entry (pos,typeof (*chinfo_ax), list); + tu += chinfo_ax->period; +break ; +case RTW89_CHIP_BE : + chinfo_be =list_entry (pos,typeof (*chinfo_be), list); + tu += chinfo_be->period; +break ; +default : +rtw89_warn (rtwdev,"%s: invalid chip gen %d\n" , + __func__, chip->chip_gen); +return ; + } + } + +if (unlikely (tu ==0 )) { +rtw89_debug (rtwdev,RTW89_DBG_HW_SCAN , +"%s: cannot estimate needed TU\n" , __func__); +return ; + } + +list_for_each_entry (rtwvif, &mgnt->active_list, mgnt_entry) { +unsigned int link_id; + + vif =rtwvif_to_vif (rtwvif); +if (vif->type !=NL80211_IFTYPE_AP || !vif->p2p) +continue ; + +rtw89_vif_for_each_link (rtwvif, rtwvif_link, link_id) +rtw89_hw_scan_update_link_beacon_noa (rtwdev, rtwvif_link, tu); + } +} +int rtw89_hw_scan_start (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct ieee80211_scan_request *scan_req) {const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; +enum rtw89_entity_mode mode =rtw89_get_entity_mode (rtwdev);struct cfg80211_scan_request *req = &scan_req->req;const struct rtw89_chan *chan =rtw89_chan_get (rtwdev, rtwvif_link->chanctx_idx);
@@ -7362,6 +7438,9 @@ int rtw89_hw_scan_start(struct rtw89_dev *rtwdev,rtw89_chanctx_pause (rtwdev,RTW89_CHANCTX_PAUSE_REASON_HW_SCAN ); +if (mode ==RTW89_ENTITY_MODE_MCC ) +rtw89_hw_scan_update_beacon_noa (rtwdev, req); +return 0 ; }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/12 wifi: rtw89: don't re-randomize TSF of AP/GO
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
When APs or GOs are up, their TSF start point are randomized to avoid collisions. However, the TSF of an existing AP/GO would be randomized multiple times. It caused the TSF is discontinuous to the corresponding STA/GC sides. So, once TSF has been randomized, don't re-randomize it unless SER (system error recovery) happens unfortunately.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/mac.c | 8 ++++++++ drivers/net/wireless/realtek/rtw89/mac80211.c | 1 + drivers/net/wireless/realtek/rtw89/ser.c | 1 + 4 files changed, 11 insertions(+)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -3507,6 +3507,7 @@ struct rtw89_vif_link {u8 hit_rule;u8 last_noa_nr;u64 sync_bcn_tsf; +bool rand_tsf_done;bool trigger;bool lsig_txop;u8 tgt_ind;
drivers/net/wireless/realtek/rtw89/mac.c +8 -0
@@ -4631,11 +4631,17 @@ static void rtw89_mac_port_tsf_sync_rand(struct rtw89_dev *rtwdev,if (rtwvif_link->net_type !=RTW89_NET_TYPE_AP_MODE || rtwvif_link == rtwvif_src)return ; +if (rtwvif_link->rand_tsf_done) + goto out; +/* adjust offset randomly to avoid beacon conflict */ offset = offset - offset /4 +get_random_u32 () % (offset /2 );rtw89_mac_port_tsf_sync (rtwdev, rtwvif_link, rtwvif_src, (*n_offset) * offset); + rtwvif_link->rand_tsf_done = true; + +out: (*n_offset)++; }
@@ -4866,6 +4872,8 @@ void rtw89_mac_set_he_tb(struct rtw89_dev *rtwdev,void rtw89_mac_stop_ap (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link) {rtw89_mac_port_cfg_func_sw (rtwdev, rtwvif_link); + + rtwvif_link->rand_tsf_done = false; }int rtw89_mac_add_vif (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link)
drivers/net/wireless/realtek/rtw89/mac80211.c +1 -0
@@ -119,6 +119,7 @@ static int __rtw89_ops_add_iface_link(struct rtw89_dev *rtwdev, rtwvif_link->chanctx_assigned = false; rtwvif_link->chanctx_idx =RTW89_CHANCTX_0 ; rtwvif_link->reg_6ghz_power =RTW89_REG_6GHZ_POWER_DFLT ; + rtwvif_link->rand_tsf_done = false;rcu_read_lock ();
drivers/net/wireless/realtek/rtw89/ser.c +1 -0
@@ -309,6 +309,7 @@ static void ser_reset_vif(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_core_release_bit_map (rtwdev->hw_port, rtwvif_link->port); rtwvif_link->net_type =RTW89_NET_TYPE_NO_LINK ; rtwvif_link->trigger = false; + rtwvif_link->rand_tsf_done = false; } }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/12 wifi: rtw89: mcc: make GO+STA mode calculate dynamic beacon offset
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
There are two roles during MCC and the offset between their TBTT is called beacon offset. Originally, when MCC runs GO+STA mode, it used fixed beacon offset to simplify some logic because GO role can master its TSF. However, if MCC is stopped and restarted before a same GO is down, its TSF might be discontinuous. Then, there might be undefined behavior happens in GC sides. So, to let a same GO have a continuous TSF, MCC no longer changes its TSF to meet a fixed beacon offset. Instead, GO+STA mode also calculates beacon offset dynamically as what GC+STA mode did.
--- drivers/net/wireless/realtek/rtw89/chan.c | 84 ++++------------------- drivers/net/wireless/realtek/rtw89/core.h | 1 + 2 files changed, 16 insertions(+), 69 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +15 -69
@@ -557,7 +557,9 @@ static u32 rtw89_mcc_get_tbtt_ofst(struct rtw89_dev *rtwdev,u64 sync_tsf =READ_ONCE (rtwvif_link->sync_bcn_tsf);u32 remainder; -if (tsf < sync_tsf) { +if (role->is_go) { + sync_tsf =0 ; + }else if (tsf < sync_tsf) {rtw89_debug (rtwdev,RTW89_DBG_CHAN ,"MCC get tbtt ofst: tsf might not update yet\n" ); sync_tsf =0 ;
@@ -1439,57 +1441,6 @@ static bool rtw89_mcc_duration_decision_on_bt(struct rtw89_dev *rtwdev)return false; } -static void rtw89_mcc_sync_tbtt (struct rtw89_dev *rtwdev, -struct rtw89_mcc_role *tgt, -struct rtw89_mcc_role *src, -bool ref_is_src) -{ -struct rtw89_mcc_info *mcc = &rtwdev->mcc; -struct rtw89_mcc_config *config = &mcc->config; -u16 beacon_offset_us =ieee80211_tu_to_usec (config->beacon_offset); -u32 bcn_intvl_src_us =ieee80211_tu_to_usec (src->beacon_interval); -u32 cur_tbtt_ofst_src; -u32 tsf_ofst_tgt; -u32 remainder; -u64 tbtt_tgt; -u64 tsf_src; -int ret; - - ret =rtw89_mac_port_get_tsf (rtwdev, src->rtwvif_link, &tsf_src); -if (ret) { -rtw89_warn (rtwdev,"MCC failed to get port tsf: %d\n" , ret); -return ; - } - - cur_tbtt_ofst_src =rtw89_mcc_get_tbtt_ofst (rtwdev, src, tsf_src); - -if (ref_is_src) - tbtt_tgt = tsf_src - cur_tbtt_ofst_src + beacon_offset_us; -else - tbtt_tgt = tsf_src - cur_tbtt_ofst_src + - (bcn_intvl_src_us - beacon_offset_us); - -div_u64_rem (tbtt_tgt, bcn_intvl_src_us, &remainder); - tsf_ofst_tgt = bcn_intvl_src_us - remainder; - - config->sync.macid_tgt = tgt->rtwvif_link->mac_id; - config->sync.band_tgt = tgt->rtwvif_link->mac_idx; - config->sync.port_tgt = tgt->rtwvif_link->port; - config->sync.macid_src = src->rtwvif_link->mac_id; - config->sync.band_src = src->rtwvif_link->mac_idx; - config->sync.port_src = src->rtwvif_link->port; - config->sync.offset = tsf_ofst_tgt /1024 ; - config->sync.enable = true; - -rtw89_debug (rtwdev,RTW89_DBG_CHAN , -"MCC sync tbtt: tgt %d, src %d, offset %d\n" , - config->sync.macid_tgt, config->sync.macid_src, - config->sync.offset); - -rtw89_mac_port_tsf_sync (rtwdev, tgt->rtwvif_link, src->rtwvif_link, - config->sync.offset); -} -static int rtw89_mcc_fill_start_tsf (struct rtw89_dev *rtwdev) {struct rtw89_mcc_info *mcc = &rtwdev->mcc;
@@ -1497,17 +1448,19 @@ static int rtw89_mcc_fill_start_tsf(struct rtw89_dev *rtwdev)struct rtw89_mcc_config *config = &mcc->config;u32 bcn_intvl_ref_us =ieee80211_tu_to_usec (ref->beacon_interval);u32 tob_ref_us =ieee80211_tu_to_usec (config->pattern.tob_ref); -struct rtw89_vif_link *rtwvif_link = ref->rtwvif_link;u64 tsf, start_tsf;u32 cur_tbtt_ofst;u64 min_time; +u64 tsf_aux;int ret; - ret =rtw89_mac_port_get_tsf (rtwdev, rtwvif_link, &tsf); -if (ret) { -rtw89_warn (rtwdev,"MCC failed to get port tsf: %d\n" , ret); +if (rtw89_concurrent_via_mrc (rtwdev)) + ret =__mrc_fw_req_tsf (rtwdev, &tsf, &tsf_aux); +else + ret =__mcc_fw_req_tsf (rtwdev, &tsf, &tsf_aux); + +if (ret)return ret; - } min_time = tsf;if (ref->is_go)
@@ -1521,6 +1474,7 @@ static int rtw89_mcc_fill_start_tsf(struct rtw89_dev *rtwdev) start_tsf += bcn_intvl_ref_us; config->start_tsf = start_tsf; + config->start_tsf_in_aux_domain = tsf_aux + start_tsf - tsf;return 0 ; }
@@ -1537,13 +1491,11 @@ static int rtw89_mcc_fill_config(struct rtw89_dev *rtwdev)switch (mcc->mode) {case RTW89_MCC_MODE_GO_STA : - config->beacon_offset =RTW89_MCC_DFLT_BCN_OFST_TIME ; + config->beacon_offset =rtw89_mcc_get_bcn_ofst (rtwdev);if (ref->is_go) { -rtw89_mcc_sync_tbtt (rtwdev, ref, aux, false); config->mcc_interval = ref->beacon_interval;rtw89_mcc_set_duration_go_sta (rtwdev, ref, aux); }else { -rtw89_mcc_sync_tbtt (rtwdev, aux, ref, true); config->mcc_interval = aux->beacon_interval;rtw89_mcc_set_duration_go_sta (rtwdev, aux, ref); }
@@ -2000,30 +1952,24 @@ static void rtw89_mcc_handle_beacon_noa(struct rtw89_dev *rtwdev, bool enable)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 rtw89_mcc_sync *sync = &config->sync;struct ieee80211_p2p_noa_desc noa_desc = {}; -u64 start_time = config->start_tsf;u32 interval = config->mcc_interval;struct rtw89_vif_link *rtwvif_go; +u64 start_time;u32 duration;if (mcc->mode !=RTW89_MCC_MODE_GO_STA )return ;if (ref->is_go) { + start_time = config->start_tsf; rtwvif_go = ref->rtwvif_link; start_time +=ieee80211_tu_to_usec (ref->duration); duration = config->mcc_interval - ref->duration; }else if (aux->is_go) { + start_time = config->start_tsf_in_aux_domain; rtwvif_go = aux->rtwvif_link; - 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; - -/* convert time domain from sta(ref) to GO(aux) */ - start_time +=ieee80211_tu_to_usec (sync->offset); }else {rtw89_debug (rtwdev,RTW89_DBG_CHAN ,"MCC find no GO: skip updating beacon NoA\n" );
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -5695,6 +5695,7 @@ struct rtw89_mcc_config {struct rtw89_mcc_pattern pattern;struct rtw89_mcc_sync sync;u64 start_tsf; +u64 start_tsf_in_aux_domain;u16 mcc_interval;/* TU */ u16 beacon_offset;/* TU */ };
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/12 wifi: rtw89: mcc: handle the case where NoA start time has passed
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
MCC will limit the time a role can use in a schedule according to the periodic NoA. Original logic didn't consider the case where NoA start time has passed. It might lead to inaccurate result. So, tweak it.
--- drivers/net/wireless/realtek/rtw89/chan.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/realtek/rtw89/chan.c +3 -0
@@ -787,6 +787,9 @@ static void rtw89_mcc_fill_role_limit(struct rtw89_dev *rtwdev, } tsf_lmt = (tsf &GENMASK_ULL (63 ,32 )) | start_time; +if (tsf_lmt < tsf) + tsf_lmt +=roundup_u64 (tsf - tsf_lmt, interval); + max_toa_us =rtw89_mcc_get_tbtt_ofst (rtwdev, mcc_role, tsf_lmt); max_dur_us = interval - duration; max_tob_us = max_dur_us - max_toa_us;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/12 wifi: rtw89: mcc: update entire plan when courtesy config changes
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
MCC has a courtesy mechanism which allows one role to use another's duration in a given cycle. Courtesy mechanism will be enabled when one role has a not perfect duration. Otherwise, not. When MCC updates, duration of each role will be re-calculated. And then, the new courtesy config might be different from the old one. However, to change courtesy config, the entire MCC plan requires to be renewed when MCC updates.
--- drivers/net/wireless/realtek/rtw89/chan.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/chan.c +9 -1
@@ -2142,6 +2142,7 @@ 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 courtesy_changed;bool sync_changed;int ret;
@@ -2154,8 +2155,15 @@ static int rtw89_mcc_update(struct rtw89_dev *rtwdev)if (ret)return ret; +if (memcmp (&old_cfg.pattern.courtesy, &config->pattern.courtesy, +sizeof (old_cfg.pattern.courtesy)) ==0 ) + courtesy_changed = false; +else + courtesy_changed = true; +if (old_cfg.pattern.plan !=RTW89_MCC_PLAN_NO_BT || - config->pattern.plan !=RTW89_MCC_PLAN_NO_BT ) { + config->pattern.plan !=RTW89_MCC_PLAN_NO_BT || + courtesy_changed) {if (rtw89_concurrent_via_mrc (rtwdev)) ret =__mrc_fw_start (rtwdev, true);else
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/12 wifi: rtw89: mcc: support courtesy mechanism on both roles at the same time
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
MCC has a courtesy mechanism which allows one role to use another's duration in a given cycle. Originally, this courtesy mechanism only supports in one direction. However, in some field cases, both of MCC roles may simultaneously have timing configurations that are not good enough. So, support courtesy mechanism in both directions.
--- drivers/net/wireless/realtek/rtw89/chan.c | 82 ++++++++++++----------- drivers/net/wireless/realtek/rtw89/chan.h | 8 +++ drivers/net/wireless/realtek/rtw89/core.h | 11 ++- 3 files changed, 58 insertions(+), 43 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +42 -40
@@ -942,37 +942,44 @@ static void rtw89_mcc_assign_pattern(struct rtw89_dev *rtwdev,struct rtw89_mcc_role *aux = &mcc->role_aux;struct rtw89_mcc_config *config = &mcc->config;struct rtw89_mcc_pattern *pattern = &config->pattern; +struct rtw89_mcc_courtesy_cfg *crtz;rtw89_debug (rtwdev,RTW89_DBG_CHAN ,"MCC assign pattern: ref {%d | %d}, aux {%d | %d}\n" , new->tob_ref, new->toa_ref, new->tob_aux, new->toa_aux); +rtw89_debug (rtwdev,RTW89_DBG_CHAN ,"MCC pattern plan: %d\n" , new->plan); + *pattern = *new;memset (&pattern->courtesy,0 ,sizeof (pattern->courtesy)); -if (pattern->tob_aux <=0 || pattern->toa_aux <=0 ) { - pattern->courtesy.macid_tgt = aux->rtwvif_link->mac_id; - pattern->courtesy.macid_src = ref->rtwvif_link->mac_id; - pattern->courtesy.slot_num =RTW89_MCC_DFLT_COURTESY_SLOT ; - pattern->courtesy.enable = true; - }else if (pattern->tob_ref <=0 || pattern->toa_ref <=0 ) { - pattern->courtesy.macid_tgt = ref->rtwvif_link->mac_id; - pattern->courtesy.macid_src = aux->rtwvif_link->mac_id; - pattern->courtesy.slot_num =RTW89_MCC_DFLT_COURTESY_SLOT ; - pattern->courtesy.enable = true; +if (RTW89_MCC_REQ_COURTESY (pattern, aux)) { + crtz = &pattern->courtesy.ref; + ref->crtz = crtz; + + crtz->macid_tgt = aux->rtwvif_link->mac_id; + crtz->slot_num =RTW89_MCC_DFLT_COURTESY_SLOT ; + +rtw89_debug (rtwdev,RTW89_DBG_CHAN , +"MCC courtesy ref: tgt %d, slot %d\n" , + crtz->macid_tgt, crtz->slot_num); + }else { + ref->crtz =NULL ; } -rtw89_debug (rtwdev,RTW89_DBG_CHAN , -"MCC pattern flags: plan %d, courtesy_en %d\n" , - pattern->plan, pattern->courtesy.enable); +if (RTW89_MCC_REQ_COURTESY (pattern, ref)) { + crtz = &pattern->courtesy.aux; + aux->crtz = crtz; -if (!pattern->courtesy.enable) -return ; + crtz->macid_tgt = ref->rtwvif_link->mac_id; + crtz->slot_num =RTW89_MCC_DFLT_COURTESY_SLOT ; -rtw89_debug (rtwdev,RTW89_DBG_CHAN , -"MCC pattern courtesy: tgt %d, src %d, slot %d\n" , - pattern->courtesy.macid_tgt, pattern->courtesy.macid_src, - pattern->courtesy.slot_num); +rtw89_debug (rtwdev,RTW89_DBG_CHAN , +"MCC courtesy aux: tgt %d, slot %d\n" , + crtz->macid_tgt, crtz->slot_num); + }else { + aux->crtz =NULL ; + } }/* The follow-up roughly shows the relationship between the parameters
@@ -1528,10 +1535,8 @@ static int rtw89_mcc_fill_config(struct rtw89_dev *rtwdev)static int __mcc_fw_add_role (struct rtw89_dev *rtwdev,struct rtw89_mcc_role *role) { +const struct rtw89_mcc_courtesy_cfg *crtz = role->crtz;struct rtw89_mcc_info *mcc = &rtwdev->mcc; -struct rtw89_mcc_config *config = &mcc->config; -struct rtw89_mcc_pattern *pattern = &config->pattern; -struct rtw89_mcc_courtesy *courtesy = &pattern->courtesy;struct rtw89_mcc_policy *policy = &role->policy;struct rtw89_fw_mcc_add_req req = {};const struct rtw89_chan *chan;
@@ -1554,9 +1559,9 @@ static int __mcc_fw_add_role(struct rtw89_dev *rtwdev, struct rtw89_mcc_role *ro req.duration = role->duration; req.btc_in_2g = false; -if (courtesy->enable && courtesy->macid_src == req.macid) { - req.courtesy_target = courtesy->macid_tgt; - req.courtesy_num = courtesy->slot_num; +if (crtz) { + req.courtesy_target = crtz->macid_tgt; + req.courtesy_num = crtz->slot_num; req.courtesy_en = true; }
@@ -1736,26 +1741,23 @@ static void __mrc_fw_add_courtesy(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; -struct rtw89_mcc_config *config = &mcc->config; -struct rtw89_mcc_pattern *pattern = &config->pattern; -struct rtw89_mcc_courtesy *courtesy = &pattern->courtesy;struct rtw89_fw_mrc_add_slot_arg *slot_arg_src; -u8 slot_idx_tgt; -if (!courtesy->enable) -return ; - -if (courtesy->macid_src == ref->rtwvif_link->mac_id) { +if (ref->crtz) { slot_arg_src = &arg->slots[ref->slot_idx]; - slot_idx_tgt = aux->slot_idx; - }else { - slot_arg_src = &arg->slots[aux->slot_idx]; - slot_idx_tgt = ref->slot_idx; + + slot_arg_src->courtesy_target = aux->slot_idx; + slot_arg_src->courtesy_period = ref->crtz->slot_num; + slot_arg_src->courtesy_en = true; } - slot_arg_src->courtesy_target = slot_idx_tgt; - slot_arg_src->courtesy_period = courtesy->slot_num; - slot_arg_src->courtesy_en = true; +if (aux->crtz) { + slot_arg_src = &arg->slots[aux->slot_idx]; + + slot_arg_src->courtesy_target = ref->slot_idx; + slot_arg_src->courtesy_period = aux->crtz->slot_num; + slot_arg_src->courtesy_en = true; + } }static int __mrc_fw_start (struct rtw89_dev *rtwdev,bool replace)
drivers/net/wireless/realtek/rtw89/chan.h +8 -0
@@ -31,6 +31,14 @@#define RTW89_MCC_DFLT_TX_NULL_EARLY 3#define RTW89_MCC_DFLT_COURTESY_SLOT 3 +#define RTW89_MCC_REQ_COURTESY_TIME 5 +#define RTW89_MCC_REQ_COURTESY (pattern, role) \ +({ \ + const struct rtw89_mcc_pattern *p = pattern; \ + p->tob_ ## role <= RTW89_MCC_REQ_COURTESY_TIME || \ + p->toa_ ## role <= RTW89_MCC_REQ_COURTESY_TIME; \ +}) +#define NUM_OF_RTW89_MCC_ROLES 2enum rtw89_chanctx_pause_reasons {
drivers/net/wireless/realtek/rtw89/core.h +8 -3
@@ -5638,6 +5638,8 @@ struct rtw89_mcc_role {struct rtw89_mcc_policy policy;struct rtw89_mcc_limit limit; +const struct rtw89_mcc_courtesy_cfg *crtz; +/* only valid when running with FW MRC mechanism */ u8 slot_idx;
@@ -5655,13 +5657,16 @@ struct rtw89_mcc_bt_role {u16 duration;/* TU */ }; -struct rtw89_mcc_courtesy { -bool enable; +struct rtw89_mcc_courtesy_cfg {u8 slot_num; -u8 macid_src;u8 macid_tgt; }; +struct rtw89_mcc_courtesy { +struct rtw89_mcc_courtesy_cfg ref; +struct rtw89_mcc_courtesy_cfg aux; +}; +enum rtw89_mcc_plan {RTW89_MCC_PLAN_TAIL_BT ,RTW89_MCC_PLAN_MID_BT ,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 11/12 wifi: rtw89: mcc: refine filling function of start TSF
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Since tob (time offset behind) could be negative, change the type of tob in microsecond to s32. And, refine accumulation with while-loop by calculation with roundup_u64(). Besides, as long as one of the MCC roles is GO, use the short MCC start time.
--- drivers/net/wireless/realtek/rtw89/chan.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +5 -4
@@ -1455,9 +1455,10 @@ static int rtw89_mcc_fill_start_tsf(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;struct rtw89_mcc_config *config = &mcc->config;u32 bcn_intvl_ref_us =ieee80211_tu_to_usec (ref->beacon_interval); -u32 tob_ref_us =ieee80211_tu_to_usec (config->pattern.tob_ref); +s32 tob_ref_us =ieee80211_tu_to_usec (config->pattern.tob_ref);u64 tsf, start_tsf;u32 cur_tbtt_ofst;u64 min_time;
@@ -1473,15 +1474,15 @@ static int rtw89_mcc_fill_start_tsf(struct rtw89_dev *rtwdev)return ret; min_time = tsf; -if (ref->is_go) +if (ref->is_go || aux->is_go) min_time +=ieee80211_tu_to_usec (RTW89_MCC_SHORT_TRIGGER_TIME );else min_time +=ieee80211_tu_to_usec (RTW89_MCC_LONG_TRIGGER_TIME ); cur_tbtt_ofst =rtw89_mcc_get_tbtt_ofst (rtwdev, ref, tsf); start_tsf = tsf - cur_tbtt_ofst + bcn_intvl_ref_us - tob_ref_us; -while (start_tsf < min_time) - start_tsf += bcn_intvl_ref_us; +if (start_tsf < min_time) + start_tsf +=roundup_u64 (min_time - start_tsf, bcn_intvl_ref_us); config->start_tsf = start_tsf; config->start_tsf_in_aux_domain = tsf_aux + start_tsf - tsf;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 12/12 wifi: rtw89: mcc: avoid that loose pattern sets negative timing for auxiliary GO
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
A MCC (multi-channel concurrency) schedule is like the following.
|< mcc interval >|
|< duration ref >|< duration aux >|
|< tob ref >|< toa ref >|< tob aux >|< toa aux >|
V V
tbtt ref tbtt aux
|< beacon offset >|Original logic might unexpectedly calculate toa (time offset ahead) of auxiliary role to be negative even when there is no role timing limit. If toa-aux is negative, TBTT-aux would in logic fall into duration-ref. Then, if auxiliary role is GO unfortunately, it cannot guarantee that beacons will TX well. So now, when deciding the lower bound of toa-ref, take toa-aux into account. Make toa-aux at least be zero in normal cases.
--- drivers/net/wireless/realtek/rtw89/chan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/chan.c +2 -1
@@ -1004,6 +1004,7 @@ static void __rtw89_mcc_calc_pattern_loose(struct rtw89_dev *rtwdev,struct rtw89_mcc_role *ref = &mcc->role_ref;struct rtw89_mcc_role *aux = &mcc->role_aux;struct rtw89_mcc_config *config = &mcc->config; +u16 mcc_intvl = config->mcc_interval;u16 bcn_ofst = config->beacon_offset;u16 bt_dur_in_mid =0 ;u16 max_bcn_ofst;
@@ -1037,7 +1038,7 @@ static void __rtw89_mcc_calc_pattern_loose(struct rtw89_dev *rtwdev, res = bcn_ofst - bt_dur_in_mid; upper =min_t (s16, ref->duration, res); - lower =0 ; + lower =max_t (s16,0 , ref->duration - (mcc_intvl - bcn_ofst));if (ref->limit.enable) { upper =min_t (s16, upper, ref->limit.max_toa);
Signature · 1 line
2.25.1