wifi: rtw89: 8852bx: move BTC common code from 8852b to 8852b_common
Ping-Ke Shih
maintainerPATCH 1/2 wifi: rtw89: 8852bx: move BTC common code from 8852b to 8852b_common
The BT coexistence part of 8852B and 8852BT are similar, so move shared code into common module.
Don't change logic for existing RTL8852BE.
--- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 173 +----------------- .../wireless/realtek/rtw89/rtw8852b_common.c | 168 +++++++++++++++++ .../wireless/realtek/rtw89/rtw8852b_common.h | 42 +++++ 3 files changed, 216 insertions(+), 167 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8852b.c +6 -167
@@ -633,86 +633,6 @@ static void rtw8852b_btc_set_rfe(struct rtw89_dev *rtwdev) } } -static -void rtw8852b_set_trx_mask (struct rtw89_dev *rtwdev,u8 path,u8 group,u32 val) -{ -rtw89_write_rf (rtwdev, path,RR_LUTWE ,RFREG_MASK ,0x20000 ); -rtw89_write_rf (rtwdev, path,RR_LUTWA ,RFREG_MASK , group); -rtw89_write_rf (rtwdev, path,RR_LUTWD0 ,RFREG_MASK , val); -rtw89_write_rf (rtwdev, path,RR_LUTWE ,RFREG_MASK ,0x0 ); -} - -static void rtw8852b_btc_init_cfg (struct rtw89_dev *rtwdev) -{ -struct rtw89_btc *btc = &rtwdev->btc; -const struct rtw89_chip_info *chip = rtwdev->chip; -const struct rtw89_mac_ax_coex coex_params = { - .pta_mode =RTW89_MAC_AX_COEX_RTK_MODE , - .direction =RTW89_MAC_AX_COEX_INNER , - }; - -/* PTA init */ -rtw89_mac_coex_init (rtwdev, &coex_params); - -/* set WL Tx response = Hi-Pri */ - chip->ops->btc_set_wl_pri (rtwdev,BTC_PRI_MASK_TX_RESP , true); - chip->ops->btc_set_wl_pri (rtwdev,BTC_PRI_MASK_BEACON , true); - -/* set rf gnt debug off */ -rtw89_write_rf (rtwdev,RF_PATH_A ,RR_WLSEL ,RFREG_MASK ,0x0 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_WLSEL ,RFREG_MASK ,0x0 ); - -/* set WL Tx thru in TRX mask table if GNT_WL = 0 && BT_S1 = ss group */ -if (btc->ant_type ==BTC_ANT_SHARED ) { -rtw8852b_set_trx_mask (rtwdev,RF_PATH_A ,BTC_BT_SS_GROUP ,0x5ff ); -rtw8852b_set_trx_mask (rtwdev,RF_PATH_B ,BTC_BT_SS_GROUP ,0x5ff ); -/* set path-A(S0) Tx/Rx no-mask if GNT_WL=0 && BT_S1=tx group */ -rtw8852b_set_trx_mask (rtwdev,RF_PATH_A ,BTC_BT_TX_GROUP ,0x5ff ); -rtw8852b_set_trx_mask (rtwdev,RF_PATH_B ,BTC_BT_TX_GROUP ,0x55f ); - }else {/* set WL Tx stb if GNT_WL = 0 && BT_S1 = ss group for 3-ant */ -rtw8852b_set_trx_mask (rtwdev,RF_PATH_A ,BTC_BT_SS_GROUP ,0x5df ); -rtw8852b_set_trx_mask (rtwdev,RF_PATH_B ,BTC_BT_SS_GROUP ,0x5df ); -rtw8852b_set_trx_mask (rtwdev,RF_PATH_A ,BTC_BT_TX_GROUP ,0x5ff ); -rtw8852b_set_trx_mask (rtwdev,RF_PATH_B ,BTC_BT_TX_GROUP ,0x5ff ); - } - -/* set PTA break table */ -rtw89_write32 (rtwdev,R_BTC_BREAK_TABLE ,BTC_BREAK_PARAM ); - -/* enable BT counter 0xda40[16,2] = 2b'11 */ -rtw89_write32_set (rtwdev,R_AX_CSR_MODE ,B_AX_BT_CNT_RST |B_AX_STATIS_BT_EN ); - btc->cx.wl.status.map.init_ok = true; -} - -static -void rtw8852b_btc_set_wl_pri (struct rtw89_dev *rtwdev,u8 map,bool state) -{ -u32 bitmap; -u32 reg; - -switch (map) { -case BTC_PRI_MASK_TX_RESP : - reg =R_BTC_BT_COEX_MSK_TABLE ; - bitmap =B_BTC_PRI_MASK_TX_RESP_V1 ; -break ; -case BTC_PRI_MASK_BEACON : - reg =R_AX_WL_PRI_MSK ; - bitmap =B_AX_PTA_WL_PRI_MASK_BCNQ ; -break ; -case BTC_PRI_MASK_RX_CCK : - reg =R_BTC_BT_COEX_MSK_TABLE ; - bitmap =B_BTC_PRI_MASK_RXCCK_V1 ; -break ; -default : -return ; - } - -if (state) -rtw89_write32_set (rtwdev, reg, bitmap); -else -rtw89_write32_clr (rtwdev, reg, bitmap); -} -union rtw8852b_btc_wl_txpwr_ctrl {u32 txpwr_val;struct {
@@ -780,87 +700,6 @@ do { \#undef __write_ctrl } -static -s8 rtw8852b_btc_get_bt_rssi (struct rtw89_dev *rtwdev,s8 val) -{ -/* +6 for compensate offset */ -return clamp_t (s8, val +6 ,-100 ,0 ) +100 ; -} - -static -void rtw8852b_btc_update_bt_cnt (struct rtw89_dev *rtwdev) -{ -/* Feature move to firmware */ -} - -static void rtw8852b_btc_wl_s1_standby (struct rtw89_dev *rtwdev,bool state) -{ -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWE ,RFREG_MASK ,0x80000 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWA ,RFREG_MASK ,0x1 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD1 ,RFREG_MASK ,0x31 ); - -/* set WL standby = Rx for GNT_BT_Tx = 1->0 settle issue */ -if (state) -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD0 ,RFREG_MASK ,0x179 ); -else -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD0 ,RFREG_MASK ,0x20 ); - -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWE ,RFREG_MASK ,0x0 ); -} - -static void rtw8852b_btc_set_wl_lna2 (struct rtw89_dev *rtwdev,u8 level) -{ -switch (level) { -case 0 :/* default */ -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWE ,RFREG_MASK ,0x1000 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWA ,RFREG_MASK ,0x0 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD0 ,RFREG_MASK ,0x15 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWA ,RFREG_MASK ,0x1 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD0 ,RFREG_MASK ,0x17 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWA ,RFREG_MASK ,0x2 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD0 ,RFREG_MASK ,0x15 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWA ,RFREG_MASK ,0x3 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD0 ,RFREG_MASK ,0x17 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWE ,RFREG_MASK ,0x0 ); -break ; -case 1 :/* Fix LNA2=5 */ -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWE ,RFREG_MASK ,0x1000 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWA ,RFREG_MASK ,0x0 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD0 ,RFREG_MASK ,0x15 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWA ,RFREG_MASK ,0x1 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD0 ,RFREG_MASK ,0x5 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWA ,RFREG_MASK ,0x2 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD0 ,RFREG_MASK ,0x15 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWA ,RFREG_MASK ,0x3 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWD0 ,RFREG_MASK ,0x5 ); -rtw89_write_rf (rtwdev,RF_PATH_B ,RR_LUTWE ,RFREG_MASK ,0x0 ); -break ; - } -} - -static void rtw8852b_btc_set_wl_rx_gain (struct rtw89_dev *rtwdev,u32 level) -{ -struct rtw89_btc *btc = &rtwdev->btc; - -switch (level) { -case 0 :/* original */ -default : -rtw8852bx_ctrl_nbtg_bt_tx (rtwdev, false,RTW89_PHY_0 ); - btc->dm.wl_lna2 =0 ; -break ; -case 1 :/* for FDD free-run */ -rtw8852bx_ctrl_nbtg_bt_tx (rtwdev, true,RTW89_PHY_0 ); - btc->dm.wl_lna2 =0 ; -break ; -case 2 :/* for BTG Co-Rx*/ -rtw8852bx_ctrl_nbtg_bt_tx (rtwdev, false,RTW89_PHY_0 ); - btc->dm.wl_lna2 =1 ; -break ; - } - -rtw8852b_btc_set_wl_lna2 (rtwdev, btc->dm.wl_lna2); -} -static const struct rtw89_chip_ops rtw8852b_chip_ops = { .enable_bb_rf = rtw8852bx_mac_enable_bb_rf, .disable_bb_rf = rtw8852bx_mac_disable_bb_rf,
@@ -911,13 +750,13 @@ static const struct rtw89_chip_ops rtw8852b_chip_ops = { .h2c_ba_cam = rtw89_fw_h2c_ba_cam, .btc_set_rfe = rtw8852b_btc_set_rfe, - .btc_init_cfg = rtw8852b_btc_init_cfg, - .btc_set_wl_pri = rtw8852b_btc_set_wl_pri, + .btc_init_cfg = rtw8852bx_btc_init_cfg, + .btc_set_wl_pri = rtw8852bx_btc_set_wl_pri, .btc_set_wl_txpwr_ctrl = rtw8852b_btc_set_wl_txpwr_ctrl, - .btc_get_bt_rssi = rtw8852b_btc_get_bt_rssi, - .btc_update_bt_cnt = rtw8852b_btc_update_bt_cnt, - .btc_wl_s1_standby = rtw8852b_btc_wl_s1_standby, - .btc_set_wl_rx_gain = rtw8852b_btc_set_wl_rx_gain, + .btc_get_bt_rssi = rtw8852bx_btc_get_bt_rssi, + .btc_update_bt_cnt = rtw8852bx_btc_update_bt_cnt, + .btc_wl_s1_standby = rtw8852bx_btc_wl_s1_standby, + .btc_set_wl_rx_gain = rtw8852bx_btc_set_wl_rx_gain, .btc_set_policy = rtw89_btc_set_policy_v1, };
drivers/net/wireless/realtek/rtw89/rtw8852b_common.c +168 -0
186 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852b_common.h +42 -0
52 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 2/2 wifi: rtw89: 8852bx: add extra handles of BTC for 8852BT in 8852b_common
For 8852BT, the initial settings of BT-coexistence is a little bit different, so add the extra handles.
--- drivers/net/wireless/realtek/rtw89/rtw8852b_common.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/realtek/rtw89/rtw8852b_common.c +5 -0
@@ -1793,6 +1793,11 @@ static void __rtw8852bx_btc_init_cfg(struct rtw89_dev *rtwdev)rtw8852bx_set_trx_mask (rtwdev,RF_PATH_B ,BTC_BT_TX_GROUP ,0x5ff ); } +if (rtwdev->chip->chip_id ==RTL8852BT ) { +rtw8852bx_set_trx_mask (rtwdev,RF_PATH_A ,BTC_BT_RX_GROUP ,0x5df ); +rtw8852bx_set_trx_mask (rtwdev,RF_PATH_B ,BTC_BT_RX_GROUP ,0x5df ); + } +/* set PTA break table */ rtw89_write32 (rtwdev,R_BTC_BREAK_TABLE ,BTC_BREAK_PARAM );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerQuoted 6 lines · Ping-Ke Shih
The BT coexistence part of 8852B and 8852BT are similar, so move shared code into common module.
Don't change logic for existing RTL8852BE.
Signed-off-by Ping-Ke Shih <[email protected]>
2 patch(es) applied to rtw-next branch of rtw.git, thanks.
0e557c5c1a61 wifi: rtw89: 8852bx: move BTC common code from 8852b to 8852b_common 52bc83ad2ed5 wifi: rtw89: 8852bx: add extra handles of BTC for 8852BT in 8852b_common