You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
139 lines
5.5 KiB
139 lines
5.5 KiB
From 9157b32cbe2524cfaea119ff7ac5789d7b2c08e5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@redhat.com>
|
|
Date: Wed, 24 May 2023 15:00:23 +0200
|
|
Subject: [PATCH 016/142] wifi: rtw89: coex: move chip_ops::btc_bt_aci_imp to a
|
|
generic code
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/2207499
|
|
|
|
commit 127da1aa61859c1eb27d7fc2d5b936e9e528815d
|
|
Author: Ching-Te Ku <ku920601@realtek.com>
|
|
Date: Wed Oct 5 16:32:07 2022 +0800
|
|
|
|
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
|
|
|
|
Signed-off-by: Íñigo Huguet <ihuguet@redhat.com>
|
|
---
|
|
drivers/net/wireless/realtek/rtw89/coex.c | 9 +++++++--
|
|
drivers/net/wireless/realtek/rtw89/core.h | 1 -
|
|
drivers/net/wireless/realtek/rtw89/rtw8852a.c | 14 --------------
|
|
drivers/net/wireless/realtek/rtw89/rtw8852c.c | 14 --------------
|
|
4 files changed, 7 insertions(+), 31 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
|
|
index bbdfa9ac203cc..f21c73310fdb6 100644
|
|
--- 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 51af91b30fc4d..b04e7a54b1e0a 100644
|
|
--- 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 5678683ec02a5..b5aa8697a0982 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
|
|
@@ -1871,19 +1871,6 @@ static struct rtw89_btc_fbtc_mreg rtw89_btc_8852a_mon_reg[] = {
|
|
};
|
|
|
|
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)
|
|
{
|
|
struct rtw89_btc *btc = &rtwdev->btc;
|
|
@@ -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 a5bcd3fcecb71..00f564be29e8d 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
|
|
@@ -2685,19 +2685,6 @@ static const struct rtw89_btc_fbtc_mreg rtw89_btc_8852c_mon_reg[] = {
|
|
};
|
|
|
|
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)
|
|
{
|
|
/* Feature move to firmware */
|
|
@@ -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,
|
|
--
|
|
2.13.6
|
|
|