rtw88: coex: Change antenna setting to enhance free-run performance

While the mechanism goes to 2G_free_run or WL5G_BT2G,
set BT to hardware PTA mode to get a more efficiently performance.

Add a flag to indicate antenna switch is supported or not so
that the IC serials which has different antenna structure can
set antenna correctly.

Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201112031430.4846-8-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/coex.c b/drivers/net/wireless/realtek/rtw88/coex.c
index 57b7776..d3432e6 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/coex.c
+++ b/drivers/net/wireless/realtek/rtw88/coex.c
@@ -1061,6 +1061,7 @@ static void rtw_coex_set_ant_path(struct rtw_dev *rtwdev, bool force, u8 phase)
 {
        struct rtw_coex *coex = &rtwdev->coex;
        struct rtw_coex_stat *coex_stat = &coex->stat;
+       struct rtw_coex_rfe *coex_rfe = &coex->rfe;
        struct rtw_coex_dm *coex_dm = &coex->dm;
        u8 ctrl_type = COEX_SWITCH_CTRL_MAX;
        u8 pos_type = COEX_SWITCH_TO_MAX;
@@ -1156,8 +1157,8 @@ static void rtw_coex_set_ant_path(struct rtw_dev *rtwdev, bool force, u8 phase)
                rtw_dbg(rtwdev, RTW_DBG_COEX,
                        "[BTCoex], %s() - PHASE_5G_RUNTIME\n", __func__);
 
-               /* set GNT_BT to PTA */
-               rtw_coex_set_gnt_bt(rtwdev, COEX_GNT_SET_SW_HIGH);
+               /* set GNT_BT to HW PTA */
+               rtw_coex_set_gnt_bt(rtwdev, COEX_GNT_SET_HW_PTA);
 
                /* set GNT_WL to SW high */
                rtw_coex_set_gnt_wl(rtwdev, COEX_GNT_SET_SW_HIGH);
@@ -1172,8 +1173,8 @@ static void rtw_coex_set_ant_path(struct rtw_dev *rtwdev, bool force, u8 phase)
                rtw_dbg(rtwdev, RTW_DBG_COEX,
                        "[BTCoex], %s() - PHASE_2G_FREERUN\n", __func__);
 
-               /* set GNT_BT to SW high */
-               rtw_coex_set_gnt_bt(rtwdev, COEX_GNT_SET_SW_HIGH);
+               /* set GNT_BT to HW PTA */
+               rtw_coex_set_gnt_bt(rtwdev, COEX_GNT_SET_HW_PTA);
 
                /* Set GNT_WL to SW high */
                rtw_coex_set_gnt_wl(rtwdev, COEX_GNT_SET_SW_HIGH);
@@ -1204,7 +1205,8 @@ static void rtw_coex_set_ant_path(struct rtw_dev *rtwdev, bool force, u8 phase)
                return;
        }
 
-       if (ctrl_type < COEX_SWITCH_CTRL_MAX && pos_type < COEX_SWITCH_TO_MAX)
+       if (ctrl_type < COEX_SWITCH_CTRL_MAX && pos_type < COEX_SWITCH_TO_MAX &&
+           coex_rfe->ant_switch_exist)
                rtw_coex_set_ant_switch(rtwdev, ctrl_type, pos_type);
 }