wifi: rtw89: coex: Allow Bluetooth doing traffic during Wi-Fi scan

The Wi-Fi/Bluetooth slot are toggled by firmware timer when Wi-Fi doing
firmware scan, and Wi-Fi slot don't allow Bluetooth do traffic when
Wi-Fi slot. It will trigger Bluetooth audio lag in a random rate, because
Bluetooth can not have enough time slot to keep enough data to play audio.
This patch make Bluetooth can do traffic during Wi-Fi slot, this can help
Bluetooth to collect audio data in time.

Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://msgid.link/20240418021207.32173-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index e4f70d62b32f14367868e443b59ee58ea21118ae..8992ee408b7f04c7979730fe29b661d0cfef2c79 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -212,6 +212,16 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = {
 
 #define RTW89_DEFAULT_BTC_VER_IDX (ARRAY_SIZE(rtw89_btc_ver_defs) - 1)
 
+static const union rtw89_btc_wl_state_map btc_scanning_map = {
+       .map = {
+               .scan = 1,
+               .connecting = 1,
+               .roaming = 1,
+               .transacting = 1,
+               ._4way = 1,
+       },
+};
+
 struct rtw89_btc_btf_tlv {
        u8 type;
        u8 len;
@@ -4848,6 +4858,30 @@ static void _action_wl_2g_sta(struct rtw89_dev *rtwdev)
        _action_by_bt(rtwdev);
 }
 
+static void _action_wl_25g_mcc(struct rtw89_dev *rtwdev)
+{
+       struct rtw89_btc *btc = &rtwdev->btc;
+       u16 policy_type = BTC_CXP_OFF_BT;
+
+       if (btc->ant_type == BTC_ANT_SHARED) {
+               if (btc->cx.wl.status.map._4way)
+                       policy_type = BTC_CXP_OFFE_WL;
+               else if (btc->cx.wl.status.val & btc_scanning_map.val)
+                       policy_type = BTC_CXP_OFFE_2GBWMIXB;
+               else if (btc->cx.bt.link_info.profile_cnt.now == 0)
+                       policy_type = BTC_CXP_OFFE_2GISOB;
+               else
+                       policy_type = BTC_CXP_OFFE_2GBWISOB;
+       } else { /* dedicated-antenna */
+               policy_type = BTC_CXP_OFF_EQ0;
+       }
+
+       btc->dm.e2g_slot_limit = BTC_E2G_LIMIT_DEF;
+
+       _set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W25G);
+       _set_policy(rtwdev, policy_type, BTC_ACT_WL_25G_MCC);
+}
+
 static void _action_wl_scan(struct rtw89_dev *rtwdev)
 {
        struct rtw89_btc *btc = &rtwdev->btc;
@@ -4855,14 +4889,7 @@ static void _action_wl_scan(struct rtw89_dev *rtwdev)
        struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;
 
        if (RTW89_CHK_FW_FEATURE(SCAN_OFFLOAD, &rtwdev->fw)) {
-               _set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W25G);
-               if (btc->ant_type == BTC_ANT_SHARED)
-                       _set_policy(rtwdev, BTC_CXP_OFFE_DEF,
-                                   BTC_RSN_NTFY_SCAN_START);
-               else
-                       _set_policy(rtwdev, BTC_CXP_OFF_EQ0,
-                                   BTC_RSN_NTFY_SCAN_START);
-
+               _action_wl_25g_mcc(rtwdev);
                rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], Scan offload!\n");
        } else if (rtwdev->dbcc_en) {
                if (wl_dinfo->real_band[RTW89_PHY_0] != RTW89_BAND_2G &&
@@ -4878,24 +4905,6 @@ static void _action_wl_scan(struct rtw89_dev *rtwdev)
        }
 }
 
-static void _action_wl_25g_mcc(struct rtw89_dev *rtwdev)
-{
-       struct rtw89_btc *btc = &rtwdev->btc;
-
-       _set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W25G);
-
-       if (btc->ant_type == BTC_ANT_SHARED) {
-               if (btc->cx.bt.link_info.profile_cnt.now == 0)
-                       _set_policy(rtwdev, BTC_CXP_OFFE_DEF2,
-                                   BTC_ACT_WL_25G_MCC);
-               else
-                       _set_policy(rtwdev, BTC_CXP_OFFE_DEF,
-                                   BTC_ACT_WL_25G_MCC);
-       } else { /* dedicated-antenna */
-               _set_policy(rtwdev, BTC_CXP_OFF_EQ0, BTC_ACT_WL_25G_MCC);
-       }
-}
-
 static void _action_wl_2g_mcc(struct rtw89_dev *rtwdev)
 {      struct rtw89_btc *btc = &rtwdev->btc;
 

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 1fb960af0a85f5373514f6ae8d6fe4b806834750..635100f1c739e5f9ba6fd3b3dacc63b26583e432 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -1308,6 +1308,7 @@ struct rtw89_btc_wl_smap {
        u32 scan: 1;
        u32 connecting: 1;
        u32 roaming: 1;
+       u32 transacting: 1;
        u32 _4way: 1;
        u32 rf_off: 1;
        u32 lps: 2;
@@ -1316,6 +1317,8 @@ struct rtw89_btc_wl_smap {
        u32 traffic_dir : 2;
        u32 rf_off_pre: 1;
        u32 lps_pre: 2;
+       u32 lps_exiting: 1;
+       u32 emlsr: 1;
 };
 
 enum rtw89_tfc_lv {