wifi: rtw89: coex: improve user experience of BT A2DP while WiFi connecting
Ping-Ke Shih
maintainercover wifi: rtw89: coex: improve user experience of BT A2DP while WiFi connecting
The BT A2DP lag sound might present while WiFi connecting. Implement separated policy for connecting and preserve time for BT interleaved with RF calibration while WiFi is connecting.
Ching-Te Ku (3):
wifi: rtw89: coex: Add protect to avoid A2DP lag while Wi-Fi
connecting
wifi: rtw89: coex: Separated Wi-Fi connecting event from Wi-Fi scan
event
wifi: rtw89: coex: Update Wi-Fi/Bluetooth coexistence version to 7.0.2
drivers/net/wireless/realtek/rtw89/coex.c | 100 ++++++++++-------- drivers/net/wireless/realtek/rtw89/coex.h | 2 + drivers/net/wireless/realtek/rtw89/core.h | 3 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 6 ++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 6 ++ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 6 ++ .../net/wireless/realtek/rtw89/rtw8852bt.c | 6 ++ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 6 ++ 8 files changed, 92 insertions(+), 43 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/3 wifi: rtw89: coex: Add protect to avoid A2DP lag while Wi-Fi connecting
From: Ching-Te Ku <[email protected]>
To get a well Wi-Fi RF quality, Wi-Fi need to do RF calibrations. While Wi-Fi is doing RF calibrations, driver will pause the Bluetooth traffic to make sure the RF calibration will not be interfered by Bluetooth. However, if the RF calibrations take too much time, Bluetooth audio will perform a lag sound. Add a function to make Bluetooth can do traffic between the individual calibrations to avoid Bluetooth sound lag. And patch related A2DP coexistence mechanism actions.
--- drivers/net/wireless/realtek/rtw89/coex.c | 90 +++++++++++-------- drivers/net/wireless/realtek/rtw89/coex.h | 2 + drivers/net/wireless/realtek/rtw89/core.h | 3 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 6 ++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 6 ++ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 6 ++ .../net/wireless/realtek/rtw89/rtw8852bt.c | 6 ++ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 6 ++ 8 files changed, 85 insertions(+), 40 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +51 -39
@@ -4589,17 +4589,16 @@ static void _action_bt_a2dp(struct rtw89_dev *rtwdev)_set_ant (rtwdev,NM_EXEC ,BTC_PHY_ALL ,BTC_ANT_W2G ); +if (a2dp.vendor_id ==0x4c || dm->leak_ap || bt_linfo->slave_role) + dm->slot_dur[CXST_W1 ] =20 ; +else + dm->slot_dur[CXST_W1 ] =40 ; + + dm->slot_dur[CXST_B1 ] =BTC_B1_MAX ; +switch (btc->cx.state_map) {case BTC_WBUSY_BNOSCAN :/* wl-busy + bt-A2DP */ -if (a2dp.vendor_id ==0x4c || dm->leak_ap) { - dm->slot_dur[CXST_W1 ] =40 ; - dm->slot_dur[CXST_B1 ] =200 ; -_set_policy (rtwdev, -BTC_CXP_PAUTO_TDW1B1 ,BTC_ACT_BT_A2DP ); - }else { -_set_policy (rtwdev, -BTC_CXP_PAUTO_TD50B1 ,BTC_ACT_BT_A2DP ); - } +_set_policy (rtwdev,BTC_CXP_PAUTO_TDW1B1 ,BTC_ACT_BT_A2DP );break ;case BTC_WBUSY_BSCAN :/* wl-busy + bt-inq + bt-A2DP */ _set_policy (rtwdev,BTC_CXP_PAUTO2_TD3050 ,BTC_ACT_BT_A2DP );
@@ -4609,15 +4608,10 @@ static void _action_bt_a2dp(struct rtw89_dev *rtwdev)break ;case BTC_WSCAN_BNOSCAN :/* wl-scan + bt-A2DP */ case BTC_WLINKING :/* wl-connecting + bt-A2DP */ -if (a2dp.vendor_id ==0x4c || dm->leak_ap) { - dm->slot_dur[CXST_W1 ] =40 ; - dm->slot_dur[CXST_B1 ] =200 ; -_set_policy (rtwdev,BTC_CXP_AUTO_TDW1B1 , -BTC_ACT_BT_A2DP ); - }else { -_set_policy (rtwdev,BTC_CXP_AUTO_TD50B1 , -BTC_ACT_BT_A2DP ); - } +if (btc->cx.wl.rfk_info.con_rfk) +_set_policy (rtwdev,BTC_CXP_OFF_BT ,BTC_ACT_BT_A2DP ); +else +_set_policy (rtwdev,BTC_CXP_AUTO_TDW1B1 ,BTC_ACT_BT_A2DP );break ;case BTC_WIDLE :/* wl-idle + bt-A2DP */ _set_policy (rtwdev,BTC_CXP_AUTO_TD20B1 ,BTC_ACT_BT_A2DP );
@@ -4645,7 +4639,10 @@ static void _action_bt_a2dpsink(struct rtw89_dev *rtwdev)_set_policy (rtwdev,BTC_CXP_FIX_TD2060 ,BTC_ACT_BT_A2DPSINK );break ;case BTC_WLINKING :/* wl-connecting + bt-A2dp_Sink */ -_set_policy (rtwdev,BTC_CXP_FIX_TD3030 ,BTC_ACT_BT_A2DPSINK ); +if (btc->cx.wl.rfk_info.con_rfk) +_set_policy (rtwdev,BTC_CXP_OFF_BT ,BTC_ACT_BT_A2DPSINK ); +else +_set_policy (rtwdev,BTC_CXP_FIX_TD3030 ,BTC_ACT_BT_A2DPSINK );break ;case BTC_WIDLE :/* wl-idle + bt-A2dp_Sink */ _set_policy (rtwdev,BTC_CXP_FIX_TD2080 ,BTC_ACT_BT_A2DPSINK );
@@ -4699,21 +4696,20 @@ static void _action_bt_a2dp_hid(struct rtw89_dev *rtwdev)_set_ant (rtwdev,NM_EXEC ,BTC_PHY_ALL ,BTC_ANT_W2G ); +if (a2dp.vendor_id ==0x4c || dm->leak_ap || bt_linfo->slave_role) + dm->slot_dur[CXST_W1 ] =20 ; +else + dm->slot_dur[CXST_W1 ] =40 ; + + dm->slot_dur[CXST_B1 ] =BTC_B1_MAX ; +switch (btc->cx.state_map) {case BTC_WBUSY_BNOSCAN :/* wl-busy + bt-A2DP+HID */ case BTC_WIDLE :/* wl-idle + bt-A2DP */ -if (a2dp.vendor_id ==0x4c || dm->leak_ap) { - dm->slot_dur[CXST_W1 ] =40 ; - dm->slot_dur[CXST_B1 ] =200 ; -_set_policy (rtwdev, -BTC_CXP_PAUTO_TDW1B1 ,BTC_ACT_BT_A2DP_HID ); - }else { -_set_policy (rtwdev, -BTC_CXP_PAUTO_TD50B1 ,BTC_ACT_BT_A2DP_HID ); - } +_set_policy (rtwdev,BTC_CXP_PAUTO_TDW1B1 ,BTC_ACT_BT_A2DP_HID );break ;case BTC_WBUSY_BSCAN :/* wl-busy + bt-inq + bt-A2DP+HID */ -_set_policy (rtwdev,BTC_CXP_PAUTO2_TD3050 ,BTC_ACT_BT_A2DP_HID ); +_set_policy (rtwdev,BTC_CXP_PAUTO2_TD3070 ,BTC_ACT_BT_A2DP_HID );break ;case BTC_WSCAN_BSCAN :/* wl-scan + bt-inq + bt-A2DP+HID */
@@ -4721,15 +4717,10 @@ static void _action_bt_a2dp_hid(struct rtw89_dev *rtwdev)break ;case BTC_WSCAN_BNOSCAN :/* wl-scan + bt-A2DP+HID */ case BTC_WLINKING :/* wl-connecting + bt-A2DP+HID */ -if (a2dp.vendor_id ==0x4c || dm->leak_ap) { - dm->slot_dur[CXST_W1 ] =40 ; - dm->slot_dur[CXST_B1 ] =200 ; -_set_policy (rtwdev,BTC_CXP_AUTO_TDW1B1 , -BTC_ACT_BT_A2DP_HID ); - }else { -_set_policy (rtwdev,BTC_CXP_AUTO_TD50B1 , -BTC_ACT_BT_A2DP_HID ); - } +if (btc->cx.wl.rfk_info.con_rfk) +_set_policy (rtwdev,BTC_CXP_OFF_BT ,BTC_ACT_BT_A2DP_HID ); +else +_set_policy (rtwdev,BTC_CXP_AUTO_TDW1B1 ,BTC_ACT_BT_A2DP_HID );break ; } }
@@ -7002,7 +6993,7 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason) goto exit; } -if (wl->status.val & btc_scanning_map.val) { +if (wl->status.val & btc_scanning_map.val && !wl->rfk_info.con_rfk) {_action_wl_scan (rtwdev); bt->scan_rx_low_pri = true; goto exit;
@@ -11037,3 +11028,24 @@ void rtw89_coex_recognize_ver(struct rtw89_dev *rtwdev)rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC] use version def[%d] = 0x%08x\n" , (int )(btc->ver - rtw89_btc_ver_defs), btc->ver->fw_ver_code); } + +void rtw89_btc_ntfy_preserve_bt_time (struct rtw89_dev *rtwdev,u32 ms) +{ +struct rtw89_btc_bt_link_info *bt_linfo = &rtwdev->btc.cx.bt.link_info; +struct rtw89_btc_bt_a2dp_desc a2dp = bt_linfo->a2dp_desc; + +if (test_bit (RTW89_FLAG_SER_HANDLING , rtwdev->flags)) +return ; + +if (!a2dp.exist) +return ; + +fsleep (ms *1000 ); +} +EXPORT_SYMBOL (rtw89_btc_ntfy_preserve_bt_time); + +void rtw89_btc_ntfy_conn_rfk (struct rtw89_dev *rtwdev,bool state) +{ + rtwdev->btc.cx.wl.rfk_info.con_rfk = state; +} +EXPORT_SYMBOL (rtw89_btc_ntfy_conn_rfk);
drivers/net/wireless/realtek/rtw89/coex.h +2 -0
@@ -290,6 +290,8 @@ void rtw89_coex_power_on(struct rtw89_dev *rtwdev);void rtw89_btc_set_policy (struct rtw89_dev *rtwdev,u16 policy_type);void rtw89_btc_set_policy_v1 (struct rtw89_dev *rtwdev,u16 policy_type);void rtw89_coex_recognize_ver (struct rtw89_dev *rtwdev); +void rtw89_btc_ntfy_preserve_bt_time (struct rtw89_dev *rtwdev,u32 ms); +void rtw89_btc_ntfy_conn_rfk (struct rtw89_dev *rtwdev,bool state); static inline u8 rtw89_btc_phymap(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,
drivers/net/wireless/realtek/rtw89/core.h +2 -1
@@ -1758,7 +1758,8 @@ struct rtw89_btc_wl_rfk_info { u32 phy_map: 2; u32 band: 2; u32 type: 8; - u32 rsvd: 14; + u32 con_rfk: 1; + u32 rsvd: 13;u32 start_time;u32 proc_time;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +6 -0
@@ -1596,10 +1596,16 @@ static void rtw8851b_rfk_channel(struct rtw89_dev *rtwdev,enum rtw89_chanctx_idx chanctx_idx = rtwvif_link->chanctx_idx;enum rtw89_phy_idx phy_idx = rtwvif_link->phy_idx; +rtw89_btc_ntfy_conn_rfk (rtwdev, true); +rtw8851b_rx_dck (rtwdev, phy_idx, chanctx_idx);rtw8851b_iqk (rtwdev, phy_idx, chanctx_idx); +rtw89_btc_ntfy_preserve_bt_time (rtwdev,30 );rtw8851b_tssi (rtwdev, phy_idx, true, chanctx_idx); +rtw89_btc_ntfy_preserve_bt_time (rtwdev,30 );rtw8851b_dpk (rtwdev, phy_idx, chanctx_idx); + +rtw89_btc_ntfy_conn_rfk (rtwdev, false); } static void rtw8851b_rfk_band_changed(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +6 -0
@@ -1356,10 +1356,16 @@ static void rtw8852a_rfk_channel(struct rtw89_dev *rtwdev,enum rtw89_chanctx_idx chanctx_idx = rtwvif_link->chanctx_idx;enum rtw89_phy_idx phy_idx = rtwvif_link->phy_idx; +rtw89_btc_ntfy_conn_rfk (rtwdev, true); +rtw8852a_rx_dck (rtwdev, phy_idx, true, chanctx_idx);rtw8852a_iqk (rtwdev, phy_idx, chanctx_idx); +rtw89_btc_ntfy_preserve_bt_time (rtwdev,30 );rtw8852a_tssi (rtwdev, phy_idx, chanctx_idx); +rtw89_btc_ntfy_preserve_bt_time (rtwdev,30 );rtw8852a_dpk (rtwdev, phy_idx, chanctx_idx); + +rtw89_btc_ntfy_conn_rfk (rtwdev, false); } static void rtw8852a_rfk_band_changed(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +6 -0
@@ -568,10 +568,16 @@ static void rtw8852b_rfk_channel(struct rtw89_dev *rtwdev,enum rtw89_chanctx_idx chanctx_idx = rtwvif_link->chanctx_idx;enum rtw89_phy_idx phy_idx = rtwvif_link->phy_idx; +rtw89_btc_ntfy_conn_rfk (rtwdev, true); +rtw8852b_rx_dck (rtwdev, phy_idx, chanctx_idx);rtw8852b_iqk (rtwdev, phy_idx, chanctx_idx); +rtw89_btc_ntfy_preserve_bt_time (rtwdev,30 );rtw8852b_tssi (rtwdev, phy_idx, true, chanctx_idx); +rtw89_btc_ntfy_preserve_bt_time (rtwdev,30 );rtw8852b_dpk (rtwdev, phy_idx, chanctx_idx); + +rtw89_btc_ntfy_conn_rfk (rtwdev, false); } static void rtw8852b_rfk_band_changed(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +6 -0
@@ -541,10 +541,16 @@ static void rtw8852bt_rfk_channel(struct rtw89_dev *rtwdev,enum rtw89_chanctx_idx chanctx_idx = rtwvif_link->chanctx_idx;enum rtw89_phy_idx phy_idx = rtwvif_link->phy_idx; +rtw89_btc_ntfy_conn_rfk (rtwdev, true); +rtw8852bt_rx_dck (rtwdev, phy_idx, chanctx_idx);rtw8852bt_iqk (rtwdev, phy_idx, chanctx_idx); +rtw89_btc_ntfy_preserve_bt_time (rtwdev,30 );rtw8852bt_tssi (rtwdev, phy_idx, true, chanctx_idx); +rtw89_btc_ntfy_preserve_bt_time (rtwdev,30 );rtw8852bt_dpk (rtwdev, phy_idx, chanctx_idx); + +rtw89_btc_ntfy_conn_rfk (rtwdev, false); } static void rtw8852bt_rfk_band_changed(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +6 -0
@@ -1853,10 +1853,16 @@ static void rtw8852c_rfk_channel(struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx = rtwvif_link->phy_idx;rtw8852c_mcc_get_ch_info (rtwdev, phy_idx); +rtw89_btc_ntfy_conn_rfk (rtwdev, true); +rtw8852c_rx_dck (rtwdev, phy_idx, false);rtw8852c_iqk (rtwdev, phy_idx, chanctx_idx); +rtw89_btc_ntfy_preserve_bt_time (rtwdev,30 );rtw8852c_tssi (rtwdev, phy_idx, chanctx_idx); +rtw89_btc_ntfy_preserve_bt_time (rtwdev,30 );rtw8852c_dpk (rtwdev, phy_idx, chanctx_idx); + +rtw89_btc_ntfy_conn_rfk (rtwdev, false);rtw89_fw_h2c_rf_ntfy_mcc (rtwdev); }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH 1/3] wifi: rtw89: coex: Add protect to avoid A2DP lag while Wi-Fi connecting
Quoted 10 lines · Ping-Ke Shih
From: Ching-Te Ku <[email protected]>
To get a well Wi-Fi RF quality, Wi-Fi need to do RF calibrations. While Wi-Fi is doing RF calibrations, driver will pause the Bluetooth traffic to make sure the RF calibration will not be interfered by Bluetooth. However, if the RF calibrations take too much time, Bluetooth audio will perform a lag sound. Add a function to make Bluetooth can do traffic between the individual calibrations to avoid Bluetooth sound lag. And patch related A2DP coexistence mechanism actions.
Quoted 2 lines
Signed-off-by Ching-Te Ku <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
3 patch(es) applied to rtw-next branch of rtw.git, thanks.
5251fd321684 wifi: rtw89: coex: Add protect to avoid A2DP lag while Wi-Fi connecting 4a5734665215 wifi: rtw89: coex: Separated Wi-Fi connecting event from Wi-Fi scan event dbb6a738f6cb wifi: rtw89: coex: Update Wi-Fi/Bluetooth coexistence version to 7.0.2
Ping-Ke Shih
maintainerPATCH 2/3 wifi: rtw89: coex: Separated Wi-Fi connecting event from Wi-Fi scan event
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Wi-Fi connecting process don't need to assign to firmware slot control, if assign firmware slot control for Wi-Fi connecting event, firmware will not toggle slots because driver don't tell the slot schedule to firmware. Wi-Fi connecting event end should also cancel the 4way handshake status.
--- drivers/net/wireless/realtek/rtw89/coex.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +6 -2
@@ -5399,7 +5399,8 @@ static void _action_wl_scan(struct rtw89_dev *rtwdev)struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info; -if (RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw)) { +if (btc->cx.state_map !=BTC_WLINKING && +RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw)) {_action_wl_25g_mcc (rtwdev);rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], Scan offload!\n" ); }else if (rtwdev->dbcc_en) {
@@ -7214,6 +7215,8 @@ void rtw89_btc_ntfy_scan_finish(struct rtw89_dev *rtwdev, u8 phy_idx)_fw_set_drv_info (rtwdev,CXDRVINFO_DBCC ); } + btc->dm.tdma_instant_excute =1 ; +_run_coex (rtwdev,BTC_RSN_NTFY_SCAN_FINISH ); }
@@ -7662,7 +7665,8 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev,else wl->status.map.connecting =0 ; -if (state ==BTC_ROLE_MSTS_STA_DIS_CONN ) +if (state ==BTC_ROLE_MSTS_STA_DIS_CONN || + state ==BTC_ROLE_MSTS_STA_CONN_END ) wl->status.map._4way = false;_run_coex (rtwdev,BTC_RSN_NTFY_ROLE_INFO );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/3 wifi: rtw89: coex: Update Wi-Fi/Bluetooth coexistence version to 7.0.2
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
With this version, fix Wi-Fi scan/connecting/RF calibration triggered A2DP sound lag related issues.
--- drivers/net/wireless/realtek/rtw89/coex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +1 -1
@@ -10,7 +10,7 @@#include "ps.h" #include "reg.h" -#define RTW89_COEX_VERSION 0x07000113 +#define RTW89_COEX_VERSION 0x07000213#define FCXDEF_STEP 50/* MUST <= FCXMAX_STEP and match with wl fw*/ #define BTC_E2G_LIMIT_DEF 80
Signature · 1 line
2.25.1