wifi: rtw89: report per-channel noise level to get better user experience
Ping-Ke Shih
maintainercover wifi: rtw89: report per-channel noise level to get better user experience
First two patches are to add feature of reporting noise level, so supplicant has more clues to make decision when doing roaming.
Third and forth patches are to update firmware feature and BT coexistence parameters by the way.
Ching-Te Ku (1):
wifi: rtw89: coex: Limit Wi-Fi scan slot cost to avoid A2DP glitch
Ping-Ke Shih (1):
wifi: rtw89: 8852c: update firmware crash trigger type for newer
firmware
Po-Hao Huang (2):
wifi: rtw89: 8852a: report per-channel noise level by get_survey ops
wifi: rtw89: 8852a: report average RSSI to avoid unnecessary scanning
drivers/net/wireless/realtek/rtw89/coex.c | 5 +- drivers/net/wireless/realtek/rtw89/core.c | 4 + drivers/net/wireless/realtek/rtw89/core.h | 22 +- drivers/net/wireless/realtek/rtw89/fw.c | 1 + drivers/net/wireless/realtek/rtw89/mac.c | 4 + drivers/net/wireless/realtek/rtw89/mac80211.c | 35 ++ drivers/net/wireless/realtek/rtw89/phy.c | 306 +++++++++++++++++- drivers/net/wireless/realtek/rtw89/phy.h | 20 ++ drivers/net/wireless/realtek/rtw89/phy_be.c | 9 + drivers/net/wireless/realtek/rtw89/reg.h | 42 +++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 3 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 45 ++- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 3 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 3 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 3 + 15 files changed, 497 insertions(+), 8 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/4 wifi: rtw89: 8852a: report per-channel noise level by get_survey ops
From: Po-Hao Huang <[email protected]>
To optimize roaming decisions, report per-channel noise levels during scans so supplicant can have a better view of the current channel condition. This allows it to prefer the APs operating on channels with lower noise levels.
--- drivers/net/wireless/realtek/rtw89/core.c | 4 + drivers/net/wireless/realtek/rtw89/core.h | 22 +- drivers/net/wireless/realtek/rtw89/mac.c | 4 + drivers/net/wireless/realtek/rtw89/mac80211.c | 35 ++ drivers/net/wireless/realtek/rtw89/phy.c | 306 +++++++++++++++++- drivers/net/wireless/realtek/rtw89/phy.h | 20 ++ drivers/net/wireless/realtek/rtw89/phy_be.c | 9 + drivers/net/wireless/realtek/rtw89/reg.h | 42 +++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 3 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 32 ++ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 3 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 3 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 3 + 13 files changed, 482 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +4 -0
@@ -6258,6 +6258,7 @@ int rtw89_core_register(struct rtw89_dev *rtwdev)return ret; } +rtw89_phy_dm_init_data (rtwdev);rtw89_debugfs_init (rtwdev);return 0 ;
@@ -6308,6 +6309,9 @@ struct rtw89_dev *rtw89_alloc_ieee80211_hw(struct device *device, ops->cancel_remain_on_channel =NULL ; } +if (!chip->support_noise) + ops->get_survey =NULL ; + driver_data_size =sizeof (struct rtw89_dev ) + bus_data_size; hw =ieee80211_alloc_hw (driver_data_size, ops);if (!hw)
drivers/net/wireless/realtek/rtw89/core.h +20 -2
@@ -4364,6 +4364,9 @@ struct rtw89_chanctx_listener { (struct rtw89_dev *rtwdev, enum rtw89_chanctx_state state); }; +#define RTW89_NHM_TH_NUM 11 +#define RTW89_NHM_RPT_NUM 12 +struct rtw89_chip_info {enum rtw89_core_chip_id chip_id;enum rtw89_chip_gen chip_gen;
@@ -4398,6 +4401,7 @@ struct rtw89_chip_info {bool support_ant_gain;bool support_tas;bool support_sar_by_ant; +bool support_noise;bool ul_tb_waveform_ctrl;bool ul_tb_pwr_diff;bool rx_freq_frome_ie;
@@ -4482,6 +4486,8 @@ struct rtw89_chip_info {bool cfo_hw_comp;const struct rtw89_reg_def *dcfo_comp;u8 dcfo_comp_sft; +const struct rtw89_reg_def (*nhm_report)[RTW89_NHM_RPT_NUM ]; +const struct rtw89_reg_def (*nhm_th)[RTW89_NHM_TH_NUM ];const struct rtw89_imr_info *imr_info;const struct rtw89_imr_table *imr_dmac_table;const struct rtw89_imr_table *imr_cmac_table;
@@ -5464,6 +5470,7 @@ enum rtw89_env_racing_lv {struct rtw89_ccx_para_info {enum rtw89_env_racing_lv rac_lv;u16 mntr_time; +bool nhm_incld_cca;u8 nhm_manual_th_ofst;u8 nhm_manual_th0;enum rtw89_ifs_clm_application ifs_clm_app;
@@ -5497,9 +5504,13 @@ enum rtw89_ccx_edcca_opt_bw_idx {RTW89_CCX_EDCCA_BW20_7 =7 }; -#define RTW89_NHM_TH_NUM 11 +struct rtw89_nhm_report { +struct list_head list; +struct ieee80211_channel *channel; +u8 noise; +}; +#define RTW89_FAHM_TH_NUM 11 -#define RTW89_NHM_RPT_NUM 12#define RTW89_FAHM_RPT_NUM 12#define RTW89_IFS_CLM_NUM 4struct rtw89_env_monitor_info {
@@ -5533,6 +5544,13 @@ struct rtw89_env_monitor_info {u16 ifs_clm_ofdm_fa_permil;u32 ifs_clm_ifs_avg[RTW89_IFS_CLM_NUM ];u32 ifs_clm_cca_avg[RTW89_IFS_CLM_NUM ]; +bool nhm_include_cca; +u32 nhm_sum; +u32 nhm_mntr_time; +u16 nhm_result[RTW89_NHM_RPT_NUM ]; +u8 nhm_th[RTW89_NHM_RPT_NUM ]; +struct rtw89_nhm_report *nhm_his[RTW89_BAND_NUM ]; +struct list_head nhm_rpt_list; };enum rtw89_ser_rcvy_step {
drivers/net/wireless/realtek/rtw89/mac.c +4 -0
@@ -9,6 +9,7 @@#include "fw.h" #include "mac.h" #include "pci.h" +#include "phy.h" #include "ps.h" #include "reg.h" #include "util.h"
@@ -5045,6 +5046,8 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb,if (op_chan) {rtw89_mac_enable_aps_bcn_by_chan (rtwdev, op_chan, false);ieee80211_stop_queues (rtwdev->hw); + }else { +rtw89_phy_nhm_get_result (rtwdev, band, chan); }return ;case RTW89_SCAN_END_SCAN_NOTIFY :
@@ -5075,6 +5078,7 @@ rtw89_mac_c2h_scanofld_rsp(struct rtw89_dev *rtwdev, struct sk_buff *skb, RTW89_CHANNEL_WIDTH_20);rtw89_assign_entity_chan (rtwdev, rtwvif_link->chanctx_idx, &new); +rtw89_phy_nhm_trigger (rtwdev); }break ;default :
drivers/net/wireless/realtek/rtw89/mac80211.c +35 -0
@@ -1837,6 +1837,40 @@ static void rtw89_set_rekey_data(struct ieee80211_hw *hw, }#endif +static int rtw89_ops_get_survey (struct ieee80211_hw *hw,int idx, +struct survey_info *survey) +{ +struct ieee80211_conf *conf = &hw->conf; +struct rtw89_dev *rtwdev = hw->priv; +struct rtw89_bb_ctx *bb; + +if (idx ==0 ) { + survey->channel = conf->chandef.chan; + survey->filled =SURVEY_INFO_NOISE_DBM ; + survey->noise =RTW89_NOISE_DEFAULT ; + +return 0 ; + } + +rtw89_for_each_active_bb (rtwdev, bb) { +struct rtw89_env_monitor_info *env = &bb->env_monitor; +struct rtw89_nhm_report *rpt; + + rpt =list_first_entry_or_null (&env->nhm_rpt_list,typeof (*rpt), list); +if (!rpt) +continue ; + + survey->filled =SURVEY_INFO_NOISE_DBM ; + survey->noise = rpt->noise -MAX_RSSI ; + survey->channel = rpt->channel; +list_del_init (&rpt->list); + +return 0 ; + } + +return -EINVAL ; +} +static void rtw89_ops_rfkill_poll (struct ieee80211_hw *hw) {struct rtw89_dev *rtwdev = hw->priv;
@@ -1869,6 +1903,7 @@ const struct ieee80211_ops rtw89_ops = { .sta_state = rtw89_ops_sta_state, .set_key = rtw89_ops_set_key, .ampdu_action = rtw89_ops_ampdu_action, + .get_survey = rtw89_ops_get_survey, .set_rts_threshold = rtw89_ops_set_rts_threshold, .sta_statistics = rtw89_ops_sta_statistics, .flush = rtw89_ops_flush,
drivers/net/wireless/realtek/rtw89/phy.c +304 -2
364 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/phy.h +20 -0
@@ -188,6 +188,12 @@ enum rtw89_env_monitor_result_level { RTW89_PHY_ENV_MON_EDCCA_CLM = BIT(4), }; +#define RTW89_NHM_WEIGHT_OFFSET 2 +#define RTW89_NHM_WA_TH (109 << 1) +#define RTW89_NOISE_DEFAULT -96 +#define RTW89_NHM_MNTR_TIME 40 +#define RTW89_NHM_TH_FACTOR 1 +#define CCX_US_BASE_RATIO 4enum rtw89_ccx_unit {RTW89_CCX_4_US =0 ,
@@ -428,6 +434,15 @@ struct rtw89_ccx_regs {u32 ifs_total_addr;u32 ifs_cnt_done_mask;u32 ifs_total_mask; +u32 nhm; +u32 nhm_ready; +u32 nhm_config; +u32 nhm_period_mask; +u32 nhm_unit_mask; +u32 nhm_include_cca_mask; +u32 nhm_en_mask; +u32 nhm_method; +u32 nhm_pwr_method_msk; };struct rtw89_physts_regs {
@@ -821,6 +836,7 @@ void rtw89_phy_config_rf_reg_v1(struct rtw89_dev *rtwdev, void *extra_data);void rtw89_phy_dm_init (struct rtw89_dev *rtwdev);void rtw89_phy_dm_reinit (struct rtw89_dev *rtwdev); +void rtw89_phy_dm_init_data (struct rtw89_dev *rtwdev);void rtw89_phy_write32_idx (struct rtw89_dev *rtwdev,u32 addr,u32 mask,u32 data,enum rtw89_phy_idx phy_idx); void rtw89_phy_write32_idx_set(struct rtw89_dev *rtwdev, u32 addr, u32 bits,
@@ -1038,5 +1054,9 @@ enum rtw89_rf_path rtw89_phy_get_syn_sel(struct rtw89_dev *rtwdev,u8 rtw89_rfk_chan_lookup (struct rtw89_dev *rtwdev,const struct rtw89_rfk_chan_desc *desc,u8 desc_nr,const struct rtw89_chan *target_chan); +void rtw89_phy_nhm_setting_init (struct rtw89_dev *rtwdev); +void rtw89_phy_nhm_get_result (struct rtw89_dev *rtwdev,enum rtw89_band hw_band, +u16 ch_hw_value); +void rtw89_phy_nhm_trigger (struct rtw89_dev *rtwdev);#endif
drivers/net/wireless/realtek/rtw89/phy_be.c +9 -0
@@ -63,6 +63,15 @@ static const struct rtw89_ccx_regs rtw89_ccx_regs_be = { .ifs_total_addr = R_IFSCNT_V1, .ifs_cnt_done_mask = B_IFSCNT_DONE_MSK, .ifs_total_mask = B_IFSCNT_TOTAL_CNT_MSK, + .nhm = R_NHM_BE, + .nhm_ready = B_NHM_READY_BE_MSK, + .nhm_config = R_NHM_CFG, + .nhm_period_mask = B_NHM_PERIOD_MSK, + .nhm_unit_mask = B_NHM_COUNTER_MSK, + .nhm_include_cca_mask = B_NHM_INCLUDE_CCA_MSK, + .nhm_en_mask = B_NHM_EN_MSK, + .nhm_method = R_NHM_TH9, + .nhm_pwr_method_msk = B_NHM_PWDB_METHOD_MSK, };static const struct rtw89_physts_regs rtw89_physts_regs_be = {
drivers/net/wireless/realtek/rtw89/reg.h +42 -0
60 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8851b.c +3 -0
@@ -2628,6 +2628,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .support_ant_gain = false, .support_tas = false, .support_sar_by_ant = false, + .support_noise = false, .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, .rx_freq_frome_ie = true,
@@ -2689,6 +2690,8 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .cfo_hw_comp = true, .dcfo_comp = &rtw8851b_dcfo_comp, .dcfo_comp_sft = 12, + .nhm_report = NULL, + .nhm_th = NULL, .imr_info = &rtw8851b_imr_info, .imr_dmac_table = NULL, .imr_cmac_table = NULL,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +32 -0
@@ -426,6 +426,35 @@ static const struct rtw89_reg_def rtw8852a_dcfo_comp = {R_DCFO_COMP_S0 ,B_DCFO_COMP_S0_MSK }; +static const struct rtw89_reg_def rtw8852a_nhm_th[RTW89_NHM_TH_NUM ] = { + {R_NHM_CFG ,B_NHM_TH0_MSK }, + {R_NHM_TH1 ,B_NHM_TH1_MSK }, + {R_NHM_TH1 ,B_NHM_TH2_MSK }, + {R_NHM_TH1 ,B_NHM_TH3_MSK }, + {R_NHM_TH1 ,B_NHM_TH4_MSK }, + {R_NHM_TH5 ,B_NHM_TH5_MSK }, + {R_NHM_TH5 ,B_NHM_TH6_MSK }, + {R_NHM_TH5 ,B_NHM_TH7_MSK }, + {R_NHM_TH5 ,B_NHM_TH8_MSK }, + {R_NHM_TH9 ,B_NHM_TH9_MSK }, + {R_NHM_TH9 ,B_NHM_TH10_MSK }, +}; + +static const struct rtw89_reg_def rtw8852a_nhm_rpt[RTW89_NHM_RPT_NUM ] = { + {R_NHM_CNT0 ,B_NHM_CNT0_MSK }, + {R_NHM_CNT0 ,B_NHM_CNT1_MSK }, + {R_NHM_CNT2 ,B_NHM_CNT2_MSK }, + {R_NHM_CNT2 ,B_NHM_CNT3_MSK }, + {R_NHM_CNT4 ,B_NHM_CNT4_MSK }, + {R_NHM_CNT4 ,B_NHM_CNT5_MSK }, + {R_NHM_CNT6 ,B_NHM_CNT6_MSK }, + {R_NHM_CNT6 ,B_NHM_CNT7_MSK }, + {R_NHM_CNT8 ,B_NHM_CNT8_MSK }, + {R_NHM_CNT8 ,B_NHM_CNT9_MSK }, + {R_NHM_CNT10 ,B_NHM_CNT10_MSK }, + {R_NHM_CNT10 ,B_NHM_CNT11_MSK }, +}; +static const struct rtw89_imr_info rtw8852a_imr_info = { .wdrls_imr_set =B_AX_WDRLS_IMR_SET , .wsec_imr_reg = R_AX_SEC_DEBUG,
@@ -2220,6 +2249,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .support_ant_gain = false, .support_tas = false, .support_sar_by_ant = false, + .support_noise = true, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = false, .rx_freq_frome_ie = true,
@@ -2282,6 +2312,8 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .cfo_hw_comp = false, .dcfo_comp = &rtw8852a_dcfo_comp, .dcfo_comp_sft = 10, + .nhm_report = &rtw8852a_nhm_rpt, + .nhm_th = &rtw8852a_nhm_th, .imr_info = &rtw8852a_imr_info, .imr_dmac_table = NULL, .imr_cmac_table = NULL,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +3 -0
@@ -939,6 +939,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .support_ant_gain = true, .support_tas = false, .support_sar_by_ant = true, + .support_noise = false, .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, .rx_freq_frome_ie = true,
@@ -1001,6 +1002,8 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .cfo_hw_comp = true, .dcfo_comp = &rtw8852b_dcfo_comp, .dcfo_comp_sft = 10, + .nhm_report = NULL, + .nhm_th = NULL, .imr_info = &rtw8852b_imr_info, .imr_dmac_table = NULL, .imr_cmac_table = NULL,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +3 -0
@@ -3043,6 +3043,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .support_ant_gain = true, .support_tas = true, .support_sar_by_ant = true, + .support_noise = false, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = true, .rx_freq_frome_ie = false,
@@ -3106,6 +3107,8 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .cfo_hw_comp = false, .dcfo_comp = &rtw8852c_dcfo_comp, .dcfo_comp_sft = 12, + .nhm_report = NULL, + .nhm_th = NULL, .imr_info = &rtw8852c_imr_info, .imr_dmac_table = NULL, .imr_cmac_table = NULL,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +3 -0
@@ -2896,6 +2896,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .support_ant_gain = true, .support_tas = false, .support_sar_by_ant = true, + .support_noise = false, .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = false, .rx_freq_frome_ie = false,
@@ -2958,6 +2959,8 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .cfo_hw_comp = true, .dcfo_comp = NULL, .dcfo_comp_sft = 0, + .nhm_report = NULL, + .nhm_th = NULL, .imr_info = NULL, .imr_dmac_table = &rtw8922a_imr_dmac_table, .imr_cmac_table = &rtw8922a_imr_cmac_table,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 1/4] wifi: rtw89: 8852a: report per-channel noise level by get_survey ops
Quoted 9 lines · Ping-Ke Shih
From: Po-Hao Huang <[email protected]>
To optimize roaming decisions, report per-channel noise levels during scans so supplicant can have a better view of the current channel condition. This allows it to prefer the APs operating on channels with lower noise levels.
Signed-off-by Po-Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
4 patch(es) applied to rtw-next branch of rtw.git, thanks.
4367000c0e33 wifi: rtw89: 8852a: report per-channel noise level by get_survey ops f0f3bf4b370c wifi: rtw89: 8852a: report average RSSI to avoid unnecessary scanning d47c1c6f321c wifi: rtw89: 8852c: update firmware crash trigger type for newer firmware ebea22c7f1b2 wifi: rtw89: coex: Limit Wi-Fi scan slot cost to avoid A2DP glitch
Ping-Ke Shih
maintainerPATCH 2/4 wifi: rtw89: 8852a: report average RSSI to avoid unnecessary scanning
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
8852A uses single antenna during power save, when the loss between two antennas is too large, previous logic induces greater RSSI variation. Report the average beacon RSSI for connected AP to get more stable RSSI and less unnecessary scanning.
--- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8852a.c +10 -3
@@ -2109,10 +2109,17 @@ static void rtw8852a_query_ppdu(struct rtw89_dev *rtwdev, {u8 path;u8 *rx_power = phy_ppdu->rssi; +u8 raw; + +if (!status->signal) { +if (phy_ppdu->to_self) + raw =ewma_rssi_read (&rtwdev->phystat.bcn_rssi); +else + raw =max (rx_power[RF_PATH_A ], rx_power[RF_PATH_B ]); + + status->signal =RTW89_RSSI_RAW_TO_DBM (raw); + } -if (!status->signal) - status->signal =RTW89_RSSI_RAW_TO_DBM (max (rx_power[RF_PATH_A ], - rx_power[RF_PATH_B ]));for (path =0 ; path < rtwdev->chip->rf_path_num; path++) { status->chains |=BIT (path); status->chain_signal[path] =RTW89_RSSI_RAW_TO_DBM (rx_power[path]);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/4 wifi: rtw89: 8852c: update firmware crash trigger type for newer firmware
In reply to Ping-Ke ShihThe newer firmware (after 0.27.128.0) uses trigger type 1. Add an entry accordingly.
--- drivers/net/wireless/realtek/rtw89/fw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtw89/fw.c +1 -0
@@ -848,6 +848,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,80 ,0 ,WOW_REASON_V1 ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,128 ,0 ,BEACON_LOSS_COUNT_V1 ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,128 ,0 ,LPS_DACK_BY_C2H_REG ), +__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,128 ,0 ,CRASH_TRIGGER_TYPE_1 ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,129 ,1 ,BEACON_TRACKING ),__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,30 ,0 ,CRASH_TRIGGER_TYPE_0 ), __CFG_FW_FEAT(RTL8922A, ge, 0, 34, 11, 0, MACID_PAUSE_SLEEP),
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/4 wifi: rtw89: coex: Limit Wi-Fi scan slot cost to avoid A2DP glitch
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
When Wi-Fi is scanning at 2.4GHz, PTA will abort almost all the BT request. Once the Wi-Fi slot stay too long, BT audio device can not get enough data, audio glitch will happened. This patch limit 2.4Ghz Wi-Fi slot to 80ms while Wi-Fi is scanning to avoid audio glitch.
--- drivers/net/wireless/realtek/rtw89/coex.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +4 -1
@@ -93,7 +93,7 @@ static const struct rtw89_btc_fbtc_slot s_def[] = { [CXST_E2G] = __DEF_FBTC_SLOT(5, 0xea5a5a5a, SLOT_MIX), [CXST_E5G] = __DEF_FBTC_SLOT(5, 0xffffffff, SLOT_ISO), [CXST_EBT] = __DEF_FBTC_SLOT(5, 0xe5555555, SLOT_MIX), - [CXST_ENULL] = __DEF_FBTC_SLOT(5, 0xaaaaaaaa, SLOT_ISO), + [CXST_ENULL] = __DEF_FBTC_SLOT(5, 0x55555555, SLOT_MIX), [CXST_WLK] = __DEF_FBTC_SLOT(250, 0xea5a5a5a, SLOT_MIX), [CXST_W1FDD] = __DEF_FBTC_SLOT(50, 0xffffffff, SLOT_ISO), [CXST_B1FDD] = __DEF_FBTC_SLOT(50, 0xffffdfff, SLOT_ISO),
@@ -4153,6 +4153,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type) s_def[CXST_EBT].cxtbl, s_def[CXST_EBT].cxtype);_slot_set_le (btc,CXST_ENULL , s_def[CXST_ENULL ].dur, s_def[CXST_ENULL ].cxtbl, s_def[CXST_ENULL ].cxtype); +_slot_set_dur (btc,CXST_EBT , dur_2);break ;case BTC_CXP_OFFE_DEF2 :_slot_set (btc,CXST_E2G ,20 , cxtbl[1 ],SLOT_ISO );
@@ -4162,6 +4163,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type) s_def[CXST_EBT].cxtbl, s_def[CXST_EBT].cxtype);_slot_set_le (btc,CXST_ENULL , s_def[CXST_ENULL ].dur, s_def[CXST_ENULL ].cxtbl, s_def[CXST_ENULL ].cxtype); +_slot_set_dur (btc,CXST_EBT , dur_2);break ;case BTC_CXP_OFFE_2GBWMIXB :if (a2dp->exist)
@@ -4170,6 +4172,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)_slot_set (btc,CXST_E2G ,5 , tbl_w1,SLOT_MIX );_slot_set_le (btc,CXST_EBT ,cpu_to_le16 (40 ), s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype); +_slot_set_dur (btc,CXST_EBT , dur_2);break ;case BTC_CXP_OFFE_WL :/* for 4-way */ _slot_set (btc,CXST_E2G ,5 , cxtbl[1 ],SLOT_MIX );
Signature · 1 line
2.25.1