wifi: rtw89: coex: implement coex for RTL8922D
Ping-Ke Shih
maintainercover wifi: rtw89: coex: implement coex for RTL8922D
The BT-coexistence introduce many new formats and features for RTL8922D, including dual-BT support, offload features to firmware and etc. Update them accordingly and add a tag version for reference.
Ching-Te Ku (11):
wifi: rtw89: coex: Add Wi-Fi role info version 10
wifi: rtw89: coex: Rearrange coexistence control structure
wifi: rtw89: coex: Update driver outsource info to firmware version 6
wifi: rtw89: ceox: Update antenna & grant signal setting
wifi: rtw89: coex: Rearrange Bluetooth firmware report entry
wifi: rtw89: coex: Refine send firmware command function
wifi: rtw89: coex: Refine _reset_btc_var()
wifi: rtw89: coex: Correct SET_RFE settings
wifi: rtw89: coex: Add firmware report control report v11
wifi: rtw89: coex: update external control length by case
wifi: rtw89: coex: Update coexistence version to 9.24.0
drivers/net/wireless/realtek/rtw89/coex.c | 3781 ++++++++--------- drivers/net/wireless/realtek/rtw89/coex.h | 73 + drivers/net/wireless/realtek/rtw89/core.c | 11 +- drivers/net/wireless/realtek/rtw89/core.h | 486 ++- drivers/net/wireless/realtek/rtw89/debug.c | 6 +- drivers/net/wireless/realtek/rtw89/fw.c | 556 ++- drivers/net/wireless/realtek/rtw89/fw.h | 60 +- drivers/net/wireless/realtek/rtw89/mac.c | 27 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 21 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922d.c | 214 +- 16 files changed, 2954 insertions(+), 2287 deletions(-)
base-commit: 56d32cdc6040440b08edfd5d7262250a721233f8
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/11 wifi: rtw89: coex: Add Wi-Fi role info version 10
From: Ching-Te Ku <[email protected]>
Because the new generation Bluetooth will able to work on 5/6GHz band, it will suffer 5/6GHz Wi-Fi, the mechanism need to cover more scenario with different Wi-Fi/Bluetooth combination.
--- drivers/net/wireless/realtek/rtw89/coex.c | 2445 +++++++---------- drivers/net/wireless/realtek/rtw89/coex.h | 34 + drivers/net/wireless/realtek/rtw89/core.h | 153 +- drivers/net/wireless/realtek/rtw89/fw.c | 392 ++- drivers/net/wireless/realtek/rtw89/fw.h | 48 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922d.c | 1 + 12 files changed, 1391 insertions(+), 1688 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +947 -1498
@@ -436,11 +436,6 @@ union rtw89_fbtc_set_mon_reg {struct rtw89_btc_btf_set_mon_reg_v7 v7; } __packed; -struct _wl_rinfo_now { -u8 link_mode; -u32 dbcc_2g_phy:2 ; -}; -enum btc_btf_set_cx_policy {CXPOLICY_TDMA =0x0 ,CXPOLICY_SLOT =0x1 ,
@@ -570,9 +565,21 @@ enum btc_cx_poicy_type {/* TDMA off + pri: WL > BT, Block-BT*/ BTC_CXP_OFF_WL2 = (BTC_CXP_OFF <<8 ) |12 , -/* TDMA off+Bcn-Protect + pri: WL_Hi-Tx > BT_Hi_Rx, BT_Hi > WL > BT_Lo*/ +/* TDMA off+Bcn-Protect + pri: BT_Hi > WL > BT_Lo */ BTC_CXP_OFFB_BWB0 = (BTC_CXP_OFFB <<8 ) |0 , +/* TDMA off+Bcn-Protect + pri: BT_Hi_Tx = WL_Hi-Tx > BT_Hi_Rx, BT_Hi > WL > BT_Lo */ +BTC_CXP_OFFB_BWB1 = (BTC_CXP_OFFB <<8 ) |1 , + +/* TDMA off+Bcn-Protect + pri: WL_Hi-Tx > BT, BT_Hi > other-WL > BT_Lo */ +BTC_CXP_OFFB_BWB2 = (BTC_CXP_OFFB <<8 ) |2 , + +/* TDMA off+Bcn-Protect + pri: WL_Hi-Tx = BT*/ +BTC_CXP_OFFB_BWB3 = (BTC_CXP_OFFB <<8 ) |3 , + +/* TDMA off+Bcn-Protect + pri: BT > WL*/ +BTC_CXP_OFFB_BWB4 = (BTC_CXP_OFFB <<8 ) |4 , +/* TDMA off + Ext-Ctrl + pri: default */ BTC_CXP_OFFE_DEF = (BTC_CXP_OFFE << 8) | 0,
@@ -752,19 +759,31 @@ enum btc_w2b_scoreboard { BTC_WSCB_ALL = GENMASK(23, 0), }; -enum btc_wl_link_mode { +enum btc_wl_link_mode_v0 { +BTC_WLINK_V0_NOLINK =0x0 , +BTC_WLINK_V0_2G_STA , +BTC_WLINK_V0_2G_AP , +BTC_WLINK_V0_2G_GO , +BTC_WLINK_V0_2G_GC , +BTC_WLINK_V0_2G_SCC , +BTC_WLINK_V0_2G_MCC , +BTC_WLINK_V0_25G_MCC , +BTC_WLINK_V0_25G_DBCC , +BTC_WLINK_V0_5G , +BTC_WLINK_V0_2G_NAN , +BTC_WLINK_V0_OTHER , +BTC_WLINK_V0_MAX +}; + +enum btc_wl_link_mode_v1 {BTC_WLINK_NOLINK =0x0 , -BTC_WLINK_2G_STA , -BTC_WLINK_2G_AP , -BTC_WLINK_2G_GO , -BTC_WLINK_2G_GC , -BTC_WLINK_2G_SCC , -BTC_WLINK_2G_MCC , -BTC_WLINK_25G_MCC , -BTC_WLINK_25G_DBCC , -BTC_WLINK_5G , -BTC_WLINK_2G_NAN , -BTC_WLINK_OTHER , +BTC_WLINK_STA , +BTC_WLINK_AP , +BTC_WLINK_GO , +BTC_WLINK_GC , +BTC_WLINK_SCC , +BTC_WLINK_SB_MCC , +BTC_WLINK_DB_MCC ,/* 2+0/0+2 Dual-RF-band MCC */ BTC_WLINK_MAX };
@@ -774,16 +793,13 @@ static const char *id_to_linkmode(u8 id) {switch (id) {CASE_BTC_WL_LINK_MODE (NOLINK ); - CASE_BTC_WL_LINK_MODE(2G_STA); - CASE_BTC_WL_LINK_MODE(2G_AP); - CASE_BTC_WL_LINK_MODE(2G_GO); - CASE_BTC_WL_LINK_MODE(2G_GC); - CASE_BTC_WL_LINK_MODE(2G_SCC); - CASE_BTC_WL_LINK_MODE(2G_MCC); - CASE_BTC_WL_LINK_MODE(25G_MCC); - CASE_BTC_WL_LINK_MODE(25G_DBCC); - CASE_BTC_WL_LINK_MODE(5G); -CASE_BTC_WL_LINK_MODE (OTHER ); +CASE_BTC_WL_LINK_MODE (STA ); +CASE_BTC_WL_LINK_MODE (AP ); +CASE_BTC_WL_LINK_MODE (GO ); +CASE_BTC_WL_LINK_MODE (GC ); +CASE_BTC_WL_LINK_MODE (SCC ); +CASE_BTC_WL_LINK_MODE (SB_MCC ); +CASE_BTC_WL_LINK_MODE (DB_MCC );default :return "unknown" ; }
@@ -969,7 +985,7 @@ static void _reset_btc_var(struct rtw89_dev *rtwdev, u8 type)struct rtw89_btc_bt_info *bt = &btc->cx.bt0;struct rtw89_btc_bt_link_info *bt_linfo = &bt->link_info;struct rtw89_btc_wl_link_info *wl_linfo; -u8 i; +u8 i, j;rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s\n" , __func__);
@@ -990,12 +1006,11 @@ static void _reset_btc_var(struct rtw89_dev *rtwdev, u8 type)if (type &BTC_RESET_DM ) {memset (&btc->dm,0 ,sizeof (btc->dm));memset (bt_linfo->rssi_state,0 ,sizeof (bt_linfo->rssi_state)); -for (i =0 ; i <RTW89_PORT_NUM ; i++) { -if (btc->ver->fwlrole ==8 ) - wl_linfo = &wl->rlink_info[i][0 ]; -else - wl_linfo = &wl->link_info[i]; -memset (wl_linfo->rssi_state,0 ,sizeof (wl_linfo->rssi_state)); +for (j =RTW89_MAC_0 ; j <=RTW89_MAC_1 ; j++) { +for (i =0 ; i <RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ; i++) { + wl_linfo = &wl->rlink_info[i][j]; +memset (wl_linfo->rssi_state,0 ,sizeof (wl_linfo->rssi_state)); + } }/* set the slot_now table to original */
@@ -2847,6 +2862,8 @@ static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 index)rtw89_fw_h2c_cxdrv_role_v7 (rtwdev, index); else if (ver->fwlrole == 8) rtw89_fw_h2c_cxdrv_role_v8(rtwdev, index); + else if (ver->fwlrole == 10) + rtw89_fw_h2c_cxdrv_role_v10(rtwdev, index);break ;case CXDRVINFO_CTRL :if (ver->drvinfo_ver !=0 )
@@ -3396,29 +3413,17 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_wl_role_info *r = &wl->role_info;struct rtw89_btc_bt_info *bt = &btc->cx.bt0;struct rtw89_btc_bt_link_info *b = &bt->link_info;struct rtw89_btc_wl_smap *wl_smap = &wl->status.map;struct rtw89_btc_rf_trx_para_v9 para; -u8 lv, link_mode =0 , i, dbcc_2g_phy =0 ; -u8 ul_para_num, dl_para_num; -u8 rf_band =RTW89_BAND_2G ; -u8 bid =BTC_BT_1ST ; -u32 wl_stb_chg =0 ; - -if (ver->fwlrole ==0 ) { - link_mode = wl->role_info.link_mode; -for (i =0 ; i <RTW89_PHY_NUM ; i++) { -if (wl->dbcc_info.real_band[i] ==RTW89_BAND_2G ) - dbcc_2g_phy = i; - } - }else if (ver->fwlrole ==1 ) { - link_mode = wl->role_info_v1.link_mode; - dbcc_2g_phy = wl->role_info_v1.dbcc_2g_phy; - }else if (ver->fwlrole ==2 ) { - link_mode = wl->role_info_v2.link_mode; - dbcc_2g_phy = wl->role_info_v2.dbcc_2g_phy; - } +u8 bmode = dm->tdd_bind.wl_link_mode; +u8 rf_band = dm->tdd_bind.rf_band; +u8 i, ul_para_num, dl_para_num; +u8 mode =BTC_WLINK_NOLINK ; +u8 bid =BTC_BT_1ST , lv; +u32 wl_stb_chg;if (ver->fcxtrx ==9 && chip->rf_para_ulink_v9) { ul_para_num = chip->rf_para_ulink_num_v9;
@@ -3434,6 +3439,19 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev) goto next; } +if (bmode ==BTC_WLINK_NOLINK ) { +return ; + }else if (btc->ver->fwlrole ==10 ) { +if (rf_band ==RTW89_BAND_5G ) { + mode =BTC_WLINK_V0_5G ; + }else if (rf_band ==RTW89_BAND_2G && + bmode ==BTC_WLINK_STA ) { + mode =BTC_WLINK_V0_2G_STA ; + } + }else { + mode = r->link_mode_v0; + } +/* decide trx_para_level */ if (btc->ant_type ==BTC_ANT_SHARED ) {/* fix LNA2 + TIA gain not change by GNT_BT */
@@ -3446,7 +3464,7 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev) dm->trx_para_level =5 ;/* modify trx_para if WK 2.4G-STA-DL + bt link */ if (b->link_cnt.now !=0 && - link_mode ==BTC_WLINK_2G_STA && + mode ==BTC_WLINK_V0_2G_STA && wl->status.map.traffic_dir &BIT (RTW89_TFC_UL )) {/* uplink */ if (wl->rssi_level ==4 && bt->rssi_level >2 ) dm->trx_para_level =6 ;
@@ -3504,10 +3522,8 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev) next:if (!bt->enable.now || dm->wl_only || wl_smap->rf_off || - wl_smap->lps ==BTC_LPS_RF_OFF || - link_mode ==BTC_WLINK_5G || - link_mode ==BTC_WLINK_NOLINK || - (rtwdev->dbcc_en && dbcc_2g_phy !=RTW89_PHY_1 )) + wl_smap->lps ==BTC_LPS_RF_OFF || mode ==BTC_WLINK_V0_5G || + (rtwdev->dbcc_en && r->dbcc_2g_phy !=RTW89_PHY_1 )) wl_stb_chg =0 ;else wl_stb_chg =1 ;
@@ -3544,282 +3560,372 @@ static void _update_btc_state_map(struct rtw89_dev *rtwdev) } } -static void _set_bt_afh_info_v0 (struct rtw89_dev *rtwdev) +static u8 _get_wl_guard_bw (struct rtw89_dev *rtwdev,u8 index) { -const struct rtw89_chip_info *chip = rtwdev->chip; -struct rtw89_btc *btc = &rtwdev->btc; -const struct rtw89_btc_ver *ver = btc->ver; -struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_bt_info *bt = &btc->cx.bt0; -struct rtw89_btc_bt_link_info *b = &bt->link_info; -struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info; -struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1; -struct rtw89_btc_wl_role_info_v2 *wl_rinfo_v2 = &wl->role_info_v2; -struct rtw89_btc_wl_role_info_v7 *wl_rinfo_v7 = &wl->role_info_v7; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo_v8 = &wl->role_info_v8; -struct rtw89_btc_wl_active_role *r; -struct rtw89_btc_wl_active_role_v1 *r1; -struct rtw89_btc_wl_active_role_v2 *r2; -struct rtw89_btc_wl_active_role_v7 *r7; -struct rtw89_btc_wl_rlink *rlink; -u8 en =0 , i, ch =0 , bw =0 ; -u8 mode, connect_cnt; - -if (btc->manual_ctrl || wl->status.map.scan) -return ; - -if (ver->fwlrole ==0 ) { - mode = wl_rinfo->link_mode; - connect_cnt = wl_rinfo->connect_cnt; - }else if (ver->fwlrole ==1 ) { - mode = wl_rinfo_v1->link_mode; - connect_cnt = wl_rinfo_v1->connect_cnt; - }else if (ver->fwlrole ==2 ) { - mode = wl_rinfo_v2->link_mode; - connect_cnt = wl_rinfo_v2->connect_cnt; - }else if (ver->fwlrole ==7 ) { - mode = wl_rinfo_v7->link_mode; - connect_cnt = wl_rinfo_v7->connect_cnt; - }else if (ver->fwlrole ==8 ) { - mode = wl_rinfo_v8->link_mode; - connect_cnt = wl_rinfo_v8->connect_cnt; - }else { -return ; - } - -if (wl->status.map.rf_off || bt->whql_test || - mode ==BTC_WLINK_NOLINK || mode ==BTC_WLINK_5G || - connect_cnt >BTC_TDMA_WLROLE_MAX ) { - en = false; - }else if (mode ==BTC_WLINK_2G_MCC || mode ==BTC_WLINK_2G_SCC ) { - en = true; -/* get p2p channel */ -for (i =0 ; i <RTW89_PORT_NUM ; i++) { - r = &wl_rinfo->active_role[i]; - r1 = &wl_rinfo_v1->active_role_v1[i]; - r2 = &wl_rinfo_v2->active_role_v2[i]; - r7 = &wl_rinfo_v7->active_role[i]; - rlink = &wl_rinfo_v8->rlink[i][0 ]; - -if (ver->fwlrole ==0 && - (r->role ==RTW89_WIFI_ROLE_P2P_GO || - r->role ==RTW89_WIFI_ROLE_P2P_CLIENT )) { - ch = r->ch; - bw = r->bw; -break ; - }else if (ver->fwlrole ==1 && - (r1->role ==RTW89_WIFI_ROLE_P2P_GO || - r1->role ==RTW89_WIFI_ROLE_P2P_CLIENT )) { - ch = r1->ch; - bw = r1->bw; -break ; - }else if (ver->fwlrole ==2 && - (r2->role ==RTW89_WIFI_ROLE_P2P_GO || - r2->role ==RTW89_WIFI_ROLE_P2P_CLIENT )) { - ch = r2->ch; - bw = r2->bw; -break ; - }else if (ver->fwlrole ==7 && - (r7->role ==RTW89_WIFI_ROLE_P2P_GO || - r7->role ==RTW89_WIFI_ROLE_P2P_CLIENT )) { - ch = r7->ch; - bw = r7->bw; -break ; - }else if (ver->fwlrole ==8 && - (rlink->role ==RTW89_WIFI_ROLE_P2P_GO || - rlink->role ==RTW89_WIFI_ROLE_P2P_CLIENT )) { - ch = rlink->ch; - bw = rlink->bw; -break ; - } - } - }else { - en = true; -/* get 2g channel */ -for (i =0 ; i <RTW89_PORT_NUM ; i++) { - r = &wl_rinfo->active_role[i]; - r1 = &wl_rinfo_v1->active_role_v1[i]; - r2 = &wl_rinfo_v2->active_role_v2[i]; - r7 = &wl_rinfo_v7->active_role[i]; - rlink = &wl_rinfo_v8->rlink[i][0 ]; - -if (ver->fwlrole ==0 && - r->connected && r->band ==RTW89_BAND_2G ) { - ch = r->ch; - bw = r->bw; -break ; - }else if (ver->fwlrole ==1 && - r1->connected && r1->band ==RTW89_BAND_2G ) { - ch = r1->ch; - bw = r1->bw; -break ; - }else if (ver->fwlrole ==2 && - r2->connected && r2->band ==RTW89_BAND_2G ) { - ch = r2->ch; - bw = r2->bw; -break ; - }else if (ver->fwlrole ==7 && - r7->connected && r7->band ==RTW89_BAND_2G ) { - ch = r7->ch; - bw = r7->bw; -break ; - }else if (ver->fwlrole ==8 && - rlink->connected && rlink->rf_band ==RTW89_BAND_2G ) { - ch = rlink->ch; - bw = rlink->bw; -break ; - } - } - } +struct rtw89_btc_dm *dm = &rtwdev->btc.dm; +u8 guard_ch = rtwdev->chip->afh_guard_ch; +u8 bw =0 ; -switch (bw) { +/* default AFH channel sapn = center-ch +- 6MHz */ +switch (index) {case RTW89_CHANNEL_WIDTH_20 : - bw =20 + chip->afh_guard_ch *2 ; +if (dm->freerun || dm->fddt_train) + bw =48 ; +else + bw =20 + guard_ch *2 ;break ;case RTW89_CHANNEL_WIDTH_40 : - bw =40 + chip->afh_guard_ch *2 ; + bw =40 + guard_ch *2 ; +break ; +case RTW89_CHANNEL_WIDTH_80 : + bw =80 + guard_ch *2 ; +break ; +case RTW89_CHANNEL_WIDTH_160 : +case RTW89_CHANNEL_WIDTH_80_80 : + bw =160 + guard_ch *2 ; +break ; +case RTW89_CHANNEL_WIDTH_320 : + bw =320 + guard_ch *2 ;break ;case RTW89_CHANNEL_WIDTH_5 : - bw =5 + chip->afh_guard_ch *2 ; + bw =5 + guard_ch *2 ;break ;case RTW89_CHANNEL_WIDTH_10 : - bw =10 + chip->afh_guard_ch *2 ; + bw =10 + guard_ch *2 ;break ;default : bw =0 ; - en = false;/* turn off AFH info if BW > 40 */ break ; } -if (wl->afh_info.en == en && - wl->afh_info.ch == ch && - wl->afh_info.bw == bw && - b->link_cnt.last == b->link_cnt.now) { -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], %s(): return because no change!\n" , - __func__); +return bw; +} + +static void _set_wl_ch_map (struct rtw89_dev *rtwdev) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_wl_afh_info *afh; +u16 ch_start, ch_end, i; +u8 b_group, b_pos;/* byte-group, bit-position */ +u8 hwb; + +if (wl->afh_info[RTW89_MAC_0 ][RTW89_BAND_2G ].en && + wl->afh_info[RTW89_MAC_1 ][RTW89_BAND_2G ].en) { +/* select wilder bw if 1+1 */ +if (wl->afh_info[RTW89_MAC_1 ][RTW89_BAND_2G ].bw > + wl->afh_info[RTW89_MAC_0 ][RTW89_BAND_2G ].bw) + hwb =RTW89_MAC_1 ; +else + hwb =RTW89_MAC_0 ; + }else if (wl->afh_info[RTW89_MAC_1 ][RTW89_BAND_2G ].en) { + hwb =RTW89_MAC_1 ; + }else { + hwb =RTW89_MAC_0 ; + } + + afh = &wl->afh_info[hwb][RTW89_BAND_2G ]; + +/* focus on WL 2.4GHz link */ +if (!afh->en || afh->band !=RTW89_BAND_2G )return ; + +memset (wl->ch_map,0x0 ,sizeof (wl->ch_map)); +memset (wl->ch_map_le,0x0 ,sizeof (wl->ch_map_le)); + + ch_start = afh->ch *5 +2407 - afh->bw /2 ; + ch_end = ch_start + afh->bw; + +for (i = ch_start; i < ch_end; i++) { +if (i <2402 || i >2480 ) +continue ; + b_group = (i -2402 ) /8 ; + b_pos =7 - ((i -2402 ) %8 ); + wl->ch_map[b_group] |=BIT (b_pos); + +if (i %2 )/* BLE ch = even-freq (ex:2402,2404) */ +continue ; + + b_group = (i -2402 ) /16 ; + b_pos =7 - (((i -2402 ) /2 ) %8 ); + wl->ch_map_le[b_group] |=BIT (b_pos); } +} - wl->afh_info.en = en; - wl->afh_info.ch = ch; - wl->afh_info.bw = bw; +static u8 _get_w2b_fbd_ch (struct rtw89_dev *rtwdev, +u8 bt_fb_band,u32 wl_vco_freq, +u32 *ch_lo_bound,u32 *ch_up_bound) +{ +u32 ch_lo, ch_pup, ch_min, ch_max; +u8 out_of_range =0 ; +s32 val_lo, val_up; +u32 vco_lo_in_KHz;/* VCO pulling lower bound */ +u32 vco_up_in_KHz;/* VCO pulling Upper bound */ +u32 freq_start; -_send_fw_cmd (rtwdev,BTFC_SET ,SET_BT_WL_CH_INFO , &wl->afh_info,3 ); + vco_lo_in_KHz = wl_vco_freq -BTC_VCO_GUARD_W2B *1000 ;/* KHz */ + vco_up_in_KHz = wl_vco_freq +BTC_VCO_GUARD_W2B *1000 ; -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], %s(): en=%d, ch=%d, bw=%d\n" , - __func__, en, ch, bw); - wl->wcnt[BTC_WCNT_CH_UPDATE ]++; +switch (bt_fb_band) { +default : +case BTC_BT_B2G :/* BT 2GHz forbiddened Channel */ + val_lo = vco_lo_in_KHz *BTC_LO_2G_DNM /BTC_LO_2G_NMR ; + val_up = vco_up_in_KHz *BTC_LO_2G_DNM /BTC_LO_2G_NMR ; + freq_start =BTC_FREQ_B2G *1000 ;/* KHz */ + ch_min =BTC_CH_B2G_MIN ; + ch_max =BTC_CH_B2G_MAX ; +break ; +case BTC_BT_B5G :/* BT 5/6GHz forbiddened Channel */ + val_lo = vco_lo_in_KHz *BTC_LO_6G_DNM /BTC_LO_6G_NMR ; + val_up = vco_up_in_KHz *BTC_LO_6G_DNM /BTC_LO_6G_NMR ; + freq_start =BTC_FREQ_B6G *1000 ;/* KHz */ + ch_min =BTC_CH_B5G_MIN ; + ch_max =BTC_CH_B5G_MAX ; +break ; + } + +/* Search forbiddened Channel (un-process range)*/ + ch_lo = (val_lo - freq_start) /1000 ; +if ((val_lo - freq_start) %1000 !=0 )/* Round-UP */ + ch_lo++; + + ch_pup = (val_up - freq_start) /1000 ;/* Round-down */ + +/* Search forbiddened Channel */ +if (ch_lo > ch_max || ch_pup < ch_min) {/* out-of-range -> NA */ + out_of_range =1 ; + *ch_lo_bound =0 ; + *ch_up_bound =0 ; + } + +if (ch_lo < ch_min) + *ch_lo_bound = ch_min; +else if (ch_lo <= ch_max) + *ch_lo_bound = ch_lo; + +if (ch_pup > ch_max) + *ch_up_bound = ch_max; +else if (ch_pup >= ch_min) + *ch_up_bound = ch_pup; + +if (bt_fb_band ==BTC_BT_B5G ) {/* BT ch is 8MHz-spacing for 5/6GHz */ + *ch_lo_bound = *ch_lo_bound /8 ;/* low-bound -> Round-down */ + +if (*ch_up_bound %8 !=0 )/* Up-bound -> cover wider range */ + *ch_up_bound = *ch_up_bound /8 +1 ; +else + *ch_up_bound = *ch_up_bound /8 ; + } + +return out_of_range; } -static void _set_bt_afh_info_v1 (struct rtw89_dev *rtwdev) +static void _set_wl_ch_info (struct rtw89_dev *rtwdev) +{ +static const u8 path_hwb[BTC_RF_NUM ] = {RTW89_PHY_0 ,RTW89_PHY_1 }; +struct rtw89_btc_dm *dm = &rtwdev->btc.dm; +struct rtw89_btc_cx *cx = &rtwdev->btc.cx; +struct rtw89_btc_wl_info *wl = &cx->wl; +u32 vco_freq, ch_lo =0 , ch_up =0 ; +u16 rf_band, freq, f_diff; +u8 i, j, ch; + +if (!(rtwdev->chip->para_ver &BTC_FEAT_MULTI_PTA ))/* only new-PTA require setup */ +return ; + +for (i =RTW89_PHY_0 ; i <=RTW89_PHY_1 ; i++) { +if (wl->mlo_info.wmode[i] ==RTW89_MR_WMODE_NONE ) {/* no-connect */ + dm->ost_info.rf_center_freq[i] =0 ; + dm->ost_info.fbd_group_en[i][0 ] =0 ; + dm->ost_info.fbd_group_en[i][1 ] =0 ; + dm->ost_info.fbd_group_bound[i][0 ] =0 ; + dm->ost_info.fbd_group_bound[i][1 ] =0 ; +continue ; + } + + ch = wl->rf_ch_info[i].center_ch; +switch (wl->rf_ch_info[i].band) { +case RTW89_BAND_2G : +default : + rf_band =0 ; +if (ch ==14 ) + freq =BTC_FREQ_W2G_CH14 ; +else + freq =BTC_FREQ_W2G + (ch -1 ) *5 ; + vco_freq = freq *1000 *BTC_LO_2G_NMR /BTC_LO_2G_DNM ; +break ; +case RTW89_BAND_5G : + rf_band =BIT (15 ); + freq =BTC_FREQ_W5G + (ch -1 ) *5 ; + vco_freq = freq *1000 *BTC_LO_5G_NMR /BTC_LO_5G_DNM ; +break ; +case RTW89_BAND_6G : + rf_band =BIT (15 ); + freq =BTC_FREQ_W6G + (ch -1 ) *5 ; + vco_freq = freq *1000 *BTC_LO_6G_NMR /BTC_LO_6G_DNM ; +break ; + } + + dm->ost_info.rf_center_freq[i] = rf_band + freq; + +for (j =BTC_BT_B2G ; j <=BTC_BT_B5G ; j++) { +/* no WL->BT forbidden channel */ +if (_get_w2b_fbd_ch (rtwdev, j, vco_freq, &ch_lo, &ch_up)) { + dm->ost_info.fbd_group_en[i][j] = j <<1 ; + dm->ost_info.fbd_group_bound[i][j] =0 ; +continue ; + } + + dm->ost_info.fbd_group_en[i][j] = (j <<1 ) +0x1 ; + dm->ost_info.fbd_group_bound[i][j] = (ch_up <<8 ) + ch_lo; + } + } + +for (i =BTC_RF_S0 ; i <=BTC_RF_S1 ; i++) { +for (j =BTC_BT_1ST ; j <=BTC_BT_EXT ; j++) { +/* +* If WL & BT share same ANT/Path, set freq-diff > 2GHz, +* because TDD will always run in 5/6GHz band. +* Otherwise, the frq-diff thres is decided by the RF +* out-of-channel rejection capability. +*/ +if (dm->ant_xmap[i][j]) + f_diff =0x7ff ;/* 2047MHz */ +else + f_diff = rtwdev->chip->fdd_iso_freq; + + dm->ost_info.freq_diff_thres[path_hwb[i]][j] = f_diff; + } + } +} + +static void _set_bt_afh_info (struct rtw89_dev *rtwdev) { -const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; -struct rtw89_btc_wl_afh_info *wl_afh = &wl->afh_info; -struct rtw89_btc_bt_info *bt = &btc->cx.bt0; +struct rtw89_btc_cx *cx = &btc->cx; +struct rtw89_btc_wl_info *wl = &cx->wl; +struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;struct rtw89_btc_wl_rlink *rlink; -u8 en =0 , ch =0 , bw =0 , buf[3 ] = {}; -u8 i, j, link_mode; +u8 h2c_func, hwb, bt_link_chg; +u8 i, j, sz, bw; +u8 buf[4 ]; -if (btc->manual_ctrl || wl->status.map.scan) +if (btc->manual_ctrl || wl->status.map.rf_off || + (wl->status.val & btc_scanning_map.val))return ; - link_mode = wl_rinfo->link_mode; +memset (wl->afh_info,0 ,sizeof (wl->afh_info)); -for (i =0 ; i < btc->ver->max_role_num; i++) { -for (j =RTW89_MAC_0 ; j <RTW89_MAC_NUM ; j++) { -if (wl->status.map.rf_off || bt->whql_test || - link_mode ==BTC_WLINK_NOLINK || - link_mode ==BTC_WLINK_5G ) -break ; +for (j =RTW89_MAC_0 ; j <RTW89_MAC_NUM ; j++) { +/* skip HW-Band if no fdd/fdd bind */ +if ((!(btc->dm.tdd_bind.wl_hwb_sel &BIT (j))) && + (!(btc->dm.fdd_bind.wl_hwb_sel &BIT (j)))) +continue ; +for (i =0 ; i <RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ; i++) { rlink = &wl_rinfo->rlink[i][j]; -/* Don't care no-connected/non-2G-band role */ +/* Skip no-active case */ if (!rlink->connected || !rlink->active || - rlink->rf_band !=RTW89_BAND_2G ) + rlink->rf_band >=RTW89_BAND_NUM )continue ; - en =1 ; - ch = rlink->ch; - bw = rlink->bw; +/* In addition to AP/P2P, skip if same-rf-band*/ +if (wl->afh_info[j][rlink->rf_band].en && + (rlink->role !=RTW89_WIFI_ROLE_AP && + rlink->role !=RTW89_WIFI_ROLE_P2P_GO && + rlink->role !=RTW89_WIFI_ROLE_P2P_CLIENT )) +continue ; -if (link_mode ==BTC_WLINK_2G_MCC && - (rlink->role ==RTW89_WIFI_ROLE_AP || - rlink->role ==RTW89_WIFI_ROLE_P2P_GO || - rlink->role ==RTW89_WIFI_ROLE_P2P_CLIENT )) { -/* for 2.4G MCC, take role = ap/go/gc */ -break ; - }else if (link_mode !=BTC_WLINK_2G_SCC || - rlink->bw ==RTW89_CHANNEL_WIDTH_40 ) { -/* for 2.4G scc, take bw = 40M */ -break ; - } + bw =_get_wl_guard_bw (rtwdev, rlink->bw); + wl->afh_info[j][rlink->rf_band].en =1 ; + wl->afh_info[j][rlink->rf_band].ch = rlink->ch; + wl->afh_info[j][rlink->rf_band].bw = bw; + wl->afh_info[j][rlink->rf_band].band = rlink->rf_band; } } -/* default AFH channel sapn = center-ch +- 6MHz */ -switch (bw) { -case RTW89_CHANNEL_WIDTH_20 : -if (btc->dm.freerun || btc->dm.fddt_train) - bw =48 ; -else - bw =20 + chip->afh_guard_ch *2 ; -break ; -case RTW89_CHANNEL_WIDTH_40 : -if (btc->dm.freerun) - bw =40 + chip->afh_guard_ch *2 ; -else - bw =40 ; -break ; -case RTW89_CHANNEL_WIDTH_5 : - bw =5 + chip->afh_guard_ch *2 ; -break ; -case RTW89_CHANNEL_WIDTH_10 : - bw =10 + chip->afh_guard_ch *2 ; -break ; -default : - en = false;/* turn off AFH info if invalid BW */ - bw =0 ; - ch =0 ; -break ; - } +for (j =RTW89_BAND_2G ; j <RTW89_BAND_NUM ; j++) { +/* skip non-2.4GHz if BT is 2.4GHz only*/ +if (!(rtwdev->chip->para_ver &BTC_FEAT_BT_6G )) { +if (j !=RTW89_BAND_2G ) +continue ; + sz =3 ; + }else { + sz =4 ; + } -if (!en || ch >14 || ch ==0 ) { - en = false; - bw =0 ; - ch =0 ; - } +if (wl->afh_info[RTW89_MAC_0 ][j].en && + wl->afh_info[RTW89_MAC_1 ][j].en) { +/* select wilder bw if 1+1 */ +if (wl->afh_info[RTW89_MAC_1 ][j].bw > + wl->afh_info[RTW89_MAC_0 ][j].bw) + hwb =RTW89_MAC_1 ; +else + hwb =RTW89_MAC_0 ; + }else if (wl->afh_info[RTW89_MAC_1 ][j].en) { + hwb =RTW89_MAC_1 ; + }else { + hwb =RTW89_MAC_0 ; + } -if (wl_afh->en == en && - wl_afh->ch == ch && - wl_afh->bw == bw && - (!bt->enable.now || bt->enable.last)) -return ; +if (j ==RTW89_BAND_2G ) { +if (cx->bt0.link_info.link_cnt.chg || + cx->bt1.link_info.link_cnt.chg) + bt_link_chg =1 ; +else + bt_link_chg =0 ; + }else { +if (cx->bt0.link_info_56g.link_cnt.chg || + cx->bt1.link_info_56g.link_cnt.chg) + bt_link_chg =1 ; +else + bt_link_chg =0 ; + } + +/* return if no-afh-info-change/no wl-bt link change */ +if (!memcmp (&wl->afh_info_last[hwb][j], + &wl->afh_info[hwb][j], +sizeof (struct rtw89_btc_wl_afh_info )) && + !bt_link_chg && + !wl->link_mode_chg) +continue ; + +memcpy (&wl->afh_info_last[hwb][j], + &wl->afh_info[hwb][j], +sizeof (struct rtw89_btc_wl_afh_info )); + + buf[0 ] = wl->afh_info[hwb][j].en; + buf[1 ] = wl->afh_info[hwb][j].ch; + buf[2 ] = wl->afh_info[hwb][j].bw; + buf[3 ] = wl->afh_info[hwb][j].band; + + h2c_func =SET_BT_WL_CH_INFO ; +if (cx->bt0.enable.now) +_send_fw_cmd (rtwdev,BTFC_SET , h2c_func, buf, sz); - wl_afh->en = buf[0 ]; - wl_afh->ch = buf[1 ]; - wl_afh->bw = buf[2 ]; +/* send mailbox to 2nd-BT if exist */ +if (cx->bt1.enable.now) { + h2c_func |=BT_H2C_FUNC_BT2ND ; +_send_fw_cmd (rtwdev,BTFC_SET , h2c_func, buf, sz); + } -if (_send_fw_cmd (rtwdev,BTFC_SET ,SET_BT_WL_CH_INFO , &wl->afh_info,3 )) {rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], %s(): en=%d, ch=%d, bw=%d\n" , - __func__, en, ch, bw); +"[BTC], %s(): en=%d, ch=%d, bw=%d, rf_band=%d\n" , + __func__, buf[0 ], buf[1 ], buf[2 ], buf[3 ]); wl->wcnt[BTC_WCNT_CH_UPDATE ]++; + +/* ToDo: Remove if BT update new-define to support 6GHz */ +if (j ==RTW89_BAND_2G ) +break ; } -} -static void _set_bt_afh_info (struct rtw89_dev *rtwdev) -{ -if (rtwdev->chip->chip_id ==RTL8922A ) -_set_bt_afh_info_v1 (rtwdev); -else -_set_bt_afh_info_v0 (rtwdev); +/* for AFH map display in coex log */ +_set_wl_ch_map (rtwdev); + +/* set HWB center-ch/forbidden group to ost_info for CR setup in FW */ +_set_wl_ch_info (rtwdev); }static bool _check_freerun (struct rtw89_dev *rtwdev)
@@ -3828,39 +3934,24 @@ static bool _check_freerun(struct rtw89_dev *rtwdev)struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_bt_info *bt = &btc->cx.bt0;struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info; -struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1; -struct rtw89_btc_wl_role_info_v2 *wl_rinfo_v2 = &wl->role_info_v2; -struct rtw89_btc_wl_role_info_v7 *wl_rinfo_v7 = &wl->role_info_v7; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo_v8 = &wl->role_info_v8;struct rtw89_btc_bt_link_info *bt_linfo = &bt->link_info;struct rtw89_btc_bt_hid_desc *hid = &bt_linfo->hid_desc;union rtw89_btc_module_info *md = &btc->mdinfo;const struct rtw89_btc_ver *ver = btc->ver; -u8 isolation, connect_cnt =0 ; +u8 isolation;if (ver->fcxinit ==7 ) isolation = md->md_v7.ant.isolation;else isolation = md->md.ant.isolation; -if (ver->fwlrole ==0 ) - connect_cnt = wl_rinfo->connect_cnt; -else if (ver->fwlrole ==1 ) - connect_cnt = wl_rinfo_v1->connect_cnt; -else if (ver->fwlrole ==2 ) - connect_cnt = wl_rinfo_v2->connect_cnt; -else if (ver->fwlrole ==7 ) - connect_cnt = wl_rinfo_v7->connect_cnt; -else if (ver->fwlrole ==8 ) - connect_cnt = wl_rinfo_v8->connect_cnt; -if (btc->ant_type ==BTC_ANT_SHARED ) { btc->dm.trx_para_level =0 ;return false; }/* The below is dedicated antenna case */ -if (connect_cnt >BTC_TDMA_WLROLE_MAX ) { +if (wl_rinfo->connect_cnt >BTC_TDMA_WLROLE_MAX ) { btc->dm.trx_para_level =5 ;return true; }
@@ -4097,11 +4188,26 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)case BTC_CXP_OFFB :/* TDMA off + beacon protect */ tdma_on = false; *t = t_def[CXTD_OFF_B2 ]; - s[CXST_OFF ] = s_def[CXST_OFF ]; +_slot_set_le (btc,CXST_OFF , s_def[CXST_OFF ].dur, + s_def[CXST_OFF ].cxtbl, s_def[CXST_OFF ].cxtype); +_slot_set (btc,CXST_B2 ,10 , cxtbl[1 ],SLOT_ISO ); +switch (policy_type) {case BTC_CXP_OFFB_BWB0 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[5 ]); +break ; +case BTC_CXP_OFFB_BWB1 :_slot_set_tbl (btc,CXST_OFF , cxtbl[8 ]);break ; +case BTC_CXP_OFFB_BWB2 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[7 ]); +break ; +case BTC_CXP_OFFB_BWB3 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[6 ]); +break ; +case BTC_CXP_OFFB_BWB4 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[2 ]); +break ; }break ;case BTC_CXP_OFFE :/* TDMA off + beacon protect + Ext_control */
@@ -4182,7 +4288,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)case BTC_CXP_PFIX :/* PS-TDMA Fix-Slot */ tdma_on = true; *t = t_def[CXTD_PFIX ]; -if (btc->cx.wl.role_info.role_map.role.ap) +if (btc->cx.wl.role_info.role_map &BIT (RTW89_WIFI_ROLE_AP ))_tdma_set_flctrl (btc,CXFLC_QOSNULL );switch (policy_type) {
@@ -4461,12 +4567,23 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type) *t = t_def[CXTD_OFF_B2 ];_slot_set_le (btc,CXST_OFF , s_def[CXST_OFF ].dur, s_def[CXST_OFF ].cxtbl, s_def[CXST_OFF ].cxtype); +_slot_set (btc,CXST_B2 ,10 , cxtbl[1 ],SLOT_ISO );switch (policy_type) {case BTC_CXP_OFFB_BWB0 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[5 ]); +break ; +case BTC_CXP_OFFB_BWB1 :_slot_set_tbl (btc,CXST_OFF , cxtbl[8 ]);break ; -default : +case BTC_CXP_OFFB_BWB2 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[7 ]); +break ; +case BTC_CXP_OFFB_BWB3 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[6 ]); +break ; +case BTC_CXP_OFFB_BWB4 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[2 ]);break ; }break ;
@@ -4841,35 +4958,17 @@ static void _set_ant_v0(struct rtw89_dev *rtwdev, bool force_exec,struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_wl_role_info *r = &btc->cx.wl.role_info;struct rtw89_btc_bt_info *bt = &cx->bt0;struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info; -u8 gwl, gwl0, gwl1, gbt, plt_ctrl, i, dbcc_2g_phy, b2g =0 ; -bool dbcc_chg = false, dbcc_en = false; +u8 gwl, gwl0, gwl1, gbt, plt_ctrl, i, b2g =0 ;u32 ant_path_type; ant_path_type = ((phy_map <<8 ) + type); -if (btc->ver->fwlrole ==1 ) { - dbcc_chg = wl->role_info_v1.dbcc_chg; - dbcc_en = wl->role_info_v1.dbcc_en; - dbcc_2g_phy = wl->role_info_v1.dbcc_2g_phy; - }else if (btc->ver->fwlrole ==2 ) { - dbcc_chg = wl->role_info_v2.dbcc_chg; - dbcc_en = wl->role_info_v2.dbcc_en; - dbcc_2g_phy = wl->role_info_v2.dbcc_2g_phy; - }else if (btc->ver->fwlrole ==7 ) { - dbcc_chg = wl->role_info_v7.dbcc_chg; - dbcc_en = wl->role_info_v7.dbcc_en; - dbcc_2g_phy = wl->role_info_v7.dbcc_2g_phy; - }else if (btc->ver->fwlrole ==8 ) { - dbcc_chg = wl->role_info_v8.dbcc_chg; - dbcc_en = wl->role_info_v8.dbcc_en; - dbcc_2g_phy = wl->role_info_v8.dbcc_2g_phy; - } -if (btc->dm.run_reason ==BTC_RSN_NTFY_POWEROFF || btc->dm.run_reason ==BTC_RSN_NTFY_RADIO_STATE || - btc->dm.run_reason ==BTC_RSN_CMD_SET_COEX || dbcc_chg) + btc->dm.run_reason ==BTC_RSN_CMD_SET_COEX || r->dbcc_chg) force_exec =FC_EXEC ;if (!force_exec && ant_path_type == dm->set_ant_path) {
@@ -4967,12 +5066,12 @@ static void _set_ant_v0(struct rtw89_dev *rtwdev, bool force_exec,default : gbt =BTC_GNT_HW ;if ((rtwdev->chip->para_ver &BTC_FEAT_MULTI_PTA ) || - !dbcc_en) { + !r->dbcc_en) { gwl =BTC_GNT_HW ;_set_gnt (rtwdev,BTC_PHY_ALL , gwl, gbt); }else {/* for DBCC Only-1-PTA */ -if (dbcc_2g_phy ==RTW89_PHY_0 ) { +if (r->dbcc_2g_phy ==RTW89_PHY_0 ) { gwl0 =BTC_GNT_HW ; gwl1 =BTC_GNT_SW_HI ; }else {
@@ -4994,7 +5093,7 @@ static void _set_ant_v1(struct rtw89_dev *rtwdev, bool force_exec,struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_bt_info *bt = &btc->cx.bt0; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; +struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;u32 ant_path_type =rtw89_get_antpath_type (phy_map, type);struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;struct rtw89_btc_dm *dm = &btc->dm;
@@ -5005,7 +5104,7 @@ static void _set_ant_v1(struct rtw89_dev *rtwdev, bool force_exec, btc->dm.run_reason == BTC_RSN_CMD_SET_COEX || wl_rinfo->dbcc_chg) force_exec =FC_EXEC ; -if (wl_rinfo->link_mode !=BTC_WLINK_25G_MCC && +if (wl_rinfo->link_mode !=BTC_WLINK_DB_MCC && btc->dm.wl_btg_rx ==2 ) force_exec =FC_EXEC ;
@@ -5111,7 +5210,7 @@ static void _set_ant_v1(struct rtw89_dev *rtwdev, bool force_exec,static void _set_ant (struct rtw89_dev *rtwdev,bool force_exec,u8 phy_map,u8 type) { -if (rtwdev->chip->chip_id ==RTL8922A ) +if (rtwdev->chip->chip_id >=RTL8922A )_set_ant_v1 (rtwdev, force_exec, phy_map, type);else _set_ant_v0 (rtwdev, force_exec, phy_map, type);
@@ -5134,29 +5233,24 @@ static void _action_wl_init(struct rtw89_dev *rtwdev)static void _action_wl_off (struct rtw89_dev *rtwdev,u8 mode) {struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_dm *dm = &btc->dm; +struct rtw89_btc_cx *cx = &btc->cx; +struct rtw89_btc_wl_info *wl = &cx->wl;rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): !!\n" , __func__); -if (wl->status.map.rf_off || btc->dm.bt_only) { +if (wl->status.map.rf_off || btc->dm.bt_only)_set_ant (rtwdev,NM_EXEC ,BTC_PHY_ALL ,BTC_ANT_WOFF ); - }else if (wl->status.map.lps ==BTC_LPS_RF_ON ) { -if (mode ==BTC_WLINK_5G ) -_set_ant (rtwdev,FC_EXEC ,BTC_PHY_ALL ,BTC_ANT_W5G ); -else -_set_ant (rtwdev,FC_EXEC ,BTC_PHY_ALL ,BTC_ANT_W2G ); - } +else if (wl->status.map.lps ==BTC_LPS_RF_ON || + cx->bt0.whql_test || cx->bt1.whql_test) +_set_ant (rtwdev,FC_EXEC ,BTC_PHY_ALL ,BTC_ANT_PTA ); -if (mode ==BTC_WLINK_5G ) { +if (dm->out_of_band)_set_policy (rtwdev,BTC_CXP_OFF_EQ0 ,BTC_ACT_WL_OFF ); - }else if (wl->status.map.lps ==BTC_LPS_RF_ON ) { -if (btc->cx.bt0.link_info.a2dp_desc.active) -_set_policy (rtwdev,BTC_CXP_OFF_BT ,BTC_ACT_WL_OFF ); -else -_set_policy (rtwdev,BTC_CXP_OFF_BWB1 ,BTC_ACT_WL_OFF ); - }else { +else if (cx->bt0.whql_test || cx->bt1.whql_test) +_set_policy (rtwdev,BTC_CXP_OFFB_BWB4 ,BTC_ACT_WL_OFF ); +else _set_policy (rtwdev,BTC_CXP_OFF_BT ,BTC_ACT_WL_OFF ); - } }static void _action_freerun (struct rtw89_dev *rtwdev)
@@ -5563,48 +5657,29 @@ static void _action_wl_rfk(struct rtw89_dev *rtwdev)static void _set_btg_ctrl (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_dm *dm = &btc->dm; +struct rtw89_btc_fbtc_outsrc_set_info *o_info = &dm->ost_info;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1; -struct rtw89_btc_wl_role_info_v2 *wl_rinfo_v2 = &wl->role_info_v2; -struct rtw89_btc_wl_role_info_v7 *wl_rinfo_v7 = &wl->role_info_v7; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo_v8 = &wl->role_info_v8; -struct rtw89_btc_fbtc_outsrc_set_info *o_info = &btc->dm.ost_info; -struct rtw89_btc_wl_role_info *wl_rinfo_v0 = &wl->role_info; +struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;const struct rtw89_chip_info *chip = rtwdev->chip; -const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_bt_info *bt = &btc->cx.bt0; -struct rtw89_btc_dm *dm = &btc->dm; -struct _wl_rinfo_now wl_rinfo;u32 is_btg =BTC_BTGCTRL_DISABLE ;if (btc->manual_ctrl)return ; -if (ver->fwlrole ==0 ) - wl_rinfo.link_mode = wl_rinfo_v0->link_mode; -else if (ver->fwlrole ==1 ) - wl_rinfo.link_mode = wl_rinfo_v1->link_mode; -else if (ver->fwlrole ==2 ) - wl_rinfo.link_mode = wl_rinfo_v2->link_mode; -else if (ver->fwlrole ==7 ) - wl_rinfo.link_mode = wl_rinfo_v7->link_mode; -else if (ver->fwlrole ==8 ) - wl_rinfo.link_mode = wl_rinfo_v8->link_mode; -else -return ; -/* notify halbb ignore GNT_BT or not for WL BB Rx-AGC control */ if (btc->ant_type ==BTC_ANT_SHARED ) {if (!(bt->run_patch_code && bt->enable.now)) is_btg =BTC_BTGCTRL_DISABLE ; -else if (wl_rinfo.link_mode !=BTC_WLINK_5G ) +else if (wl_rinfo->link_mode_v0 !=BTC_WLINK_V0_5G ) is_btg =BTC_BTGCTRL_ENABLE ;else is_btg =BTC_BTGCTRL_DISABLE ;/* bb call ctrl_btg() in WL FW by slot */ -if (!ver->fcxosi && - wl_rinfo.link_mode ==BTC_WLINK_25G_MCC ) +if (!btc->ver->fcxosi && + wl_rinfo->link_mode_v0 ==BTC_WLINK_V0_25G_MCC ) is_btg =BTC_BTGCTRL_BB_GNT_FWCTRL ; }
@@ -5614,7 +5689,7 @@ static void _set_btg_ctrl(struct rtw89_dev *rtwdev) dm->wl_btg_rx = is_btg;/* skip setup if btg_ctrl set by wl fw */ -if (!ver->fcxosi && is_btg >BTC_BTGCTRL_ENABLE ) +if (!btc->ver->fcxosi && is_btg >BTC_BTGCTRL_ENABLE )return ;/* Below flow is for BTC_FEAT_NEW_BBAPI_FLOW = 1 */
@@ -5633,7 +5708,7 @@ static void _set_btg_ctrl(struct rtw89_dev *rtwdev) o_info->btg_rx[BTC_RF_S1 ] = is_btg; } -if (ver->fcxosi) +if (btc->ver->fcxosi)return ; chip->ops->ctrl_btg_bt_rx(rtwdev, o_info->btg_rx[BTC_RF_S0],
@@ -5651,40 +5726,20 @@ static void _set_wl_preagc_ctrl(struct rtw89_dev *rtwdev)struct rtw89_btc_fbtc_outsrc_set_info *o_info = &btc->dm.ost_info;struct rtw89_btc_bt_link_info *bt_linfo = &btc->cx.bt0.link_info;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_role_info_v2 *rinfo_v2 = &wl->role_info_v2; -struct rtw89_btc_wl_role_info_v7 *rinfo_v7 = &wl->role_info_v7; -struct rtw89_btc_wl_role_info_v8 *rinfo_v8 = &wl->role_info_v8; +struct rtw89_btc_wl_role_info *rinfo = &wl->role_info;const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc_bt_info *bt = &btc->cx.bt0;struct rtw89_btc_dm *dm = &btc->dm; -u8 is_preagc, val, link_mode, dbcc_2g_phy; -u8 role_ver = rtwdev->btc.ver->fwlrole; -bool dbcc_en; +u8 is_preagc, val;if (btc->manual_ctrl)return ; -if (role_ver ==2 ) { - dbcc_en = rinfo_v2->dbcc_en; - link_mode = rinfo_v2->link_mode; - dbcc_2g_phy = rinfo_v2->dbcc_2g_phy; - }else if (role_ver ==7 ) { - dbcc_en = rinfo_v7->dbcc_en; - link_mode = rinfo_v7->link_mode; - dbcc_2g_phy = rinfo_v7->dbcc_2g_phy; - }else if (role_ver ==8 ) { - dbcc_en = rinfo_v8->dbcc_en; - link_mode = rinfo_v8->link_mode; - dbcc_2g_phy = rinfo_v7->dbcc_2g_phy; - }else { -return ; - } -if (!(bt->run_patch_code && bt->enable.now)) { is_preagc =BTC_PREAGC_DISABLE ; - }else if (link_mode ==BTC_WLINK_5G ) { + }else if (dm->tdd_bind.rf_band ==BIT (RTW89_BAND_5G )) { is_preagc =BTC_PREAGC_DISABLE ; - }else if (link_mode ==BTC_WLINK_NOLINK || + }else if (rinfo->link_mode ==BTC_WLINK_NOLINK || btc->cx.bt0.link_info.link_cnt.now ==0 ) { is_preagc =BTC_PREAGC_DISABLE ; } else if (dm->tdma_now.type != CXTDMA_OFF &&
@@ -5692,7 +5747,7 @@ static void _set_wl_preagc_ctrl(struct rtw89_dev *rtwdev) !bt_linfo->hid_desc.exist && dm->fddt_train == BTC_FDDT_DISABLE) { is_preagc =BTC_PREAGC_DISABLE ; - } else if (dbcc_en && (dbcc_2g_phy != RTW89_PHY_1)) { + } else if (rinfo->dbcc_en && (rinfo->dbcc_2g_phy != RTW89_PHY_1)) { is_preagc =BTC_PREAGC_DISABLE ; } else if (btc->ant_type == BTC_ANT_SHARED) { is_preagc =BTC_PREAGC_DISABLE ;
@@ -5700,7 +5755,7 @@ static void _set_wl_preagc_ctrl(struct rtw89_dev *rtwdev) is_preagc =BTC_PREAGC_ENABLE ; } -if (!btc->ver->fcxosi && link_mode ==BTC_WLINK_25G_MCC ) +if (!btc->ver->fcxosi && rinfo->link_mode ==BTC_WLINK_DB_MCC ) is_preagc =BTC_PREAGC_BB_FWCTRL ; if (dm->wl_pre_agc_rb != dm->wl_pre_agc &&
@@ -5771,10 +5826,7 @@ static void __rtw89_tx_time_iter(struct rtw89_vif_link *rtwvif_link,u16 enable = iter_data->enable;bool reenable = iter_data->reenable; -if (btc->ver->fwlrole ==8 ) - plink = &wl->rlink_info[port][0 ]; -else - plink = &wl->link_info[port]; + plink = &wl->rlink_info[port][rtwsta_link->link_id];rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): port = %d\n" , __func__, port);
@@ -5840,39 +5892,23 @@ static void _set_wl_tx_limit(struct rtw89_dev *rtwdev)struct rtw89_btc_bt_hfp_desc *hfp = &b->hfp_desc;struct rtw89_btc_bt_hid_desc *hid = &b->hid_desc;struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info; -struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1; -struct rtw89_btc_wl_role_info_v2 *wl_rinfo_v2 = &wl->role_info_v2; -struct rtw89_btc_wl_role_info_v7 *wl_rinfo_v7 = &wl->role_info_v7; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo_v8 = &wl->role_info_v8;struct rtw89_txtime_data data = {.rtwdev = rtwdev}; -u8 mode, igno_bt, tx_retry; +bool reenable = false; +u8 igno_bt, tx_retry;u32 tx_time;u16 enable; -bool reenable = false;if (btc->manual_ctrl)return ; -if (ver->fwlrole ==0 ) - mode = wl_rinfo->link_mode; -else if (ver->fwlrole ==1 ) - mode = wl_rinfo_v1->link_mode; -else if (ver->fwlrole ==2 ) - mode = wl_rinfo_v2->link_mode; -else if (ver->fwlrole ==7 ) - mode = wl_rinfo_v7->link_mode; -else if (ver->fwlrole ==8 ) - mode = wl_rinfo_v8->link_mode; -else -return ; -if (ver->fcxctrl ==7 ) igno_bt = btc->ctrl.ctrl_v7.igno_bt;else igno_bt = btc->ctrl.ctrl.igno_bt;if (btc->dm.freerun || igno_bt || b->link_cnt.now ==0 || - mode ==BTC_WLINK_5G || mode ==BTC_WLINK_NOLINK ) { + dm->tdd_bind.rf_band ==BIT (RTW89_BAND_5G ) || + wl_rinfo->link_mode ==BTC_WLINK_NOLINK ) { enable =0 ; tx_time =BTC_MAX_TX_TIME_DEF ; tx_retry =BTC_MAX_TX_RETRY_DEF ;
@@ -5915,31 +5951,12 @@ static void _set_wl_tx_limit(struct rtw89_dev *rtwdev)static void _set_bt_rx_agc (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; -const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info; -struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1; -struct rtw89_btc_wl_role_info_v2 *wl_rinfo_v2 = &wl->role_info_v2; -struct rtw89_btc_wl_role_info_v7 *wl_rinfo_v7 = &wl->role_info_v7; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo_v8 = &wl->role_info_v8;struct rtw89_btc_bt_info *bt = &btc->cx.bt0;bool bt_hi_lna_rx = false; -u8 mode; -if (ver->fwlrole ==0 ) - mode = wl_rinfo->link_mode; -else if (ver->fwlrole ==1 ) - mode = wl_rinfo_v1->link_mode; -else if (ver->fwlrole ==2 ) - mode = wl_rinfo_v2->link_mode; -else if (ver->fwlrole ==7 ) - mode = wl_rinfo_v7->link_mode; -else if (ver->fwlrole ==8 ) - mode = wl_rinfo_v8->link_mode; -else -return ; - -if (mode !=BTC_WLINK_NOLINK && btc->dm.wl_btg_rx) +if (wl_rinfo->link_mode !=BTC_WLINK_NOLINK && btc->dm.wl_btg_rx) bt_hi_lna_rx = true;if (bt_hi_lna_rx == bt->hi_lna_rx)
@@ -5985,20 +6002,51 @@ static void _wl_req_mac(struct rtw89_dev *rtwdev, u8 mac)rtw89_write32_set (rtwdev, add,B_AX_WL_SRC ); } -static void _action_common (struct rtw89_dev *rtwdev) +static void _update_zb_coex_tbl (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_role_info_v8 *rinfo_v8 = &wl->role_info_v8; -struct rtw89_btc_wl_smap *wl_smap = &wl->status.map; -struct rtw89_btc_bt_info *bt = &btc->cx.bt0; -struct rtw89_btc_dm *dm = &btc->dm; -u32 bt_rom_code_id, bt_fw_ver; -u8 i; - -if (btc->ver->fwlrole ==8 ) -_wl_req_mac (rtwdev, rinfo_v8->pta_req_band); +const struct rtw89_btc_ver *ver = btc->ver; +u32 zb_tbl0 =0xda5a5a5a , zb_tbl1 =0xda5a5a5a ; +u8 link_mode_chg = btc->cx.wl.link_mode_chg; +u8 mode = btc->cx.wl.role_info.link_mode; +u8 wa_type; + +if (btc->dm.run_reason !=BTC_RSN_NTFY_INIT && !link_mode_chg) +return ; + +if (ver->fcxinit ==7 ) + wa_type = btc->mdinfo.md_v7.wa_type; +else + wa_type = btc->mdinfo.md.wa_type; +if (!(wa_type &BTC_WA_HFP_ZB )) +return ; + +if (btc->dm.tdd_bind.rf_band ==BIT (RTW89_BAND_5G ) || + rtwdev->btc.dm.freerun) { + zb_tbl0 =0xffffffff ; + zb_tbl1 =0xffffffff ; + }else if (mode ==BTC_WLINK_DB_MCC ) { + zb_tbl0 =0xffffffff ;/* for E5G slot */ + zb_tbl1 =0xda5a5a5a ;/* for E2G slot */ + } +rtw89_write32 (rtwdev,R_BTC_ZB_COEX_TBL_0 , zb_tbl0); +rtw89_write32 (rtwdev,R_BTC_ZB_COEX_TBL_1 , zb_tbl1); +} + +static void _action_common (struct rtw89_dev *rtwdev) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_wl_role_info *rinfo = &wl->role_info; +struct rtw89_btc_wl_smap *wl_smap = &wl->status.map; +struct rtw89_btc_bt_info *bt = &btc->cx.bt0; +struct rtw89_btc_dm *dm = &btc->dm; +u32 bt_rom_code_id, bt_fw_ver; +u8 i; + +_wl_req_mac (rtwdev, rinfo->pta_req_band); +_update_zb_coex_tbl (rtwdev);_set_btg_ctrl (rtwdev);_set_wl_preagc_ctrl (rtwdev);_set_wl_tx_limit (rtwdev);
@@ -6041,7 +6089,10 @@ static void _action_common(struct rtw89_dev *rtwdev) } dm->tdma_instant_excute =0 ; dm->lps_ctrl_change = false; + wl->role_info.link_mode_chg =0 ; wl->pta_reg_mac_chg = false; + dm->pre_agc_chg = false; + wl->dbcc_chg =0 ; }static void _action_by_bt (struct rtw89_dev *rtwdev)
@@ -6407,473 +6458,29 @@ void _update_dbcc_band(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx) btc->cx.wl.dbcc_info.op_band[phy_idx]; } -static void _update_wl_info (struct rtw89_dev *rtwdev) -{ -struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_link_info *wl_linfo = wl->link_info; -struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info; -struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info; -u8 i, cnt_connect =0 , cnt_connecting =0 , cnt_active =0 ; -u8 cnt_2g =0 , cnt_5g =0 , phy; -u32 wl_2g_ch[2 ] = {0 }, wl_5g_ch[2 ] = {0 }; -bool b2g = false, b5g = false, client_joined = false; - -memset (wl_rinfo,0 ,sizeof (*wl_rinfo)); - -for (i =0 ; i <RTW89_PORT_NUM ; i++) { -/* check if role active? */ -if (!wl_linfo[i].active) -continue ; - - cnt_active++; - wl_rinfo->active_role[cnt_active -1 ].role = wl_linfo[i].role; - wl_rinfo->active_role[cnt_active -1 ].pid = wl_linfo[i].pid; - wl_rinfo->active_role[cnt_active -1 ].phy = wl_linfo[i].phy; - wl_rinfo->active_role[cnt_active -1 ].band = wl_linfo[i].band; - wl_rinfo->active_role[cnt_active -1 ].noa = (u8 )wl_linfo[i].noa; - wl_rinfo->active_role[cnt_active -1 ].connected =0 ; - - wl->port_id[wl_linfo[i].role] = wl_linfo[i].pid; - - phy = wl_linfo[i].phy; - -/* check dbcc role */ -if (rtwdev->dbcc_en && phy <RTW89_PHY_NUM ) { - wl_dinfo->role[phy] = wl_linfo[i].role; - wl_dinfo->op_band[phy] = wl_linfo[i].band; -_update_dbcc_band (rtwdev, phy); -_fw_set_drv_info (rtwdev,CXDRVINFO_DBCC ); - } - -if (wl_linfo[i].connected ==MLME_NO_LINK ) { -continue ; - }else if (wl_linfo[i].connected ==MLME_LINKING ) { - cnt_connecting++; - }else { - cnt_connect++; -if ((wl_linfo[i].role ==RTW89_WIFI_ROLE_P2P_GO || - wl_linfo[i].role ==RTW89_WIFI_ROLE_AP ) && - wl_linfo[i].client_cnt >1 ) - client_joined = true; - } - - wl_rinfo->role_map.val |=BIT (wl_linfo[i].role); - wl_rinfo->active_role[cnt_active -1 ].ch = wl_linfo[i].ch; - wl_rinfo->active_role[cnt_active -1 ].bw = wl_linfo[i].bw; - wl_rinfo->active_role[cnt_active -1 ].connected =1 ; - -/* only care 2 roles + BT coex */ -if (wl_linfo[i].band !=RTW89_BAND_2G ) { -if (cnt_5g <=ARRAY_SIZE (wl_5g_ch) -1 ) - wl_5g_ch[cnt_5g] = wl_linfo[i].ch; - cnt_5g++; - b5g = true; - }else { -if (cnt_2g <=ARRAY_SIZE (wl_2g_ch) -1 ) - wl_2g_ch[cnt_2g] = wl_linfo[i].ch; - cnt_2g++; - b2g = true; - } - } - - wl_rinfo->connect_cnt = cnt_connect; - -/* Be careful to change the following sequence!! */ -if (cnt_connect ==0 ) { - wl_rinfo->link_mode =BTC_WLINK_NOLINK ; - wl_rinfo->role_map.role.none =1 ; - }else if (!b2g && b5g) { - wl_rinfo->link_mode =BTC_WLINK_5G ; - }else if (wl_rinfo->role_map.role.nan) { - wl_rinfo->link_mode =BTC_WLINK_2G_NAN ; - }else if (cnt_connect >BTC_TDMA_WLROLE_MAX ) { - wl_rinfo->link_mode =BTC_WLINK_OTHER ; - }else if (b2g && b5g && cnt_connect ==2 ) { -if (rtwdev->dbcc_en) { -switch (wl_dinfo->role[RTW89_PHY_0 ]) { -case RTW89_WIFI_ROLE_STATION : - wl_rinfo->link_mode =BTC_WLINK_2G_STA ; -break ; -case RTW89_WIFI_ROLE_P2P_GO : - wl_rinfo->link_mode =BTC_WLINK_2G_GO ; -break ; -case RTW89_WIFI_ROLE_P2P_CLIENT : - wl_rinfo->link_mode =BTC_WLINK_2G_GC ; -break ; -case RTW89_WIFI_ROLE_AP : - wl_rinfo->link_mode =BTC_WLINK_2G_AP ; -break ; -default : - wl_rinfo->link_mode =BTC_WLINK_OTHER ; -break ; - } - }else { - wl_rinfo->link_mode =BTC_WLINK_25G_MCC ; - } - }else if (!b5g && cnt_connect ==2 ) { -if (wl_rinfo->role_map.role.station && - (wl_rinfo->role_map.role.p2p_go || - wl_rinfo->role_map.role.p2p_gc || - wl_rinfo->role_map.role.ap)) { -if (wl_2g_ch[0 ] == wl_2g_ch[1 ]) - wl_rinfo->link_mode =BTC_WLINK_2G_SCC ; -else - wl_rinfo->link_mode =BTC_WLINK_2G_MCC ; - }else { - wl_rinfo->link_mode =BTC_WLINK_2G_MCC ; - } - }else if (!b5g && cnt_connect ==1 ) { -if (wl_rinfo->role_map.role.station) - wl_rinfo->link_mode =BTC_WLINK_2G_STA ; -else if (wl_rinfo->role_map.role.ap) - wl_rinfo->link_mode =BTC_WLINK_2G_AP ; -else if (wl_rinfo->role_map.role.p2p_go) - wl_rinfo->link_mode =BTC_WLINK_2G_GO ; -else if (wl_rinfo->role_map.role.p2p_gc) - wl_rinfo->link_mode =BTC_WLINK_2G_GC ; -else - wl_rinfo->link_mode =BTC_WLINK_OTHER ; - } - -/* if no client_joined, don't care P2P-GO/AP role */ -if (wl_rinfo->role_map.role.p2p_go || wl_rinfo->role_map.role.ap) { -if (!client_joined) { -if (wl_rinfo->link_mode ==BTC_WLINK_2G_SCC || - wl_rinfo->link_mode ==BTC_WLINK_2G_MCC ) { - wl_rinfo->link_mode =BTC_WLINK_2G_STA ; - wl_rinfo->connect_cnt =1 ; - }else if (wl_rinfo->link_mode ==BTC_WLINK_2G_GO || - wl_rinfo->link_mode ==BTC_WLINK_2G_AP ) { - wl_rinfo->link_mode =BTC_WLINK_NOLINK ; - wl_rinfo->connect_cnt =0 ; - } - } - } - -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], cnt_connect = %d, connecting = %d, link_mode = %d\n" , - cnt_connect, cnt_connecting, wl_rinfo->link_mode); - -_fw_set_drv_info (rtwdev,CXDRVINFO_ROLE ); -} - -static void _update_wl_info_v1 (struct rtw89_dev *rtwdev) -{ -struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_link_info *wl_linfo = wl->link_info; -struct rtw89_btc_wl_role_info_v1 *wl_rinfo = &wl->role_info_v1; -struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info; -u8 cnt_connect =0 , cnt_connecting =0 , cnt_active =0 ; -u8 cnt_2g =0 , cnt_5g =0 , phy; -u32 wl_2g_ch[2 ] = {}, wl_5g_ch[2 ] = {}; -bool b2g = false, b5g = false, client_joined = false; -u8 i; - -memset (wl_rinfo,0 ,sizeof (*wl_rinfo)); - -for (i =0 ; i <RTW89_PORT_NUM ; i++) { -if (!wl_linfo[i].active) -continue ; - - cnt_active++; - wl_rinfo->active_role_v1[cnt_active -1 ].role = wl_linfo[i].role; - wl_rinfo->active_role_v1[cnt_active -1 ].pid = wl_linfo[i].pid; - wl_rinfo->active_role_v1[cnt_active -1 ].phy = wl_linfo[i].phy; - wl_rinfo->active_role_v1[cnt_active -1 ].band = wl_linfo[i].band; - wl_rinfo->active_role_v1[cnt_active -1 ].noa = (u8 )wl_linfo[i].noa; - wl_rinfo->active_role_v1[cnt_active -1 ].connected =0 ; - - wl->port_id[wl_linfo[i].role] = wl_linfo[i].pid; - - phy = wl_linfo[i].phy; - -if (rtwdev->dbcc_en && phy <RTW89_PHY_NUM ) { - wl_dinfo->role[phy] = wl_linfo[i].role; - wl_dinfo->op_band[phy] = wl_linfo[i].band; -_update_dbcc_band (rtwdev, phy); -_fw_set_drv_info (rtwdev,CXDRVINFO_DBCC ); - } - -if (wl_linfo[i].connected ==MLME_NO_LINK ) { -continue ; - }else if (wl_linfo[i].connected ==MLME_LINKING ) { - cnt_connecting++; - }else { - cnt_connect++; -if ((wl_linfo[i].role ==RTW89_WIFI_ROLE_P2P_GO || - wl_linfo[i].role ==RTW89_WIFI_ROLE_AP ) && - wl_linfo[i].client_cnt >1 ) - client_joined = true; - } - - wl_rinfo->role_map.val |=BIT (wl_linfo[i].role); - wl_rinfo->active_role_v1[cnt_active -1 ].ch = wl_linfo[i].ch; - wl_rinfo->active_role_v1[cnt_active -1 ].bw = wl_linfo[i].bw; - wl_rinfo->active_role_v1[cnt_active -1 ].connected =1 ; - -/* only care 2 roles + BT coex */ -if (wl_linfo[i].band !=RTW89_BAND_2G ) { -if (cnt_5g <=ARRAY_SIZE (wl_5g_ch) -1 ) - wl_5g_ch[cnt_5g] = wl_linfo[i].ch; - cnt_5g++; - b5g = true; - }else { -if (cnt_2g <=ARRAY_SIZE (wl_2g_ch) -1 ) - wl_2g_ch[cnt_2g] = wl_linfo[i].ch; - cnt_2g++; - b2g = true; - } - } - - wl_rinfo->connect_cnt = cnt_connect; - -/* Be careful to change the following sequence!! */ -if (cnt_connect ==0 ) { - wl_rinfo->link_mode =BTC_WLINK_NOLINK ; - wl_rinfo->role_map.role.none =1 ; - }else if (!b2g && b5g) { - wl_rinfo->link_mode =BTC_WLINK_5G ; - }else if (wl_rinfo->role_map.role.nan) { - wl_rinfo->link_mode =BTC_WLINK_2G_NAN ; - }else if (cnt_connect >BTC_TDMA_WLROLE_MAX ) { - wl_rinfo->link_mode =BTC_WLINK_OTHER ; - }else if (b2g && b5g && cnt_connect ==2 ) { -if (rtwdev->dbcc_en) { -switch (wl_dinfo->role[RTW89_PHY_0 ]) { -case RTW89_WIFI_ROLE_STATION : - wl_rinfo->link_mode =BTC_WLINK_2G_STA ; -break ; -case RTW89_WIFI_ROLE_P2P_GO : - wl_rinfo->link_mode =BTC_WLINK_2G_GO ; -break ; -case RTW89_WIFI_ROLE_P2P_CLIENT : - wl_rinfo->link_mode =BTC_WLINK_2G_GC ; -break ; -case RTW89_WIFI_ROLE_AP : - wl_rinfo->link_mode =BTC_WLINK_2G_AP ; -break ; -default : - wl_rinfo->link_mode =BTC_WLINK_OTHER ; -break ; - } - }else { - wl_rinfo->link_mode =BTC_WLINK_25G_MCC ; - } - }else if (!b5g && cnt_connect ==2 ) { -if (wl_rinfo->role_map.role.station && - (wl_rinfo->role_map.role.p2p_go || - wl_rinfo->role_map.role.p2p_gc || - wl_rinfo->role_map.role.ap)) { -if (wl_2g_ch[0 ] == wl_2g_ch[1 ]) - wl_rinfo->link_mode =BTC_WLINK_2G_SCC ; -else - wl_rinfo->link_mode =BTC_WLINK_2G_MCC ; - }else { - wl_rinfo->link_mode =BTC_WLINK_2G_MCC ; - } - }else if (!b5g && cnt_connect ==1 ) { -if (wl_rinfo->role_map.role.station) - wl_rinfo->link_mode =BTC_WLINK_2G_STA ; -else if (wl_rinfo->role_map.role.ap) - wl_rinfo->link_mode =BTC_WLINK_2G_AP ; -else if (wl_rinfo->role_map.role.p2p_go) - wl_rinfo->link_mode =BTC_WLINK_2G_GO ; -else if (wl_rinfo->role_map.role.p2p_gc) - wl_rinfo->link_mode =BTC_WLINK_2G_GC ; -else - wl_rinfo->link_mode =BTC_WLINK_OTHER ; - } - -/* if no client_joined, don't care P2P-GO/AP role */ -if (wl_rinfo->role_map.role.p2p_go || wl_rinfo->role_map.role.ap) { -if (!client_joined) { -if (wl_rinfo->link_mode ==BTC_WLINK_2G_SCC || - wl_rinfo->link_mode ==BTC_WLINK_2G_MCC ) { - wl_rinfo->link_mode =BTC_WLINK_2G_STA ; - wl_rinfo->connect_cnt =1 ; - }else if (wl_rinfo->link_mode ==BTC_WLINK_2G_GO || - wl_rinfo->link_mode ==BTC_WLINK_2G_AP ) { - wl_rinfo->link_mode =BTC_WLINK_NOLINK ; - wl_rinfo->connect_cnt =0 ; - } - } - } - -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], cnt_connect = %d, connecting = %d, link_mode = %d\n" , - cnt_connect, cnt_connecting, wl_rinfo->link_mode); - -_fw_set_drv_info (rtwdev,CXDRVINFO_ROLE ); -} - -static void _update_wl_info_v2 (struct rtw89_dev *rtwdev) -{ -struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_link_info *wl_linfo = wl->link_info; -struct rtw89_btc_wl_role_info_v2 *wl_rinfo = &wl->role_info_v2; -struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info; -u8 cnt_connect =0 , cnt_connecting =0 , cnt_active =0 ; -u8 cnt_2g =0 , cnt_5g =0 , phy; -u32 wl_2g_ch[2 ] = {}, wl_5g_ch[2 ] = {}; -bool b2g = false, b5g = false, client_joined = false; -u8 i; - -memset (wl_rinfo,0 ,sizeof (*wl_rinfo)); - -for (i =0 ; i <RTW89_PORT_NUM ; i++) { -if (!wl_linfo[i].active) -continue ; - - cnt_active++; - wl_rinfo->active_role_v2[cnt_active -1 ].role = wl_linfo[i].role; - wl_rinfo->active_role_v2[cnt_active -1 ].pid = wl_linfo[i].pid; - wl_rinfo->active_role_v2[cnt_active -1 ].phy = wl_linfo[i].phy; - wl_rinfo->active_role_v2[cnt_active -1 ].band = wl_linfo[i].band; - wl_rinfo->active_role_v2[cnt_active -1 ].noa = (u8 )wl_linfo[i].noa; - wl_rinfo->active_role_v2[cnt_active -1 ].connected =0 ; - - wl->port_id[wl_linfo[i].role] = wl_linfo[i].pid; - - phy = wl_linfo[i].phy; - -if (rtwdev->dbcc_en && phy <RTW89_PHY_NUM ) { - wl_dinfo->role[phy] = wl_linfo[i].role; - wl_dinfo->op_band[phy] = wl_linfo[i].band; -_update_dbcc_band (rtwdev, phy); -_fw_set_drv_info (rtwdev,CXDRVINFO_DBCC ); - } - -if (wl_linfo[i].connected ==MLME_NO_LINK ) { -continue ; - }else if (wl_linfo[i].connected ==MLME_LINKING ) { - cnt_connecting++; - }else { - cnt_connect++; -if ((wl_linfo[i].role ==RTW89_WIFI_ROLE_P2P_GO || - wl_linfo[i].role ==RTW89_WIFI_ROLE_AP ) && - wl_linfo[i].client_cnt >1 ) - client_joined = true; - } - - wl_rinfo->role_map.val |=BIT (wl_linfo[i].role); - wl_rinfo->active_role_v2[cnt_active -1 ].ch = wl_linfo[i].ch; - wl_rinfo->active_role_v2[cnt_active -1 ].bw = wl_linfo[i].bw; - wl_rinfo->active_role_v2[cnt_active -1 ].connected =1 ; - -/* only care 2 roles + BT coex */ -if (wl_linfo[i].band !=RTW89_BAND_2G ) { -if (cnt_5g <=ARRAY_SIZE (wl_5g_ch) -1 ) - wl_5g_ch[cnt_5g] = wl_linfo[i].ch; - cnt_5g++; - b5g = true; - }else { -if (cnt_2g <=ARRAY_SIZE (wl_2g_ch) -1 ) - wl_2g_ch[cnt_2g] = wl_linfo[i].ch; - cnt_2g++; - b2g = true; - } - } - - wl_rinfo->connect_cnt = cnt_connect; - -/* Be careful to change the following sequence!! */ -if (cnt_connect ==0 ) { - wl_rinfo->link_mode =BTC_WLINK_NOLINK ; - wl_rinfo->role_map.role.none =1 ; - }else if (!b2g && b5g) { - wl_rinfo->link_mode =BTC_WLINK_5G ; - }else if (wl_rinfo->role_map.role.nan) { - wl_rinfo->link_mode =BTC_WLINK_2G_NAN ; - }else if (cnt_connect >BTC_TDMA_WLROLE_MAX ) { - wl_rinfo->link_mode =BTC_WLINK_OTHER ; - }else if (b2g && b5g && cnt_connect ==2 ) { -if (rtwdev->dbcc_en) { -switch (wl_dinfo->role[RTW89_PHY_0 ]) { -case RTW89_WIFI_ROLE_STATION : - wl_rinfo->link_mode =BTC_WLINK_2G_STA ; -break ; -case RTW89_WIFI_ROLE_P2P_GO : - wl_rinfo->link_mode =BTC_WLINK_2G_GO ; -break ; -case RTW89_WIFI_ROLE_P2P_CLIENT : - wl_rinfo->link_mode =BTC_WLINK_2G_GC ; -break ; -case RTW89_WIFI_ROLE_AP : - wl_rinfo->link_mode =BTC_WLINK_2G_AP ; -break ; -default : - wl_rinfo->link_mode =BTC_WLINK_OTHER ; -break ; - } - }else { - wl_rinfo->link_mode =BTC_WLINK_25G_MCC ; - } - }else if (!b5g && cnt_connect ==2 ) { -if (wl_rinfo->role_map.role.station && - (wl_rinfo->role_map.role.p2p_go || - wl_rinfo->role_map.role.p2p_gc || - wl_rinfo->role_map.role.ap)) { -if (wl_2g_ch[0 ] == wl_2g_ch[1 ]) - wl_rinfo->link_mode =BTC_WLINK_2G_SCC ; -else - wl_rinfo->link_mode =BTC_WLINK_2G_MCC ; - }else { - wl_rinfo->link_mode =BTC_WLINK_2G_MCC ; - } - }else if (!b5g && cnt_connect ==1 ) { -if (wl_rinfo->role_map.role.station) - wl_rinfo->link_mode =BTC_WLINK_2G_STA ; -else if (wl_rinfo->role_map.role.ap) - wl_rinfo->link_mode =BTC_WLINK_2G_AP ; -else if (wl_rinfo->role_map.role.p2p_go) - wl_rinfo->link_mode =BTC_WLINK_2G_GO ; -else if (wl_rinfo->role_map.role.p2p_gc) - wl_rinfo->link_mode =BTC_WLINK_2G_GC ; -else - wl_rinfo->link_mode =BTC_WLINK_OTHER ; - } - -/* if no client_joined, don't care P2P-GO/AP role */ -if (wl_rinfo->role_map.role.p2p_go || wl_rinfo->role_map.role.ap) { -if (!client_joined) { -if (wl_rinfo->link_mode ==BTC_WLINK_2G_SCC || - wl_rinfo->link_mode ==BTC_WLINK_2G_MCC ) { - wl_rinfo->link_mode =BTC_WLINK_2G_STA ; - wl_rinfo->connect_cnt =1 ; - }else if (wl_rinfo->link_mode ==BTC_WLINK_2G_GO || - wl_rinfo->link_mode ==BTC_WLINK_2G_AP ) { - wl_rinfo->link_mode =BTC_WLINK_NOLINK ; - wl_rinfo->connect_cnt =0 ; - } - } - } - -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], cnt_connect = %d, connecting = %d, link_mode = %d\n" , - cnt_connect, cnt_connecting, wl_rinfo->link_mode); - -_fw_set_drv_info (rtwdev,CXDRVINFO_ROLE ); -} -#define BTC_CHK_HANG_MAX 3#define BTC_SCB_INV_VALUE GENMASK(31, 0) -static u8 _get_role_link_mode (u8 role) +static u8 _get_role_link_mode (struct rtw89_btc_wl_role_info *r,u8 role,bool notv10) {switch (role) {case RTW89_WIFI_ROLE_STATION : -return BTC_WLINK_2G_STA ; +default : +if (notv10) + r->link_mode_v0 =BTC_WLINK_V0_2G_STA ; +return BTC_WLINK_STA ;case RTW89_WIFI_ROLE_P2P_GO : -return BTC_WLINK_2G_GO ; +if (notv10) + r->link_mode_v0 =BTC_WLINK_V0_2G_GO ; +return BTC_WLINK_GO ;case RTW89_WIFI_ROLE_P2P_CLIENT : -return BTC_WLINK_2G_GC ; +if (notv10) + r->link_mode_v0 =BTC_WLINK_V0_2G_GC ; +return BTC_WLINK_GC ;case RTW89_WIFI_ROLE_AP : -return BTC_WLINK_2G_AP ; -default : -return BTC_WLINK_OTHER ; +if (notv10) + r->link_mode_v0 =BTC_WLINK_V0_2G_AP ; +return BTC_WLINK_AP ; } }
@@ -6891,13 +6498,13 @@ static bool _chk_role_ch_group(const struct rtw89_btc_chdef *r1, }static u8 _chk_dbcc (struct rtw89_dev *rtwdev,struct rtw89_btc_chdef *ch, -u8 *phy,u8 *role,u8 link_cnt) +u8 *phy,u8 *role,u8 link_cnt,bool notv10) {struct rtw89_btc_wl_info *wl = &rtwdev->btc.cx.wl; -struct rtw89_btc_wl_role_info_v7 *rinfo_v7 = &wl->role_info_v7; -struct rtw89_btc_wl_role_info_v8 *rinfo_v8 = &wl->role_info_v8; +struct rtw89_btc_wl_role_info *rinfo = &wl->role_info;bool is_2g_ch_exist = false, is_multi_role_in_2g_phy = false; -u8 j, k, dbcc_2g_cid, dbcc_2g_cid2, dbcc_2g_phy, pta_req_band; +u8 j, k, dbcc_2g_cid =0 , dbcc_2g_cid2 =0 ; +u8 mode;/* find out the 2G-PHY by connect-id ->ch */ for (j =0 ; j < link_cnt; j++) {
@@ -6908,34 +6515,31 @@ static u8 _chk_dbcc(struct rtw89_dev *rtwdev, struct rtw89_btc_chdef *ch, }/* If no any 2G-port exist, it's impossible because 5G-exclude */ -if (!is_2g_ch_exist) -return BTC_WLINK_5G ; +if (!is_2g_ch_exist) { + mode =BTC_WLINK_SB_MCC ; +if (notv10) + rinfo->link_mode_v0 =BTC_WLINK_V0_5G ; +return mode; + } dbcc_2g_cid = j; - dbcc_2g_phy = phy[dbcc_2g_cid]; + rinfo->dbcc_2g_phy = phy[dbcc_2g_cid]; -if (dbcc_2g_phy ==RTW89_PHY_1 ) - pta_req_band =RTW89_PHY_1 ; +if (rinfo->dbcc_2g_phy ==RTW89_PHY_1 ) + rinfo->pta_req_band =RTW89_PHY_1 ;else - pta_req_band =RTW89_PHY_0 ; - -if (rtwdev->btc.ver->fwlrole ==7 ) { - rinfo_v7->dbcc_2g_phy = dbcc_2g_phy; - }else if (rtwdev->btc.ver->fwlrole ==8 ) { - rinfo_v8->dbcc_2g_phy = dbcc_2g_phy; - rinfo_v8->pta_req_band = pta_req_band; - } + rinfo->pta_req_band =RTW89_PHY_0 ;/* connect_cnt <= 2 */ if (link_cnt <BTC_TDMA_WLROLE_MAX ) -return (_get_role_link_mode ((role[dbcc_2g_cid]))); +return _get_role_link_mode (rinfo, role[dbcc_2g_cid], notv10);/* find the other-port in the 2G-PHY, ex: PHY-0:6G, PHY1: mcc/scc */ for (k =0 ; k < link_cnt; k++) {if (k == dbcc_2g_cid)continue ; -if (phy[k] == dbcc_2g_phy) { +if (phy[k] == rinfo->dbcc_2g_phy) { is_multi_role_in_2g_phy = true; dbcc_2g_cid2 = k;break ;
@@ -6944,319 +6548,151 @@ static u8 _chk_dbcc(struct rtw89_dev *rtwdev, struct rtw89_btc_chdef *ch,/* Single-role in 2G-PHY */ if (!is_multi_role_in_2g_phy) -return (_get_role_link_mode (role[dbcc_2g_cid])); +return _get_role_link_mode (rinfo, role[dbcc_2g_cid], notv10);/* 2-role in 2G-PHY */ -if (ch[dbcc_2g_cid2].center_ch >14 ) -return BTC_WLINK_25G_MCC ; -else if (_chk_role_ch_group (&ch[dbcc_2g_cid], &ch[dbcc_2g_cid2])) -return BTC_WLINK_2G_SCC ; -else -return BTC_WLINK_2G_MCC ; -} - -static void _update_role_link_mode (struct rtw89_dev *rtwdev, -bool client_joined,u32 noa) -{ -struct rtw89_btc_wl_role_info_v8 *rinfo_v8 = &rtwdev->btc.cx.wl.role_info_v8; -struct rtw89_btc_wl_role_info_v7 *rinfo_v7 = &rtwdev->btc.cx.wl.role_info_v7; -u8 role_ver = rtwdev->btc.ver->fwlrole; -u32 type =BTC_WLMROLE_NONE , dur =0 ; -u8 link_mode, connect_cnt; -u32 wl_role; - -if (role_ver ==7 ) { - wl_role = rinfo_v7->role_map; - link_mode = rinfo_v7->link_mode; - connect_cnt = rinfo_v7->connect_cnt; - }else if (role_ver ==8 ) { - wl_role = rinfo_v8->role_map; - link_mode = rinfo_v8->link_mode; - connect_cnt = rinfo_v8->connect_cnt; +if (ch[dbcc_2g_cid2].center_ch >14 ) { +if (notv10) + rinfo->link_mode_v0 =BTC_WLINK_V0_25G_MCC ; +return BTC_WLINK_DB_MCC ; + }else if (_chk_role_ch_group (&ch[dbcc_2g_cid], &ch[dbcc_2g_cid2])) { +if (notv10) + rinfo->link_mode_v0 =BTC_WLINK_V0_2G_SCC ; +return BTC_WLINK_SCC ; }else { -return ; - } - -/* if no client_joined, don't care P2P-GO/AP role */ -if (((wl_role &BIT (RTW89_WIFI_ROLE_P2P_GO )) || - (wl_role &BIT (RTW89_WIFI_ROLE_AP ))) && !client_joined) { -if (link_mode ==BTC_WLINK_2G_SCC ) { -if (role_ver ==7 ) { - rinfo_v7->link_mode =BTC_WLINK_2G_STA ; - rinfo_v7->connect_cnt--; - }else if (role_ver ==8 ) { - rinfo_v8->link_mode =BTC_WLINK_2G_STA ; - rinfo_v8->connect_cnt--; - } - }else if (link_mode ==BTC_WLINK_2G_GO || - link_mode ==BTC_WLINK_2G_AP ) { -if (role_ver ==7 ) { - rinfo_v7->link_mode =BTC_WLINK_NOLINK ; - rinfo_v7->connect_cnt--; - }else if (role_ver ==8 ) { - rinfo_v8->link_mode =BTC_WLINK_NOLINK ; - rinfo_v8->connect_cnt--; - } - } - } - -/* Identify 2-Role type */ -if (connect_cnt >=2 && - (link_mode ==BTC_WLINK_2G_SCC || - link_mode ==BTC_WLINK_2G_MCC || - link_mode ==BTC_WLINK_25G_MCC || - link_mode ==BTC_WLINK_5G )) { -if ((wl_role &BIT (RTW89_WIFI_ROLE_P2P_GO )) || - (wl_role &BIT (RTW89_WIFI_ROLE_AP ))) - type = noa ?BTC_WLMROLE_STA_GO_NOA :BTC_WLMROLE_STA_GO ; -else if (wl_role &BIT (RTW89_WIFI_ROLE_P2P_CLIENT )) - type = noa ?BTC_WLMROLE_STA_GC_NOA :BTC_WLMROLE_STA_GC ; -else - type =BTC_WLMROLE_STA_STA ; - - dur = noa; - } - -if (role_ver ==7 ) { - rinfo_v7->mrole_type = type; - rinfo_v7->mrole_noa_duration = dur; - }else if (role_ver ==8 ) { - rinfo_v8->mrole_type = type; - rinfo_v8->mrole_noa_duration = dur; +if (notv10) + rinfo->link_mode_v0 =BTC_WLINK_V0_2G_MCC ; +return BTC_WLINK_SB_MCC ; } } -static void _update_wl_info_v7 (struct rtw89_dev *rtwdev,u8 rid) +static void _update_wl_link_mode (struct rtw89_dev *rtwdev,u8 hw_band,u8 type) { -struct rtw89_btc_chdef cid_ch[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ];struct rtw89_btc *btc = &rtwdev->btc; +const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_role_info_v7 *wl_rinfo = &wl->role_info_v7; -struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info; -struct rtw89_btc_wl_link_info *wl_linfo = wl->link_info; -struct rtw89_btc_wl_active_role_v7 *act_role =NULL ; -u8 i, mode, cnt =0 , cnt_2g =0 , cnt_5g =0 , phy_now =RTW89_PHY_NUM , phy_dbcc; -bool b2g = false, b5g = false, client_joined = false, client_inc_2g = false; -u8 client_cnt_last[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {}; -u8 cid_role[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {}; -u8 cid_phy[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {}; -u8 mac =RTW89_MAC_0 , dbcc_2g_phy =RTW89_PHY_0 ; -u32 noa_duration =0 ; - -memset (wl_rinfo,0 ,sizeof (*wl_rinfo)); - -for (i =0 ; i <RTW89_PORT_NUM ; i++) { -if (!wl_linfo[i].active || wl_linfo[i].phy >=RTW89_PHY_NUM ) -continue ; - - act_role = &wl_rinfo->active_role[i]; - act_role->role = wl_linfo[i].role; - -/* check if role connect? */ -if (wl_linfo[i].connected ==MLME_NO_LINK ) { - act_role->connected =0 ; -continue ; - }else if (wl_linfo[i].connected ==MLME_LINKING ) { -continue ; - } - - cnt++; - act_role->connected =1 ; - act_role->pid = wl_linfo[i].pid; - act_role->phy = wl_linfo[i].phy; - act_role->band = wl_linfo[i].band; - act_role->ch = wl_linfo[i].ch; - act_role->bw = wl_linfo[i].bw; - act_role->noa = wl_linfo[i].noa; - act_role->noa_dur = wl_linfo[i].noa_duration; - cid_ch[cnt -1 ] = wl_linfo[i].chdef; - cid_phy[cnt -1 ] = wl_linfo[i].phy; - cid_role[cnt -1 ] = wl_linfo[i].role; - wl_rinfo->role_map |=BIT (wl_linfo[i].role); - -if (rid == i) - phy_now = act_role->phy; - -if (wl_linfo[i].role ==RTW89_WIFI_ROLE_P2P_GO || - wl_linfo[i].role ==RTW89_WIFI_ROLE_AP ) { -if (wl_linfo[i].client_cnt >1 ) - client_joined = true; -if (client_cnt_last[i] < wl_linfo[i].client_cnt && - wl_linfo[i].chdef.band ==RTW89_BAND_2G ) - client_inc_2g = true; - act_role->client_cnt = wl_linfo[i].client_cnt; - }else { - act_role->client_cnt =0 ; - } - -if (act_role->noa && act_role->noa_dur >0 ) - noa_duration = act_role->noa_dur; - -if (rtwdev->dbcc_en) { - phy_dbcc = wl_linfo[i].phy; - wl_dinfo->role[phy_dbcc] |=BIT (wl_linfo[i].role); - wl_dinfo->op_band[phy_dbcc] = wl_linfo[i].chdef.band; - } - -if (wl_linfo[i].chdef.band !=RTW89_BAND_2G ) { - cnt_5g++; - b5g = true; - }else { -if (((wl_linfo[i].role ==RTW89_WIFI_ROLE_P2P_GO || - wl_linfo[i].role ==RTW89_WIFI_ROLE_AP ) && - client_joined) || - wl_linfo[i].role ==RTW89_WIFI_ROLE_P2P_CLIENT ) - wl_rinfo->p2p_2g =1 ; - -if ((wl_linfo[i].mode &BIT (BTC_WL_MODE_11B )) || - (wl_linfo[i].mode &BIT (BTC_WL_MODE_11G ))) - wl->bg_mode =1 ; -else if (wl_linfo[i].mode &BIT (BTC_WL_MODE_HE )) - wl->he_mode = true; - - cnt_2g++; - b2g = true; - } - -if (act_role->band ==RTW89_BAND_5G && act_role->ch >=100 ) - wl->is_5g_hi_channel =1 ; -else - wl->is_5g_hi_channel =0 ; - } - - wl_rinfo->connect_cnt = cnt; - wl->client_cnt_inc_2g = client_inc_2g; - -if (cnt ==0 ) { - mode =BTC_WLINK_NOLINK ; - wl_rinfo->role_map =BIT (RTW89_WIFI_ROLE_NONE ); - }else if (!b2g && b5g) { - mode =BTC_WLINK_5G ; - }else if (wl_rinfo->role_map &BIT (RTW89_WIFI_ROLE_NAN )) { - mode =BTC_WLINK_2G_NAN ; - }else if (cnt >BTC_TDMA_WLROLE_MAX ) { - mode =BTC_WLINK_OTHER ; - }else if (rtwdev->dbcc_en) { - mode =_chk_dbcc (rtwdev, cid_ch, cid_phy, cid_role, cnt); - -/* correct 2G-located PHY band for gnt ctrl */ -if (dbcc_2g_phy <RTW89_PHY_NUM ) - wl_dinfo->op_band[dbcc_2g_phy] =RTW89_BAND_2G ; - }else if (b2g && b5g && cnt ==2 ) { - mode =BTC_WLINK_25G_MCC ; - }else if (!b5g && cnt ==2 ) {/* cnt_connect = 2 */ -if (_chk_role_ch_group (&cid_ch[0 ], &cid_ch[cnt -1 ])) - mode =BTC_WLINK_2G_SCC ; -else - mode =BTC_WLINK_2G_MCC ; - }else if (!b5g && cnt ==1 ) {/* cnt_connect = 1 */ - mode =_get_role_link_mode (cid_role[0 ]); - }else { - mode =BTC_WLINK_NOLINK ; - } - - wl_rinfo->link_mode = mode; -_update_role_link_mode (rtwdev, client_joined, noa_duration); - -/* todo DBCC related event */ -rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC] wl_info phy_now=%d\n" , phy_now); -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC] rlink cnt_2g=%d cnt_5g=%d\n" , cnt_2g, cnt_5g); - -if (wl_rinfo->dbcc_en != rtwdev->dbcc_en) { - wl_rinfo->dbcc_chg =1 ; - wl_rinfo->dbcc_en = rtwdev->dbcc_en; - wl->wcnt[BTC_WCNT_DBCC_CHG ]++; - } - -if (rtwdev->dbcc_en) { - wl_rinfo->dbcc_2g_phy = dbcc_2g_phy; - -if (dbcc_2g_phy ==RTW89_PHY_1 ) - mac =RTW89_MAC_1 ; - -_update_dbcc_band (rtwdev,RTW89_PHY_0 ); -_update_dbcc_band (rtwdev,RTW89_PHY_1 ); - } -_wl_req_mac (rtwdev, mac); -_fw_set_drv_info (rtwdev,CXDRVINFO_ROLE ); -} - -static u8 _update_wl_link_mode (struct rtw89_dev *rtwdev,u8 hw_band,u8 type) -{ -struct rtw89_btc_wl_info *wl = &rtwdev->btc.cx.wl;struct rtw89_btc_wl_mlo_info *mlo_info = &wl->mlo_info; -u8 mode =BTC_WLINK_NOLINK ; +struct rtw89_btc_wl_role_info *r = &wl->role_info; +u8 p2p_exist = wl->role_info.p2p_exist; +if (hw_band ==RTW89_PHY_1 ) + p2p_exist = wl->role_info.p2p_exist_hb1; + +/* MLD: nLmR --> 2L1R: 2-Link by 1-RF, 2L2R: 2-link by 2-RF */ switch (type) {case RTW89_MR_WTYPE_NONE :/* no-link */ - mode =BTC_WLINK_NOLINK ; + r->link_mode =BTC_WLINK_NOLINK ;break ;case RTW89_MR_WTYPE_NONMLD :/* Non_MLO 1-role 2+0/0+2 */ case RTW89_MR_WTYPE_MLD1L1R :/* MLO only-1 link 2+0/0+2 */ +if (mlo_info->wmode[hw_band] ==RTW89_MR_WMODE_1AP ) { + r->link_mode =BTC_WLINK_GO ; + }else if (mlo_info->wmode[hw_band] ==RTW89_MR_WMODE_1CLIENT && + p2p_exist) { + r->link_mode =BTC_WLINK_GC ; + }else { + r->link_mode =BTC_WLINK_STA ; + } + +if (ver->fwlrole >=10 ) +break ; +if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) { - mode =BTC_WLINK_5G ; + r->link_mode_v0 =BTC_WLINK_V0_5G ; }else if (mlo_info->wmode[hw_band] ==RTW89_MR_WMODE_1AP ) { - mode =BTC_WLINK_2G_GO ; + r->link_mode_v0 =BTC_WLINK_V0_2G_GO ; }else if (mlo_info->wmode[hw_band] ==RTW89_MR_WMODE_1CLIENT ) { -if (wl->role_info_v8.p2p_2g) - mode =BTC_WLINK_2G_GC ; +if (wl->role_info.p2p_2g) + r->link_mode_v0 =BTC_WLINK_V0_2G_GC ;else - mode =BTC_WLINK_2G_STA ; + r->link_mode_v0 =BTC_WLINK_V0_2G_STA ; }break ;case RTW89_MR_WTYPE_NONMLD_NONMLD :/* Non_MLO 2-role 2+0/0+2 */ case RTW89_MR_WTYPE_MLD1L1R_NONMLD :/* MLO only-1 link + P2P 2+0/0+2 */ +if (mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_2GHZ_5GHZ || + mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_2GHZ_6GHZ ) { + r->link_mode =BTC_WLINK_DB_MCC ; + }else if (mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_2GHZ || + mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_5GHZ || + mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_6GHZ || + mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_5GHZ_6GHZ ) { + r->link_mode =BTC_WLINK_SB_MCC ; + }else { + r->link_mode =BTC_WLINK_SCC ; + } + +if (ver->fwlrole >=10 ) +break ; +if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) { - mode =BTC_WLINK_5G ; + r->link_mode_v0 =BTC_WLINK_V0_5G ; }else if (mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_2GHZ_5GHZ || mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_2GHZ_6GHZ ) { - mode =BTC_WLINK_25G_MCC ; + r->link_mode_v0 =BTC_WLINK_V0_25G_MCC ; }else if (mlo_info->ch_type[hw_band] ==RTW89_MR_CTX2_2GHZ ) { - mode =BTC_WLINK_2G_MCC ; + r->link_mode_v0 =BTC_WLINK_V0_2G_MCC ; }else if (mlo_info->ch_type[hw_band] ==RTW89_MR_CTX1_2GHZ ) { - mode =BTC_WLINK_2G_SCC ; + r->link_mode_v0 =BTC_WLINK_V0_2G_SCC ; }break ;case RTW89_MR_WTYPE_MLD2L1R :/* MLO_MLSR 2+0/0+2 */ +if (p2p_exist)/* MLO_MLSR only support STA/GC */ + r->link_mode =BTC_WLINK_GC ; +else + r->link_mode =BTC_WLINK_STA ; + +if (ver->fwlrole >=10 ) +break ; +if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) - mode =BTC_WLINK_5G ; -else if (wl->role_info_v8.p2p_2g) - mode =BTC_WLINK_2G_GC ; + r->link_mode_v0 =BTC_WLINK_V0_5G ; +else if (wl->role_info.p2p_2g) + r->link_mode_v0 =BTC_WLINK_V0_2G_GC ;else - mode =BTC_WLINK_2G_STA ; + r->link_mode_v0 =BTC_WLINK_V0_2G_STA ;break ;case RTW89_MR_WTYPE_MLD2L1R_NONMLD :/* MLO_MLSR + P2P 2+0/0+2 */ -case RTW89_MR_WTYPE_MLD2L2R_NONMLD :/* MLO_MLMR + P2P 1+1/2+2 */ -/* driver may doze 1-link to +case RTW89_MR_WTYPE_MLD2L2R_NONMLD :/* MLO_MLMR + P2P 1+1/2+2*/ +/* driver may doze 1-link (1+1) or 2+0->0+2->1+1 * 2G+5G -> TDMA slot switch by E2G/E5G * 5G only -> TDMA slot switch by E5G */ - mode =BTC_WLINK_25G_MCC ; + r->link_mode =BTC_WLINK_DB_MCC ; + +if (ver->fwlrole >=10 ) +break ; + + r->link_mode_v0 =BTC_WLINK_V0_25G_MCC ;break ;case RTW89_MR_WTYPE_MLD2L2R :/* MLO_MLMR 1+1/2+2 */ +/* MLMR only support STA now (2024) */ + r->link_mode =BTC_WLINK_STA ; + +if (ver->fwlrole >=10 ) +break ; +if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) { - mode =BTC_WLINK_5G ; + r->link_mode_v0 =BTC_WLINK_V0_5G ; }else if (mlo_info->wmode[hw_band] ==RTW89_MR_WMODE_1AP ) { - mode =BTC_WLINK_2G_GO ; + r->link_mode_v0 =BTC_WLINK_V0_2G_GO ; }else if (mlo_info->wmode[hw_band] ==RTW89_MR_WMODE_1CLIENT ) { -if (wl->role_info_v8.p2p_2g) - mode =BTC_WLINK_2G_GC ; +if (wl->role_info.p2p_2g) + r->link_mode_v0 =BTC_WLINK_V0_2G_GC ;else - mode =BTC_WLINK_2G_STA ; + r->link_mode_v0 =BTC_WLINK_V0_2G_STA ; }break ; } -return mode; } -static void _update_wl_mlo_info (struct rtw89_dev *rtwdev) +static void _update_wl_mlo_info (struct rtw89_dev *rtwdev,u8 hw_band) {struct rtw89_btc_wl_info *wl = &rtwdev->btc.cx.wl; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; +struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;struct rtw89_btc_wl_mlo_info *mlo_info = &wl->mlo_info;struct rtw89_mr_chanctx_info qinfo; -u8 track_band =RTW89_PHY_0 ; +struct rtw89_chanctx *ch;u8 rf_band =RTW89_BAND_2G ;u8 i, type;
@@ -7265,19 +6701,46 @@ static void _update_wl_mlo_info(struct rtw89_dev *rtwdev)memset (&qinfo,0 ,sizeof (qinfo));rtw89_query_mr_chanctx_info (rtwdev, i, &qinfo); + +switch (qinfo.ctxtype) { +default : + mlo_info->hwb_rf_band[i] =0 ; +break ; +case RTW89_MR_CTX1_2GHZ : +case RTW89_MR_CTX2_2GHZ : + mlo_info->hwb_rf_band[i] =BIT (RTW89_BAND_2G ); +break ; +case RTW89_MR_CTX1_5GHZ : +case RTW89_MR_CTX2_5GHZ : + mlo_info->hwb_rf_band[i] =BIT (RTW89_BAND_5G ); +break ; +case RTW89_MR_CTX1_6GHZ : +case RTW89_MR_CTX2_6GHZ : + mlo_info->hwb_rf_band[i] =BIT (RTW89_BAND_6G ); +break ; +case RTW89_MR_CTX2_2GHZ_5GHZ : + mlo_info->hwb_rf_band[i] =BIT (RTW89_BAND_2G ) | +BIT (RTW89_BAND_5G ); +break ; +case RTW89_MR_CTX2_2GHZ_6GHZ : + mlo_info->hwb_rf_band[i] =BIT (RTW89_BAND_2G ) | +BIT (RTW89_BAND_6G ); +break ; +case RTW89_MR_CTX2_5GHZ_6GHZ : + mlo_info->hwb_rf_band[i] =BIT (RTW89_BAND_5G ) | +BIT (RTW89_BAND_6G ); +break ; + } mlo_info->wmode[i] = qinfo.wmode; mlo_info->ch_type[i] = qinfo.ctxtype; mlo_info->wtype = qinfo.wtype; - -if (mlo_info->ch_type[i] ==RTW89_MR_CTX1_5GHZ || - mlo_info->ch_type[i] ==RTW89_MR_CTX2_5GHZ || - mlo_info->ch_type[i] ==RTW89_MR_CTX2_5GHZ_6GHZ ) - mlo_info->hwb_rf_band[i] =RTW89_BAND_5G ; -else if (mlo_info->ch_type[i] ==RTW89_MR_CTX1_6GHZ || - mlo_info->ch_type[i] ==RTW89_MR_CTX2_6GHZ ) - mlo_info->hwb_rf_band[i] =RTW89_BAND_6G ; -else /* check if "2G-included" or unknown in each HW-band */ - mlo_info->hwb_rf_band[i] =RTW89_BAND_2G ; + wl->rf_band_map[i] = mlo_info->hwb_rf_band[i]; + ch = &rtwdev->hal.chanctx[i]; + wl->rf_ch_info[i].center_ch = ch->chan.channel; + wl->rf_ch_info[i].band = ch->chan.band_type; + wl->rf_ch_info[i].chan = ch->chan.channel; + wl->rf_ch_info[i].offset = ch->chan.pri_ch_idx; + wl->rf_ch_info[i].bw = ch->chan.band_width; } mlo_info->link_status = rtwdev->mlo_dbcc_mode;
@@ -7312,71 +6775,64 @@ static void _update_wl_mlo_info(struct rtw89_dev *rtwdev)default :case MLO_2_PLUS_0_1RF :/* 2+0 */ case MLO_2_PLUS_0_2RF : - mlo_info->rf_combination =BTC_MLO_RF_2_PLUS_0 ; - track_band =RTW89_MAC_0 ; - rf_band = mlo_info->hwb_rf_band[RTW89_MAC_0 ]; - mlo_info->path_rf_band[BTC_RF_S0 ] = rf_band; - mlo_info->path_rf_band[BTC_RF_S1 ] = rf_band; - +_update_wl_link_mode (rtwdev,RTW89_MAC_0 , type); + wl_rinfo->link_mode_hb1 = wl_rinfo->link_mode; wl_rinfo->pta_req_band =RTW89_MAC_0 ; wl_rinfo->dbcc_2g_phy =RTW89_PHY_0 ; wl_rinfo->dbcc_en =0 ; + + rf_band = wl->rf_band_map[RTW89_PHY_0 ]; + mlo_info->path_rf_band[BTC_RF_S0 ] = rf_band; + mlo_info->path_rf_band[BTC_RF_S1 ] = rf_band;break ;case MLO_0_PLUS_2_1RF :/* 0+2 */ case MLO_0_PLUS_2_2RF : - mlo_info->rf_combination =BTC_MLO_RF_0_PLUS_2 ; - track_band =RTW89_MAC_1 ; - rf_band = mlo_info->hwb_rf_band[RTW89_MAC_1 ]; - mlo_info->path_rf_band[BTC_RF_S0 ] = rf_band; - mlo_info->path_rf_band[BTC_RF_S1 ] = rf_band; - +_update_wl_link_mode (rtwdev,RTW89_MAC_1 , type); + wl_rinfo->link_mode_hb1 = wl_rinfo->link_mode; wl_rinfo->pta_req_band =RTW89_MAC_1 ; wl_rinfo->dbcc_2g_phy =RTW89_PHY_1 ; wl_rinfo->dbcc_en =0 ; + + rf_band = wl->rf_band_map[RTW89_PHY_1 ]; + mlo_info->path_rf_band[BTC_RF_S0 ] = rf_band; + mlo_info->path_rf_band[BTC_RF_S1 ] = rf_band;break ;case MLO_1_PLUS_1_1RF :/* 1+1 */ case MLO_1_PLUS_1_2RF :/* 1+1 */ case MLO_2_PLUS_2_2RF :/* 2+2 */ case DBCC_LEGACY :/* DBCC 1+1 */ -if (mlo_info->link_status ==MLO_2_PLUS_2_2RF ) - mlo_info->rf_combination =BTC_MLO_RF_2_PLUS_2 ; -else - mlo_info->rf_combination =BTC_MLO_RF_1_PLUS_1 ; - -if (mlo_info->hwb_rf_band[RTW89_MAC_0 ] ==RTW89_BAND_2G ) - track_band =RTW89_MAC_0 ; +/* Check ch count from ch_type and modify type*/ +if (mlo_info->ch_type[hw_band] ==RTW89_MR_CTX1_2GHZ || + mlo_info->ch_type[hw_band] ==RTW89_MR_CTX1_5GHZ || + mlo_info->ch_type[hw_band] ==RTW89_MR_CTX1_6GHZ ) + type =RTW89_MR_WTYPE_NONMLD ;/* only 1-role */ else - track_band =RTW89_MAC_1 ; + type =RTW89_MR_WTYPE_NONMLD_NONMLD ; - mlo_info->path_rf_band[BTC_RF_S0 ] = - mlo_info->hwb_rf_band[RTW89_MAC_0 ]; - mlo_info->path_rf_band[BTC_RF_S1 ] = - mlo_info->hwb_rf_band[RTW89_MAC_1 ]; + rf_band = wl->rf_band_map[hw_band]; +_update_wl_link_mode (rtwdev, hw_band, type); -/* Check ch count from ch_type @ 2.4G HW-band, and modify type */ -if (mlo_info->ch_type[track_band] ==RTW89_MR_CTX1_2GHZ ) - type =RTW89_MR_WTYPE_NONMLD ;/* only 1-role at 2G */ -else - type =RTW89_MR_WTYPE_NONMLD_NONMLD ; +if (hw_band ==RTW89_MAC_0 ) { + mlo_info->path_rf_band[BTC_RF_S0 ] = rf_band; + }else { + wl_rinfo->link_mode_hb1 = wl_rinfo->link_mode; + mlo_info->path_rf_band[BTC_RF_S1 ] = rf_band; + } -if (mlo_info->hwb_rf_band[RTW89_MAC_0 ] ==RTW89_BAND_2G ) { +/* set pta_req_band for 1-PTA architecture */ +if (wl->rf_band_map[RTW89_MAC_0 ] &BIT (RTW89_BAND_2G )) { wl_rinfo->pta_req_band =RTW89_MAC_0 ; wl_rinfo->dbcc_2g_phy =RTW89_PHY_0 ; - }else { + }else if (wl->rf_band_map[RTW89_MAC_1 ] &BIT (RTW89_BAND_2G )) { wl_rinfo->pta_req_band =RTW89_MAC_1 ; wl_rinfo->dbcc_2g_phy =RTW89_PHY_1 ; + }else {/* Both HW-BAND are not on 2.4G*/ + wl_rinfo->pta_req_band =RTW89_MAC_0 ; + wl_rinfo->dbcc_2g_phy =RTW89_PHY_0 ; } - -if (mlo_info->wmode[RTW89_MAC_0 ] ==RTW89_MR_WMODE_NONE && - mlo_info->wmode[RTW89_MAC_1 ] ==RTW89_MR_WMODE_NONE ) - wl_rinfo->dbcc_en =0 ; -else - wl_rinfo->dbcc_en =1 ;break ; } - wl_rinfo->link_mode =_update_wl_link_mode (rtwdev, track_band, type); -rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(), mode=%s, pta_band=%d" , __func__,id_to_linkmode (wl_rinfo->link_mode), wl_rinfo->pta_req_band);
@@ -7386,16 +6842,19 @@ static void _update_wl_non_mlo_info(struct rtw89_dev *rtwdev) {struct rtw89_btc_wl_info *wl = &rtwdev->btc.cx.wl;struct rtw89_btc_wl_rlink *rlink =NULL ; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; +struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;struct rtw89_btc_chdef cid_ch[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {};u8 cid_role[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {};u8 cid_phy[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {};bool b2g = false, b5g = false, outloop = false; +bool notv10 = rtwdev->btc.ver->fwlrole !=10 ; +u8 mode_v0 =BTC_WLINK_V0_NOLINK ;u8 mode =BTC_WLINK_NOLINK ;u8 cnt_2g =0 , cnt_5g =0 ;u8 i, j, cnt =0 ;for (j =RTW89_PHY_0 ; j <RTW89_PHY_NUM ; j++) { + wl->rf_band_map[j] =0 ;/* j=link id, is the link use which band */ for (i =0 ; i <RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ; i++) { rlink = &wl_rinfo->rlink[i][j];
@@ -7419,6 +6878,7 @@ static void _update_wl_non_mlo_info(struct rtw89_dev *rtwdev) cnt_2g++; b2g = true; } + wl->rf_band_map[j] |=BIT (rlink->rf_band); }if (outloop)break ;
@@ -7427,56 +6887,73 @@ static void _update_wl_non_mlo_info(struct rtw89_dev *rtwdev)rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): cnt_2g=%d, cnt_5g=%d\n" , __func__, cnt_2g, cnt_5g); + wl_rinfo->pta_req_band =RTW89_PHY_0 ;/* no 0+2 for non-MLO */ wl_rinfo->dbcc_en = rtwdev->dbcc_en; +/* Be careful to change the following sequence!! */ if (cnt ==0 ) { mode =BTC_WLINK_NOLINK ; - }else if (!b2g && b5g) { - mode =BTC_WLINK_5G ; + mode_v0 =BTC_WLINK_V0_NOLINK ; }else if (wl_rinfo->dbcc_en) { - mode =_chk_dbcc (rtwdev, cid_ch, cid_phy, cid_role, cnt); +/* update pta_req_band to 2.4GHz HW-BAND for DBCC = 1*/ + mode =_chk_dbcc (rtwdev, cid_ch, cid_phy, cid_role, cnt, notv10); + mode_v0 = wl_rinfo->link_mode_v0; + }else if (!b2g && b5g && notv10) { + mode_v0 =BTC_WLINK_V0_5G ; }else if (b2g && b5g) { - mode =BTC_WLINK_25G_MCC ; - }else if (!b5g && cnt >=2 ) { -if (_chk_role_ch_group (&cid_ch[0 ], &cid_ch[1 ])) - mode =BTC_WLINK_2G_SCC ; -else - mode =BTC_WLINK_2G_MCC ; - }else if (!b5g) {/* cnt_connect = 1 */ - mode =_get_role_link_mode (cid_role[0 ]); + mode =BTC_WLINK_DB_MCC ; + mode_v0 =BTC_WLINK_V0_25G_MCC ; + }else if (cnt >=2 ) { +if (_chk_role_ch_group (&cid_ch[0 ], &cid_ch[1 ])) { + mode =BTC_WLINK_SCC ; + mode_v0 =BTC_WLINK_V0_2G_SCC ; + }else { + mode =BTC_WLINK_SB_MCC ; + mode_v0 =BTC_WLINK_V0_2G_MCC ; + } + }else { + mode =_get_role_link_mode (wl_rinfo, cid_role[0 ], notv10); } wl_rinfo->link_mode = mode; + wl_rinfo->link_mode_hb1 = mode; + wl_rinfo->link_mode_v0 = mode_v0; } -static void _modify_role_link_mode (struct rtw89_dev *rtwdev) +static void _modify_role_link_mode (struct rtw89_dev *rtwdev,u8 hw_band) { -struct rtw89_btc_wl_info *wl = &rtwdev->btc.cx.wl; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;u8 go_cleint_exist = wl->go_client_exist; -u8 link_mode = wl_rinfo->link_mode; +u8 *link_mode = &wl_rinfo->link_mode;u32 role_map = wl_rinfo->role_map;u8 noa_exist = wl->noa_exist;u32 mrole =BTC_WLMROLE_NONE ; +if (hw_band ==RTW89_PHY_1 ) { + *link_mode = wl_rinfo->link_mode_hb1; + role_map = wl_rinfo->role_map_hb1; + go_cleint_exist = wl->go_client_exist_hb1; + } +/* if no client_joined, don't care P2P-GO/AP role */ if (((role_map &BIT (RTW89_WIFI_ROLE_P2P_GO )) || - (role_map &BIT (RTW89_WIFI_ROLE_AP ))) && !go_cleint_exist) { -if (link_mode ==BTC_WLINK_2G_SCC ) { - wl_rinfo->link_mode =BTC_WLINK_2G_STA ; - }else if (link_mode ==BTC_WLINK_2G_GO || - link_mode ==BTC_WLINK_2G_AP ) { - wl_rinfo->link_mode =BTC_WLINK_NOLINK ; + (role_map &BIT (RTW89_WIFI_ROLE_AP ))) && !go_cleint_exist) { +if (*link_mode ==BTC_WLINK_SCC ) { + *link_mode =BTC_WLINK_STA ; + }else if (*link_mode ==BTC_WLINK_GO || + *link_mode ==BTC_WLINK_AP ) { + *link_mode =BTC_WLINK_NOLINK ; } } -/* Identify 2-Role type */ -if (link_mode ==BTC_WLINK_2G_SCC || - link_mode ==BTC_WLINK_2G_MCC || - link_mode ==BTC_WLINK_25G_MCC || - link_mode ==BTC_WLINK_5G ) { +/* Identify 2-Role type */ +if (*link_mode ==BTC_WLINK_SCC || + *link_mode ==BTC_WLINK_SB_MCC || + *link_mode ==BTC_WLINK_DB_MCC ) {if ((role_map &BIT (RTW89_WIFI_ROLE_P2P_GO )) || - (role_map &BIT (RTW89_WIFI_ROLE_AP ))) { + (role_map &BIT (RTW89_WIFI_ROLE_AP ))) {if (noa_exist) mrole =BTC_WLMROLE_STA_GO_NOA ;else
@@ -7489,127 +6966,147 @@ static void _modify_role_link_mode(struct rtw89_dev *rtwdev) }else { mrole =BTC_WLMROLE_STA_STA ; } - } - wl_rinfo->mrole_type = mrole; +if (hw_band ==RTW89_PHY_0 ) { + wl_rinfo->mrole_type &=GENMASK (31 ,16 );/* clear Low-Word */ + wl_rinfo->mrole_type |= mrole; + }else { + wl_rinfo->mrole_type &=GENMASK (15 ,0 );/* clear high-Word */ + wl_rinfo->mrole_type |= (mrole <<16 ); + } + }else { + wl_rinfo->mrole_type =BTC_WLMROLE_NONE ; + }rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): link_mode=%s, mrole_type=%d\n" , __func__,id_to_linkmode (wl_rinfo->link_mode), wl_rinfo->mrole_type); } -static void _update_wl_info_v8 (struct rtw89_dev *rtwdev,u8 role_id,u8 rlink_id, -enum btc_role_state state) +static void _update_wl_info (struct rtw89_dev *rtwdev,struct rtw89_btc_wl_link_info *wl_linfo) { -struct rtw89_btc_wl_rlink *rlink =NULL ; -struct rtw89_btc_wl_link_info *wl_linfo;struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; -bool client_joined = false, noa_exist = false, p2p_exist = false; -bool is_5g_hi_channel = false, bg_mode = false, dbcc_en_ori; -u8 i, j, link_mode_ori; +struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info; +struct rtw89_btc_wl_rlink *rlink =NULL ; +u8 dbcc_en_ori, is_5g_hi_ch =0 , bg_mode =0 , p2p_exist =0 ; +u8 go_client_exist =0 , noa_exist =0 ; +u8 rlink_id = wl_linfo->phy; +u8 role_id = wl_linfo->pid; +u8 i, link_mode_ori;u32 role_map =0 ; -if (role_id >=RTW89_BE_BTC_WL_MAX_ROLE_NUMBER || rlink_id >=RTW89_MAC_NUM ) +if (role_id >=RTW89_BE_BTC_WL_MAX_ROLE_NUMBER || rlink_id >=RTW89_BAND_NUM )return ; -/* Extract wl->link_info[role_id][rlink_id] to wl->role_info +/* +* Extract wl->link_info[role_id][rlink_id] to wl->role_info * role_id: role index * rlink_id: rlink index (= HW-band index) * pid: port_index */ - - wl_linfo = &wl->rlink_info[role_id][rlink_id]; rlink = &wl_rinfo->rlink[role_id][rlink_id]; rlink->role = wl_linfo->role; rlink->active = wl_linfo->active;/* Doze or not */ rlink->pid = wl_linfo->pid; + rlink->mac_id = wl_linfo->mac_id; rlink->phy = wl_linfo->phy; - rlink->rf_band = wl_linfo->band; - rlink->ch = wl_linfo->ch; - rlink->bw = wl_linfo->bw; + rlink->rf_band = wl_linfo->chdef.band; + rlink->ch = wl_linfo->chdef.center_ch; + rlink->bw = wl_linfo->chdef.bw; rlink->noa = wl_linfo->noa; rlink->noa_dur = wl_linfo->noa_duration /1000 ; rlink->client_cnt = wl_linfo->client_cnt; rlink->mode = wl_linfo->mode; +/* check if rlink connect? */ switch (wl_linfo->connected) {case MLME_NO_LINK : rlink->connected =0 ;break ;case MLME_LINKED : rlink->connected =1 ; + +/* reset special-AP flag if station mode linked */ + dm->leak_ap =0 ;break ;default :return ; } -for (j =RTW89_MAC_0 ; j <=RTW89_MAC_1 ; j++) { -for (i =0 ; i <RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ; i++) { - rlink = &wl_rinfo->rlink[i][j]; - -if (!rlink->active || !rlink->connected) -continue ; +/* update by HW-Band */ +for (i =0 ; i <RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ; i++) {/* i = role_id */ + rlink = &wl_rinfo->rlink[i][rlink_id]; - role_map |=BIT (rlink->role); +if (!rlink->active || !rlink->connected) +continue ; -/* only one noa-role exist */ -if (rlink->noa && rlink->noa_dur >0 ) - noa_exist = true; + role_map |=BIT (rlink->role); -/* for WL 5G-Rx interfered with BT issue */ -if (rlink->rf_band ==RTW89_BAND_5G ) { -if (rlink->ch >=100 ) - is_5g_hi_channel = true; +/* Identify if P2P-Go (GO/GC/AP) exist at 2GHz band */ +if (((rlink->role ==RTW89_WIFI_ROLE_P2P_GO || + rlink->role ==RTW89_WIFI_ROLE_AP ) && + rlink->client_cnt >1 )) { + p2p_exist =1 ; + go_client_exist =1 ; + } -continue ; - } +if (rlink->role ==RTW89_WIFI_ROLE_P2P_CLIENT ) + p2p_exist =1 ; -/* only if client connect for p2p-Go/AP */ -if ((rlink->role ==RTW89_WIFI_ROLE_P2P_GO || - rlink->role ==RTW89_WIFI_ROLE_AP ) && - rlink->client_cnt >1 ) { - p2p_exist = true; - client_joined = true; - } +/* only one noa-role exist */ +if (rlink->noa && rlink->noa_dur >0 ) + noa_exist =1 ; -/* Identify if P2P-Go (GO/GC/AP) exist at 2G band */ -if (rlink->role ==RTW89_WIFI_ROLE_P2P_CLIENT ) - p2p_exist = true; +/* for WL 5G-Rx interfered with BT issue */ +if (rlink->rf_band ==RTW89_BAND_5G && rlink->ch >=100 ) + is_5g_hi_ch =1 ; -if ((rlink->mode &BIT (BTC_WL_MODE_11B )) || - (rlink->mode &BIT (BTC_WL_MODE_11G ))) - bg_mode = true; - } +if ((rlink->mode &BIT (BTC_WL_MODE_11B )) || + (rlink->mode &BIT (BTC_WL_MODE_11G ))) + bg_mode =1 ; } - link_mode_ori = wl_rinfo->link_mode; - wl->is_5g_hi_channel = is_5g_hi_channel; - wl->bg_mode = bg_mode; - wl->go_client_exist = client_joined; - wl->noa_exist = noa_exist; - wl_rinfo->p2p_2g = p2p_exist; - wl_rinfo->role_map = role_map; +if (rlink_id ==RTW89_PHY_0 ) { + link_mode_ori = wl_rinfo->link_mode; + wl->is_5g_hi_ch = is_5g_hi_ch; + wl->bg_mode = bg_mode; + wl->go_client_exist = go_client_exist; + wl->noa_exist = noa_exist; + wl_rinfo->p2p_exist = p2p_exist; + wl_rinfo->role_map = role_map; + }else { + link_mode_ori = wl_rinfo->link_mode_hb1; + wl->is_5g_hi_ch_hb1 = is_5g_hi_ch; + wl->bg_mode_hb1 = bg_mode; + wl->go_client_exist_hb1 = go_client_exist; + wl->noa_exist_hb1 = noa_exist; + wl_rinfo->p2p_exist_hb1 = p2p_exist; + wl_rinfo->role_map_hb1 = role_map; + } dbcc_en_ori = wl_rinfo->dbcc_en; +/* for MLO-supported, link-mode from driver directly */ if (rtwdev->chip->para_ver &BTC_FEAT_MLO_SUPPORT ) { -/* for MLO-supported, link-mode from driver directly */ -_update_wl_mlo_info (rtwdev); - }else { -/* for non-MLO-supported, link-mode by BTC */ +_update_wl_mlo_info (rtwdev, rlink_id); + }else {/* for non-MLO-supported, link-mode by BTC */ _update_wl_non_mlo_info (rtwdev); } -_modify_role_link_mode (rtwdev); +_modify_role_link_mode (rtwdev, rlink_id); -if (link_mode_ori != wl_rinfo->link_mode) - wl->link_mode_chg = true; +if ((rlink_id ==RTW89_PHY_0 && wl_rinfo->link_mode != link_mode_ori) || + (rlink_id ==RTW89_PHY_1 && wl_rinfo->link_mode_hb1 != link_mode_ori)) { + wl_rinfo->link_mode_chg =1 ; + wl->link_mode_chg =1 ; + }if (wl_rinfo->dbcc_en != dbcc_en_ori) { - wl->dbcc_chg = true; + wl->dbcc_chg =1 ; + wl->role_info.dbcc_chg =1 ; wl->wcnt[BTC_WCNT_DBCC_CHG ]++; } }
@@ -7685,25 +7182,21 @@ static void _update_bt_scbd(struct rtw89_dev *rtwdev, u8 bid)struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_bt_info *bt;u32 val, any_bt_connect, any_bt_6g_connect =0 ; -u8 id, id_start, id_stop, mode; +u8 id, id_start, id_stop, mode =0 ;bool bt_link_change = false;bool lps_ctrl = false;if (!rtwdev->chip->scbd || bid >BTC_ALL_BT )return ; -if (ver->fwlrole ==0 ) - mode = wl->role_info.link_mode; -else if (ver->fwlrole ==1 ) - mode = wl->role_info_v1.link_mode; -else if (ver->fwlrole ==2 ) - mode = wl->role_info_v2.link_mode; -else if (ver->fwlrole ==7 ) - mode = wl->role_info_v7.link_mode; -else if (ver->fwlrole ==8 ) - mode = wl->role_info_v8.link_mode; -else -return ; +if (ver->fwlrole ==10 ) { +if (wl->role_info.link_mode ==BTC_WLINK_STA && + (dm->tdd_en && wl->rf_band_map[RTW89_MAC_0 ] & +BIT (RTW89_BAND_2G ))) + mode =BTC_WLINK_V0_2G_STA ; + }else { + mode = wl->role_info.link_mode_v0; + }if (bid ==BTC_ALL_BT ) { id_start =BTC_BT_1ST ;
@@ -7796,7 +7289,7 @@ static void _update_bt_scbd(struct rtw89_dev *rtwdev, u8 bid)if (((bt->link_info.a2dp_desc.exist || bt->link_info.pan_desc.exist || bt->link_info.hfp_desc.exist) && - mode ==BTC_WLINK_2G_STA ) || + mode ==BTC_WLINK_V0_2G_STA ) || bt->whql_test) lps_ctrl = true;
@@ -7900,7 +7393,12 @@ static void _set_bind_info(struct rtw89_btc *btc, u8 type)* HW-Band is decided by wl->mlo_info.mrcx_act_hwb_map */ if (wl->mlo_info.wtype ==RTW89_MR_WTYPE_MLD2L1R_NONMLD ) { -/* TODO: Should patched WiFi mode & WiFi role patch */ +if (wl->role_info.link_mode !=BTC_WLINK_DB_MCC ) {/* mode chg */ +if (wl->mlo_info.mrcx_act_hwb_map ==BIT (RTW89_MAC_1 )) + path_hwb[BTC_RF_S0 ] =RTW89_PHY_1 ;/* S0/1->HWB1 */ +else + path_hwb[BTC_RF_S1 ] =RTW89_PHY_0 ;/* S0/1->HWB0 */ + } }else {/* * Dual-RF_band(HWB)TDMA if BT-profile is TDMA-type at both
@@ -7933,7 +7431,22 @@ static void _set_bind_info(struct rtw89_btc *btc, u8 type) } } -/* TODO: Should patched WiFi mode & WiFi role patch */ +if (wl->mlo_info.wtype ==RTW89_MR_WTYPE_MLD2L2R && + (bd->wl_hwb_sel == (BIT (RTW89_MAC_1 ) |BIT (RTW89_MAC_0 )))) { +if (wl->role_info.link_mode ==BTC_WLINK_AP || + wl->role_info.link_mode_hb1 ==BTC_WLINK_AP ) + bd->wl_link_mode =BTC_WLINK_DB_MCC ; +else + bd->wl_link_mode =BTC_WLINK_STA ; + bd->wl_bg_mode = wl->bg_mode | wl->bg_mode_hb1; + }else if (bd->wl_hwb_sel == (BIT (RTW89_MAC_1 ))) { + bd->wl_link_mode = wl->role_info.link_mode_hb1; + bd->wl_bg_mode = wl->bg_mode_hb1; + }else {/* HW-BAND-0 or no-hw-band */ + bd->wl_hwb_sel =BIT (RTW89_MAC_0 ); + bd->wl_link_mode = wl->role_info.link_mode; + bd->wl_bg_mode = wl->bg_mode; + }/* update Bind-BT status map for BT0/BT1 */ for (i =BTC_BT_1ST ; i <BTC_ALL_BT_EZL ; i++) {
@@ -7966,9 +7479,9 @@ static void _set_bind_info(struct rtw89_btc *btc, u8 type) bd->bt_smap.a2dp_sink |= b->a2dp_desc.sink; bd->bt_smap.pan_active |= b->pan_desc.active; bd->bt_smap.connect |= b->status.map.connect; - bd->bt_smap.hid_cnt += (u8 )b->hid_desc.pair_cnt; + bd->bt_smap.hid_cnt += b->hid_desc.pair_cnt; bd->bt_smap.hid_type |= b->hid_desc.type; - bd->bt_smap.cis_cnt += (u8 )b->leaudio_desc.cis_cnt; + bd->bt_smap.cis_cnt += b->leaudio_desc.cis_cnt; bd->bt_smap.link_cnt += b->link_cnt.now; bd->bt_smap.inq_page |= b->status.map.inq_pag; bd->bt_smap.page |= b->pag;
@@ -8028,7 +7541,7 @@ static void _set_coex_binding(struct rtw89_btc *btc)* ==> 1: interference, 0: no-interference * * fdm_map(Frequency-Division-Multiplexing): WL/BT RF_Band overlap-map -* 2bit-map: bit[1]:5GHz/6GHz, bit[0]:2.4GHz +* 2bit-map: bit[1]:5/6GHz, bit[0]:2.4GHz */ for (i =0 ; i <RTW89_PHY_NUM ; i++) {if (wl->rf_band_map[i] &BIT (RTW89_BAND_2G ))
@@ -8050,9 +7563,7 @@ static void _set_coex_binding(struct rtw89_btc *btc)* In this case, BTC_RF_S0->HWB0, BTC_RF_S1->HWB1 */ if (wl->mlo_info.wtype ==RTW89_MR_WTYPE_MLD2L1R_NONMLD ) { -if (wl->role_info.link_mode !=BTC_WLINK_2G_MCC && - wl->role_info.link_mode !=BTC_WLINK_25G_MCC && - wl->role_info.link_mode !=BTC_WLINK_25G_DBCC ) {/* mode chg */ +if (wl->role_info.link_mode !=BTC_WLINK_DB_MCC ) {/* mode chg */ if (wl->mlo_info.mrcx_act_hwb_map ==BIT (RTW89_PHY_1 )) path_hwb[BTC_RF_S0 ] =RTW89_PHY_1 ;/* S0/1->HWB1 */ else
@@ -8114,31 +7625,14 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason)struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_bt_info *bt = &btc->cx.bt0; -struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info; -struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1; -struct rtw89_btc_wl_role_info_v2 *wl_rinfo_v2 = &wl->role_info_v2; -struct rtw89_btc_wl_role_info_v7 *wl_rinfo_v7 = &wl->role_info_v7; -struct rtw89_btc_wl_role_info_v8 *wl_rinfo_v8 = &wl->role_info_v8; -u8 mode, igno_bt, always_freerun; +u8 mode = btc->dm.tdd_bind.wl_link_mode; +u8 mode_v0 = wl->role_info.link_mode_v0; +u8 igno_bt, always_freerun;lockdep_assert_wiphy (rtwdev->hw->wiphy); dm->run_reason = reason;_update_dm_step (rtwdev, reason); -_update_btc_state_map (rtwdev); - -if (ver->fwlrole ==0 ) - mode = wl_rinfo->link_mode; -else if (ver->fwlrole ==1 ) - mode = wl_rinfo_v1->link_mode; -else if (ver->fwlrole ==2 ) - mode = wl_rinfo_v2->link_mode; -else if (ver->fwlrole ==7 ) - mode = wl_rinfo_v7->link_mode; -else if (ver->fwlrole ==8 ) - mode = wl_rinfo_v8->link_mode; -else -return ;if (ver->fcxctrl ==7 ) { igno_bt = btc->ctrl.ctrl_v7.igno_bt;
@@ -8206,6 +7700,7 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason) igno_bt = false;_set_coex_binding (btc); +_update_btc_state_map (rtwdev); dm->freerun_chk =_check_freerun (rtwdev);/* check if meet freerun */
@@ -8253,43 +7748,76 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason) goto exit; } -switch (mode) { +if (mode ==BTC_WLINK_NOLINK ) { + mode_v0 =BTC_WLINK_V0_NOLINK ; + }else if (btc->dm.tdd_bind.rf_band ==BIT (RTW89_BAND_5G )) { + mode_v0 =BTC_WLINK_V0_5G ; + }else if (btc->dm.tdd_bind.rf_band &BIT (RTW89_BAND_5G ) && + btc->dm.tdd_bind.rf_band &BIT (RTW89_BAND_2G )) { + mode_v0 =BTC_WLINK_V0_25G_MCC ; + }else if (btc->dm.tdd_bind.rf_band ==BIT (RTW89_BAND_2G )) { +switch (mode) { +case BTC_WLINK_STA : + mode_v0 =BTC_WLINK_V0_2G_STA ; +break ; +case BTC_WLINK_AP : + mode_v0 =BTC_WLINK_V0_2G_AP ; +break ; +case BTC_WLINK_GO : + mode_v0 =BTC_WLINK_V0_2G_GO ; +break ; +case BTC_WLINK_GC : + mode_v0 =BTC_WLINK_V0_2G_GC ; +break ; +case BTC_WLINK_SCC : + mode_v0 =BTC_WLINK_V0_2G_SCC ; +break ; +case BTC_WLINK_SB_MCC : + mode_v0 =BTC_WLINK_V0_2G_MCC ; +break ; +default : + mode_v0 =BTC_WLINK_V0_OTHER ; +break ; + } + } + +switch (mode_v0) {case BTC_WLINK_NOLINK :_action_wl_nc (rtwdev);break ; -case BTC_WLINK_2G_STA : +case BTC_WLINK_V0_2G_STA :if (wl->status.map.traffic_dir &BIT (RTW89_TFC_DL )) bt->scan_rx_low_pri = true;_action_wl_2g_sta (rtwdev);break ; -case BTC_WLINK_2G_AP : +case BTC_WLINK_V0_2G_AP : bt->scan_rx_low_pri = true;_action_wl_2g_ap (rtwdev);break ; -case BTC_WLINK_2G_GO : +case BTC_WLINK_V0_2G_GO : bt->scan_rx_low_pri = true;_action_wl_2g_go (rtwdev);break ; -case BTC_WLINK_2G_GC : +case BTC_WLINK_V0_2G_GC : bt->scan_rx_low_pri = true;_action_wl_2g_gc (rtwdev);break ; -case BTC_WLINK_2G_SCC : +case BTC_WLINK_V0_2G_SCC : bt->scan_rx_low_pri = true;_action_wl_2g_scc (rtwdev);break ; -case BTC_WLINK_2G_MCC : +case BTC_WLINK_V0_2G_MCC : bt->scan_rx_low_pri = true;_action_wl_2g_mcc (rtwdev);break ; -case BTC_WLINK_25G_MCC : +case BTC_WLINK_V0_25G_MCC : bt->scan_rx_low_pri = true;_action_wl_25g_mcc (rtwdev);break ; -case BTC_WLINK_5G : +case BTC_WLINK_V0_5G :_action_wl_5g (rtwdev);break ; -case BTC_WLINK_2G_NAN : +case BTC_WLINK_V0_2G_NAN :_action_wl_2g_nan (rtwdev);break ;default :
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtw89/coex.h +34 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtw89/core.h +133 -20
153 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.c +263 -129
392 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +7 -41
48 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtw89/rtw8922d.c +1 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 01/11] wifi: rtw89: coex: Add Wi-Fi role info version 10
Quoted 8 lines · Ping-Ke Shih
From: Ching-Te Ku <[email protected]>
Because the new generation Bluetooth will able to work on 5/6GHz band, it will suffer 5/6GHz Wi-Fi, the mechanism need to cover more scenario with different Wi-Fi/Bluetooth combination.
Signed-off-by Ching-Te Ku <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
11 patch(es) applied to rtw-next branch of rtw.git, thanks.
af7f59e8e876 wifi: rtw89: coex: Add Wi-Fi role info version 10 3b6dd05aee28 wifi: rtw89: coex: Rearrange coexistence control structure 404edeea3b18 wifi: rtw89: coex: Update driver outsource info to firmware version 6 a20edfbc15a5 wifi: rtw89: ceox: Update antenna & grant signal setting 5d5a5eb7ae2e wifi: rtw89: coex: Rearrange Bluetooth firmware report entry a67bb858ba4d wifi: rtw89: coex: Refine send firmware command function aaba33e780f5 wifi: rtw89: coex: Refine _reset_btc_var()f59f0767348a wifi: rtw89: coex: Correct SET_RFE settings578f9b48276c wifi: rtw89: coex: Add firmware report control report v11 aed0d7771d52 wifi: rtw89: coex: update external control length by case c2d96cd05c17 wifi: rtw89: coex: Update coexistence version to 9.24.0
Ping-Ke Shih
maintainerPATCH 2/11 wifi: rtw89: coex: Rearrange coexistence control structure
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The control structure will record some Wi-Fi/Bluetooth status, and packed send to firmware. The new generation chip had offloaded many mechanism control to firmware, firmware may need update these very often to make sure run in correct mechanism.
--- drivers/net/wireless/realtek/rtw89/coex.c | 154 ++++++++++----------- drivers/net/wireless/realtek/rtw89/core.h | 76 ++++++++-- drivers/net/wireless/realtek/rtw89/debug.c | 6 +- drivers/net/wireless/realtek/rtw89/fw.c | 63 ++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 6 + 5 files changed, 207 insertions(+), 98 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +77 -77
@@ -295,10 +295,11 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = {static const union rtw89_btc_wl_state_map btc_scanning_map = { .map = { .scan =1 , - .connecting =1 , + .dhcp =1 , .roaming =1 , - .dbccing =1 , + .transacting =1 , ._4way =1 , + .handshake =1 , }, };
@@ -998,8 +999,7 @@ static void _reset_btc_var(struct rtw89_dev *rtwdev, u8 type)if (type &BTC_RESET_CTRL ) {memset (&btc->ctrl,0 ,sizeof (btc->ctrl)); btc->manual_ctrl = false; -if (ver->fcxctrl !=7 ) - btc->ctrl.ctrl.trace_step =FCXDEF_STEP ; + btc->ctrl.trace_step =FCXDEF_STEP ; }/* Init Coex variables that are not zero */
@@ -1601,7 +1601,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,case BTC_RPT_TYPE_STEP : pcinfo = &pfwinfo->rpt_fbtc_step.cinfo;if (ver->fcxctrl !=7 ) - trace_step = btc->ctrl.ctrl.trace_step; + trace_step = btc->ctrl.trace_step;if (ver->fcxstep ==2 ) { pfinfo = &pfwinfo->rpt_fbtc_step.finfo.v2;
@@ -3542,8 +3542,9 @@ static void _update_btc_state_map(struct rtw89_dev *rtwdev)struct rtw89_btc_bt_info *bt = &cx->bt0;struct rtw89_btc_bt_link_info *bt_linfo = &bt->link_info; -if (wl->status.map.connecting || wl->status.map._4way || - wl->status.map.roaming || wl->status.map.dbccing) { +if (wl->status.map.dhcp || wl->status.map._4way || + wl->status.map.roaming || wl->status.map.transacting || + wl->status.map.handshake) { cx->state_map =BTC_WLINKING ; }else if (wl->status.map.scan) {/* wl scan */ if (bt_linfo->status.map.inq_pag)
@@ -5883,7 +5884,6 @@ static void rtw89_tx_time_iter(void *data, struct ieee80211_sta *sta)static void _set_wl_tx_limit (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; -const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_wl_info *wl = &cx->wl;
@@ -5894,19 +5894,14 @@ static void _set_wl_tx_limit(struct rtw89_dev *rtwdev)struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;struct rtw89_txtime_data data = {.rtwdev = rtwdev};bool reenable = false; -u8 igno_bt, tx_retry; +u8 tx_retry;u32 tx_time;u16 enable;if (btc->manual_ctrl)return ; -if (ver->fcxctrl ==7 ) - igno_bt = btc->ctrl.ctrl_v7.igno_bt; -else - igno_bt = btc->ctrl.ctrl.igno_bt; - -if (btc->dm.freerun || igno_bt || b->link_cnt.now ==0 || +if (btc->dm.freerun || btc->ctrl.igno_bt || b->link_cnt.now ==0 || dm->tdd_bind.rf_band ==BIT (RTW89_BAND_5G ) || wl_rinfo->link_mode ==BTC_WLINK_NOLINK ) { enable =0 ;
@@ -6216,7 +6211,7 @@ static void _action_wl_scan(struct rtw89_dev *rtwdev)struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;if (btc->cx.state_map !=BTC_WLINKING && -RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw)) { + btc->ctrl.wl_ctrl_info.fw_scan) {_action_wl_25g_mcc (rtwdev);rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], Scan offload!\n" ); }else if (rtwdev->dbcc_en) {
@@ -7124,11 +7119,13 @@ void rtw89_coex_act1_work(struct wiphy *wiphy, struct wiphy_work *work)rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): enter\n" , __func__); dm->cnt_notify[BTC_NCNT_TIMER ]++; -if (wl->status.map._4way) - wl->status.map._4way = false; -if (wl->status.map.connecting) - wl->status.map.connecting = false; - +if (wl->status.map.handshake || + wl->status.map._4way || + wl->status.map.dhcp) { + wl->status.map._4way =0 ; + wl->status.map.dhcp =0 ; + wl->status.map.handshake =0 ; + }_run_coex (rtwdev,BTC_RSN_ACT1_WORK ); }
@@ -7616,32 +7613,53 @@ static void _set_coex_binding(struct rtw89_btc *btc) dm->ost_info.bt_enable_state = dm->bt_only ? _bind_is_btonly : val; } +static void _update_run_ctrl_info (struct rtw89_dev *rtwdev) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_dm *dm = &btc->dm; +struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_ctrl ctrl = btc->ctrl; +struct rtw89_fbtc_wl_ctrl_info *wl_ctrl_info = &ctrl.wl_ctrl_info; +u8 i; + + ctrl.wl_only = dm->wl_only; + ctrl.bt_only = dm->bt_only; + ctrl.ntfy_type = dm->run_reason; + + wl_ctrl_info->smap_val = wl->status.val; + wl_ctrl_info->rfk_state = wl->rfk_info.state; + wl_ctrl_info->rfk_type = wl->rfk_info.type; + wl_ctrl_info->client_pstdma_on = dm->client_ps_tdma_on; + wl_ctrl_info->fw_scan = wl->scan_info.fw_scan; + +for (i =RTW89_MAC_0 ; i <=RTW89_MAC_1 ; i++) { + wl_ctrl_info->rf_band_map[i] = wl->rf_band_map[i]; + wl_ctrl_info->rf_ch[i] = wl->rf_ch_info[i].center_ch; + } + +if (!memcmp (&btc->ctrl, &ctrl,sizeof (struct rtw89_btc_ctrl ))) { +memcpy (&btc->ctrl, &ctrl,sizeof (struct rtw89_btc_ctrl )); +if (btc->ver->fcxctrl >=9 ) +_fw_set_drv_info (rtwdev,CXDRVINFO_CTRL ); + } +} +static void _run_coex (struct rtw89_dev *rtwdev,enum btc_reason_and_action reason) {struct rtw89_btc *btc = &rtwdev->btc; -const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_dm *dm = &rtwdev->btc.dm;struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_bt_info *bt = &btc->cx.bt0;u8 mode = btc->dm.tdd_bind.wl_link_mode;u8 mode_v0 = wl->role_info.link_mode_v0; -u8 igno_bt, always_freerun;lockdep_assert_wiphy (rtwdev->hw->wiphy); dm->run_reason = reason;_update_dm_step (rtwdev, reason); -if (ver->fcxctrl ==7 ) { - igno_bt = btc->ctrl.ctrl_v7.igno_bt; - always_freerun = btc->ctrl.ctrl_v7.always_freerun; - }else { - igno_bt = btc->ctrl.ctrl.igno_bt; - always_freerun = btc->ctrl.ctrl.always_freerun; - } -rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): reason=%d, mode=%d\n" , __func__, reason, mode); rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): wl_only=%d, bt_only=%d\n",
@@ -7655,15 +7673,6 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason)return ; } -if (igno_bt && - (reason ==BTC_RSN_UPDATE_BT_INFO || - reason ==BTC_RSN_UPDATE_BT_SCBD )) { -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], %s(): return for Stop Coex DM!!\n" , - __func__); -return ; - } -if (!wl->status.map.init_ok) { rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): return for WL init fail!!\n",
@@ -7690,6 +7699,8 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason) } } +_update_run_ctrl_info (rtwdev); +if (reason ==BTC_RSN_NTFY_INIT || reason ==BTC_RSN_NTFY_RADIO_STATE )_update_bt_scbd (rtwdev, false);
@@ -7697,28 +7708,24 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason) dm->cnt_dm[BTC_DCNT_RUN ]++; dm->fddt_train =BTC_FDDT_DISABLE ; bt->scan_rx_low_pri = false; - igno_bt = false;_set_coex_binding (btc);_update_btc_state_map (rtwdev); dm->freerun_chk =_check_freerun (rtwdev);/* check if meet freerun */ -if (always_freerun) { +if (btc->ctrl.always_freerun) {_action_freerun (rtwdev); - igno_bt = true; goto exit; }if (dm->wl_only) {_action_wl_only (rtwdev); - igno_bt = true; goto exit; }if (wl->status.map.rf_off || dm->bt_only || wl->status.map.lps) {_action_wl_off (rtwdev, mode); - igno_bt = true; goto exit; }
@@ -7827,10 +7834,6 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason) exit:rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): exit\n" , __func__); -if (ver->fcxctrl ==7 ) - btc->ctrl.ctrl_v7.igno_bt = igno_bt; -else - btc->ctrl.ctrl.igno_bt = igno_bt;_action_common (rtwdev); }
@@ -7839,7 +7842,6 @@ void rtw89_btc_init(struct rtw89_dev *rtwdev)const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -const struct rtw89_btc_ver *ver = btc->ver; rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): Init %s !!\n", __func__,
@@ -7849,10 +7851,6 @@ void rtw89_btc_init(struct rtw89_dev *rtwdev) btc->dm.run_reason =BTC_RSN_NONE ; btc->dm.run_action =BTC_ACT_NONE ; -if (ver->fcxctrl >=7 ) - btc->ctrl.ctrl_v7.igno_bt = true; -else - btc->ctrl.ctrl.igno_bt = true; wl->status.map.init_ok = true; }
@@ -7937,7 +7935,6 @@ void rtw89_btc_ntfy_init(struct rtw89_dev *rtwdev, u8 mode)struct rtw89_btc_dm *dm = &rtwdev->btc.dm;struct rtw89_btc_wl_info *wl = &btc->cx.wl;const struct rtw89_chip_info *chip = rtwdev->chip; -const struct rtw89_btc_ver *ver = btc->ver;rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): mode=%d\n" , __func__, mode);
@@ -7948,10 +7945,7 @@ void rtw89_btc_ntfy_init(struct rtw89_dev *rtwdev, u8 mode) dm->bt_only = mode ==BTC_MODE_BT ?1 :0 ; wl->status.map.rf_off = mode ==BTC_MODE_WLOFF ?1 :0 ; dm->vid = rtwdev->custid; -if (ver->fcxctrl >=7 ) - btc->ctrl.ctrl_v7.always_freerun = mode ==BTC_MODE_COTX ; -else - btc->ctrl.ctrl.always_freerun = mode ==BTC_MODE_COTX ; + btc->ctrl.always_freerun = mode ==BTC_MODE_COTX ;if (!wl->status.map.init_ok) { rtw89_debug(rtwdev, RTW89_DBG_BTC,
@@ -8020,6 +8014,9 @@ void rtw89_btc_ntfy_scan_start(struct rtw89_dev *rtwdev, u8 phy_idx, u8 band)_fw_set_drv_info (rtwdev,CXDRVINFO_DBCC ); } +if (RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw)) + btc->ctrl.wl_ctrl_info.fw_scan =1 ; +_run_coex (rtwdev,BTC_RSN_NTFY_SCAN_START ); }
@@ -8086,14 +8083,18 @@ void rtw89_btc_ntfy_specific_packet(struct rtw89_dev *rtwdev, cnt = ++wl->wcnt[BTC_WCNT_DHCP ];rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): DHCP cnt=%d\n" , __func__, cnt); - wl->status.map.connecting = true; + wl->status.map.handshake =0 ; + wl->status.map._4way =0 ; + wl->status.map.dhcp =1 ; delay_work = true;break ;case PACKET_EAPOL : cnt = ++wl->wcnt[BTC_WCNT_EAPOL ];rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): EAPOL cnt=%d\n" , __func__, cnt); - wl->status.map._4way = true; + wl->status.map.handshake =0 ; + wl->status.map._4way =1 ; + wl->status.map.dhcp =0 ; delay_work = true;if (hfp->exist || hid->exist) delay /=2 ;
@@ -8103,7 +8104,7 @@ void rtw89_btc_ntfy_specific_packet(struct rtw89_dev *rtwdev,rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): EAPOL_End cnt=%d\n" , __func__, cnt); - wl->status.map._4way = false; + wl->status.map._4way =0 ;wiphy_delayed_work_cancel (rtwdev->hw->wiphy, &rtwdev->coex_act1_work);break ;case PACKET_ARP :
@@ -8435,10 +8436,16 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev, wlinfo->connected == MLME_NO_LINK) btc->dm.leak_ap =0 ; -if (state ==BTC_ROLE_MSTS_STA_CONN_START ) - wl->status.map.connecting =1 ; -else - wl->status.map.connecting =0 ; +if (state ==BTC_ROLE_MSTS_STA_CONN_START ) { + wl->status.map.transacting =1 ; +wiphy_delayed_work_cancel (rtwdev->hw->wiphy, &rtwdev->coex_act1_work); +wiphy_delayed_work_queue (rtwdev->hw->wiphy, + &rtwdev->coex_act1_work, +RTW89_COEX_ACT1_WORK_PERIOD ); + }else { +wiphy_delayed_work_cancel (rtwdev->hw->wiphy, &rtwdev->coex_act1_work); + wl->status.map.transacting =0 ; + }if (state ==BTC_ROLE_MSTS_STA_DIS_CONN || state ==BTC_ROLE_MSTS_STA_CONN_END )
@@ -9116,8 +9123,8 @@ static int _show_wl_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) wl->scan_info.band[RTW89_PHY_0], wl->scan_info.phy_map); p +=scnprintf (p, end - p, -"connecting:%s, roam:%s, 4way:%s, init_ok:%s\n" , - wl->status.map.connecting ?"Y" :"N" , +"handshake:%s, roam:%s, 4way:%s, init_ok:%s\n" , + wl->status.map.handshake ?"Y" :"N" , wl->status.map.roaming ?"Y" :"N" , wl->status.map._4way ?"Y" :"N" , wl->status.map.init_ok ?"Y" :"N" );
@@ -9718,12 +9725,10 @@ static int _show_dm_step(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)static int _show_dm_info (struct rtw89_dev *rtwdev,char *buf,size_t bufsz) {struct rtw89_btc *btc = &rtwdev->btc; -const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_bt_info *bt = &btc->cx.bt0;char *p = buf, *end = buf + bufsz; -u8 igno_bt;if (!(dm->coex_info_map &BTC_COEX_INFO_DM ))return 0 ;
@@ -9744,14 +9749,9 @@ static int _show_dm_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) p +=_show_dm_step (rtwdev, p, end - p); -if (ver->fcxctrl ==7 ) - igno_bt = btc->ctrl.ctrl_v7.igno_bt; -else - igno_bt = btc->ctrl.ctrl.igno_bt; - p +=scnprintf (p, end - p," %-15s : wl_only:%d, bt_only:%d, igno_bt:%d, free_run:%d, wl_ps_ctrl:%d, wl_mimo_ps:%d, " , -"[dm_flag]" , dm->wl_only, dm->bt_only, igno_bt, +"[dm_flag]" , dm->wl_only, dm->bt_only, btc->ctrl.igno_bt, dm->freerun, btc->btc_ctrl_lps, dm->wl_mimo_ps); p += scnprintf(p, end - p, "leak_ap:%d, fw_offload:%s%s\n",
@@ -10742,7 +10742,7 @@ static int _show_fbtc_step_v2(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)if (ver->fcxctrl ==7 || ver->fcxctrl ==1 ) trace_step =50 ;else - trace_step = btc->ctrl.ctrl.trace_step; + trace_step = btc->ctrl.trace_step; n_start = pos_old;if (pos_new >= pos_old)
drivers/net/wireless/realtek/rtw89/core.h +63 -13
125 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/debug.c +1 -5
@@ -3900,17 +3900,13 @@ static ssize_t rtw89_debug_priv_btc_manual_set(struct rtw89_dev *rtwdev, const char *buf, size_t count) {struct rtw89_btc *btc = &rtwdev->btc; -const struct rtw89_btc_ver *ver = btc->ver;int ret; ret =kstrtobool (buf, &btc->manual_ctrl);if (ret)return ret; -if (ver->fcxctrl ==7 ) - btc->ctrl.ctrl_v7.manual = btc->manual_ctrl; -else - btc->ctrl.ctrl.manual = btc->manual_ctrl; + btc->ctrl.manual = btc->manual_ctrl;return count; }
drivers/net/wireless/realtek/rtw89/fw.c +60 -3
81 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +6 -0
@@ -2430,6 +2430,11 @@ struct rtw89_h2c_cxctrl_v7 {struct rtw89_btc_ctrl_v7 ctrl; } __packed; +struct rtw89_h2c_cxctrl_v9 { +struct rtw89_h2c_cxhdr_v7 hdr; +struct rtw89_btc_ctrl_v9 ctrl; +} __packed; +#define H2C_LEN_CXDRVHDR sizeof(struct rtw89_h2c_cxhdr)#define H2C_LEN_CXDRVHDR_V7 sizeof(struct rtw89_h2c_cxhdr_v7)
@@ -5382,6 +5387,7 @@ int rtw89_fw_h2c_cxdrv_role_v10(struct rtw89_dev *rtwdev, u8 type);int rtw89_fw_h2c_cxdrv_osi_info (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_ctrl (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_ctrl_v7 (struct rtw89_dev *rtwdev,u8 type); +int rtw89_fw_h2c_cxdrv_ctrl_v9 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_trx_v7 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_trx_v9 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_rfk (struct rtw89_dev *rtwdev,u8 type);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/11 wifi: rtw89: coex: Update driver outsource info to firmware version 6
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
In order to make dual MAC Wi-Fi performance more stable, and take effect in time, offload more register/ hardware control to firmware.
--- drivers/net/wireless/realtek/rtw89/coex.c | 13 ++- drivers/net/wireless/realtek/rtw89/core.h | 89 +++++++++++++++++-- drivers/net/wireless/realtek/rtw89/fw.c | 101 +++++++++++++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 8 +- 4 files changed, 199 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +11 -2
@@ -2923,7 +2923,12 @@ static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 index)else return ; -rtw89_fw_h2c_cxdrv_osi_info (rtwdev, index); +if (ver->fcxosi ==1 ) +rtw89_fw_h2c_cxdrv_osi_info (rtwdev, index); +else if (ver->fcxosi ==6 ) +rtw89_fw_h2c_cxdrv_osi_info_v6 (rtwdev, index); +else +return ;break ;default :break ;
@@ -3090,7 +3095,11 @@ static void _set_gnt_v1(struct rtw89_dev *rtwdev, u8 phy_map, }memcpy (osi->gnt_set, dm->gnt.band,sizeof (osi->gnt_set)); -memcpy (osi->wlact_set, dm->gnt.bt,sizeof (osi->wlact_set)); + +for (i =0 ; i <BTC_ALL_BT ; i++) { + osi->wlact_set[i].wlan_act_en = dm->gnt.bt[i].wlan_act_en; + osi->wlact_set[i].wlan_act = dm->gnt.bt[i].wlan_act; + }/* GBT source should be GBT_S1 in 1+1 (HWB0:5G + HWB1:2G) case */ if (osi->rf_band[BTC_RF_S0] == 1 &&
drivers/net/wireless/realtek/rtw89/core.h +81 -8
114 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.c +100 -1
113 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +7 -1
@@ -2455,7 +2455,12 @@ struct rtw89_h2c_cxrole_v10 {struct rtw89_h2c_cxosi {struct rtw89_h2c_cxhdr_v7 hdr; -struct rtw89_btc_fbtc_outsrc_set_info osi; +struct rtw89_btc_fbtc_outsrc_set_info_v1 osi; +} __packed; + +struct rtw89_h2c_cxosi_v6 { +struct rtw89_h2c_cxhdr_v7 hdr; +struct rtw89_btc_fbtc_outsrc_set_info_v6 osi; } __packed;struct rtw89_h2c_cxinit {
@@ -5385,6 +5390,7 @@ int rtw89_fw_h2c_cxdrv_role_v7(struct rtw89_dev *rtwdev, u8 type);int rtw89_fw_h2c_cxdrv_role_v8 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_role_v10 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_osi_info (struct rtw89_dev *rtwdev,u8 type); +int rtw89_fw_h2c_cxdrv_osi_info_v6 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_ctrl (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_ctrl_v7 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_ctrl_v9 (struct rtw89_dev *rtwdev,u8 type);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/11 wifi: rtw89: ceox: Update antenna & grant signal setting
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Merge set antenna & grant signal logic. Combine all information to big structure for runtime logic using, only separate to version format while it is going to assign value to register or offload to firmware. Add new format for dual-BT & external BT for RTL8922D.
--- drivers/net/wireless/realtek/rtw89/coex.c | 501 ++++++++------------ drivers/net/wireless/realtek/rtw89/core.h | 4 +- drivers/net/wireless/realtek/rtw89/mac.c | 27 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 21 +- 4 files changed, 216 insertions(+), 337 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +189 -312
@@ -492,7 +492,7 @@ enum btc_ant_phase {BTC_ANT_WONLY ,BTC_ANT_WOFF ,BTC_ANT_W2G , -BTC_ANT_W5G , +BTC_ANT_FDD ,BTC_ANT_W25G ,BTC_ANT_FREERUN , BTC_ANT_WRFK,
@@ -841,7 +841,9 @@ enum btc_gnt_state {BTC_GNT_HW =0 ,BTC_GNT_SW_LO ,BTC_GNT_SW_HI , -BTC_GNT_MAX +BTC_GNT_MAX , + + BTC_GNT_SET_SKIP = 0xff, }; enum btc_ctr_path {
@@ -1787,8 +1789,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, dm->wl_fw_cx_offload = !!le32_to_cpu (prpt->v4.wl_fw_info.cx_offload);for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt.band[i], &prpt->v4.gnt_val[i], -sizeof (dm->gnt.band[i])); +memcpy (&dm->gnt_set[i], &prpt->v4.gnt_val[i], +sizeof (dm->gnt_set[i])); bt->bcnt[BTC_BCNT_HIPRI_TX ] =le32_to_cpu (prpt->v4.bt_cnt[BTC_BCNT_HI_TX ]);
@@ -1819,8 +1821,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, dm->wl_fw_cx_offload =0 ;for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt.band[i], &prpt->v5.gnt_val[i][0 ], -sizeof (dm->gnt.band[i])); +memcpy (&dm->gnt_set[i], &prpt->v5.gnt_val[i], +sizeof (dm->gnt_set[i])); bt->bcnt[BTC_BCNT_HIPRI_TX ] =le16_to_cpu (prpt->v5.bt_cnt[BTC_BCNT_HI_TX ]);
@@ -1846,8 +1848,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, dm->wl_fw_cx_offload =0 ;for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt.band[i], &prpt->v105.gnt_val[i][0 ], -sizeof (dm->gnt.band[i])); +memcpy (&dm->gnt_set[i], &prpt->v105.gnt_val[i], +sizeof (dm->gnt_set[i])); bt->bcnt[BTC_BCNT_HIPRI_TX ] =le16_to_cpu (prpt->v105.bt_cnt[BTC_BCNT_HI_TX_V105 ]);
@@ -1872,8 +1874,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, wl->ver_info.fw =le32_to_cpu (prpt->v7.rpt_info.fw_ver);for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt.band[i], &prpt->v7.gnt_val[i][0 ], -sizeof (dm->gnt.band[i])); +memcpy (&dm->gnt_set[i], &prpt->v7.gnt_val[i], +sizeof (dm->gnt_set[i])); bt->bcnt[BTC_BCNT_HIPRI_TX ] =le16_to_cpu (prpt->v7.bt_cnt[BTC_BCNT_HI_TX_V105 ]);
@@ -1904,8 +1906,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, wl->ver_info.fw =le32_to_cpu (prpt->v8.rpt_info.fw_ver);for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt.band[i], &prpt->v8.gnt_val[i][0 ], -sizeof (dm->gnt.band[i])); +memcpy (&dm->gnt_set[i], &prpt->v8.gnt_val[i], +sizeof (dm->gnt_set[i])); bt->bcnt[BTC_BCNT_HIPRI_TX ] =le16_to_cpu (prpt->v8.bt_cnt[BTC_BCNT_HI_TX_V105 ]);
@@ -2971,11 +2973,14 @@ void btc_fw_event(struct rtw89_dev *rtwdev, u8 evt_id, void *data, u32 len) btc->dm.scbd_b2w_update =0 ; } -static void _set_gnt (struct rtw89_dev *rtwdev,u8 phy_map,u8 wl_state,u8 bt_state) +static void _set_gnt (struct rtw89_dev *rtwdev,u8 phy_map, +u8 wl_state,u8 bt_state,u8 wlact_state) {struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_dm *dm = &btc->dm; -struct rtw89_mac_ax_gnt *g = dm->gnt.band; +struct rtw89_btc_fbtc_outsrc_set_info *o = &dm->ost_info; +struct rtw89_mac_ax_wl_act *wlact_set; +struct rtw89_mac_ax_coex_gnt mg;u8 i;if (phy_map >BTC_PHY_ALL )
@@ -2987,126 +2992,118 @@ static void _set_gnt(struct rtw89_dev *rtwdev, u8 phy_map, u8 wl_state, u8 bt_stswitch (wl_state) {case BTC_GNT_HW : - g[i].gnt_wl_sw_en =0 ; - g[i].gnt_wl =0 ; + dm->gnt_set[i].gnt_wl_sw_en =0 ; + dm->gnt_set[i].gnt_wl =0 ;break ;case BTC_GNT_SW_LO : - g[i].gnt_wl_sw_en =1 ; - g[i].gnt_wl =0 ; + dm->gnt_set[i].gnt_wl_sw_en =1 ; + dm->gnt_set[i].gnt_wl =0 ;break ;case BTC_GNT_SW_HI : - g[i].gnt_wl_sw_en =1 ; - g[i].gnt_wl =1 ; + dm->gnt_set[i].gnt_wl_sw_en =1 ; + dm->gnt_set[i].gnt_wl =1 ; +break ; +case BTC_GNT_SET_SKIP : +default :break ; }switch (bt_state) {case BTC_GNT_HW : - g[i].gnt_bt_sw_en =0 ; - g[i].gnt_bt =0 ; + dm->gnt_set[i].gnt_bt0_sw_en =0 ; + dm->gnt_set[i].gnt_bt0 =0 ; + dm->gnt_set[i].gnt_bt1_sw_en =0 ; + dm->gnt_set[i].gnt_bt1 =0 ; + dm->gnt_set[i].gnt_zb_sw_en =0 ; + dm->gnt_set[i].gnt_zb =0 ;break ;case BTC_GNT_SW_LO : - g[i].gnt_bt_sw_en =1 ; - g[i].gnt_bt =0 ; + dm->gnt_set[i].gnt_bt0_sw_en =1 ; + dm->gnt_set[i].gnt_bt0 =0 ; + dm->gnt_set[i].gnt_bt1_sw_en =1 ; + dm->gnt_set[i].gnt_bt1 =0 ; + dm->gnt_set[i].gnt_zb_sw_en =1 ; + dm->gnt_set[i].gnt_zb =0 ;break ;case BTC_GNT_SW_HI : - g[i].gnt_bt_sw_en =1 ; - g[i].gnt_bt =1 ; + dm->gnt_set[i].gnt_bt0_sw_en =1 ; + dm->gnt_set[i].gnt_bt0 =1 ; + dm->gnt_set[i].gnt_bt1_sw_en =1 ; + dm->gnt_set[i].gnt_bt1 =1 ; + dm->gnt_set[i].gnt_zb_sw_en =1 ; + dm->gnt_set[i].gnt_zb =1 ; +break ; +case BTC_GNT_SET_SKIP : +default :break ; } } -rtw89_chip_mac_cfg_gnt (rtwdev, &dm->gnt); -} - -static void _set_gnt_v1 (struct rtw89_dev *rtwdev,u8 phy_map, -u8 wl_state,u8 bt_state,u8 wlact_state) -{ -struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_dm *dm = &btc->dm; -struct rtw89_btc_fbtc_outsrc_set_info *osi = &dm->ost_info; -struct rtw89_mac_ax_wl_act *b = dm->gnt.bt; -struct rtw89_mac_ax_gnt *g = dm->gnt.band; -u8 i, bt_idx = dm->bt_select +1 ; - -if (phy_map >BTC_PHY_ALL ) -return ; - -for (i =0 ; i <RTW89_PHY_NUM ; i++) { -if (!(phy_map &BIT (i))) -continue ; +for (i =0 ; i <BTC_ALL_BT_EZL ; i++) { +if (!(rtwdev->chip->para_ver &BTC_FEAT_WLAN_ACT_MUX )) +break ; -switch (wl_state) { -case BTC_GNT_HW : - g[i].gnt_wl_sw_en =0 ; - g[i].gnt_wl =0 ; +switch (wlact_state) { +case BTC_WLACT_HW : + dm->wlact_set[i].wlan_act_en =0 ; + dm->wlact_set[i].wlan_act =0 ;break ; -case BTC_GNT_SW_LO : - g[i].gnt_wl_sw_en =1 ; - g[i].gnt_wl =0 ; +case BTC_WLACT_SW_LO : + dm->wlact_set[i].wlan_act_en =1 ; + dm->wlact_set[i].wlan_act =0 ;break ; -case BTC_GNT_SW_HI : - g[i].gnt_wl_sw_en =1 ; - g[i].gnt_wl =1 ; +case BTC_WLACT_SW_HI : + dm->wlact_set[i].wlan_act_en =1 ; + dm->wlact_set[i].wlan_act =1 ; +break ; +default :break ; } -switch (bt_state) { -case BTC_GNT_HW : - g[i].gnt_bt_sw_en =0 ; - g[i].gnt_bt =0 ; -break ; -case BTC_GNT_SW_LO : - g[i].gnt_bt_sw_en =1 ; - g[i].gnt_bt =0 ; -break ; -case BTC_GNT_SW_HI : - g[i].gnt_bt_sw_en =1 ; - g[i].gnt_bt =1 ; +if (!(rtwdev->chip->para_ver &BTC_FEAT_DUAL_BT ))break ; - } } -if (rtwdev->chip->para_ver &BTC_FEAT_WLAN_ACT_MUX ) { -for (i =0 ; i <2 ; i++) { -if (!(bt_idx &BIT (i))) -continue ; +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s(): phy_map=0x%x, gnt_wl:%d, gnt_bt:%d, wl_act:%d\n" , + __func__, phy_map, wl_state, bt_state, wlact_state); -switch (wlact_state) { -case BTC_WLACT_HW : - b[i].wlan_act_en =0 ; - b[i].wlan_act =0 ; -break ; -case BTC_WLACT_SW_LO : - b[i].wlan_act_en =1 ; - b[i].wlan_act =0 ; -break ; -case BTC_WLACT_SW_HI : - b[i].wlan_act_en =1 ; - b[i].wlan_act =1 ; -break ; +if (rtwdev->chip->para_ver &BTC_FEAT_H2C_MACRO ) { +if (o->rf_band[BTC_RF_S0 ] ==1 && o->rf_band[BTC_RF_S1 ] ==0 ) + o->rf_gbt_source =BTC_RF_S1 ; +else + o->rf_gbt_source =BTC_RF_S0 ; + +memcpy (o->wlact_set, dm->wlact_set,sizeof (o->wlact_set)); + +if (btc->ver->fcxosi ==6 ) { +memcpy (o->gnt_set_be, dm->gnt_set,sizeof (o->gnt_set_be)); +return ; + }else if (btc->ver->fcxosi ==1 ) { +for (i =0 ; i <RTW89_PHY_NUM ; i++) {/* gnt[MAC0/MAC1] */ + mg.band[i].gnt_bt_sw_en = dm->gnt_set[i].gnt_bt0_sw_en; + mg.band[i].gnt_bt = dm->gnt_set[i].gnt_bt0; + mg.band[i].gnt_wl_sw_en = dm->gnt_set[i].gnt_wl_sw_en; + mg.band[i].gnt_wl = dm->gnt_set[i].gnt_wl; +memcpy (o->gnt_set, mg.band,sizeof (o->gnt_set)); } +return ; } } -if (!btc->ver->fcxosi) { -rtw89_mac_cfg_gnt_v2 (rtwdev, &dm->gnt); -return ; +for (i =0 ; i <RTW89_PHY_NUM ; i++) {/* gnt[MAC0/MAC1] */ + mg.band[i].gnt_bt_sw_en = dm->gnt_set[i].gnt_bt0_sw_en; + mg.band[i].gnt_bt = dm->gnt_set[i].gnt_bt0; + mg.band[i].gnt_wl_sw_en = dm->gnt_set[i].gnt_wl_sw_en; + mg.band[i].gnt_wl = dm->gnt_set[i].gnt_wl; } - -memcpy (osi->gnt_set, dm->gnt.band,sizeof (osi->gnt_set)); - -for (i =0 ; i <BTC_ALL_BT ; i++) { - osi->wlact_set[i].wlan_act_en = dm->gnt.bt[i].wlan_act_en; - osi->wlact_set[i].wlan_act = dm->gnt.bt[i].wlan_act; +for (i =0 ; i <BTC_ALL_BT ; i++) {/* wlact[BT0/BT1] */ + wlact_set = &dm->wlact_set[i]; + mg.bt[i].wlan_act_en = wlact_set->wlan_act_en; + mg.bt[i].wlan_act = wlact_set->wlan_act; } -/* GBT source should be GBT_S1 in 1+1 (HWB0:5G + HWB1:2G) case */ -if (osi->rf_band[BTC_RF_S0 ] ==1 && - osi->rf_band[BTC_RF_S1 ] ==0 ) - osi->rf_gbt_source =BTC_RF_S1 ; -else - osi->rf_gbt_source =BTC_RF_S0 ; +rtw89_chip_mac_cfg_gnt (rtwdev, &mg); }#define BTC_TDMA_WLROLE_MAX 3
@@ -4961,157 +4958,22 @@ static void _set_bt_plut(struct rtw89_dev *rtwdev, u8 phy_map, } } -static void _set_ant_v0 (struct rtw89_dev *rtwdev,bool force_exec, -u8 phy_map,u8 type) +static void _set_ant (struct rtw89_dev *rtwdev,bool force_exec, +u8 phy_map,u8 type) {struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_wl_role_info *r = &btc->cx.wl.role_info; -struct rtw89_btc_bt_info *bt = &cx->bt0; -struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info; -u8 gwl, gwl0, gwl1, gbt, plt_ctrl, i, b2g =0 ; -u32 ant_path_type; - - ant_path_type = ((phy_map <<8 ) + type); - -if (btc->dm.run_reason ==BTC_RSN_NTFY_POWEROFF || - btc->dm.run_reason ==BTC_RSN_NTFY_RADIO_STATE || - btc->dm.run_reason ==BTC_RSN_CMD_SET_COEX || r->dbcc_chg) - force_exec =FC_EXEC ; - -if (!force_exec && ant_path_type == dm->set_ant_path) { -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], %s(): return by no change!!\n" , - __func__); -return ; - }else if (bt->rfk_info.map.run) { -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], %s(): return by bt rfk!!\n" , __func__); -return ; - }else if (btc->dm.run_reason !=BTC_RSN_NTFY_WL_RFK && - wl->rfk_info.state !=BTC_WRFK_STOP ) { -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], %s(): return by wl rfk!!\n" , __func__); -return ; - } - - dm->set_ant_path = ant_path_type; - -rtw89_debug (rtwdev, -RTW89_DBG_BTC , -"[BTC], %s(): path=0x%x, set_type=0x%x\n" , - __func__, phy_map, dm->set_ant_path &0xff ); - -switch (type) { -case BTC_ANT_WPOWERON : -rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_BT ); -break ; -case BTC_ANT_WINIT : -if (bt->enable.now) -_set_gnt (rtwdev, phy_map,BTC_GNT_SW_LO ,BTC_GNT_SW_HI ); -else -_set_gnt (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_SW_LO ); - -rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_WL ); -_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_BT ,BTC_PLT_BT ); -break ; -case BTC_ANT_WONLY : -_set_gnt (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_SW_LO ); -rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_WL ); -_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_NONE ,BTC_PLT_NONE ); -break ; -case BTC_ANT_WOFF : -rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_BT ); -_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_NONE ,BTC_PLT_NONE ); -break ; -case BTC_ANT_W2G : -rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_WL ); -if (rtwdev->dbcc_en) { -for (i =0 ; i <RTW89_PHY_NUM ; i++) { - b2g = (wl_dinfo->real_band[i] ==RTW89_BAND_2G ); - - gwl = b2g ?BTC_GNT_HW :BTC_GNT_SW_HI ; - gbt = b2g ?BTC_GNT_HW :BTC_GNT_SW_HI ; -/* BT should control by GNT_BT if WL_2G at S0 */ -if (i ==1 && - wl_dinfo->real_band[0 ] ==RTW89_BAND_2G && - wl_dinfo->real_band[1 ] ==RTW89_BAND_5G ) - gbt =BTC_GNT_HW ; -_set_gnt (rtwdev,BIT (i), gwl, gbt); - plt_ctrl = b2g ?BTC_PLT_BT :BTC_PLT_NONE ; -_set_bt_plut (rtwdev,BIT (i), - plt_ctrl, plt_ctrl); - } - }else { -_set_gnt (rtwdev, phy_map,BTC_GNT_HW ,BTC_GNT_HW ); -_set_bt_plut (rtwdev,BTC_PHY_ALL , -BTC_PLT_BT ,BTC_PLT_BT ); - } -break ; -case BTC_ANT_W5G : -rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_WL ); -_set_gnt (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_HW ); -_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_NONE ,BTC_PLT_NONE ); -break ; -case BTC_ANT_W25G : -rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_WL ); -_set_gnt (rtwdev, phy_map,BTC_GNT_HW ,BTC_GNT_HW ); -_set_bt_plut (rtwdev,BTC_PHY_ALL , -BTC_PLT_GNT_WL ,BTC_PLT_GNT_WL ); -break ; -case BTC_ANT_FREERUN : -rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_WL ); -_set_gnt (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_SW_HI ); -_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_NONE ,BTC_PLT_NONE ); -break ; -case BTC_ANT_WRFK : -case BTC_ANT_WRFK2 : -rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_WL ); -_set_gnt (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_SW_LO ); -_set_bt_plut (rtwdev, phy_map,BTC_PLT_NONE ,BTC_PLT_NONE ); -break ; -case BTC_ANT_PTA : -default : - gbt =BTC_GNT_HW ; -if ((rtwdev->chip->para_ver &BTC_FEAT_MULTI_PTA ) || - !r->dbcc_en) { - gwl =BTC_GNT_HW ; -_set_gnt (rtwdev,BTC_PHY_ALL , gwl, gbt); - }else { -/* for DBCC Only-1-PTA */ -if (r->dbcc_2g_phy ==RTW89_PHY_0 ) { - gwl0 =BTC_GNT_HW ; - gwl1 =BTC_GNT_SW_HI ; - }else { - gwl0 =BTC_GNT_SW_HI ; - gwl1 =BTC_GNT_HW ; - } -_set_gnt (rtwdev,BTC_PHY_0 , gwl0, gbt); -_set_gnt (rtwdev,BTC_PHY_1 , gwl1, gbt); - } -rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_WL ); -_set_bt_plut (rtwdev, phy_map,BTC_PLT_NONE ,BTC_PLT_NONE ); -break ; - } -} - -static void _set_ant_v1 (struct rtw89_dev *rtwdev,bool force_exec, -u8 phy_map,u8 type) -{ -struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_bt_info *bt = &btc->cx.bt0;struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;u32 ant_path_type =rtw89_get_antpath_type (phy_map, type); -struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;struct rtw89_btc_dm *dm = &btc->dm;u8 gwl =BTC_GNT_HW , gwl0, gwl1, gbt; +bool cx_ctrl; -if (btc->dm.run_reason ==BTC_RSN_NTFY_POWEROFF || - btc->dm.run_reason ==BTC_RSN_NTFY_RADIO_STATE || - btc->dm.run_reason ==BTC_RSN_CMD_SET_COEX || wl_rinfo->dbcc_chg) +if (btc->cli_h2c_cmd || wl_rinfo->dbcc_chg || + dm->run_reason ==BTC_RSN_NTFY_POWEROFF || + dm->run_reason ==BTC_RSN_NTFY_RADIO_STATE || + dm->run_reason ==BTC_RSN_CMD_SET_COEX ) force_exec =FC_EXEC ; if (wl_rinfo->link_mode != BTC_WLINK_DB_MCC &&
@@ -5123,10 +4985,6 @@ static void _set_ant_v1(struct rtw89_dev *rtwdev, bool force_exec,"[BTC], %s(): return by no change!!\n" , __func__);return ; - }else if (bt->rfk_info.map.run) { -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], %s(): return by bt rfk!!\n" , __func__); -return ; }else if (btc->dm.run_reason !=BTC_RSN_NTFY_WL_RFK && wl->rfk_info.state !=BTC_WRFK_STOP ) { rtw89_debug(rtwdev, RTW89_DBG_BTC,
@@ -5141,64 +4999,38 @@ static void _set_ant_v1(struct rtw89_dev *rtwdev, bool force_exec, __func__, phy_map, dm->set_ant_path & 0xff);switch (type) { +case BTC_ANT_WPOWERON : + cx_ctrl =BTC_CTRL_BY_BT ; +break ;case BTC_ANT_WINIT : + cx_ctrl =BTC_CTRL_BY_WL ;/* To avoid BT MP driver case (bt_enable but no mailbox) */ -if (bt->enable.now && bt->run_patch_code) -_set_gnt_v1 (rtwdev, phy_map,BTC_GNT_SW_LO ,BTC_GNT_SW_HI , -BTC_WLACT_SW_LO ); +if ((cx->bt0.enable.now && cx->bt0.run_patch_code) || + (cx->bt1.enable.now && cx->bt1.run_patch_code)) +_set_gnt (rtwdev,BTC_PHY_ALL ,BTC_GNT_SW_LO ,BTC_GNT_SW_HI , +BTC_WLACT_SW_LO );else -_set_gnt_v1 (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_SW_LO , -BTC_WLACT_SW_HI ); +_set_gnt (rtwdev,BTC_PHY_ALL ,BTC_GNT_SW_HI ,BTC_GNT_SW_LO , +BTC_WLACT_SW_HI );break ;case BTC_ANT_WONLY : -_set_gnt_v1 (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_SW_LO , -BTC_WLACT_SW_HI ); + cx_ctrl =BTC_CTRL_BY_WL ; +_set_gnt (rtwdev,BTC_PHY_ALL ,BTC_GNT_SW_HI ,BTC_GNT_SW_LO , +BTC_WLACT_SW_HI );break ;case BTC_ANT_WOFF : -_set_gnt_v1 (rtwdev, phy_map,BTC_GNT_SW_LO ,BTC_GNT_SW_HI , -BTC_WLACT_SW_LO ); -break ; -case BTC_ANT_W2G : -case BTC_ANT_W25G : -if (wl_rinfo->dbcc_en) { -if (wl_dinfo->real_band[RTW89_PHY_0 ] ==RTW89_BAND_2G ) - gwl =BTC_GNT_HW ; -else - gwl =BTC_GNT_SW_HI ; -_set_gnt_v1 (rtwdev,BTC_PHY_0 , gwl,BTC_GNT_HW ,BTC_WLACT_HW ); - -if (wl_dinfo->real_band[RTW89_PHY_1 ] ==RTW89_BAND_2G ) - gwl =BTC_GNT_HW ; -else - gwl =BTC_GNT_SW_HI ; -_set_gnt_v1 (rtwdev,BTC_PHY_1 , gwl,BTC_GNT_HW ,BTC_WLACT_HW ); - }else { - gwl =BTC_GNT_HW ; -_set_gnt_v1 (rtwdev, phy_map, gwl,BTC_GNT_HW ,BTC_WLACT_HW ); - } -break ; -case BTC_ANT_W5G : -_set_gnt_v1 (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_HW ,BTC_WLACT_HW ); -break ; -case BTC_ANT_FREERUN : -_set_gnt_v1 (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_SW_HI , -BTC_WLACT_SW_LO ); -break ; -case BTC_ANT_WRFK : -_set_gnt_v1 (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_SW_LO , -BTC_WLACT_HW ); -break ; -case BTC_ANT_WRFK2 : -_set_gnt_v1 (rtwdev, phy_map,BTC_GNT_SW_HI ,BTC_GNT_SW_LO , -BTC_WLACT_SW_HI );/* no BT-Tx */ + cx_ctrl =BTC_CTRL_BY_BT ; +_set_gnt (rtwdev,BTC_PHY_ALL ,BTC_GNT_SW_LO ,BTC_GNT_SW_HI , +BTC_WLACT_SW_LO );break ;case BTC_ANT_PTA :default : + cx_ctrl =BTC_CTRL_BY_WL ; gbt =BTC_GNT_HW ;if ((rtwdev->chip->para_ver &BTC_FEAT_MULTI_PTA ) || !wl_rinfo->dbcc_en) { gwl =BTC_GNT_HW ; -_set_gnt_v1 (rtwdev,BTC_PHY_ALL , gwl, gbt,BTC_WLACT_HW ); +_set_gnt (rtwdev,BTC_PHY_ALL , gwl, gbt,BTC_WLACT_HW ); }else {/* for DBCC Only-1-PTA */ if (wl_rinfo->dbcc_2g_phy ==RTW89_PHY_0 ) {
@@ -5208,24 +5040,36 @@ static void _set_ant_v1(struct rtw89_dev *rtwdev, bool force_exec, gwl0 =BTC_GNT_SW_HI ; gwl1 =BTC_GNT_HW ; } -_set_gnt_v1 (rtwdev,BTC_PHY_0 , gwl0, gbt,BTC_WLACT_HW ); -_set_gnt_v1 (rtwdev,BTC_PHY_1 , gwl1, gbt,BTC_WLACT_HW ); +_set_gnt (rtwdev,BTC_PHY_0 , gwl0, gbt,BTC_WLACT_HW ); +_set_gnt (rtwdev,BTC_PHY_1 , gwl1, gbt,BTC_WLACT_HW ); }break ; +case BTC_ANT_FDD : + cx_ctrl =BTC_CTRL_BY_WL ; +_set_gnt (rtwdev,BTC_PHY_ALL ,BTC_GNT_SW_HI ,BTC_GNT_HW , +BTC_WLACT_HW ); +break ; +case BTC_ANT_FREERUN : + cx_ctrl =BTC_CTRL_BY_WL ; +_set_gnt (rtwdev,BTC_PHY_ALL ,BTC_GNT_SW_HI ,BTC_GNT_SW_HI , +BTC_WLACT_SW_LO ); +break ; +case BTC_ANT_WRFK : + cx_ctrl =BTC_CTRL_BY_WL ; +_set_gnt (rtwdev,BTC_PHY_ALL ,BTC_GNT_SW_HI ,BTC_GNT_SW_LO , +BTC_WLACT_HW ); +break ; +case BTC_ANT_WRFK2 : + cx_ctrl =BTC_CTRL_BY_WL ; +_set_gnt (rtwdev,BTC_PHY_ALL ,BTC_GNT_SW_HI ,BTC_GNT_SW_LO , +BTC_WLACT_SW_HI );/* no BT-Tx */ +break ; } +rtw89_chip_cfg_ctrl_path (rtwdev, cx_ctrl);_set_bt_plut (rtwdev, phy_map,BTC_PLT_GNT_WL ,BTC_PLT_GNT_WL ); } -static void _set_ant (struct rtw89_dev *rtwdev,bool force_exec, -u8 phy_map,u8 type) -{ -if (rtwdev->chip->chip_id >=RTL8922A ) -_set_ant_v1 (rtwdev, force_exec, phy_map, type); -else -_set_ant_v0 (rtwdev, force_exec, phy_map, type); -} -static void _action_wl_only (struct rtw89_dev *rtwdev) {_set_ant (rtwdev,FC_EXEC ,BTC_PHY_ALL ,BTC_ANT_WONLY );
@@ -5619,7 +5463,7 @@ static void _action_bt_a2dp_pan_hid(struct rtw89_dev *rtwdev)static void _action_wl_5g (struct rtw89_dev *rtwdev) { -_set_ant (rtwdev,NM_EXEC ,BTC_PHY_ALL ,BTC_ANT_W5G ); +_set_ant (rtwdev,NM_EXEC ,BTC_PHY_ALL ,BTC_ANT_FDD );_set_policy (rtwdev,BTC_CXP_OFF_EQ0 ,BTC_ACT_WL_5G ); }
@@ -9674,7 +9518,7 @@ static const char *id_to_ant(u32 id)CASE_BTC_ANTPATH_STR (WONLY );CASE_BTC_ANTPATH_STR (WOFF );CASE_BTC_ANTPATH_STR (W2G ); -CASE_BTC_ANTPATH_STR (W5G ); +CASE_BTC_ANTPATH_STR (FDD );CASE_BTC_ANTPATH_STR (W25G );CASE_BTC_ANTPATH_STR (FREERUN );CASE_BTC_ANTPATH_STR (WRFK );
@@ -10898,6 +10742,7 @@ static int _show_fw_dm_msg(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)static void _get_gnt (struct rtw89_dev *rtwdev,struct rtw89_mac_ax_coex_gnt *gnt_cfg) {const struct rtw89_chip_info *chip = rtwdev->chip; +struct rtw89_mac_ax_wl_act *bt;struct rtw89_mac_ax_gnt *gnt;u32 val, status;
@@ -10932,7 +10777,39 @@ static void _get_gnt(struct rtw89_dev *rtwdev, struct rtw89_mac_ax_coex_gnt *gnt gnt->gnt_bt = !!(status &B_AX_GNT_BT_RFC_S1 ); gnt->gnt_wl_sw_en = !!(val &B_AX_GNT_WL_RFC_S1_SWCTRL ); gnt->gnt_wl = !!(status &B_AX_GNT_WL_RFC_S1 ); - }else { + + bt = &gnt_cfg->bt[0 ]; + bt->wlan_act_en = !!(val &B_BE_WL_ACT_SWCTRL ); + bt->wlan_act = !!(status &B_BE_WL_ACT_VAL ); + + bt = &gnt_cfg->bt[1 ]; + bt->wlan_act_en = !!(val &B_BE_WL_ACT2_SWCTRL ); + bt->wlan_act = !!(status &B_BE_WL_ACT2_VAL ); + }else if (chip->chip_id ==RTL8922A ) { + val =rtw89_read32 (rtwdev,R_BE_GNT_SW_CTRL ); + status =rtw89_read32 (rtwdev,R_BE_PTA_GNT_VAL ); + + gnt = &gnt_cfg->band[0 ]; + gnt->gnt_bt_sw_en = !!(val &B_BE_GNT_BT_BB0_SWCTRL ); + gnt->gnt_bt = !!(status &B_BE_GNT_BT_BB0_VAL ); + gnt->gnt_wl_sw_en = !!(val &B_BE_GNT_WL_BB0_SWCTRL ); + gnt->gnt_wl = !!(status &B_BE_GNT_WL_BB0_VAL ); + + gnt = &gnt_cfg->band[1 ]; + gnt->gnt_bt_sw_en = !!(val &B_BE_GNT_BT_BB1_SWCTRL ); + gnt->gnt_bt = !!(status &B_BE_GNT_BT_BB1_VAL ); + gnt->gnt_wl_sw_en = !!(val &B_BE_GNT_WL_BB1_SWCTRL ); + gnt->gnt_wl = !!(status &B_BE_GNT_WL_BB1_VAL ); + + bt = &gnt_cfg->bt[0 ]; + bt->wlan_act_en = !!(val &B_BE_WL_ACT_SWCTRL ); + bt->wlan_act = !!(status &B_BE_WL_ACT_VAL ); + + bt = &gnt_cfg->bt[1 ]; + bt->wlan_act_en = !!(val &B_BE_WL_ACT2_SWCTRL ); + bt->wlan_act = !!(status &B_BE_WL_ACT2_VAL ); + }else if (chip->chip_id ==RTL8922D ) { +/* Get from firmware */ return ; } }
@@ -11181,7 +11058,6 @@ static int _show_mreg_v7(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)struct rtw89_btc_bt_info *bt0 = &cx->bt0;struct rtw89_btc_bt_info *bt1 = &cx->bt1;struct rtw89_btc_wl_info *wl = &cx->wl; -struct rtw89_mac_ax_gnt *gnt =NULL ;struct rtw89_btc_dm *dm = &btc->dm;char *p = buf, *end = buf + bufsz;u8 i, type, cnt =0 ;
@@ -11219,18 +11095,19 @@ static int _show_mreg_v7(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) wl->pta_req_mac, id_to_polut(wl->bt_polut_type[wl->pta_req_mac])); - gnt = &dm->gnt.band[RTW89_PHY_0 ]; - p +=scnprintf (p, end - p,", phy-0[gnt_wl:%s-%d/gnt_bt:%s-%d]" , - gnt->gnt_wl_sw_en ?"SW" :"HW" , gnt->gnt_wl, - gnt->gnt_bt_sw_en ?"SW" :"HW" , gnt->gnt_bt); + dm->gnt_set[RTW89_PHY_0 ].gnt_wl_sw_en ?"SW" :"HW" , + dm->gnt_set[RTW89_PHY_0 ].gnt_wl, + dm->gnt_set[RTW89_PHY_0 ].gnt_bt0_sw_en ?"SW" :"HW" , + dm->gnt_set[RTW89_PHY_0 ].gnt_bt0);if (rtwdev->dbcc_en) { - gnt = &dm->gnt.band[RTW89_PHY_1 ]; p +=scnprintf (p, end - p,", phy-1[gnt_wl:%s-%d/gnt_bt:%s-%d]" , - gnt->gnt_wl_sw_en ?"SW" :"HW" , gnt->gnt_wl, - gnt->gnt_bt_sw_en ?"SW" :"HW" , gnt->gnt_bt); + dm->gnt_set[RTW89_PHY_1 ].gnt_wl_sw_en ?"SW" :"HW" , + dm->gnt_set[RTW89_PHY_1 ].gnt_wl, + dm->gnt_set[RTW89_PHY_1 ].gnt_bt0_sw_en ?"SW" :"HW" , + dm->gnt_set[RTW89_PHY_1 ].gnt_bt0); } pcinfo = &pfwinfo->rpt_fbtc_mregval.cinfo;
drivers/net/wireless/realtek/rtw89/core.h +3 -1
@@ -3481,7 +3481,9 @@ struct rtw89_btc_dm {union rtw89_btc_fbtc_slot_u slot_now;struct rtw89_btc_fbtc_tdma tdma;struct rtw89_btc_fbtc_tdma tdma_now; -struct rtw89_mac_ax_coex_gnt gnt; +struct rtw89_btc_gnt_ctrl gnt_set[RTW89_MAC_AX_COEX_GNT_NR ]; +struct rtw89_btc_gnt_ctrl gnt_val[RTW89_MAC_AX_COEX_GNT_NR ]; +struct rtw89_mac_ax_wl_act wlact_set[BTC_ALL_BT_EZL ];union rtw89_btc_init_info_u init_info;/* pass to wl_fw if offload */ struct rtw89_btc_rf_trx_para_v9 rf_trx_para;struct rtw89_btc_wl_tx_limit_para wl_tx_limit;
drivers/net/wireless/realtek/rtw89/mac.c +15 -12
@@ -6538,8 +6538,6 @@ int rtw89_mac_cfg_gnt_v1(struct rtw89_dev *rtwdev,if (gnt_cfg->band[0 ].gnt_bt) val |=B_AX_GNT_BT_RFC_S0_VAL |B_AX_GNT_BT_RX_VAL |B_AX_GNT_BT_TX_VAL ; -else - val |=B_AX_WL_ACT_VAL ;if (gnt_cfg->band[0 ].gnt_bt_sw_en) val |= B_AX_GNT_BT_RFC_S0_SWCTRL | B_AX_GNT_BT_RX_SWCTRL |
@@ -6556,8 +6554,6 @@ int rtw89_mac_cfg_gnt_v1(struct rtw89_dev *rtwdev,if (gnt_cfg->band[1 ].gnt_bt) val |=B_AX_GNT_BT_RFC_S1_VAL |B_AX_GNT_BT_RX_VAL |B_AX_GNT_BT_TX_VAL ; -else - val |=B_AX_WL_ACT_VAL ;if (gnt_cfg->band[1 ].gnt_bt_sw_en) val |= B_AX_GNT_BT_RFC_S1_SWCTRL | B_AX_GNT_BT_RX_SWCTRL |
@@ -6571,6 +6567,15 @@ int rtw89_mac_cfg_gnt_v1(struct rtw89_dev *rtwdev, val |=B_AX_GNT_WL_RFC_S1_SWCTRL |B_AX_GNT_WL_RX_SWCTRL |B_AX_GNT_WL_TX_SWCTRL |B_AX_GNT_WL_BB_SWCTRL ; +if (gnt_cfg->bt[0 ].wlan_act_en) + val |=B_AX_WL_ACT_SWCTRL ; +if (gnt_cfg->bt[0 ].wlan_act) + val |=B_AX_WL_ACT_VAL ; +if (gnt_cfg->bt[1 ].wlan_act_en) + val |=B_AX_WL_ACT2_SWCTRL ; +if (gnt_cfg->bt[1 ].wlan_act) + val |=B_AX_WL_ACT2_VAL ; +rtw89_write32 (rtwdev,R_AX_GNT_SW_CTRL , val);return 0 ;
@@ -6645,22 +6650,20 @@ EXPORT_SYMBOL(rtw89_mac_cfg_ctrl_path);int rtw89_mac_cfg_ctrl_path_v1 (struct rtw89_dev *rtwdev,bool wl) { -struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_dm *dm = &btc->dm; -struct rtw89_mac_ax_gnt *g = dm->gnt.band; +struct rtw89_mac_ax_coex_gnt gnt = {};int i;if (wl)return 0 ;for (i =0 ; i <RTW89_PHY_NUM ; i++) { - g[i].gnt_bt_sw_en =1 ; - g[i].gnt_bt =1 ; - g[i].gnt_wl_sw_en =1 ; - g[i].gnt_wl =0 ; + gnt.band[i].gnt_bt_sw_en =1 ; + gnt.band[i].gnt_bt =1 ; + gnt.band[i].gnt_wl_sw_en =1 ; + gnt.band[i].gnt_wl =0 ; } -return rtw89_mac_cfg_gnt_v1 (rtwdev, &dm->gnt); +return rtw89_mac_cfg_gnt_v1 (rtwdev, &gnt); }EXPORT_SYMBOL (rtw89_mac_cfg_ctrl_path_v1);
drivers/net/wireless/realtek/rtw89/mac_be.c +9 -12
@@ -2466,29 +2466,26 @@ EXPORT_SYMBOL(rtw89_mac_cfg_gnt_v3);int rtw89_mac_cfg_ctrl_path_v2 (struct rtw89_dev *rtwdev,bool wl) { -struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_dm *dm = &btc->dm; -struct rtw89_mac_ax_gnt *g = dm->gnt.band; -struct rtw89_mac_ax_wl_act *gbt = dm->gnt.bt;const struct rtw89_chip_info *chip = rtwdev->chip; +struct rtw89_mac_ax_coex_gnt gnt = {};int i;if (wl)return 0 ;for (i =0 ; i <RTW89_PHY_NUM ; i++) { - g[i].gnt_bt_sw_en =1 ; - g[i].gnt_bt =1 ; - g[i].gnt_wl_sw_en =1 ; - g[i].gnt_wl =0 ; - gbt[i].wlan_act =1 ; - gbt[i].wlan_act_en =0 ; + gnt.band[i].gnt_bt_sw_en =1 ; + gnt.band[i].gnt_bt =1 ; + gnt.band[i].gnt_wl_sw_en =1 ; + gnt.band[i].gnt_wl =0 ; + gnt.bt[i].wlan_act =1 ; + gnt.bt[i].wlan_act_en =0 ; }if (chip->chip_id ==RTL8922A ) -return rtw89_mac_cfg_gnt_v2 (rtwdev, &dm->gnt); +return rtw89_mac_cfg_gnt_v2 (rtwdev, &gnt);else -return rtw89_mac_cfg_gnt_v3 (rtwdev, &dm->gnt); +return rtw89_mac_cfg_gnt_v3 (rtwdev, &gnt); }EXPORT_SYMBOL (rtw89_mac_cfg_ctrl_path_v2);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/11 wifi: rtw89: coex: Rearrange Bluetooth firmware report entry
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
To enable/disable firmware report once at the end of mechanism round. This can make the logic more clearly, and make sure every round the mechanism running can refresh the settings. It can avoid some report missing after driver status change.
--- drivers/net/wireless/realtek/rtw89/coex.c | 209 +++++++++++----------- 1 file changed, 104 insertions(+), 105 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +104 -105
@@ -2659,37 +2659,27 @@ static void rtw89_btc_fw_set_slots(struct rtw89_dev *rtwdev) }static void rtw89_btc_fw_en_rpt (struct rtw89_dev *rtwdev, -u32 rpt_map,bool rpt_state) +bool force_exec,u32 rpt_map) {struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_wl_smap *wl_smap = &btc->cx.wl.status.map;struct rtw89_btc_btf_fwinfo *fwinfo = &btc->fwinfo;union rtw89_fbtc_rtp_ctrl r; -u32 val, bit_map;int ret; +u32 i; -if ((wl_smap->rf_off || wl_smap->lps !=BTC_LPS_OFF ) && rpt_state !=0 ) +if (!force_exec && rpt_map == fwinfo->rpt_en_map)return ; - bit_map =rtw89_btc_fw_rpt_ver (rtwdev, rpt_map); - -rtw89_debug (rtwdev,RTW89_DBG_BTC , -"[BTC], %s(): rpt_map=%x, rpt_state=%x\n" , - __func__, rpt_map, rpt_state); - -if (rpt_state) - val = fwinfo->rpt_en_map | bit_map; -else - val = fwinfo->rpt_en_map & ~bit_map; - -if (val == fwinfo->rpt_en_map) -return ; +rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): rpt_map=%x\n" , + __func__, fwinfo->rpt_en_map); -if (btc->ver->fcxbtcrpt ==7 || btc->ver->fcxbtcrpt ==8 ) { +if (btc->ver->fcxbtcrpt ==7 || + btc->ver->fcxbtcrpt ==8 || + btc->ver->fcxbtcrpt ==11 ) { r.v8.type =SET_REPORT_EN ; r.v8.fver = btc->ver->fcxbtcrpt; r.v8.len =sizeof (r.v8.map); - r.v8.map =cpu_to_le32 (val); + r.v8.map =cpu_to_le32 (rpt_map); ret =_send_fw_cmd (rtwdev,BTFC_SET ,SET_REPORT_EN , &r.v8,sizeof (r.v8)); }else {
@@ -2697,14 +2687,21 @@ static void rtw89_btc_fw_en_rpt(struct rtw89_dev *rtwdev, r.v1.fver =5 ; else r.v1.fver = btc->ver->fcxbtcrpt; - r.v1.enable =cpu_to_le32 (val); - r.v1.para =cpu_to_le32 (rpt_state); - ret =_send_fw_cmd (rtwdev,BTFC_SET ,SET_REPORT_EN , &r.v1, -sizeof (r.v1)); + +for (i =0 ; i <RPT_EN_MONITER ; i++) { + r.v1.enable =cpu_to_le32 (i); +if (rpt_map &BIT (i)) + r.v1.para =cpu_to_le32 (1 ); +else + r.v1.para =0 ; + + ret =_send_fw_cmd (rtwdev,BTFC_SET ,SET_REPORT_EN , + &r.v1,sizeof (r.v1)); + } }if (!ret) - fwinfo->rpt_en_map = val; + fwinfo->rpt_en_map = rpt_map; }static void btc_fw_set_monreg (struct rtw89_dev *rtwdev)
@@ -2766,8 +2763,6 @@ static void btc_fw_set_monreg(struct rtw89_dev *rtwdev)rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): sz=%d ulen=%d n=%d\n" , __func__, sz, ulen, n); - -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_MREG ,1 ); } static void _update_dm_step(struct rtw89_dev *rtwdev,
@@ -5882,15 +5877,72 @@ static void _update_zb_coex_tbl(struct rtw89_dev *rtwdev)rtw89_write32 (rtwdev,R_BTC_ZB_COEX_TBL_1 , zb_tbl1); } +static void _set_fw_report_map (struct rtw89_dev *rtwdev) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_wl_smap *wl_smap = &btc->cx.wl.status.map; +struct rtw89_btc_bt_info *bt0 = &btc->cx.bt0; +struct rtw89_btc_bt_info *bt1 = &btc->cx.bt1; +u32 rpt_map = btc->fwinfo.rpt_en_map; +u32 bt_rom_code_id, bt_fw_ver; +bool bt_ver_unknown = false; +u32 bitmap; + +if (wl_smap->rf_off ==1 || wl_smap->lps !=BTC_LPS_OFF ) { +rtw89_btc_fw_en_rpt (rtwdev, false,0 ); +return ; + } + + rpt_map |=rtw89_btc_fw_rpt_ver (rtwdev,RPT_EN_MREG ); + + bitmap =rtw89_btc_fw_rpt_ver (rtwdev,RPT_EN_BT_SCAN_INFO ); +if ((bt0->run_patch_code && bt0->enable.now) || + (bt1->run_patch_code && bt1->enable.now)) + rpt_map |= bitmap; +else + rpt_map &= ~bitmap; + + bt_rom_code_id =chip_id_to_bt_rom_code_id (rtwdev->btc.ver->chip_id); + bt_fw_ver = bt0->ver_info.fw &0xffff ; +if (bt_fw_ver ==0 || + (bt_fw_ver == bt_rom_code_id && bt0->run_patch_code)) + bt_ver_unknown = true; + + bitmap =rtw89_btc_fw_rpt_ver (rtwdev,RPT_EN_BT_VER_INFO ); +if (bt0->enable.now && bt_ver_unknown) + rpt_map |= bitmap; +else + rpt_map &= ~bitmap; + + bitmap =rtw89_btc_fw_rpt_ver (rtwdev,RPT_EN_BT_AFH_MAP ) | +rtw89_btc_fw_rpt_ver (rtwdev,RPT_EN_BT_AFH_MAP_LE ) | +rtw89_btc_fw_rpt_ver (rtwdev,RPT_EN_BT_TX_PWR_LVL ); +if (bt0->link_info.link_cnt.now || + bt0->link_info_56g.link_cnt.now || + bt1->link_info.link_cnt.now || + bt1->link_info_56g.link_cnt.now) + rpt_map |= bitmap; +else + rpt_map &= ~bitmap; + + bitmap =rtw89_btc_fw_rpt_ver (rtwdev,RPT_EN_BT_DEVICE_INFO ); +if ((bt0->link_info.a2dp_desc.exist && + bt0->link_info.a2dp_desc.play_latency) || + (bt1->link_info.a2dp_desc.exist && + bt1->link_info.a2dp_desc.play_latency)) + rpt_map |= bitmap; +else + rpt_map &= ~bitmap; + +rtw89_btc_fw_en_rpt (rtwdev, false, rpt_map); +} +static void _action_common (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_wl_role_info *rinfo = &wl->role_info; -struct rtw89_btc_wl_smap *wl_smap = &wl->status.map; -struct rtw89_btc_bt_info *bt = &btc->cx.bt0;struct rtw89_btc_dm *dm = &btc->dm; -u32 bt_rom_code_id, bt_fw_ver;u8 i;_wl_req_mac (rtwdev, rinfo->pta_req_band);
@@ -5902,27 +5954,13 @@ static void _action_common(struct rtw89_dev *rtwdev)_set_bt_rx_agc (rtwdev);_set_rf_trx_para (rtwdev);_set_bt_rx_scan_pri (rtwdev); - - bt_rom_code_id =chip_id_to_bt_rom_code_id (rtwdev->btc.ver->chip_id); - bt_fw_ver = bt->ver_info.fw &0xffff ; -if (bt->enable.now && - (bt_fw_ver ==0 || - (bt_fw_ver == bt_rom_code_id && bt->run_patch_code && rtwdev->chip->scbd))) -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_VER_INFO ,1 ); -else -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_VER_INFO ,0 ); +_set_fw_report_map (rtwdev);if (dm->run_reason ==BTC_RSN_NTFY_INIT || dm->run_reason ==BTC_RSN_NTFY_RADIO_STATE || - dm->run_reason ==BTC_RSN_NTFY_POWEROFF ) { + dm->run_reason ==BTC_RSN_NTFY_POWEROFF )_fw_set_drv_info (rtwdev,CXDRVINFO_ROLE ); -if (wl_smap->rf_off ==1 || wl_smap->lps !=BTC_LPS_OFF ) -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_ALL ,0 ); -else -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_MREG ,1 ); - } -for (i =BTC_BT_1ST ; i <=BTC_BT_2ND ; i++)_sned_h2c_w2bscbd (rtwdev, false, i);
@@ -7730,8 +7768,6 @@ void rtw89_btc_ntfy_poweroff(struct rtw89_dev *rtwdev)_write_scbd (rtwdev,BTC_ALL_BT ,BTC_WSCB_ALL , false);_run_coex (rtwdev,BTC_RSN_NTFY_POWEROFF ); -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_ALL ,0 ); - btc->cx.wl.status.map.rf_off_pre = btc->cx.wl.status.map.rf_off; }
@@ -8344,12 +8380,10 @@ void rtw89_btc_ntfy_radio_state(struct rtw89_dev *rtwdev, enum btc_rfctrl rf_sta }if (rf_state ==BTC_RFCTRL_WL_ON ) { -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_MREG , true); val =BTC_WSCB_ACTIVE |BTC_WSCB_ON |BTC_WSCB_BTLOG ;_write_scbd (rtwdev,BTC_ALL_BT , val, true); chip->ops->btc_init_cfg (rtwdev); }else { -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_ALL , false);if (rf_state ==BTC_RFCTRL_FW_CTRL )_write_scbd (rtwdev,BTC_ALL_BT ,BTC_WSCB_ACTIVE , false);else if (rf_state ==BTC_RFCTRL_WL_OFF )
@@ -8857,11 +8891,6 @@ static int _show_cx_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) (bt->ver_info.fw_coex >= ver->bt_desired ? "Match" : "Mismatch"), ver->bt_desired); -if (bt->enable.now && bt->ver_info.fw ==0 ) -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_VER_INFO , true); -else -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_VER_INFO , false); - ver_main =FIELD_GET (GENMASK (31 ,24 ), wl->ver_info.fw); ver_sub =FIELD_GET (GENMASK (23 ,16 ), wl->ver_info.fw); ver_hotfix =FIELD_GET (GENMASK (15 ,8 ), wl->ver_info.fw);
@@ -9056,7 +9085,6 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_bt_info *bt = &cx->bt0;struct rtw89_btc_wl_info *wl = &cx->wl; -u32 ver_main =FIELD_GET (GENMASK (31 ,24 ), wl->ver_info.fw_coex);struct rtw89_btc_bt_link_info *bt_linfo = &bt->link_info;union rtw89_btc_module_info *md = &btc->mdinfo;s8 br_dbm = bt->link_info.bt_txpwr_desc.br_dbm;
@@ -9167,39 +9195,28 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) bt->bcnt[BTC_BCNT_LOPRI_TX ], bt->bcnt[BTC_BCNT_POLLUTED]); -if (!bt->scan_info_update) { -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_SCAN_INFO , true); - p +=scnprintf (p, end - p,"\n" ); - }else { -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_SCAN_INFO , false); -if (ver->fcxbtscan ==1 ) { - p +=scnprintf (p, end - p, -"(INQ:%d-%d/PAGE:%d-%d/LE:%d-%d/INIT:%d-%d)" , -le16_to_cpu (bt->scan_info_v1[BTC_SCAN_INQ ].win), -le16_to_cpu (bt->scan_info_v1[BTC_SCAN_INQ ].intvl), -le16_to_cpu (bt->scan_info_v1[BTC_SCAN_PAGE ].win), -le16_to_cpu (bt->scan_info_v1[BTC_SCAN_PAGE ].intvl), -le16_to_cpu (bt->scan_info_v1[BTC_SCAN_BLE ].win), -le16_to_cpu (bt->scan_info_v1[BTC_SCAN_BLE ].intvl), -le16_to_cpu (bt->scan_info_v1[BTC_SCAN_INIT ].win), -le16_to_cpu (bt->scan_info_v1[BTC_SCAN_INIT ].intvl)); - }else if (ver->fcxbtscan ==2 ) { - p +=scnprintf (p, end - p, -"(BG:%d-%d/INIT:%d-%d/LE:%d-%d)" , -le16_to_cpu (bt->scan_info_v2[CXSCAN_BG ].win), -le16_to_cpu (bt->scan_info_v2[CXSCAN_BG ].intvl), -le16_to_cpu (bt->scan_info_v2[CXSCAN_INIT ].win), -le16_to_cpu (bt->scan_info_v2[CXSCAN_INIT ].intvl), -le16_to_cpu (bt->scan_info_v2[CXSCAN_LE ].win), -le16_to_cpu (bt->scan_info_v2[CXSCAN_LE ].intvl)); - } - p +=scnprintf (p, end - p,"\n" ); +if (ver->fcxbtscan ==1 ) { + p +=scnprintf (p, end - p, +"(INQ:%d-%d/PAGE:%d-%d/LE:%d-%d/INIT:%d-%d)" , +le16_to_cpu (bt->scan_info_v1[BTC_SCAN_INQ ].win), +le16_to_cpu (bt->scan_info_v1[BTC_SCAN_INQ ].intvl), +le16_to_cpu (bt->scan_info_v1[BTC_SCAN_PAGE ].win), +le16_to_cpu (bt->scan_info_v1[BTC_SCAN_PAGE ].intvl), +le16_to_cpu (bt->scan_info_v1[BTC_SCAN_BLE ].win), +le16_to_cpu (bt->scan_info_v1[BTC_SCAN_BLE ].intvl), +le16_to_cpu (bt->scan_info_v1[BTC_SCAN_INIT ].win), +le16_to_cpu (bt->scan_info_v1[BTC_SCAN_INIT ].intvl)); + }else if (ver->fcxbtscan ==2 ) { + p +=scnprintf (p, end - p, +"(BG:%d-%d/INIT:%d-%d/LE:%d-%d)" , +le16_to_cpu (bt->scan_info_v2[CXSCAN_BG ].win), +le16_to_cpu (bt->scan_info_v2[CXSCAN_BG ].intvl), +le16_to_cpu (bt->scan_info_v2[CXSCAN_INIT ].win), +le16_to_cpu (bt->scan_info_v2[CXSCAN_INIT ].intvl), +le16_to_cpu (bt->scan_info_v2[CXSCAN_LE ].win), +le16_to_cpu (bt->scan_info_v2[CXSCAN_LE ].intvl)); } - -if (ver_main >=9 && bt_linfo->link_cnt.now) -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_TX_PWR_LVL , true); -else -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_TX_PWR_LVL , false); + p +=scnprintf (p, end - p,"\n" );if (bt->bcnt[BTC_BCNT_TXPWR_UPDATE ]) { p += scnprintf(p, end - p,
@@ -9218,24 +9235,6 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) } p +=scnprintf (p, end - p,"\n" ); -if (bt_linfo->link_cnt.now || bt_linfo->status.map.ble_connect) -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_AFH_MAP , true); -else -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_AFH_MAP , false); - -if (ver->fcxbtafh ==2 && bt_linfo->status.map.ble_connect) -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_AFH_MAP_LE , true); -else -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_AFH_MAP_LE , false); - -if (bt_linfo->a2dp_desc.exist && - (bt_linfo->a2dp_desc.flush_time ==0 || - bt_linfo->a2dp_desc.vendor_id ==0 || - bt_linfo->a2dp_desc.play_latency ==1 )) -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_DEVICE_INFO , true); -else -rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_DEVICE_INFO , false); -return p - buf; }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/11 wifi: rtw89: coex: Refine send firmware command function
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Because the coexistence offload more register/ hardware setting I/O to firmware by coexistence itself, and it goes with the same entry with other control action, so the firmware command entry need to add different condition to judge should it followed coexistence TLV format or not.
--- drivers/net/wireless/realtek/rtw89/coex.c | 107 +++++++++++++++++++++- drivers/net/wireless/realtek/rtw89/core.h | 4 + 2 files changed, 110 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +106 -1
@@ -936,6 +936,14 @@ static void _run_coex(struct rtw89_dev *rtwdev,static void _write_scbd (struct rtw89_dev *rtwdev,u8 bid,u32 val,bool state);static u8 _sned_h2c_w2bscbd (struct rtw89_dev *rtwdev,bool force_exec,u8 bid);static void _update_bt_scbd (struct rtw89_dev *rtwdev,u8 bid); +static const char *id_to_h2c (u32 id); + +static void _reset_h2c_macro (struct rtw89_btc *btc) +{ + btc->hbuf_len =0 ; + btc->hbuf_cnt =0 ; +memset (btc->hbuf,0 ,BTC_H2C_MAXLEN ); +}static int _send_fw_cmd (struct rtw89_dev *rtwdev,u8 h2c_class,u8 h2c_func,void *param,u16 len)
@@ -945,6 +953,8 @@ static int _send_fw_cmd(struct rtw89_dev *rtwdev, u8 h2c_class, u8 h2c_func,struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_wl_info *wl = &cx->wl;struct rtw89_btc_dm *dm = &btc->dm; +u8 h2c_func_mask, bid =BTC_BT_1ST ; +u8 *buf = param;int ret;if (len >BTC_H2C_MAXLEN || len ==0 ) {
@@ -966,7 +976,69 @@ static int _send_fw_cmd(struct rtw89_dev *rtwdev, u8 h2c_class, u8 h2c_func,return -EINVAL ; } - ret =rtw89_fw_h2c_raw_with_hdr (rtwdev, h2c_class, h2c_func, param, len, + h2c_func_mask = h2c_func & (~BT_H2C_FUNC_BT2ND ); +if (rtwdev->chip->para_ver &BTC_FEAT_DUAL_BT ) + bid = !!(h2c_func &BT_H2C_FUNC_BT2ND ); + +if (btc->io_oflld_type !=BTC_IO_OFLD_BTC_H2C || btc->cli_h2c_cmd || + h2c_func_mask ==SET_H2C_MACRO || + (h2c_func_mask ==SET_DRV_INFO && buf[0 ] ==CXDRVINFO_TRX ) || + (h2c_func_mask ==SET_IOFLD_SCBD && dm->scbd_write_instant) || + h2c_func_mask ==SET_BT_LNA_CONSTRAIN ) { + h2c_class =BTFC_SET ; + + ret =rtw89_fw_h2c_raw_with_hdr (rtwdev, h2c_class, h2c_func, + buf, len, false, true); + +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s():class=%d, bt%d-func=%s, len=%d\n" , + __func__, h2c_class, bid, +id_to_h2c (h2c_func_mask), len); + +if (h2c_func_mask ==SET_H2C_MACRO ) { +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s():Send H2C-MACRO cnt=%d, len=%d\n" , + __func__, btc->hbuf_cnt, btc->hbuf_len); +_reset_h2c_macro (btc);/* clear H2C MACRO buffer */ + } + +if (ret !=0 ) {/* Send H2C fail */ +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s():return by rtw_hal_mac_send_h2c\n" , + __func__); + btc->fwinfo.cnt_h2c_fail++; +return 0 ; + } + + btc->fwinfo.cnt_h2c++; + }else {/* Fill H2C MACRO buffer(TLV format) temporarily */ +if (btc->hbuf_cnt ==0 ) +_reset_h2c_macro (btc); + +/* Type:1 byte, Length:2 Bytes, Data:len bytes */ +if (btc->hbuf_len + len +3 >=BTC_H2C_MAXLEN ) { +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s():return by MACRO buf full(%d)\n" , + __func__, btc->hbuf_len + len +3 ); + btc->fwinfo.cnt_h2c_fail++; +return 0 ; + } + + btc->hbuf[btc->hbuf_len] = h2c_func; + btc->hbuf[btc->hbuf_len +1 ] = len &GENMASK (7 ,0 ); + btc->hbuf[btc->hbuf_len +2 ] = (len &GENMASK (15 ,8 )) >>8 ; + +memcpy (&btc->hbuf[btc->hbuf_len +3 ], buf, len); + btc->hbuf_len = btc->hbuf_len + len +3 ; + btc->hbuf_cnt++; + +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s():Buffer H2C-MACRO cnt=%d/bt%d-func=%s/len=%d\n" , + __func__, btc->hbuf_cnt, bid, +id_to_h2c (h2c_func_mask), len); + } + + ret =rtw89_fw_h2c_raw_with_hdr (rtwdev, h2c_class, h2c_func, buf, len, false, true);if (ret) pfwinfo->cnt_h2c_fail++;
@@ -9249,6 +9321,7 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)#define CASE_BTC_POLUT_STR (e) case BTC_PLT_## e: return #e#define CASE_BTC_REGTYPE_STR (e) case REG_## e: return #e#define CASE_BTC_GDBG_STR (e) case BTC_DBG_## e: return #e +#define CASE_BTC_H2CCMD (e) case SET_##e: return #estatic const char *id_to_polut (u32 id) {
@@ -9529,6 +9602,38 @@ static const char *id_to_ant(u32 id) } } +static const char *id_to_h2c (u32 id) +{ +switch (id) { +CASE_BTC_H2CCMD (REPORT_EN ); +CASE_BTC_H2CCMD (SLOT_TABLE ); +CASE_BTC_H2CCMD (MREG_TABLE ); +CASE_BTC_H2CCMD (CX_POLICY ); +CASE_BTC_H2CCMD (GPIO_DBG ); +CASE_BTC_H2CCMD (DRV_INFO ); +CASE_BTC_H2CCMD (DRV_EVENT ); +CASE_BTC_H2CCMD (BT_WREG_ADDR ); +CASE_BTC_H2CCMD (BT_WREG_VAL ); +CASE_BTC_H2CCMD (BT_RREG_ADDR ); +CASE_BTC_H2CCMD (BT_WL_CH_INFO ); +CASE_BTC_H2CCMD (BT_INFO_REPORT ); +CASE_BTC_H2CCMD (BT_IGNORE_WLAN_ACT ); +CASE_BTC_H2CCMD (BT_TX_PWR ); +CASE_BTC_H2CCMD (BT_LNA_CONSTRAIN ); +CASE_BTC_H2CCMD (BT_QUERY_DEV_LIST ); +CASE_BTC_H2CCMD (BT_QUERY_DEV_INFO ); +CASE_BTC_H2CCMD (BT_PSD_REPORT ); +CASE_BTC_H2CCMD (H2C_TEST ); +CASE_BTC_H2CCMD (IOFLD_RF ); +CASE_BTC_H2CCMD (IOFLD_BB ); +CASE_BTC_H2CCMD (IOFLD_MAC ); +CASE_BTC_H2CCMD (IOFLD_SCBD ); +CASE_BTC_H2CCMD (H2C_MACRO ); +default : +return "unknown" ; + } +} +static int scnprintf_segment (char *buf,size_t bufsz,const char *prefix,const u16 *data,u8 len,u8 seg_len,u8 start_idx,u8 ring_len)
drivers/net/wireless/realtek/rtw89/core.h +4 -0
@@ -3820,6 +3820,7 @@ struct rtw89_btc_btf_fwinfo { };#define RTW89_BTC_POLICY_MAXLEN 512 +#define BTC_H2C_MAXLENC 2020struct rtw89_btc {const struct rtw89_btc_ver *ver;
@@ -3839,11 +3840,14 @@ struct rtw89_btc {u32 bt_req_len[RTW89_PHY_NUM ];u8 policy[RTW89_BTC_POLICY_MAXLEN ]; +u8 hbuf[BTC_H2C_MAXLENC ];/* H2C Macro buffer */ +u8 hbuf_cnt;/* H2C cmd count in buffer */ u8 ant_type;u8 btg_pos;u8 io_oflld_type;u16 policy_len;u16 policy_type; +u16 hbuf_len;/* H2C used length, it sshould be <= BTC_H2C_MAXLEN */ u32 hubmsg_cnt;bool bt_req_en;bool update_policy_force;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/11 wifi: rtw89: coex: Refine _reset_btc_var()
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
To avoid the default value not match the real using scenario, it should after assign desired default value after variable reset.
--- drivers/net/wireless/realtek/rtw89/coex.c | 68 ++++++++---- drivers/net/wireless/realtek/rtw89/coex.h | 8 ++ drivers/net/wireless/realtek/rtw89/core.h | 127 ++++++++++++++++++++++ 3 files changed, 180 insertions(+), 23 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +45 -23
@@ -1048,44 +1048,52 @@ static int _send_fw_cmd(struct rtw89_dev *rtwdev, u8 h2c_class, u8 h2c_func,return ret; } -#define BTC_BT_DEF_BR_TX_PWR 4 -#define BTC_BT_DEF_LE_TX_PWR 4 +#define BTC_DEFAULT_SIR_THRES 51/* dB, BT Pin - This = TDD/FDD swtch thres */ +#define BTC_FDDR_TP_SETUP_TIME 1/* in second */ +#define BTC_FDDR_TP_HOLD_TIME 3/* in second */ +#define BTC_FDDR_RX_LOW_RATE_THRES 4/* low rate for TDD swotch */ static void _reset_btc_var (struct rtw89_dev *rtwdev,u8 type) {struct rtw89_btc *btc = &rtwdev->btc; -const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_cx *cx = &btc->cx; -struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_bt_info *bt = &btc->cx.bt0; -struct rtw89_btc_bt_link_info *bt_linfo = &bt->link_info; -struct rtw89_btc_wl_link_info *wl_linfo; -u8 i, j; +const struct rtw89_btc_ver *ver = btc->ver; +struct rtw89_btc_bt_info *bt0 = &cx->bt0; +struct rtw89_btc_bt_info *bt1 = &cx->bt1; +u8 i;rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s\n" , __func__); -if (type &BTC_RESET_CX ) +if (type &BTC_RESET_CX ) {memset (cx,0 ,sizeof (*cx)); - -if (type &BTC_RESET_BTINFO )/* only for BT enable */ -memset (bt,0 ,sizeof (*bt)); + cx->bt_ext.max_tx_pwr =RTW89_BTC_BT_DEF_LE_TX_PWR ; + cx->bt_ext.ant_iso_to_wl =RTW89_BTC_DEFAULT_ANISO ; + } + +if (type &BTC_RESET_BTINFO ) {/* only for BT enable */ +memset (bt0,0 ,sizeof (*bt0)); + bt0->link_info.bt_txpwr_desc.br_dbm =RTW89_BTC_BT_DEF_BR_TX_PWR ; + bt0->link_info_56g.bt_txpwr_desc.br_dbm =RTW89_BTC_BT_DEF_BR_TX_PWR ; + bt0->link_info.bt_txpwr_desc.le_dbm =RTW89_BTC_BT_DEF_LE_TX_PWR ; + bt0->link_info_56g.bt_txpwr_desc.le_dbm =RTW89_BTC_BT_DEF_LE_TX_PWR ; + bt0->ant_iso_to_wl =RTW89_BTC_DEFAULT_ANISO ; + }else if (type &BTC_RESET_BTINFO2 ) { +memset (bt1,0 ,sizeof (*bt1)); + bt1->link_info.bt_txpwr_desc.br_dbm =RTW89_BTC_BT_DEF_BR_TX_PWR ; + bt1->link_info_56g.bt_txpwr_desc.br_dbm =RTW89_BTC_BT_DEF_BR_TX_PWR ; + bt1->link_info.bt_txpwr_desc.le_dbm =RTW89_BTC_BT_DEF_LE_TX_PWR ; + bt1->link_info_56g.bt_txpwr_desc.le_dbm =RTW89_BTC_BT_DEF_LE_TX_PWR ; + bt1->ant_iso_to_wl =RTW89_BTC_DEFAULT_ANISO ; + }if (type &BTC_RESET_CTRL ) {memset (&btc->ctrl,0 ,sizeof (btc->ctrl)); - btc->manual_ctrl = false; btc->ctrl.trace_step =FCXDEF_STEP ; }/* Init Coex variables that are not zero */ if (type &BTC_RESET_DM ) {memset (&btc->dm,0 ,sizeof (btc->dm)); -memset (bt_linfo->rssi_state,0 ,sizeof (bt_linfo->rssi_state)); -for (j =RTW89_MAC_0 ; j <=RTW89_MAC_1 ; j++) { -for (i =0 ; i <RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ; i++) { - wl_linfo = &wl->rlink_info[i][j]; -memset (wl_linfo->rssi_state,0 ,sizeof (wl_linfo->rssi_state)); - } - }/* set the slot_now table to original */ btc->dm.tdma_now = t_def[CXTD_OFF ];
@@ -1108,18 +1116,32 @@ static void _reset_btc_var(struct rtw89_dev *rtwdev, u8 type) btc->policy_len =0 ; btc->bt_req_len[RTW89_PHY_0 ] =0 ; btc->bt_req_len[RTW89_PHY_1 ] =0 ; + btc->hubmsg_cnt =0 ; + btc->dm.coex_info_map =BTC_COEX_INFO_ALL ; btc->dm.wl_tx_limit.tx_time =BTC_MAX_TX_TIME_DEF ; btc->dm.wl_tx_limit.tx_retry =BTC_MAX_TX_RETRY_DEF ; + btc->dm.bt_slot_flood =BTC_B1_MAX ; + btc->dm.sir_thres =BTC_DEFAULT_SIR_THRES ; + btc->dm.fddr_info.tp_setup_time =BTC_FDDR_TP_SETUP_TIME ; + btc->dm.fddr_info.tp_hold_time =BTC_FDDR_TP_HOLD_TIME ; + btc->dm.fddr_info.wl_rx_rate_thres =BTC_FDDR_RX_LOW_RATE_THRES ; + btc->dm.fddt_info.type =BTC_FDDT_TYPE_AUTO ; + btc->dm.wl_pre_agc_rb =BTC_PREAGC_NOTFOUND ; btc->dm.wl_btg_rx_rb =BTC_BTGCTRL_BB_GNT_NOTFOUND ; } -if (type &BTC_RESET_MDINFO ) +if (type &BTC_RESET_MDINFO ) {memset (&btc->mdinfo,0 ,sizeof (btc->mdinfo)); - bt->link_info.bt_txpwr_desc.br_dbm =BTC_BT_DEF_BR_TX_PWR ; - bt->link_info.bt_txpwr_desc.le_dbm =BTC_BT_DEF_LE_TX_PWR ; +if (ver->fcxinit ==10 ) + btc->mdinfo.md_v10.ant.isolation =RTW89_BTC_DEFAULT_ANISO ; +else if (ver->fcxinit ==7 ) + btc->mdinfo.md_v7.ant.isolation =RTW89_BTC_DEFAULT_ANISO ; +else + btc->mdinfo.md.ant.isolation =RTW89_BTC_DEFAULT_ANISO ; + } }static u8 _search_reg_index (struct rtw89_dev *rtwdev,u8 mreg_num,u16 reg_type,u32 target)
drivers/net/wireless/realtek/rtw89/coex.h +8 -0
@@ -241,6 +241,14 @@ enum btc_3cx_type { BTC_3CX_MAX, }; +enum btc_fddt_type { +BTC_FDDT_TYPE_STOP , +BTC_FDDT_TYPE_AUTO , +BTC_FDDT_TYPE_FIX_TDD , +BTC_FDDT_TYPE_FIX_FULL_FDD , +BTC_FDDT_MAX , +}; +enum btc_chip_feature {BTC_FEAT_PTA_ONOFF_CTRL =BIT (0 ),/* on/off ctrl by HW (not 0x73[2]) */ BTC_FEAT_NONBTG_GWL_THRU =BIT (1 ),/* non-BTG GNT_WL!=0 if GNT_BT = 1 */
drivers/net/wireless/realtek/rtw89/core.h +127 -0
157 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/11 wifi: rtw89: coex: Correct SET_RFE settings
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Because of dual-BT & dual-MAC, RTL8922D has more complex antenna settings.
--- drivers/net/wireless/realtek/rtw89/coex.h | 31 +++ drivers/net/wireless/realtek/rtw89/core.h | 11 + drivers/net/wireless/realtek/rtw89/rtw8922d.c | 213 ++++++++++++++++-- 3 files changed, 231 insertions(+), 24 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.h +31 -0
@@ -143,6 +143,11 @@ enum btc_switch {BTC_SWITCH_EXTERNAL }; +enum btc_ant_switch_type { +BTC_SWITCH_V1_NONE =0 ,/* independent antenna */ +BTC_SWITCH_V1_INTERNAL ,/* internal-switch: BTGA structure */ +}; +enum btc_pkt_type {PACKET_DHCP ,PACKET_ARP ,
@@ -262,6 +267,32 @@ enum btc_chip_feature {BTC_FEAT_DUAL_BTGA =BIT (9 )/* the future A-Die */ }; +enum btc_efuse_ant_function_map { +BTC_EFMAP_NONE =0 , +BTC_EFMAP_BT0 =BIT (0 ), +BTC_EFMAP_BT1 =BIT (1 ), +BTC_EFMAP_ZB =BIT (2 ),/* ZB or thread */ +BTC_EFMAP_24GP =BIT (3 ), +BTC_EFMAP_ULL =BIT (4 ), +}; + +enum btc_extsoc_interface {/* cx->other.hw_coex */ +BTC_EXTSOC_INTF_NONE =0 , +BTC_EXTSOC_INTF_PTA =BIT (0 ), +BTC_EXTSOC_INTF_MBX =BIT (1 ), +BTC_EXTSOC_INTF_SWIO =BIT (2 ), +BTC_EXTSOC_INTF_MAX , +}; + +enum btc_esoc_type { +BTC_ESOC_NONE , +BTC_ESOC_8761 , +BTC_ESOC_8771 , +BTC_ESOC_SILAB_MG21 , +BTC_ESOC_NORDI_NRF52840 , +BTC_ESOC_MAX , +}; +enum btc_wl_mode {BTC_WL_MODE_11B =0 ,BTC_WL_MODE_11A =1 ,
drivers/net/wireless/realtek/rtw89/core.h +11 -0
@@ -2434,6 +2434,15 @@ struct rtw89_btc_wl_tx_limit_para {u16 tx_retry; }; +struct rtw89_btc_wl_trx_nss_para { +u8 tx_limit; +u8 rx_limit; +u8 tx_ss; +u8 rx_ss; +u8 tx_path; +u8 rx_path; +}; +enum rtw89_btc_bt_scan_type {BTC_SCAN_INQ =0 ,BTC_SCAN_PAGE ,
@@ -3616,6 +3625,7 @@ struct rtw89_btc_dm {struct rtw89_btc_bind_info fdd_bind;struct rtw89_btc_fddt_info fddt_info;struct rtw89_btc_fddr_info fddr_info; +struct rtw89_btc_wl_trx_nss_para wl_trx_nss;u32 cnt_dm[BTC_DCNT_NUM ];u32 cnt_notify[BTC_NCNT_NUM ];u8 ant_xmap[BTC_RF_NUM ][BTC_ALL_BT_EZL ];/* WL-BT ANT interact-map */
@@ -3664,6 +3674,7 @@ struct rtw89_btc_dm {u8 wl_tx_pwr_phy_map;u8 vid;u8 client_ps_tdma_on; +u8 wl_trx_nss_en; u8 wl_pre_agc: 2; u8 wl_lna2: 1;
drivers/net/wireless/realtek/rtw89/rtw8922d.c +189 -24
235 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/11 wifi: rtw89: coex: Add firmware report control report v11
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
In the version 11 report control report, firmware will report firmware build date, version. And Bluetooth to Wi-Fi scoreboard value will be read at Wi-Fi firmware and update to Wi-Fi driver.
--- drivers/net/wireless/realtek/rtw89/coex.c | 218 +++++++++++++++++++++- drivers/net/wireless/realtek/rtw89/core.h | 26 +++ 2 files changed, 243 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +217 -1
@@ -1417,6 +1417,40 @@ static void _chk_btc_err(struct rtw89_dev *rtwdev, u8 type, u32 cnt) dm->error.map.bt_slot_drift = false;break ; +case BTC_DCNT_WL_STA_NTFY : + cnt = dm->cnt_notify[BTC_NCNT_WL_STA ] - + dm->cnt_notify[BTC_NCNT_WL_STA_LAST ]; + + dm->cnt_notify[BTC_NCNT_WL_STA_LAST ] = + dm->cnt_notify[BTC_NCNT_WL_STA ]; + +if (cnt ==0 && + (dm->tdd_bind.wl_link_mode !=BTC_WLINK_NOLINK || + dm->fdd_bind.wl_link_mode !=BTC_WLINK_NOLINK )) + dm->cnt_dm[BTC_DCNT_WL_STA_NTFY ]++; +else + dm->cnt_dm[BTC_DCNT_WL_STA_NTFY ] =0 ; + +if (dm->cnt_dm[BTC_DCNT_WL_STA_NTFY ] >=BTC_CHK_HANG_MAX ) + dm->error.map.wl_no_sta_ntfy = true; +else + dm->error.map.wl_no_sta_ntfy = false; +break ; +case BTC_DCNT_W2B_SCBD_NOSYNC : +if (!(rtwdev->chip->para_ver &BTC_FEAT_MULTI_PTA )) +return ;/* return if no-support W2B scbd readback */ + +if (wl->scbd_rb[BTC_BT_1ST ] != wl->scbd[BTC_BT_1ST ] || + wl->scbd_rb[BTC_BT_2ND ] != wl->scbd[BTC_BT_2ND ]) + dm->cnt_dm[BTC_DCNT_W2B_SCBD_NOSYNC ]++; +else + dm->cnt_dm[BTC_DCNT_W2B_SCBD_NOSYNC ] =0 ; + +if (dm->cnt_dm[BTC_DCNT_W2B_SCBD_NOSYNC ] >=BTC_CHK_HANG_MAX ) + dm->error.map.w2b_scbd_no_sync = true; +else + dm->error.map.w2b_scbd_no_sync = false; +break ; } }
@@ -1564,6 +1598,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ; +struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_bt_info *bt = &btc->cx.bt0;union rtw89_btc_fbtc_rpt_ctrl_ver_info *prpt =NULL ;
@@ -1574,7 +1609,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,u16 wl_slot_set =0 , wl_slot_real =0 , val16;u32 trace_step =0 , rpt_len =0 , diff_t =0 ;u32 cnt_leak_slot, bt_slot_real, bt_slot_set, cnt_rx_imr; -u8 i, val =0 , val1, val2; +u8 i, j, val =0 , val1, val2; +u32 *bt_cnt, start_idx; rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): index:%d\n",
@@ -1626,6 +1662,10 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pfinfo = &pfwinfo->rpt_ctrl.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v7); fwsubver->fcxbtcrpt = pfwinfo->rpt_ctrl.finfo.v7.fver; + }else if (ver->fcxbtcrpt ==11 ) { + pfinfo = &pfwinfo->rpt_ctrl.finfo.v11; + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v11); + fwsubver->fcxbtcrpt = pfwinfo->rpt_ctrl.finfo.v11.fver; }else { goto err; }
@@ -2031,6 +2071,70 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,_chk_btc_err (rtwdev,BTC_DCNT_RPT_HANG , val1);_chk_btc_err (rtwdev,BTC_DCNT_WL_FW_VER_MATCH ,0 );_chk_btc_err (rtwdev,BTC_DCNT_BTTX_HANG ,0 ); + }else if (ver->fcxbtcrpt ==11 ) { + prpt->v11 = pfwinfo->rpt_ctrl.finfo.v11; + pfwinfo->rpt_en_map =le32_to_cpu (prpt->v11.rpt_info.en); + wl->ver_info.fw_coex =le32_to_cpu (prpt->v11.rpt_info.cx_ver); + wl->ver_info.fw =le32_to_cpu (prpt->v11.rpt_info.fw_ver); + +memset (wl->ver_info.build_time,0 , +sizeof (wl->ver_info.build_time)); +memcpy (wl->ver_info.build_time, + prpt->v11.build_time, +sizeof (wl->ver_info.build_time)); + +memset (wl->ver_info.build_date,0 , +sizeof (wl->ver_info.build_date)); +memcpy (wl->ver_info.build_date, + prpt->v11.build_date, +sizeof (wl->ver_info.build_date)); + +for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) +memcpy (&dm->gnt_set[i], &prpt->v11.gnt_val[i][0 ], +sizeof (dm->gnt_set[i])); + +for (i =BTC_BT_1ST ; i <=BTC_BT_EXT ; i++) { +if (i ==BTC_BT_EXT ) { +if (cx->bt_ext.func_type ==BTC_BTF_NONE ) +continue ; + bt_cnt = cx->bt_ext.bcnt; + }else if (i ==BTC_BT_2ND ) { +if (!(rtwdev->chip->para_ver &BTC_FEAT_DUAL_BT )) +continue ; + bt_cnt = cx->bt1.bcnt; + wl->scbd_rb[i] =le32_to_cpu (prpt->v11.scbd_w2b[i]); + cx->bt1.scbd_rb =le32_to_cpu (prpt->v11.scbd_b2w[i]); + }else { + bt_cnt = cx->bt0.bcnt; + wl->scbd_rb[i] =le32_to_cpu (prpt->v11.scbd_w2b[i]); + cx->bt0.scbd_rb =le32_to_cpu (prpt->v11.scbd_b2w[i]); + } + + start_idx =BTC_BCNT_HIPRI_TX ; +for (j =BTC_BCNT_HI_TX_V105 ; j <=BTC_BCNT_LO_RX_V105 ; j++) + bt_cnt[start_idx++] =le16_to_cpu (prpt->v11.bt_cnt[i][j]); + +/* check if polut counter increase */ + val1 =le16_to_cpu (prpt->v11.bt_cnt[i][BTC_BCNT_POLLUTED_V105 ]); +if (val1 > bt_cnt[BTC_BCNT_POLUT_NOW ])/* cnt increase*/ + val2 = val1 - bt_cnt[BTC_BCNT_POLUT_NOW ]; +else + val2 = val1;/* overflow */ + + bt_cnt[BTC_BCNT_POLUT_DIFF ] = val2; + bt_cnt[BTC_BCNT_POLUT_NOW ] = val1; + +if (i <=BTC_BT_2ND ) + bt_cnt[BTC_BCNT_SCBDREAD ]++; + } + dm->scbd_w2b_update = true; + dm->scbd_b2w_update = true; + +_chk_btc_err (rtwdev,BTC_DCNT_BTCNT_HANG ,0 ); +_chk_btc_err (rtwdev,BTC_DCNT_WL_FW_VER_MATCH ,0 ); +_chk_btc_err (rtwdev,BTC_DCNT_BTTX_HANG ,0 ); +_chk_btc_err (rtwdev,BTC_DCNT_WL_STA_NTFY ,0 ); +_chk_btc_err (rtwdev,BTC_DCNT_W2B_SCBD_NOSYNC ,0 ); }else { goto err; }
@@ -11953,6 +12057,116 @@ static int _show_summary_v8(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)return p - buf; } +static int _show_summary_v11 (struct rtw89_dev *rtwdev,char *buf,size_t bufsz) +{ +struct rtw89_btc_btf_fwinfo *pfwinfo = &rtwdev->btc.fwinfo; +struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ; +struct rtw89_btc_fbtc_rpt_ctrl_v11 *prptctrl =NULL ; +struct rtw89_btc_cx *cx = &rtwdev->btc.cx; +struct rtw89_btc_dm *dm = &rtwdev->btc.dm; +struct rtw89_btc_wl_info *wl = &cx->wl; +u32 *cnt = rtwdev->btc.dm.cnt_notify; +char *p = buf, *end = buf + bufsz; +u32 cnt_sum =0 ; +u8 i; + +if (!(dm->coex_info_map &BTC_COEX_INFO_SUMMARY )) +return 0 ; + + p +=scnprintf (p, end - p,"%s" , +"\n\r========== [Statistics] ==========" ); + + pcinfo = &pfwinfo->rpt_ctrl.cinfo; +if (pcinfo->valid && wl->status.map.lps !=BTC_LPS_RF_OFF && + !wl->status.map.rf_off) { + prptctrl = &pfwinfo->rpt_ctrl.finfo.v11; + + p +=scnprintf (p, end - p, +"\n\r %-15s : h2c_cnt=%d(fail:%d, fw_recv:%d), c2h_cnt=%d(fw_send:%d, len:%d, max:fw-%d/drv-%d), " , +"[summary]" , pfwinfo->cnt_h2c, + pfwinfo->cnt_h2c_fail, +le16_to_cpu (prptctrl->rpt_info.cnt_h2c), + pfwinfo->cnt_c2h, +le16_to_cpu (prptctrl->rpt_info.cnt_c2h), +le16_to_cpu (prptctrl->rpt_info.len_c2h), + (prptctrl->rpt_len_max_h <<8 ) + prptctrl->rpt_len_max_l, + rtwdev->btc.ver->info_buf); + + p +=scnprintf (p, end - p, +"rpt_cnt=%d(fw_send:%d), rpt_map=0x%x" , + pfwinfo->event[BTF_EVNT_RPT ], +le16_to_cpu (prptctrl->rpt_info.cnt), +le32_to_cpu (prptctrl->rpt_info.en)); + +if (dm->error.map.wl_fw_hang) + p +=scnprintf (p, end - p," (WL FW Hang!!)" ); + + p +=scnprintf (p, end - p, +"\n\r %-15s : send_ok:%d, send_fail:%d, recv:%d, " , +"[mailbox]" , +le32_to_cpu (prptctrl->bt_mbx_info.cnt_send_ok), +le32_to_cpu (prptctrl->bt_mbx_info.cnt_send_fail), +le32_to_cpu (prptctrl->bt_mbx_info.cnt_recv)); + + p +=scnprintf (p, end - p, +"A2DP_empty:%d(stop:%d/tx:%d/ack:%d/nack:%d)" , +le32_to_cpu (prptctrl->bt_mbx_info.a2dp.cnt_empty), +le32_to_cpu (prptctrl->bt_mbx_info.a2dp.cnt_flowctrl), +le32_to_cpu (prptctrl->bt_mbx_info.a2dp.cnt_tx), +le32_to_cpu (prptctrl->bt_mbx_info.a2dp.cnt_ack), +le32_to_cpu (prptctrl->bt_mbx_info.a2dp.cnt_nack)); + + p +=scnprintf (p, end - p, +"\n\r %-15s : wl_rfk[req:%d/go:%d/reject:%d/tout:%d/time:%dms]" , +"[RFK/LPS]" , wl->wcnt[BTC_WCNT_RFK_REQ ], + wl->wcnt[BTC_WCNT_RFK_GO ], + wl->wcnt[BTC_WCNT_RFK_REJECT ], + wl->wcnt[BTC_WCNT_RFK_TIMEOUT ], + wl->rfk_info.proc_time); + + p +=scnprintf (p, end - p,", AOAC[RF_on:%d/RF_off:%d]" , +le16_to_cpu (prptctrl->rpt_info.cnt_aoac_rf_on), +le16_to_cpu (prptctrl->rpt_info.cnt_aoac_rf_off)); + }else { + p +=scnprintf (p, end - p, +"\n\r %-15s : h2c_cnt=%d(fail:%d), c2h_cnt=%d (lps=%d/rf_off=%d)" , +"[summary]" , + pfwinfo->cnt_h2c, pfwinfo->cnt_h2c_fail, + pfwinfo->cnt_c2h, + wl->status.map.lps, wl->status.map.rf_off); + } + +for (i =0 ; i <BTC_NCNT_NUM ; i++) + cnt_sum += dm->cnt_notify[i]; + + p +=scnprintf (p, end - p, +"\n\r %-15s : total=%d, show_coex_info=%d, power_on=%d, init_coex=%d, " , +"[notify_cnt]" , + cnt_sum, cnt[BTC_NCNT_SHOW_COEX_INFO ], + cnt[BTC_NCNT_POWER_ON ], cnt[BTC_NCNT_INIT_COEX ]); + + p +=scnprintf (p, end - p, +"power_off=%d, radio_state=%d, role_info=%d, wl_rfk=%d, wl_sta=%d" , + cnt[BTC_NCNT_POWER_OFF ], cnt[BTC_NCNT_RADIO_STATE ], + cnt[BTC_NCNT_ROLE_INFO ], cnt[BTC_NCNT_WL_RFK ], + cnt[BTC_NCNT_WL_STA ]); + + p +=scnprintf (p, end - p, +"\n\r %-15s : scan_start=%d, scan_finish=%d, switch_band=%d, switch_chbw=%d, special_pkt=%d, " , +"[notify_cnt]" , + cnt[BTC_NCNT_SCAN_START ], cnt[BTC_NCNT_SCAN_FINISH ], + cnt[BTC_NCNT_SWITCH_BAND ], cnt[BTC_NCNT_SWITCH_CHBW ], + cnt[BTC_NCNT_SPECIAL_PACKET ]); + + p +=scnprintf (p, end - p, +"timer=%d, customerize=%d, hub_msg=%d, chg_fw=%d, send_cc=%d" , + cnt[BTC_NCNT_TIMER ], cnt[BTC_NCNT_CUSTOMERIZE ], + rtwdev->btc.hubmsg_cnt, cnt[BTC_NCNT_RESUME_DL_FW ], + cnt[BTC_NCNT_COUNTRYCODE ]); + +return p - buf; +} +ssize_t rtw89_btc_dump_info (struct rtw89_dev *rtwdev,char *buf,size_t bufsz) {struct rtw89_btc *btc = &rtwdev->btc;
@@ -12016,6 +12230,8 @@ ssize_t rtw89_btc_dump_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) p +=_show_summary_v7 (rtwdev, p, end - p); else if (ver->fcxbtcrpt == 8) p += _show_summary_v8(rtwdev, p, end - p); + else if (ver->fcxbtcrpt == 11) + p += _show_summary_v11(rtwdev, p, end - p);return p - buf; }
drivers/net/wireless/realtek/rtw89/core.h +26 -0
@@ -1406,6 +1406,7 @@ enum rtw89_btc_dcnt {BTC_DCNT_WL_FW_VER_MATCH ,BTC_DCNT_NULL_TX_FAIL ,BTC_DCNT_WL_STA_NTFY , +BTC_DCNT_W2B_SCBD_NOSYNC , BTC_DCNT_NUM, };
@@ -2058,6 +2059,8 @@ struct rtw89_btc_wl_role_info { /* Logic dynamic using */ };struct rtw89_btc_wl_ver_info { +char build_time[12 ]; +char build_date[12 ];u32 fw_coex;/* match with which coex_ver */ u32 fw;u32 mac;
@@ -2245,6 +2248,7 @@ struct rtw89_btc_dm_emap { u32 h2c_buffer_over: 1; u32 bt_tx_hang: 1; /* for SNR too low bug, BT has no Tx req*/ u32 wl_no_sta_ntfy: 1; + u32 w2b_scbd_no_sync: 1; u32 h2c_bmap_mismatch: 1; u32 c2h_bmap_mismatch: 1;
@@ -2784,6 +2788,26 @@ struct rtw89_btc_fbtc_rpt_ctrl_v8 {struct rtw89_btc_fbtc_rpt_ctrl_bt_mailbox bt_mbx_info; } __packed; +struct rtw89_btc_fbtc_rpt_ctrl_v11 { +u8 fver; +u8 rsvd0; +u8 rpt_len_max_l;/* BTC_RPT_MAX bit0~7 */ +u8 rpt_len_max_h;/* BTC_RPT_MAX bit8~15 */ + +u8 build_time[12 ]; +u8 build_date[12 ]; + +u8 gnt_val[RTW89_PHY_NUM ][8 ];/* gwl/gbt012 refer to struct btc_gnt_ctrl */ +__le16 bt_cnt[BTC_ALL_BT_EZL ][BTC_BCNT_STA_MAX_V105 ]; + +struct rtw89_btc_fbtc_rpt_ctrl_info_v8 rpt_info; +struct rtw89_btc_fbtc_rpt_ctrl_bt_mailbox bt_mbx_info; + +__le32 error_code; +__le32 scbd_w2b[2 ]; +__le32 scbd_b2w[2 ]; +} __packed; +union rtw89_btc_fbtc_rpt_ctrl_ver_info {struct rtw89_btc_fbtc_rpt_ctrl_v1 v1;struct rtw89_btc_fbtc_rpt_ctrl_v4 v4;
@@ -2791,6 +2815,7 @@ union rtw89_btc_fbtc_rpt_ctrl_ver_info {struct rtw89_btc_fbtc_rpt_ctrl_v105 v105;struct rtw89_btc_fbtc_rpt_ctrl_v7 v7;struct rtw89_btc_fbtc_rpt_ctrl_v8 v8; +struct rtw89_btc_fbtc_rpt_ctrl_v11 v11; };enum rtw89_fbtc_ext_ctrl_type {
@@ -3691,6 +3716,7 @@ struct rtw89_btc_dm { u8 lps_ctrl_change: 1;u8 scbd_write_instant;bool scbd_b2w_update; +bool scbd_w2b_update;bool pre_agc_chg; };
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/11 wifi: rtw89: coex: update external control length by case
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Update recommend external control slot length to driver. Some of the Wi-Fi feature has its time slot requirement can not be simply controlled by coexistence firmware TDMA timer. For example: Wi-Fi scan/MCC etc. In the same time, coexistence need to tell driver the recommend Bluetooth slot length to make sure Bluetooth can still has enough time slot to traffic.
--- drivers/net/wireless/realtek/rtw89/coex.c | 70 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.c | 11 ++-- drivers/net/wireless/realtek/rtw89/core.h | 4 +- 3 files changed, 80 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +70 -0
@@ -526,6 +526,14 @@ enum btc_cx_poicy_main_type {BTC_CXP_MAIN_MAX }; +enum btc_bslot_length { +BTC_BSLOT_A2DP_HID =60 , +BTC_BSLOT_A2DP =50 , +BTC_BSLOT_A2DP_2 =40 , +BTC_BSLOT_INQ =30 , +BTC_BSLOT_IDLE =20 , +}; +enum btc_cx_poicy_type {/* TDMA off + pri: BT > WL */ BTC_CXP_OFF_BT = (BTC_CXP_OFF <<8 ) |0 ,
@@ -5989,6 +5997,67 @@ static void _set_wl_tx_limit(struct rtw89_dev *rtwdev) &data); } +static void _set_phl_bt_slot_req (struct rtw89_dev *rtwdev) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_cx *cx = &btc->cx; +struct rtw89_btc_wl_info *wl = &cx->wl; +struct rtw89_btc_dm *dm = &btc->dm; +u8 len =0 ; +u8 i; + +/* don't change bt slot req state during RFK for p2p/mcc case */ +if (dm->run_reason ==BTC_RSN_NTFY_WL_RFK || + wl->status.map.transacting) +return ; + +/* enable bt-slot req if ext-slot-control */ +if (dm->tdma_now.type ==CXTDMA_OFF && + dm->tdma_now.ext_ctrl ==CXECTL_EXT && + dm->tdd_bind.bt_sel !=0 ) { +if (btc->cx.wl.status.val & btc_scanning_map.val) + btc->bt_req_en = false; +else + btc->bt_req_en = true; + }else { + btc->bt_req_en = false; + } + +if (dm->slot_req_more) { + len =BTC_BSLOT_A2DP_HID ; + }else { +if (dm->tdd_bind.bt_link_weight >=BTC_BSLOT_A2DP_HID ) + len =BTC_BSLOT_A2DP_HID ; +else if (dm->tdd_bind.bt_link_weight <=BTC_BSLOT_IDLE ) + len =BTC_BSLOT_IDLE ; +else + len = dm->tdd_bind.bt_link_weight; + } + +if (dm->tdd_bind.rf_band ==BIT (RTW89_BAND_5G )) + len =100 - len; + +if (!btc->bt_req_en) + len =0 ; + +for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) { +if (!(dm->tdd_bind.wl_hwb_sel &BIT (i))) +continue ; + +if (len == btc->bt_req_len[i]) +continue ; + + btc->bt_req_len[i] = len; + +rtw89_core_ntfy_btc_event (rtwdev, +RTW89_BTC_HMSG_SET_BT_REQ_SLOT , i); + +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s(): HWB%d bt_req_len = %d\n" , + __func__, i, btc->bt_req_len[i]); + } +} +static void _set_bt_rx_agc (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc;
@@ -6148,6 +6217,7 @@ static void _action_common(struct rtw89_dev *rtwdev)_set_btg_ctrl (rtwdev);_set_wl_preagc_ctrl (rtwdev);_set_wl_tx_limit (rtwdev); +_set_phl_bt_slot_req (rtwdev);_set_bt_afh_info (rtwdev);_set_bt_rx_agc (rtwdev);_set_rf_trx_para (rtwdev);
drivers/net/wireless/realtek/rtw89/core.c +7 -4
@@ -6539,15 +6539,18 @@ void rtw89_complete_cond(struct rtw89_wait_info *wait, unsigned int cond,rtw89_complete_cond_resp (resp, data); } -void rtw89_core_ntfy_btc_event (struct rtw89_dev *rtwdev,enum rtw89_btc_hmsg event) +void rtw89_core_ntfy_btc_event (struct rtw89_dev *rtwdev, +enum rtw89_btc_hmsg event, +enum rtw89_phy_idx phy_idx) { -u16 bt_req_len; +u16 bt_slot_req[RTW89_PHY_NUM ];switch (event) {case RTW89_BTC_HMSG_SET_BT_REQ_SLOT : - bt_req_len =rtw89_coex_query_bt_req_len (rtwdev,RTW89_PHY_0 ); + bt_slot_req[phy_idx] =rtw89_coex_query_bt_req_len (rtwdev, phy_idx);rtw89_debug (rtwdev,RTW89_DBG_BTC , -"coex updates BT req len to %d TU\n" , bt_req_len); +"coex updates PHY-%d BT req len to %d TU\n" , + phy_idx, bt_slot_req[phy_idx]);rtw89_queue_chanctx_change (rtwdev,RTW89_CHANCTX_BT_SLOT_CHANGE );break ;default :
drivers/net/wireless/realtek/rtw89/core.h +3 -1
@@ -8866,7 +8866,9 @@ int rtw89_reg_6ghz_recalc(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvivoid rtw89_core_update_p2p_ps (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct ieee80211_bss_conf *bss_conf); -void rtw89_core_ntfy_btc_event (struct rtw89_dev *rtwdev,enum rtw89_btc_hmsg event); +void rtw89_core_ntfy_btc_event (struct rtw89_dev *rtwdev, +enum rtw89_btc_hmsg event, +enum rtw89_phy_idx phy_idx);int rtw89_core_mlsr_switch (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif,unsigned int link_id);void rtw89_core_dm_disable_cfg (struct rtw89_dev *rtwdev,u32 new);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 11/11 wifi: rtw89: coex: Update coexistence version to 9.24.0
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
RTL8922D first release, add related feature support.
--- drivers/net/wireless/realtek/rtw89/coex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +1 -1
@@ -11,7 +11,7 @@#include "ps.h" #include "reg.h" -#define RTW89_COEX_VERSION 0x09000113 +#define RTW89_COEX_VERSION 0x09180013#define FCXDEF_STEP 50/* MUST <= FCXMAX_STEP and match with wl fw*/ #define BTC_E2G_LIMIT_DEF 80
Signature · 1 line
2.25.1