wifi: rtw89: coex: move chip_ops::btc_bt_aci_imp to a generic code

This chunk is to set fixed BT LNA2 at level5 when WiFi/BT shared BTG RFC
to improve BT anti-interference ability from adjacent channel. Since all
chips use the same setting, remove chip_ops::btc_bt_aci_imp.

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

diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index bbdfa9ac203ccdf6bbc75532016a97c1a1998d4e..f21c73310fdb68721282769880f81cdae4999602 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -1809,13 +1809,18 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)
        struct rtw89_btc_dm *dm = &btc->dm;
        struct rtw89_btc_wl_info *wl = &btc->cx.wl;
        struct rtw89_btc_bt_info *bt = &btc->cx.bt;
+       struct rtw89_btc_bt_link_info *b = &bt->link_info;
        struct rtw89_btc_rf_trx_para para;
        u32 wl_stb_chg = 0;
        u8 level_id = 0;
 
        if (!dm->freerun) {
-               dm->trx_para_level = 0;
-               chip->ops->btc_bt_aci_imp(rtwdev);
+               /* fix LNA2 = level-5 for BT ACI issue at BTG */
+               if ((btc->dm.wl_btg_rx && b->profile_cnt.now != 0) ||
+                   dm->bt_only == 1)
+                       dm->trx_para_level = 1;
+               else
+                       dm->trx_para_level = 0;
        }
 
        level_id = (u8)dm->trx_para_level;

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 51af91b30fc4df6e07131d4b88fecd45eb6385a8..b04e7a54b1e0ab5dc4e95f0a971f7ccd50adc5dd 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -2363,7 +2363,6 @@ struct rtw89_chip_ops {
        void (*btc_set_wl_pri)(struct rtw89_dev *rtwdev, u8 map, bool state);
        void (*btc_set_wl_txpwr_ctrl)(struct rtw89_dev *rtwdev, u32 txpwr_val);
        s8 (*btc_get_bt_rssi)(struct rtw89_dev *rtwdev, s8 val);
-       void (*btc_bt_aci_imp)(struct rtw89_dev *rtwdev);
        void (*btc_update_bt_cnt)(struct rtw89_dev *rtwdev);
        void (*btc_wl_s1_standby)(struct rtw89_dev *rtwdev, bool state);
        void (*btc_set_policy)(struct rtw89_dev *rtwdev, u16 policy_type);

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 5678683ec02a568a01501a1cc0fb39a59a1a0b06..b5aa8697a0982d30b011240e46766397e2fc12c2 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -1870,19 +1870,6 @@ static struct rtw89_btc_fbtc_mreg rtw89_btc_8852a_mon_reg[] = {
        RTW89_DEF_FBTC_MREG(REG_BT_MODEM, 4, 0x178),
 };
 
-static
-void rtw8852a_btc_bt_aci_imp(struct rtw89_dev *rtwdev)
-{
-       struct rtw89_btc *btc = &rtwdev->btc;
-       struct rtw89_btc_dm *dm = &btc->dm;
-       struct rtw89_btc_bt_info *bt = &btc->cx.bt;
-       struct rtw89_btc_bt_link_info *b = &bt->link_info;
-
-       /* fix LNA2 = level-5 for BT ACI issue at BTG */
-       if (btc->dm.wl_btg_rx && b->profile_cnt.now != 0)
-               dm->trx_para_level = 1;
-}
-
 static
 void rtw8852a_btc_update_bt_cnt(struct rtw89_dev *rtwdev)
 {
@@ -2041,7 +2028,6 @@ static const struct rtw89_chip_ops rtw8852a_chip_ops = {
        .btc_set_wl_pri         = rtw8852a_btc_set_wl_pri,
        .btc_set_wl_txpwr_ctrl  = rtw8852a_btc_set_wl_txpwr_ctrl,
        .btc_get_bt_rssi        = rtw8852a_btc_get_bt_rssi,
-       .btc_bt_aci_imp         = rtw8852a_btc_bt_aci_imp,
        .btc_update_bt_cnt      = rtw8852a_btc_update_bt_cnt,
        .btc_wl_s1_standby      = rtw8852a_btc_wl_s1_standby,
        .btc_set_wl_rx_gain     = rtw8852a_btc_set_wl_rx_gain,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index a5bcd3fcecb71d45a89d06460fe12ff5a9c3353d..00f564be29e8d93ecf09211ad626675dde08992c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -2684,19 +2684,6 @@ static const struct rtw89_btc_fbtc_mreg rtw89_btc_8852c_mon_reg[] = {
        RTW89_DEF_FBTC_MREG(REG_BB, 4, 0x980),
 };
 
-static
-void rtw8852c_btc_bt_aci_imp(struct rtw89_dev *rtwdev)
-{
-       struct rtw89_btc *btc = &rtwdev->btc;
-       struct rtw89_btc_dm *dm = &btc->dm;
-       struct rtw89_btc_bt_info *bt = &btc->cx.bt;
-       struct rtw89_btc_bt_link_info *b = &bt->link_info;
-
-       /* fix LNA2 = level-5 for BT ACI issue at BTG */
-       if (btc->dm.wl_btg_rx && b->profile_cnt.now != 0)
-               dm->trx_para_level = 1;
-}
-
 static
 void rtw8852c_btc_update_bt_cnt(struct rtw89_dev *rtwdev)
 {
@@ -2893,7 +2880,6 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = {
        .btc_set_wl_pri         = rtw8852c_btc_set_wl_pri,
        .btc_set_wl_txpwr_ctrl  = rtw8852c_btc_set_wl_txpwr_ctrl,
        .btc_get_bt_rssi        = rtw8852c_btc_get_bt_rssi,
-       .btc_bt_aci_imp         = rtw8852c_btc_bt_aci_imp,
        .btc_update_bt_cnt      = rtw8852c_btc_update_bt_cnt,
        .btc_wl_s1_standby      = rtw8852c_btc_wl_s1_standby,
        .btc_set_wl_rx_gain     = rtw8852c_btc_set_wl_rx_gain,