rtw89: coex: add materials to support 8852C
Ping-Ke Shih
maintainerv2 cover rtw89: coex: add materials to support 8852C
8852C use new format and registers for BT coexistence mechanism. Some existing codes aren't suitable for 8852C, and then need to correct them.
The patchset depends on another patchset "rtw89: support channel context" due to structure but not functional conflicts.
v2: fix NULL pointer access if 8852A is adopted
Ching-Te Ku (9):
rtw89: coex: update radio state for RTL8852A/RTL8852C
rtw89: coex: Move Wi-Fi firmware coexistence matching version to chip
rtw89: coex: Add logic to parsing rtl8852c firmware type ctrl report
rtw89: coex: Define BT B1 slot length
rtw89: coex: Add v1 version TDMA format and parameters
rtw89: coex: update WL role info v1 for RTL8852C branch using
rtw89: coex: Move _set_policy to chip_ops
rtw89: coex: Add v1 Wi-Fi SCC coexistence policy
rtw89: coex: Update Wi-Fi driver/firmware TDMA cycle report for
RTL8852c
drivers/net/wireless/realtek/rtw89/coex.c | 1111 +++++++++++++++-- drivers/net/wireless/realtek/rtw89/coex.h | 2 + drivers/net/wireless/realtek/rtw89/core.h | 241 +++- drivers/net/wireless/realtek/rtw89/fw.c | 113 +- drivers/net/wireless/realtek/rtw89/fw.h | 88 +- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 15 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 33 +- 7 files changed, 1378 insertions(+), 225 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/9 rtw89: coex: update radio state for RTL8852A/RTL8852C
From: Ching-Te Ku <[email protected]>
Update scoreboard setting to let Bluetooth know Wi-Fi power save state.
--- drivers/net/wireless/realtek/rtw89/coex.c | 24 ++++++++++++++++------- drivers/net/wireless/realtek/rtw89/core.h | 4 ++-- 2 files changed, 19 insertions(+), 9 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +17 -7
@@ -551,8 +551,10 @@ static void _send_fw_cmd(struct rtw89_dev *rtwdev, u8 h2c_class, u8 h2c_func, "[BTC], %s(): return by btc not init!!\n", __func__); pfwinfo->cnt_h2c_fail++;return ; - }else if ((wl->status.map.rf_off_pre ==1 && wl->status.map.rf_off ==1 ) || - (wl->status.map.lps_pre ==1 && wl->status.map.lps ==1 )) { + }else if ((wl->status.map.rf_off_pre ==BTC_LPS_RF_OFF && + wl->status.map.rf_off ==BTC_LPS_RF_OFF ) || + (wl->status.map.lps_pre ==BTC_LPS_RF_OFF && + wl->status.map.lps ==BTC_LPS_RF_OFF )) {rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): return by wl off!!\n" , __func__); pfwinfo->cnt_h2c_fail++;
@@ -3743,11 +3745,14 @@ void rtw89_btc_ntfy_poweron(struct rtw89_dev *rtwdev)void rtw89_btc_ntfy_poweroff (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_wl_info *wl = &btc->cx.wl;rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): !!\n" , __func__); btc->dm.cnt_notify[BTC_NCNT_POWER_OFF ]++; btc->cx.wl.status.map.rf_off =1 ; + btc->cx.wl.status.map.busy =0 ; + wl->status.map.lps =BTC_LPS_OFF ;_write_scbd (rtwdev,BTC_WSCB_ALL , false);_run_coex (rtwdev,BTC_RSN_NTFY_POWEROFF );
@@ -4239,6 +4244,7 @@ void rtw89_btc_ntfy_radio_state(struct rtw89_dev *rtwdev, enum btc_rfctrl rf_staconst struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_wl_info *wl = &btc->cx.wl; +u32 val;rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): rf_state = %d\n" , __func__, rf_state);
@@ -4248,10 +4254,12 @@ void rtw89_btc_ntfy_radio_state(struct rtw89_dev *rtwdev, enum btc_rfctrl rf_stacase BTC_RFCTRL_WL_OFF : wl->status.map.rf_off =1 ; wl->status.map.lps =BTC_LPS_OFF ; + wl->status.map.busy =0 ;break ;case BTC_RFCTRL_FW_CTRL : wl->status.map.rf_off =0 ; wl->status.map.lps =BTC_LPS_RF_OFF ; + wl->status.map.busy =0 ;break ;case BTC_RFCTRL_WL_ON :default :
@@ -4261,14 +4269,17 @@ void rtw89_btc_ntfy_radio_state(struct rtw89_dev *rtwdev, enum btc_rfctrl rf_sta }if (rf_state ==BTC_RFCTRL_WL_ON ) { + btc->dm.cnt_dm[BTC_DCNT_BTCNT_FREEZE ] =0 ;rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_MREG |RPT_EN_BT_VER_INFO , true); -_write_scbd (rtwdev,BTC_WSCB_ACTIVE , true); + val =BTC_WSCB_ACTIVE |BTC_WSCB_ON |BTC_WSCB_BTLOG ; +_write_scbd (rtwdev, val, true);_update_bt_scbd (rtwdev, true); chip->ops->btc_init_cfg (rtwdev); }else {rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_ALL , false); -_write_scbd (rtwdev,BTC_WSCB_ACTIVE |BTC_WSCB_WLBUSY , false); +if (rf_state ==BTC_RFCTRL_WL_OFF ) +_write_scbd (rtwdev,BTC_WSCB_ALL , false); }_run_coex (rtwdev,BTC_RSN_NTFY_RADIO_STATE );
@@ -4739,9 +4750,8 @@ static void _show_wl_info(struct rtw89_dev *rtwdev, struct seq_file *m) "[status]", (u32)wl_rinfo->link_mode);seq_printf (m, -"rf_off:%s, power_save:%s, scan:%s(band:%d/phy_map:0x%x), " , - wl->status.map.rf_off ?"Y" :"N" , - wl->status.map.lps ?"Y" :"N" , +"rf_off:%d, power_save:%d, scan:%s(band:%d/phy_map:0x%x), " , + wl->status.map.rf_off, wl->status.map.lps, wl->status.map.scan ?"Y" :"N" , wl->scan_info.band[RTW89_PHY_0 ], wl->scan_info.phy_map);
drivers/net/wireless/realtek/rtw89/core.h +2 -2
@@ -936,12 +936,12 @@ struct rtw89_btc_wl_smap { u32 roaming: 1; u32 _4way: 1; u32 rf_off: 1; - u32 lps: 1; + u32 lps: 2; u32 ips: 1; u32 init_ok: 1; u32 traffic_dir : 2; u32 rf_off_pre: 1; - u32 lps_pre: 1; + u32 lps_pre: 2; };enum rtw89_tfc_lv {
Signature · 1 line
2.25.1
Re: [PATCH v2 1/9] rtw89: coex: update radio state for RTL8852A/RTL8852C
Quoted 6 lines · Ping-Ke Shih
From: Ching-Te Ku <[email protected]>
Update scoreboard setting to let Bluetooth know Wi-Fi power save state.
Signed-off-by Ching-Te Ku <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
9 patches applied to wireless-next.git, thanks.
38ede035a21b rtw89: coex: update radio state for RTL8852A/RTL8852C ba787c07ca1b rtw89: coex: Move Wi-Fi firmware coexistence matching version to chip 1162584c799d rtw89: coex: Add logic to parsing rtl8852c firmware type ctrl report 3893959cd8c7 rtw89: coex: Define BT B1 slot lengthce986f3dc4fc rtw89: coex: Add v1 version TDMA format and parameters e390cf2ebdee rtw89: coex: update WL role info v1 for RTL8852C branch using a8a0b1f70780 rtw89: coex: Move _set_policy to chip_ops747dc30e64cf rtw89: coex: Add v1 Wi-Fi SCC coexistence policy 3832a5424902 rtw89: coex: Update Wi-Fi driver/firmware TDMA cycle report for RTL8852c
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH v2 2/9 rtw89: coex: Move Wi-Fi firmware coexistence matching version to chip
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
To configure the different chips with different coexistence version, separated the firmware feature version matching number is necessary.
--- drivers/net/wireless/realtek/rtw89/coex.c | 25 +++++----- drivers/net/wireless/realtek/rtw89/core.h | 50 +++++++++---------- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 14 ++++++ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 14 ++++++ 4 files changed, 66 insertions(+), 37 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +13 -12
@@ -871,6 +871,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,struct rtw89_btc_btf_fwinfo *pfwinfo, u8 *prptbuf, u32 index) { + const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ;
@@ -908,7 +909,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_ctrl.cinfo; pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo); - pcinfo->req_fver =BTCRPT_VER ; + pcinfo->req_fver = chip->fcxbtcrpt_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -916,7 +917,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_tdma.cinfo; pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_tdma.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_tdma.finfo); - pcinfo->req_fver =FCXTDMA_VER ; + pcinfo->req_fver = chip->fcxtdma_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -924,7 +925,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_slots.cinfo; pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_slots.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_slots.finfo); - pcinfo->req_fver =FCXSLOTS_VER ; + pcinfo->req_fver = chip->fcxslots_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -934,7 +935,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcysta_le32 = &pfwinfo->rpt_fbtc_cysta.finfo;rtw89_btc_fbtc_cysta_to_cpu (pcysta_le32, pcysta); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo); - pcinfo->req_fver =FCXCYSTA_VER ; + pcinfo->req_fver = chip->fcxcysta_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -943,7 +944,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_step.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_step.finfo.step[0 ]) * trace_step +8 ; - pcinfo->req_fver =FCXSTEP_VER ; + pcinfo->req_fver = chip->fcxstep_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -951,7 +952,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_nullsta.cinfo; pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_nullsta.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_nullsta.finfo); - pcinfo->req_fver =FCXNULLSTA_VER ; + pcinfo->req_fver = chip->fcxnullsta_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -959,7 +960,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_mregval.cinfo; pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_mregval.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_mregval.finfo); - pcinfo->req_fver =FCXMREG_VER ; + pcinfo->req_fver = chip->fcxmreg_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -967,7 +968,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_gpio_dbg.cinfo; pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_gpio_dbg.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_gpio_dbg.finfo); - pcinfo->req_fver =FCXGPIODBG_VER ; + pcinfo->req_fver = chip->fcxgpiodbg_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -975,7 +976,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_btver.cinfo; pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_btver.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btver.finfo); - pcinfo->req_fver =FCX_BTVER_VER ; + pcinfo->req_fver = chip->fcxbtver_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -983,7 +984,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_btscan.cinfo; pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_btscan.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btscan.finfo); - pcinfo->req_fver =FCX_BTSCAN_VER ; + pcinfo->req_fver = chip->fcxbtscan_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -991,7 +992,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_btafh.cinfo; pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_btafh.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btafh.finfo); - pcinfo->req_fver =FCX_BTAFH_VER ; + pcinfo->req_fver = chip->fcxbtafh_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
@@ -999,7 +1000,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_btdev.cinfo; pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_btdev.finfo); pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_btdev.finfo); - pcinfo->req_fver =FCX_BTDEVINFO_VER ; + pcinfo->req_fver = chip->fcxbtdevinfo_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;break ;
drivers/net/wireless/realtek/rtw89/core.h +25 -25
155 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852a.c +14 -0
@@ -2157,6 +2157,20 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .btcx_desired = 0x5, .scbd = 0x1, .mailbox = 0x1, + + .fcxbtcrpt_ver = 1, + .fcxtdma_ver = 1, + .fcxslots_ver = 1, + .fcxcysta_ver = 2, + .fcxstep_ver = 2, + .fcxnullsta_ver = 1, + .fcxmreg_ver = 1, + .fcxgpiodbg_ver = 1, + .fcxbtver_ver = 1, + .fcxbtscan_ver = 1, + .fcxbtafh_ver = 1, + .fcxbtdevinfo_ver = 1, + .afh_guard_ch = 6, .wl_rssi_thres = rtw89_btc_8852a_wl_rssi_thres, .bt_rssi_thres = rtw89_btc_8852a_bt_rssi_thres,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +14 -0
@@ -3006,6 +3006,20 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .btcx_desired = 0x5, .scbd = 0x1, .mailbox = 0x1, + + .fcxbtcrpt_ver = 4, + .fcxtdma_ver = 3, + .fcxslots_ver = 1, + .fcxcysta_ver = 3, + .fcxstep_ver = 3, + .fcxnullsta_ver = 2, + .fcxmreg_ver = 1, + .fcxgpiodbg_ver = 1, + .fcxbtver_ver = 1, + .fcxbtscan_ver = 1, + .fcxbtafh_ver = 1, + .fcxbtdevinfo_ver = 1, + .afh_guard_ch = 6, .wl_rssi_thres = rtw89_btc_8852c_wl_rssi_thres, .bt_rssi_thres = rtw89_btc_8852c_bt_rssi_thres,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/9 rtw89: coex: Add logic to parsing rtl8852c firmware type ctrl report
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Add a part of logic to parse type of ctrl report from firmware, and remove Bluetooth packet counter count from driver, the feature was moved to firmware at rtl8852c.
--- drivers/net/wireless/realtek/rtw89/coex.c | 44 +++++++++++-- drivers/net/wireless/realtek/rtw89/core.h | 63 +++++++++++++++++-- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 18 +----- 3 files changed, 98 insertions(+), 27 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +39 -5
@@ -876,7 +876,9 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_fbtc_rpt_ctrl *prpt =NULL ; +struct rtw89_btc_bt_info *bt = &btc->cx.bt; +struct rtw89_btc_fbtc_rpt_ctrl *prpt; +struct rtw89_btc_fbtc_rpt_ctrl_v1 *prpt_v1;struct rtw89_btc_fbtc_cysta *pcysta_le32 =NULL ;struct rtw89_btc_fbtc_cysta_cpu pcysta[1 ];struct rtw89_btc_prpt *btc_prpt =NULL ;
@@ -907,8 +909,13 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,switch (rpt_type) {case BTC_RPT_TYPE_CTRL : pcinfo = &pfwinfo->rpt_ctrl.cinfo; - pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo); - pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo); +if (chip->chip_id ==RTL8852A ) { + pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo); + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo); + }else { + pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo_v1); + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo_v1); + } pcinfo->req_fver = chip->fcxbtcrpt_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;
@@ -1127,12 +1134,12 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,_chk_btc_err (rtwdev,BTC_DCNT_CYCLE_FREEZE , (u32 )pcysta->cycles); } -if (rpt_type ==BTC_RPT_TYPE_CTRL ) { +if (rpt_type ==BTC_RPT_TYPE_CTRL && chip->chip_id ==RTL8852A ) { prpt = &pfwinfo->rpt_ctrl.finfo; btc->fwinfo.rpt_en_map = prpt->rpt_enable; wl->ver_info.fw_coex = prpt->wl_fw_coex_ver; wl->ver_info.fw = prpt->wl_fw_ver; - dm->wl_fw_cx_offload = !!(prpt->wl_fw_cx_offload); + dm->wl_fw_cx_offload = !!prpt->wl_fw_cx_offload;_chk_btc_err (rtwdev,BTC_DCNT_RPT_FREEZE , pfwinfo->event[BTF_EVNT_RPT ]);
@@ -1145,6 +1152,33 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, btc->cx.cnt_bt[BTC_BCNT_POLUT ] =rtw89_mac_get_plt_cnt (rtwdev,RTW89_MAC_0 ); } + }else if (rpt_type ==BTC_RPT_TYPE_CTRL ) { + prpt_v1 = &pfwinfo->rpt_ctrl.finfo_v1; + btc->fwinfo.rpt_en_map =le32_to_cpu (prpt_v1->rpt_info.en); + wl->ver_info.fw_coex =le32_to_cpu (prpt_v1->wl_fw_info.cx_ver); + wl->ver_info.fw =le32_to_cpu (prpt_v1->wl_fw_info.fw_ver); + dm->wl_fw_cx_offload = !!le32_to_cpu (prpt_v1->wl_fw_info.cx_offload); + +for (i =RTW89_PHY_0 ; i <RTW89_PHY_MAX ; i++) +memcpy (&dm->gnt.band[i], &prpt_v1->gnt_val[i], +sizeof (dm->gnt.band[i])); + + btc->cx.cnt_bt[BTC_BCNT_HIPRI_TX ] =le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_HI_TX ]); + btc->cx.cnt_bt[BTC_BCNT_HIPRI_RX ] =le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_HI_RX ]); + btc->cx.cnt_bt[BTC_BCNT_LOPRI_TX ] =le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_LO_TX ]); + btc->cx.cnt_bt[BTC_BCNT_LOPRI_RX ] =le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_LO_RX ]); + btc->cx.cnt_bt[BTC_BCNT_POLUT ] =le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_POLLUTED ]); + +_chk_btc_err (rtwdev,BTC_DCNT_BTCNT_FREEZE ,0 ); +_chk_btc_err (rtwdev,BTC_DCNT_RPT_FREEZE , + pfwinfo->event[BTF_EVNT_RPT ]); + +if (le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_RFK_TIMEOUT ]) >0 ) + bt->rfk_info.map.timeout =1 ; +else + bt->rfk_info.map.timeout =0 ; + + dm->error.map.bt_rfk_timeout = bt->rfk_info.map.timeout; } if (rpt_type >= BTC_RPT_TYPE_BT_VER &&
drivers/net/wireless/realtek/rtw89/core.h +58 -5
96 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -17
@@ -2793,23 +2793,7 @@ void rtw8852c_btc_bt_aci_imp(struct rtw89_dev *rtwdev)static void rtw8852c_btc_update_bt_cnt (struct rtw89_dev *rtwdev) { -struct rtw89_btc *btc = &rtwdev->btc; -struct rtw89_btc_cx *cx = &btc->cx; -u32 val; - - val =rtw89_read32 (rtwdev,R_BTC_BT_CNT_HIGH ); - cx->cnt_bt[BTC_BCNT_HIPRI_TX ] =FIELD_GET (B_AX_STATIS_BT_HI_TX_MASK , val); - cx->cnt_bt[BTC_BCNT_HIPRI_RX ] =FIELD_GET (B_AX_STATIS_BT_HI_RX_MASK , val); - - val =rtw89_read32 (rtwdev,R_BTC_BT_CNT_LOW ); - cx->cnt_bt[BTC_BCNT_LOPRI_TX ] =FIELD_GET (B_AX_STATIS_BT_LO_TX_1_MASK , val); - cx->cnt_bt[BTC_BCNT_LOPRI_RX ] =FIELD_GET (B_AX_STATIS_BT_LO_RX_1_MASK , val); - -/* clock-gate off before reset counter*/ -rtw89_write32_set (rtwdev,R_AX_BTC_CFG ,B_AX_DIS_BTC_CLK_G ); -rtw89_write32_clr (rtwdev,R_AX_BT_CNT_CFG ,B_AX_BT_CNT_RST ); -rtw89_write32_set (rtwdev,R_AX_BT_CNT_CFG ,B_AX_BT_CNT_RST ); -rtw89_write32_clr (rtwdev,R_AX_BTC_CFG ,B_AX_DIS_BTC_CLK_G ); +/* Feature move to firmware */ } static
Signature · 1 line
2.25.1
Re: [PATCH v2 3/9] rtw89: coex: Add logic to parsing rtl8852c firmware type ctrl report
Quoted 32 lines · Ping-Ke Shih
From: Ching-Te Ku <[email protected]>
Add a part of logic to parse type of ctrl report from firmware, and remove Bluetooth packet counter count from driver, the feature was moved to firmware at rtl8852c.
Signed-off-by Ching-Te Ku <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>--- drivers/net/wireless/realtek/rtw89/coex.c | 44 +++++++++++-- drivers/net/wireless/realtek/rtw89/core.h | 63 +++++++++++++++++-- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 18 +----- 3 files changed, 98 insertions(+), 27 deletions(-)drivers/net/wireless/realtek/rtw89/coex.c +3
-1@@ -876,7 +876,9 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_fbtc_rpt_ctrl *prpt =NULL ; +struct rtw89_btc_bt_info *bt = &btc->cx.bt; +struct rtw89_btc_fbtc_rpt_ctrl *prpt; +struct rtw89_btc_fbtc_rpt_ctrl_v1 *prpt_v1;struct rtw89_btc_fbtc_cysta *pcysta_le32 =NULL ;struct rtw89_btc_fbtc_cysta_cpu pcysta[1 ];struct rtw89_btc_prpt *btc_prpt =NULL ;@@ -907,8 +909,13 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,switch (rpt_type) {case BTC_RPT_TYPE_CTRL :
drivers/net/wireless/realtek/rtw89/coex.c static u32 _chk_btc_report(struct rtw89_dev *rtwdev, · line 918
Quoted 10 lines
drivers/net/wireless/realtek/rtw89/coex.c +7
-2pcinfo = &pfwinfo->rpt_ctrl.cinfo; - pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo); - pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo); +if (chip->chip_id ==RTL8852A ) { + pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo); + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo); + }else { + pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo_v1); + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo_v1); + }
That u8 cast is not really pretty, shouldn't pfinfo be a void pointer and then all these casts could be avoided? But of course that's not introduced by this patch so need to resend the patch because of this.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerRe: [PATCH v2 3/9] rtw89: coex: Add logic to parsing rtl8852c firmware type ctrl report
Quoted 41 lines · Kalle Valo
Quoted 39 lines · Ping-Ke Shih
From: Ching-Te Ku <[email protected]>
Add a part of logic to parse type of ctrl report from firmware, and remove Bluetooth packet counter count from driver, the feature was moved to firmware at rtl8852c.
Signed-off-by Ching-Te Ku <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>--- drivers/net/wireless/realtek/rtw89/coex.c | 44 +++++++++++-- drivers/net/wireless/realtek/rtw89/core.h | 63 +++++++++++++++++-- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 18 +----- 3 files changed, 98 insertions(+), 27 deletions(-)drivers/net/wireless/realtek/rtw89/coex.c +6
-3@@ -876,7 +876,9 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -struct rtw89_btc_fbtc_rpt_ctrl *prpt =NULL ; +struct rtw89_btc_bt_info *bt = &btc->cx.bt; +struct rtw89_btc_fbtc_rpt_ctrl *prpt; +struct rtw89_btc_fbtc_rpt_ctrl_v1 *prpt_v1;struct rtw89_btc_fbtc_cysta *pcysta_le32 =NULL ;struct rtw89_btc_fbtc_cysta_cpu pcysta[1 ];struct rtw89_btc_prpt *btc_prpt =NULL ;@@ -907,8 +909,13 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,switch (rpt_type) {case BTC_RPT_TYPE_CTRL : pcinfo = &pfwinfo->rpt_ctrl.cinfo; - pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo); - pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo); +if (chip->chip_id ==RTL8852A ) { + pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo); + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo);
Quoted 9 lines
drivers/net/wireless/realtek/rtw89/coex.c static u32 _chk_btc_report(struct rtw89_dev *rtwdev, · line 918
Quoted 4 lines
drivers/net/wireless/realtek/rtw89/coex.c +4
-0+ }else { + pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo_v1); + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo_v1); + }That u8 cast is not really pretty, shouldn't pfinfo be a void pointer and then all these casts could be avoided? But of course that's not introduced by this patch so need to resend the patch because of this.
Thanks for pointing this out, I will change pinfo to void pointer along with next patchset of coex changes.
Ping-Ke
Ping-Ke Shih
maintainerPATCH v2 4/9 rtw89: coex: Define BT B1 slot length
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
It is for setting up BT slot max length at BT auto slot mechanism.
--- drivers/net/wireless/realtek/rtw89/coex.c | 131 +++++++++++----------- 1 file changed, 66 insertions(+), 65 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +66 -65
@@ -322,25 +322,25 @@ enum btc_cx_poicy_type {BTC_CXP_PFIX_TDW1B1 = (BTC_CXP_PFIX <<8 ) |6 ,/* TDMA Auto slot-0: W1:B1 = 50:200 */ -BTC_CXP_AUTO_TD50200 = (BTC_CXP_AUTO <<8 ) |0 , +BTC_CXP_AUTO_TD50B1 = (BTC_CXP_AUTO <<8 ) |0 ,/* TDMA Auto slot-1: W1:B1 = 60:200 */ -BTC_CXP_AUTO_TD60200 = (BTC_CXP_AUTO <<8 ) |1 , +BTC_CXP_AUTO_TD60B1 = (BTC_CXP_AUTO <<8 ) |1 ,/* TDMA Auto slot-2: W1:B1 = 20:200 */ -BTC_CXP_AUTO_TD20200 = (BTC_CXP_AUTO <<8 ) |2 , +BTC_CXP_AUTO_TD20B1 = (BTC_CXP_AUTO <<8 ) |2 ,/* TDMA Auto slot-3: W1:B1 = user-define */ BTC_CXP_AUTO_TDW1B1 = (BTC_CXP_AUTO <<8 ) |3 ,/* PS-TDMA Auto slot-0: W1:B1 = 50:200 */ -BTC_CXP_PAUTO_TD50200 = (BTC_CXP_PAUTO <<8 ) |0 , +BTC_CXP_PAUTO_TD50B1 = (BTC_CXP_PAUTO <<8 ) |0 ,/* PS-TDMA Auto slot-1: W1:B1 = 60:200 */ -BTC_CXP_PAUTO_TD60200 = (BTC_CXP_PAUTO <<8 ) |1 , +BTC_CXP_PAUTO_TD60B1 = (BTC_CXP_PAUTO <<8 ) |1 ,/* PS-TDMA Auto slot-2: W1:B1 = 20:200 */ -BTC_CXP_PAUTO_TD20200 = (BTC_CXP_PAUTO <<8 ) |2 , +BTC_CXP_PAUTO_TD20B1 = (BTC_CXP_PAUTO <<8 ) |2 ,/* PS-TDMA Auto slot-3: W1:B1 = user-define */ BTC_CXP_PAUTO_TDW1B1 = (BTC_CXP_PAUTO << 8) | 3,
@@ -531,6 +531,7 @@ enum btc_reason_and_action {#define BTC_FREERUN_ANTISO_MIN 30#define BTC_TDMA_BTHID_MAX 2#define BTC_BLINK_NOCONNECT 0 +#define BTC_B1_MAX 250/* unit ms */ static void _run_coex (struct rtw89_dev *rtwdev,enum btc_reason_and_action reason);
@@ -2117,17 +2118,17 @@ static void _set_policy(struct rtw89_dev *rtwdev, u16 policy_type,_write_scbd (rtwdev,BTC_WSCB_TDMA , true); *t = t_def[CXTD_AUTO ];switch (policy_type) { -case BTC_CXP_AUTO_TD50200 : -_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); +case BTC_CXP_AUTO_TD50B1 : +_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ; -case BTC_CXP_AUTO_TD60200 : -_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); +case BTC_CXP_AUTO_TD60B1 : +_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ; -case BTC_CXP_AUTO_TD20200 : -_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); +case BTC_CXP_AUTO_TD20B1 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_AUTO_TDW1B1 :/* W1:B1 = user-define */ _slot_set(btc, CXST_W1, dm->slot_dur[CXST_W1],
@@ -2141,17 +2142,17 @@ static void _set_policy(struct rtw89_dev *rtwdev, u16 policy_type,_write_scbd (rtwdev,BTC_WSCB_TDMA , true); *t = t_def[CXTD_PAUTO ];switch (policy_type) { -case BTC_CXP_PAUTO_TD50200 : -_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); +case BTC_CXP_PAUTO_TD50B1 : +_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ; -case BTC_CXP_PAUTO_TD60200 : -_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); +case BTC_CXP_PAUTO_TD60B1 : +_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ; -case BTC_CXP_PAUTO_TD20200 : -_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); +case BTC_CXP_PAUTO_TD20B1 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_PAUTO_TDW1B1 : _slot_set(btc, CXST_W1, dm->slot_dur[CXST_W1],
@@ -2166,29 +2167,29 @@ static void _set_policy(struct rtw89_dev *rtwdev, u16 policy_type, *t = t_def[CXTD_AUTO2 ];switch (policy_type) {case BTC_CXP_AUTO2_TD3050 : -_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); -_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_AUTO2_TD3070 : -_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); -_slot_set (btc,CXST_B4 ,70 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B4 ,70 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_AUTO2_TD5050 : -_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); -_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_AUTO2_TD6060 : -_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); -_slot_set (btc,CXST_B4 ,60 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B4 ,60 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_AUTO2_TD2080 : -_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); -_slot_set (btc,CXST_B4 ,80 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B4 ,80 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_AUTO2_TDW1B4 :/* W1:B1 = user-define */ _slot_set(btc, CXST_W1, dm->slot_dur[CXST_W1],
@@ -2203,29 +2204,29 @@ static void _set_policy(struct rtw89_dev *rtwdev, u16 policy_type, *t = t_def[CXTD_PAUTO2 ];switch (policy_type) {case BTC_CXP_PAUTO2_TD3050 : -_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); -_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_PAUTO2_TD3070 : -_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); -_slot_set (btc,CXST_B4 ,70 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B4 ,70 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_PAUTO2_TD5050 : -_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); -_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_PAUTO2_TD6060 : -_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); -_slot_set (btc,CXST_B4 ,60 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B4 ,60 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_PAUTO2_TD2080 : -_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); -_slot_set (btc,CXST_B1 ,200 , tbl_b1,SLOT_MIX ); -_slot_set (btc,CXST_B4 ,80 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B4 ,80 , tbl_b4,SLOT_MIX ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX );break ;case BTC_CXP_PAUTO2_TDW1B4 :/* W1:B1 = user-define */ _slot_set(btc, CXST_W1, dm->slot_dur[CXST_W1],
@@ -2574,7 +2575,7 @@ static void _action_bt_a2dp(struct rtw89_dev *rtwdev) BTC_CXP_PAUTO_TDW1B1, BTC_ACT_BT_A2DP); }else {_set_policy (rtwdev, -BTC_CXP_PAUTO_TD50200 ,BTC_ACT_BT_A2DP ); +BTC_CXP_PAUTO_TD50B1 ,BTC_ACT_BT_A2DP ); }break ;case BTC_WBUSY_BSCAN :/* wl-busy + bt-inq + bt-A2DP */
@@ -2591,12 +2592,12 @@ static void _action_bt_a2dp(struct rtw89_dev *rtwdev)_set_policy (rtwdev,BTC_CXP_AUTO_TDW1B1 ,BTC_ACT_BT_A2DP ); }else { -_set_policy (rtwdev,BTC_CXP_AUTO_TD50200 , +_set_policy (rtwdev,BTC_CXP_AUTO_TD50B1 ,BTC_ACT_BT_A2DP ); }break ;case BTC_WIDLE :/* wl-idle + bt-A2DP */ -_set_policy (rtwdev,BTC_CXP_AUTO_TD20200 ,BTC_ACT_BT_A2DP ); +_set_policy (rtwdev,BTC_CXP_AUTO_TD20B1 ,BTC_ACT_BT_A2DP );break ; } }
@@ -2676,7 +2677,7 @@ static void _action_bt_a2dp_hid(struct rtw89_dev *rtwdev) BTC_CXP_PAUTO_TDW1B1, BTC_ACT_BT_A2DP_HID); }else {_set_policy (rtwdev, -BTC_CXP_PAUTO_TD50200 ,BTC_ACT_BT_A2DP_HID ); +BTC_CXP_PAUTO_TD50B1 ,BTC_ACT_BT_A2DP_HID ); }break ;case BTC_WBUSY_BSCAN :/* wl-busy + bt-inq + bt-A2DP+HID */
@@ -2694,7 +2695,7 @@ static void _action_bt_a2dp_hid(struct rtw89_dev *rtwdev)_set_policy (rtwdev,BTC_CXP_AUTO_TDW1B1 ,BTC_ACT_BT_A2DP_HID ); }else { -_set_policy (rtwdev,BTC_CXP_AUTO_TD50200 , +_set_policy (rtwdev,BTC_CXP_AUTO_TD50B1 ,BTC_ACT_BT_A2DP_HID ); }break ;
@@ -5033,13 +5034,13 @@ static const char *steps_to_str(u16 step)CASE_BTC_POLICY_STR (PFIX_TD3070 );CASE_BTC_POLICY_STR (PFIX_TD2080 );CASE_BTC_POLICY_STR (PFIX_TDW1B1 ); -CASE_BTC_POLICY_STR (AUTO_TD50200 ); -CASE_BTC_POLICY_STR (AUTO_TD60200 ); -CASE_BTC_POLICY_STR (AUTO_TD20200 ); +CASE_BTC_POLICY_STR (AUTO_TD50B1 ); +CASE_BTC_POLICY_STR (AUTO_TD60B1 ); +CASE_BTC_POLICY_STR (AUTO_TD20B1 );CASE_BTC_POLICY_STR (AUTO_TDW1B1 ); -CASE_BTC_POLICY_STR (PAUTO_TD50200 ); -CASE_BTC_POLICY_STR (PAUTO_TD60200 ); -CASE_BTC_POLICY_STR (PAUTO_TD20200 ); +CASE_BTC_POLICY_STR (PAUTO_TD50B1 ); +CASE_BTC_POLICY_STR (PAUTO_TD60B1 ); +CASE_BTC_POLICY_STR (PAUTO_TD20B1 );CASE_BTC_POLICY_STR (PAUTO_TDW1B1 );CASE_BTC_POLICY_STR (AUTO2_TD3050 );CASE_BTC_POLICY_STR (AUTO2_TD3070 );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 5/9 rtw89: coex: Add v1 version TDMA format and parameters
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
RTL8852C use a later version Wi-Fi firmware, there are some parameters need to be defined. These new parameter can avoid some unexpected TDMA mode while Wi-Fi enter/leave lps.
--- drivers/net/wireless/realtek/rtw89/coex.c | 73 +++++++++++++++++++---- drivers/net/wireless/realtek/rtw89/core.h | 19 ++++-- 2 files changed, 75 insertions(+), 17 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +60 -13
@@ -923,8 +923,13 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,break ;case BTC_RPT_TYPE_TDMA : pcinfo = &pfwinfo->rpt_fbtc_tdma.cinfo; - pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_tdma.finfo); - pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_tdma.finfo); +if (chip->chip_id ==RTL8852A ) { + pfinfo = (u8 *)&pfwinfo->rpt_fbtc_tdma.finfo; + pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_tdma.finfo); + }else { + pfinfo = (u8 *)&pfwinfo->rpt_fbtc_tdma.finfo_v1; + pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_tdma.finfo_v1); + } pcinfo->req_fver = chip->fcxtdma_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;
@@ -1037,7 +1042,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,memcpy (pfinfo, rpt_content, pcinfo->req_len); pcinfo->valid =1 ; -if (rpt_type ==BTC_RPT_TYPE_TDMA ) { +if (rpt_type ==BTC_RPT_TYPE_TDMA && chip->chip_id ==RTL8852A ) {rtw89_debug (rtwdev,RTW89_DBG_BTC ,"[BTC], %s(): check %d %zu\n" , __func__,BTC_DCNT_TDMA_NONSYNC ,sizeof (dm->tdma_now));
@@ -1050,7 +1055,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, dm->tdma_now.type, dm->tdma_now.rxflctrl, dm->tdma_now.txpause, dm->tdma_now.wtgle_n, dm->tdma_now.leak_n, dm->tdma_now.ext_ctrl, - dm->tdma_now.rsvd0, dm->tdma_now.rsvd1); + dm->tdma_now.rxflctrl_role, + dm->tdma_now.option_ctrl); rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): %d rpt_fbtc_tdma %x %x %x %x %x %x %x %x\n",
@@ -1061,14 +1067,46 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pfwinfo->rpt_fbtc_tdma.finfo.wtgle_n, pfwinfo->rpt_fbtc_tdma.finfo.leak_n, pfwinfo->rpt_fbtc_tdma.finfo.ext_ctrl, - pfwinfo->rpt_fbtc_tdma.finfo.rsvd0, - pfwinfo->rpt_fbtc_tdma.finfo.rsvd1); + pfwinfo->rpt_fbtc_tdma.finfo.rxflctrl_role, + pfwinfo->rpt_fbtc_tdma.finfo.option_ctrl); }_chk_btc_err (rtwdev,BTC_DCNT_TDMA_NONSYNC ,memcmp (&dm->tdma_now, &pfwinfo->rpt_fbtc_tdma.finfo,sizeof (dm->tdma_now))); + }else if (rpt_type ==BTC_RPT_TYPE_TDMA ) { +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s(): check %d %zu\n" , __func__, +BTC_DCNT_TDMA_NONSYNC ,sizeof (dm->tdma_now)); + +if (memcmp (&dm->tdma_now, &pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma, +sizeof (dm->tdma_now)) !=0 ) { +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s(): %d tdma_now %x %x %x %x %x %x %x %x\n" , + __func__,BTC_DCNT_TDMA_NONSYNC , + dm->tdma_now.type, dm->tdma_now.rxflctrl, + dm->tdma_now.txpause, dm->tdma_now.wtgle_n, + dm->tdma_now.leak_n, dm->tdma_now.ext_ctrl, + dm->tdma_now.rxflctrl_role, + dm->tdma_now.option_ctrl); +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s(): %d rpt_fbtc_tdma %x %x %x %x %x %x %x %x\n" , + __func__,BTC_DCNT_TDMA_NONSYNC , + pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.type, + pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.rxflctrl, + pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.txpause, + pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.wtgle_n, + pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.leak_n, + pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.ext_ctrl, + pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.rxflctrl_role, + pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.option_ctrl); + } + +_chk_btc_err (rtwdev,BTC_DCNT_TDMA_NONSYNC , +memcmp (&dm->tdma_now, + &pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma, +sizeof (dm->tdma_now))); }if (rpt_type ==BTC_RPT_TYPE_SLOT ) {
@@ -1220,10 +1258,12 @@ static void _parse_btc_report(struct rtw89_dev *rtwdev,static void _append_tdma (struct rtw89_dev *rtwdev) { +const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_dm *dm = &btc->dm; -struct rtw89_btc_btf_tlv *tlv =NULL ; -struct rtw89_btc_fbtc_tdma *v =NULL ; +struct rtw89_btc_btf_tlv *tlv; +struct rtw89_btc_fbtc_tdma *v; +struct rtw89_btc_fbtc_tdma_v1 *v1;u16 len = btc->policy_len; if (!btc->update_policy_force &&
@@ -1235,12 +1275,19 @@ static void _append_tdma(struct rtw89_dev *rtwdev) } tlv = (struct rtw89_btc_btf_tlv *)&btc->policy[len]; - v = (struct rtw89_btc_fbtc_tdma *)&tlv->val[0 ]; tlv->type =CXPOLICY_TDMA ; - tlv->len =sizeof (*v); - -memcpy (v, &dm->tdma,sizeof (*v)); - btc->policy_len +=BTC_TLV_HDR_LEN +sizeof (*v); +if (chip->chip_id ==RTL8852A ) { + v = (struct rtw89_btc_fbtc_tdma *)&tlv->val[0 ]; + tlv->len =sizeof (*v); +memcpy (v, &dm->tdma,sizeof (*v)); + btc->policy_len +=BTC_TLV_HDR_LEN +sizeof (*v); + }else { + tlv->len =sizeof (*v1); + v1 = (struct rtw89_btc_fbtc_tdma_v1 *)&tlv->val[0 ]; + v1->fver = chip->fcxtdma_ver; + v1->tdma = dm->tdma; + btc->policy_len +=BTC_TLV_HDR_LEN +sizeof (*v1); + } rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): type:%d, rxflctrl=%d, txpause=%d, wtgle_n=%d, leak_n=%d, ext_ctrl=%d\n",
drivers/net/wireless/realtek/rtw89/core.h +15 -4
@@ -1368,8 +1368,15 @@ struct rtw89_btc_fbtc_tdma {u8 wtgle_n;u8 leak_n;u8 ext_ctrl; -u8 rsvd0; -u8 rsvd1; +u8 rxflctrl_role; +u8 option_ctrl; +} __packed; + +struct rtw89_btc_fbtc_tdma_v1 { +u8 fver;/* chip_info::fcxtdma_ver */ +u8 rsvd; +__le16 rsvd1; +struct rtw89_btc_fbtc_tdma tdma; } __packed;#define CXMREG_MAX 30
@@ -1683,7 +1690,8 @@ struct rtw89_btc_dm { u32 wl_btg_rx: 1; u32 trx_para_level: 8; u32 wl_stb_chg: 1; - u32 rsvd: 3; + u32 tdma_instant_excute: 1; + u32 rsvd: 2;u16 slot_dur[CXST_MAX ];
@@ -1765,7 +1773,10 @@ struct rtw89_btc_report_ctrl_state {struct rtw89_btc_rpt_fbtc_tdma {struct rtw89_btc_rpt_cmn_info cinfo;/* common info, by driver */ -struct rtw89_btc_fbtc_tdma finfo;/* info from fw */ +union { +struct rtw89_btc_fbtc_tdma finfo;/* info from fw */ +struct rtw89_btc_fbtc_tdma_v1 finfo_v1;/* info from fw for 52C*/ + }; };struct rtw89_btc_rpt_fbtc_slots {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 6/9 rtw89: coex: update WL role info v1 for RTL8852C branch using
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The H2C format and support feature are different. The newer Wi-Fi firmware and driver branch need to handshake more information like DBCC or P2P connection info.
--- drivers/net/wireless/realtek/rtw89/coex.c | 294 +++++++++++++++++++--- drivers/net/wireless/realtek/rtw89/core.h | 37 +++ drivers/net/wireless/realtek/rtw89/fw.c | 113 ++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 88 +++++-- 4 files changed, 458 insertions(+), 74 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +259 -35
@@ -1493,12 +1493,17 @@ static void _fw_set_policy(struct rtw89_dev *rtwdev, u16 policy_type,static void _fw_set_drv_info (struct rtw89_dev *rtwdev,u8 type) { +const struct rtw89_chip_info *chip = rtwdev->chip; +switch (type) {case CXDRVINFO_INIT :rtw89_fw_h2c_cxdrv_init (rtwdev);break ;case CXDRVINFO_ROLE : -rtw89_fw_h2c_cxdrv_role (rtwdev); +if (chip->chip_id ==RTL8852A ) +rtw89_fw_h2c_cxdrv_role (rtwdev); +else +rtw89_fw_h2c_cxdrv_role_v1 (rtwdev);break ;case CXDRVINFO_CTRL :rtw89_fw_h2c_cxdrv_ctrl (rtwdev);
@@ -1768,28 +1773,45 @@ static void _set_bt_afh_info(struct rtw89_dev *rtwdev)struct rtw89_btc_bt_info *bt = &btc->cx.bt;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_active_role *r; +struct rtw89_btc_wl_active_role_v1 *r1;u8 en =0 , i, ch =0 , bw =0 ; +u8 mode, connect_cnt;if (btc->ctrl.manual || wl->status.map.scan)return ; -/* TODO if include module->ant.type == BTC_ANT_SHARED */ +if (chip->chip_id ==RTL8852A ) { + mode = wl_rinfo->link_mode; + connect_cnt = wl_rinfo->connect_cnt; + }else { + mode = wl_rinfo_v1->link_mode; + connect_cnt = wl_rinfo_v1->connect_cnt; + } +if (wl->status.map.rf_off || bt->whql_test || - wl_rinfo->link_mode ==BTC_WLINK_NOLINK || - wl_rinfo->link_mode ==BTC_WLINK_5G || - wl_rinfo->connect_cnt >BTC_TDMA_WLROLE_MAX ) { + mode ==BTC_WLINK_NOLINK || mode ==BTC_WLINK_5G || + connect_cnt >BTC_TDMA_WLROLE_MAX ) { en = false; - }else if (wl_rinfo->link_mode ==BTC_WLINK_2G_MCC || - wl_rinfo->link_mode ==BTC_WLINK_2G_SCC ) { + }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++) { -if (wl_rinfo->active_role[i].role == -RTW89_WIFI_ROLE_P2P_GO || - wl_rinfo->active_role[i].role == -RTW89_WIFI_ROLE_P2P_CLIENT ) { - ch = wl_rinfo->active_role[i].ch; - bw = wl_rinfo->active_role[i].bw; + r = &wl_rinfo->active_role[i]; + r1 = &wl_rinfo_v1->active_role_v1[i]; + +if (chip->chip_id ==RTL8852A && + (r->role ==RTW89_WIFI_ROLE_P2P_GO || + r->role ==RTW89_WIFI_ROLE_P2P_CLIENT )) { + ch = r->ch; + bw = r->bw; +break ; + }else if (chip->chip_id !=RTL8852A && + (r1->role ==RTW89_WIFI_ROLE_P2P_GO || + r1->role ==RTW89_WIFI_ROLE_P2P_CLIENT )) { + ch = r1->ch; + bw = r1->bw;break ; } }
@@ -1797,10 +1819,18 @@ static void _set_bt_afh_info(struct rtw89_dev *rtwdev) en = true;/* get 2g channel */ for (i =0 ; i <RTW89_PORT_NUM ; i++) { -if (wl_rinfo->active_role[i].connected && - wl_rinfo->active_role[i].band ==RTW89_BAND_2G ) { - ch = wl_rinfo->active_role[i].ch; - bw = wl_rinfo->active_role[i].bw; + r = &wl_rinfo->active_role[i]; + r1 = &wl_rinfo_v1->active_role_v1[i]; + +if (chip->chip_id ==RTL8852A && + r->connected && r->band ==RTW89_BAND_2G ) { + ch = r->ch; + bw = r->bw; +break ; + }else if (chip->chip_id !=RTL8852A && + r1->connected && r1->band ==RTW89_BAND_2G ) { + ch = r1->ch; + bw = r1->bw;break ; } }
@@ -1853,6 +1883,7 @@ 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.bt;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_bt_link_info *bt_linfo = &bt->link_info;struct rtw89_btc_bt_hid_desc *hid = &bt_linfo->hid_desc;
@@ -1862,7 +1893,8 @@ static bool _check_freerun(struct rtw89_dev *rtwdev) }/* The below is dedicated antenna case */ -if (wl_rinfo->connect_cnt >BTC_TDMA_WLROLE_MAX ) { +if (wl_rinfo->connect_cnt >BTC_TDMA_WLROLE_MAX || + wl_rinfo_v1->connect_cnt >BTC_TDMA_WLROLE_MAX ) { btc->dm.trx_para_level =5 ;return true; }
@@ -2877,19 +2909,27 @@ static void _action_wl_rfk(struct rtw89_dev *rtwdev)static void _set_btg_ctrl (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 *wl_rinfo = &wl->role_info; +struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1;struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info; -bool is_btg = false; +bool is_btg; +u8 mode;if (btc->ctrl.manual)return ; +if (chip->chip_id ==RTL8852A ) + mode = wl_rinfo->link_mode; +else + mode = wl_rinfo_v1->link_mode; +/* notify halbb ignore GNT_BT or not for WL BB Rx-AGC control */ -if (wl_rinfo->link_mode ==BTC_WLINK_5G )/* always 0 if 5G */ +if (mode ==BTC_WLINK_5G )/* always 0 if 5G */ is_btg = false; -else if (wl_rinfo->link_mode ==BTC_WLINK_25G_DBCC && +else if (mode ==BTC_WLINK_25G_DBCC && wl_dinfo->real_band[RTW89_PHY_1 ] !=RTW89_BAND_2G ) is_btg = false;else
@@ -2901,7 +2941,7 @@ static void _set_btg_ctrl(struct rtw89_dev *rtwdev) btc->dm.wl_btg_rx = is_btg; -if (wl_rinfo->link_mode ==BTC_WLINK_25G_MCC ) +if (mode ==BTC_WLINK_25G_MCC )return ;rtw89_ctrl_btg (rtwdev, is_btg);
@@ -2974,6 +3014,7 @@ static void rtw89_tx_time_iter(void *data, struct ieee80211_sta *sta)static void _set_wl_tx_limit (struct rtw89_dev *rtwdev) { +const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_dm *dm = &btc->dm;
@@ -2983,16 +3024,22 @@ 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_txtime_data data = {.rtwdev = rtwdev}; -u8 mode = wl_rinfo->link_mode; -u8 tx_retry =0 ; -u32 tx_time =0 ; -u16 enable =0 ; +u8 mode; +u8 tx_retry; +u32 tx_time; +u16 enable;bool reenable = false;if (btc->ctrl.manual)return ; +if (chip->chip_id ==RTL8852A ) + mode = wl_rinfo->link_mode; +else + mode = wl_rinfo_v1->link_mode; +if (btc->dm.freerun || btc->ctrl.igno_bt || b->profile_cnt.now ==0 || mode ==BTC_WLINK_5G || mode ==BTC_WLINK_NOLINK ) { enable =0 ;
@@ -3036,13 +3083,21 @@ static void _set_wl_tx_limit(struct rtw89_dev *rtwdev)static void _set_bt_rx_agc (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 *wl_rinfo = &wl->role_info; +struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1;struct rtw89_btc_bt_info *bt = &btc->cx.bt;bool bt_hi_lna_rx = false; +u8 mode; + +if (chip->chip_id ==RTL8852A ) + mode = wl_rinfo->link_mode; +else + mode = wl_rinfo_v1->link_mode; -if (wl_rinfo->link_mode !=BTC_WLINK_NOLINK && btc->dm.wl_btg_rx) +if (mode !=BTC_WLINK_NOLINK && btc->dm.wl_btg_rx) bt_hi_lna_rx = true;if (bt_hi_lna_rx == bt->hi_lna_rx)
@@ -3519,6 +3574,156 @@ static void _update_wl_info(struct rtw89_dev *rtwdev)_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_MAX ) { + 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 ); +} +#define BTC_CHK_HANG_MAX 3#define BTC_SCB_INV_VALUE GENMASK(31, 0)
@@ -3669,23 +3874,31 @@ static bool _chk_wl_rfk_request(struct rtw89_dev *rtwdev)static void _run_coex (struct rtw89_dev *rtwdev,enum btc_reason_and_action reason) { +const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc;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_wl_role_info *wl_rinfo = &wl->role_info; -u8 mode = wl_rinfo->link_mode; +struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1; +u8 mode;lockdep_assert_held (&rtwdev->mutex); -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" , - __func__, dm->wl_only, dm->bt_only); dm->run_reason = reason;_update_dm_step (rtwdev, reason);_update_btc_state_map (rtwdev); +if (chip->chip_id ==RTL8852A ) + mode = wl_rinfo->link_mode; +else + mode = wl_rinfo_v1->link_mode; + +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" , + __func__, dm->wl_only, dm->bt_only); +/* Be careful to change the following function sequence!! */ if (btc->ctrl.manual) { rtw89_debug(rtwdev, RTW89_DBG_BTC,
@@ -4239,6 +4452,7 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif struct rtw89_sta *rtwsta, enum btc_role_state state) { const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, RTW89_SUB_ENTITY_0); +const struct rtw89_chip_info *chip = rtwdev->chip;struct ieee80211_vif *vif =rtwvif_to_vif (rtwvif);struct ieee80211_sta *sta =rtwsta_to_sta (rtwsta);struct rtw89_btc *btc = &rtwdev->btc;
@@ -4305,7 +4519,10 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif wlinfo = &wl->link_info[r.pid];memcpy (wlinfo, &r,sizeof (*wlinfo)); -_update_wl_info (rtwdev); +if (chip->chip_id ==RTL8852A ) +_update_wl_info (rtwdev); +else +_update_wl_info_v1 (rtwdev);if (wlinfo->role ==RTW89_WIFI_ROLE_STATION && wlinfo->connected ==MLME_NO_LINK )
@@ -4819,18 +5036,25 @@ static void _show_wl_role_info(struct rtw89_dev *rtwdev, struct seq_file *m)static void _show_wl_info (struct rtw89_dev *rtwdev,struct seq_file *m) { +const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc;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_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1; +u8 mode;if (!(btc->dm.coex_info_map &BTC_COEX_INFO_WL ))return ;seq_puts (m,"========== [WL Status] ==========\n" ); -seq_printf (m," %-15s : link_mode:%d, " , -"[status]" , (u32 )wl_rinfo->link_mode); +if (chip->chip_id ==RTL8852A ) + mode = wl_rinfo->link_mode; +else + mode = wl_rinfo_v1->link_mode; + +seq_printf (m," %-15s : link_mode:%d, " ,"[status]" , mode); seq_printf(m, "rf_off:%d, power_save:%d, scan:%s(band:%d/phy_map:0x%x), ",
drivers/net/wireless/realtek/rtw89/core.h +37 -0
@@ -1124,6 +1124,27 @@ struct rtw89_btc_wl_active_role {u16 rx_rate; }; +struct rtw89_btc_wl_active_role_v1 { +u8 connected:1 ; +u8 pid:3 ; +u8 phy:1 ; +u8 noa:1 ; +u8 band:2 ; + +u8 client_ps:1 ; +u8 bw:7 ; + +u8 role; +u8 ch; + +u16 tx_lvl; +u16 rx_lvl; +u16 tx_rate; +u16 rx_rate; + +u32 noa_duration;/* ms */ +}; +struct rtw89_btc_wl_role_info_bpos {u16 none:1 ;u16 station:1 ;
@@ -1151,6 +1172,21 @@ struct rtw89_btc_wl_role_info { /* struct size must be n*4 bytes */struct rtw89_btc_wl_active_role active_role[RTW89_PORT_NUM ]; }; +struct rtw89_btc_wl_role_info_v1 {/* struct size must be n*4 bytes */ +u8 connect_cnt; +u8 link_mode; +union rtw89_btc_wl_role_info_map role_map; +struct rtw89_btc_wl_active_role_v1 active_role_v1[RTW89_PORT_NUM ]; +u32 mrole_type;/* btc_wl_mrole_type */ +u32 mrole_noa_duration;/* ms */ + +u32 dbcc_en:1 ; +u32 dbcc_chg:1 ; +u32 dbcc_2g_phy:2 ;/* which phy operate in 2G, HW_PHY_0 or HW_PHY_1 */ +u32 link_mode_chg:1 ; +u32 rsvd:27 ; +}; +struct rtw89_btc_wl_ver_info {u32 fw_coex;/* match with which coex_ver */ u32 fw;
@@ -1256,6 +1292,7 @@ struct rtw89_btc_wl_info {struct rtw89_btc_wl_ver_info ver_info;struct rtw89_btc_wl_afh_info afh_info;struct rtw89_btc_wl_role_info role_info; +struct rtw89_btc_wl_role_info_v1 role_info_v1;struct rtw89_btc_wl_scan_info scan_info;struct rtw89_btc_wl_dbcc_info dbcc_info;struct rtw89_btc_rf_para rf_para;
drivers/net/wireless/realtek/rtw89/fw.c +100 -13
138 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +62 -26
137 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 7/9 rtw89: coex: Move _set_policy to chip_ops
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Due to the difference of Wi-Fi firmware supported feature, RTL8852C need to defined more policy to enable the features.
(Ex: DBCC, Wi-Fi multi-role, TDMA instant and so on)
--- drivers/net/wireless/realtek/rtw89/coex.c | 382 +++++++++++++++++- drivers/net/wireless/realtek/rtw89/coex.h | 2 + drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + 5 files changed, 386 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +381 -1
@@ -261,6 +261,9 @@ enum btc_cx_poicy_type {/* TDMA off + pri: WL_Hi-Tx > BT_Hi_Rx, BT_Hi > WL > BT_Lo */ BTC_CXP_OFF_BWB1 = (BTC_CXP_OFF <<8 ) |7 , +/* TDMA off + pri: WL_Hi-Tx > BT, BT_Hi > other-WL > BT_Lo */ +BTC_CXP_OFF_BWB2 = (BTC_CXP_OFF <<8 ) |8 , +/* TDMA off+Bcn-Protect + pri: WL_Hi-Tx > BT_Hi_Rx, BT_Hi > WL > BT_Lo*/ BTC_CXP_OFFB_BWB0 = (BTC_CXP_OFFB << 8) | 0,
@@ -300,6 +303,9 @@ enum btc_cx_poicy_type {/* TDMA Fix slot-9: W1:B1 = 40:20 */ BTC_CXP_FIX_TD4020 = (BTC_CXP_FIX <<8 ) |9 , +/* TDMA Fix slot-9: W1:B1 = 40:10 */ +BTC_CXP_FIX_TD4010ISO = (BTC_CXP_FIX <<8 ) |10 , +/* PS-TDMA Fix slot-0: W1:B1 = 30:30 */ BTC_CXP_PFIX_TD3030 = (BTC_CXP_PFIX << 8) | 0,
@@ -2020,6 +2026,15 @@ union btc_btinfo {static void _set_policy (struct rtw89_dev *rtwdev,u16 policy_type,enum btc_reason_and_action action) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + + chip->ops->btc_set_policy (rtwdev, policy_type); +_fw_set_policy (rtwdev, policy_type, action); +} + +#define BTC_B1_MAX 250/* unit ms */ +void rtw89_btc_set_policy (struct rtw89_dev *rtwdev,u16 policy_type) {struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_dm *dm = &btc->dm;
@@ -2316,9 +2331,372 @@ static void _set_policy(struct rtw89_dev *rtwdev, u16 policy_type, }break ; } +} +EXPORT_SYMBOL (rtw89_btc_set_policy); -_fw_set_policy (rtwdev, policy_type, action); +void rtw89_btc_set_policy_v1 (struct rtw89_dev *rtwdev,u16 policy_type) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_dm *dm = &btc->dm; +struct rtw89_btc_fbtc_tdma *t = &dm->tdma; +struct rtw89_btc_fbtc_slot *s = dm->slot; +struct rtw89_btc_bt_hid_desc *hid = &btc->cx.bt.link_info.hid_desc; +struct rtw89_btc_bt_hfp_desc *hfp = &btc->cx.bt.link_info.hfp_desc; +u8 type; +u32 tbl_w1, tbl_b1, tbl_b4; + + type =FIELD_GET (BTC_CXP_MASK , policy_type); + +if (btc->mdinfo.ant.type ==BTC_ANT_SHARED ) { +if (btc->cx.wl.status.map._4way) + tbl_w1 = cxtbl[1 ]; +else if (hid->exist && hid->type ==BTC_HID_218 ) + tbl_w1 = cxtbl[7 ];/* Ack/BA no break bt Hi-Pri-rx */ +else + tbl_w1 = cxtbl[8 ]; + +if (dm->leak_ap && + (type ==BTC_CXP_PFIX || type ==BTC_CXP_PAUTO2 )) { + tbl_b1 = cxtbl[3 ]; + tbl_b4 = cxtbl[3 ]; + }else if (hid->exist && hid->type ==BTC_HID_218 ) { + tbl_b1 = cxtbl[4 ];/* Ack/BA no break bt Hi-Pri-rx */ + tbl_b4 = cxtbl[4 ]; + }else { + tbl_b1 = cxtbl[2 ]; + tbl_b4 = cxtbl[2 ]; + } + }else { + tbl_w1 = cxtbl[16 ]; + tbl_b1 = cxtbl[17 ]; + tbl_b4 = cxtbl[17 ]; + } + + btc->bt_req_en = false; + +switch (type) { +case BTC_CXP_USERDEF0 : + btc->update_policy_force = true; + *t = t_def[CXTD_OFF ]; + s[CXST_OFF ] = s_def[CXST_OFF ]; +_slot_set_tbl (btc,CXST_OFF , cxtbl[2 ]); +break ; +case BTC_CXP_OFF :/* TDMA off */ +_write_scbd (rtwdev,BTC_WSCB_TDMA , false); + *t = t_def[CXTD_OFF ]; + s[CXST_OFF ] = s_def[CXST_OFF ]; + +switch (policy_type) { +case BTC_CXP_OFF_BT : +_slot_set_tbl (btc,CXST_OFF , cxtbl[2 ]); +break ; +case BTC_CXP_OFF_WL : +_slot_set_tbl (btc,CXST_OFF , cxtbl[1 ]); +break ; +case BTC_CXP_OFF_EQ0 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[0 ]); +break ; +case BTC_CXP_OFF_EQ1 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[16 ]); +break ; +case BTC_CXP_OFF_EQ2 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[17 ]); +break ; +case BTC_CXP_OFF_EQ3 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[18 ]); +break ; +case BTC_CXP_OFF_BWB0 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[5 ]); +break ; +case BTC_CXP_OFF_BWB1 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[8 ]); +break ; +case BTC_CXP_OFF_BWB2 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[7 ]); +break ; +default : +break ; + } +break ; +case BTC_CXP_OFFB :/* TDMA off + beacon protect */ +_write_scbd (rtwdev,BTC_WSCB_TDMA , false); + *t = t_def[CXTD_OFF_B2 ]; + s[CXST_OFF ] = s_def[CXST_OFF ]; + +switch (policy_type) { +case BTC_CXP_OFFB_BWB0 : +_slot_set_tbl (btc,CXST_OFF , cxtbl[8 ]); +break ; +default : +break ; + } +break ; +case BTC_CXP_OFFE :/* TDMA off + beacon protect + Ext_control */ + btc->bt_req_en = true; +_write_scbd (rtwdev,BTC_WSCB_TDMA , true); + *t = t_def[CXTD_OFF_EXT ]; + +/* To avoid wl-s0 tx break by hid/hfp tx */ +if (hid->exist || hfp->exist) + tbl_w1 = cxtbl[16 ]; + +switch (policy_type) { +case BTC_CXP_OFFE_DEF : + s[CXST_E2G ] = s_def[CXST_E2G ]; + s[CXST_E5G ] = s_def[CXST_E5G ]; + s[CXST_EBT ] = s_def[CXST_EBT ]; + s[CXST_ENULL ] = s_def[CXST_ENULL ]; +break ; +case BTC_CXP_OFFE_DEF2 : +_slot_set (btc,CXST_E2G ,20 , cxtbl[1 ],SLOT_ISO ); + s[CXST_E5G ] = s_def[CXST_E5G ]; + s[CXST_EBT ] = s_def[CXST_EBT ]; + s[CXST_ENULL ] = s_def[CXST_ENULL ]; +break ; +default : +break ; + } +break ; +case BTC_CXP_FIX :/* TDMA Fix-Slot */ +_write_scbd (rtwdev,BTC_WSCB_TDMA , true); + *t = t_def[CXTD_FIX ]; + +switch (policy_type) { +case BTC_CXP_FIX_TD3030 : +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,30 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_FIX_TD5050 : +_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,50 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_FIX_TD2030 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,30 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_FIX_TD4010 : +_slot_set (btc,CXST_W1 ,40 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,10 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_FIX_TD4010ISO : +_slot_set (btc,CXST_W1 ,40 , cxtbl[1 ],SLOT_ISO ); +_slot_set (btc,CXST_B1 ,10 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_FIX_TD7010 : +_slot_set (btc,CXST_W1 ,70 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,10 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_FIX_TD2060 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,60 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_FIX_TD3060 : +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,60 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_FIX_TD2080 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,80 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_FIX_TDW1B1 :/* W1:B1 = user-define */ +_slot_set (btc,CXST_W1 , dm->slot_dur[CXST_W1 ], + tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 , dm->slot_dur[CXST_B1 ], + tbl_b1,SLOT_MIX ); +break ; +default : +break ; + } +break ; +case BTC_CXP_PFIX :/* PS-TDMA Fix-Slot */ +_write_scbd (rtwdev,BTC_WSCB_TDMA , true); + *t = t_def[CXTD_PFIX ]; + +switch (policy_type) { +case BTC_CXP_PFIX_TD3030 : +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,30 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_PFIX_TD5050 : +_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,50 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_PFIX_TD2030 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,30 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_PFIX_TD2060 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,60 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_PFIX_TD3070 : +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,60 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_PFIX_TD2080 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,80 , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_PFIX_TDW1B1 :/* W1:B1 = user-define */ +_slot_set (btc,CXST_W1 , dm->slot_dur[CXST_W1 ], + tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 , dm->slot_dur[CXST_B1 ], + tbl_b1,SLOT_MIX ); +break ; +default : +break ; + } +break ; +case BTC_CXP_AUTO :/* TDMA Auto-Slot */ +_write_scbd (rtwdev,BTC_WSCB_TDMA , true); + *t = t_def[CXTD_AUTO ]; + +switch (policy_type) { +case BTC_CXP_AUTO_TD50B1 : +_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_AUTO_TD60B1 : +_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_AUTO_TD20B1 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_AUTO_TDW1B1 :/* W1:B1 = user-define */ +_slot_set (btc,CXST_W1 , dm->slot_dur[CXST_W1 ], + tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 , dm->slot_dur[CXST_B1 ], + tbl_b1,SLOT_MIX ); +break ; +default : +break ; + } +break ; +case BTC_CXP_PAUTO :/* PS-TDMA Auto-Slot */ +_write_scbd (rtwdev,BTC_WSCB_TDMA , true); + *t = t_def[CXTD_PAUTO ]; + +switch (policy_type) { +case BTC_CXP_PAUTO_TD50B1 : +_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_PAUTO_TD60B1 : +_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_PAUTO_TD20B1 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +break ; +case BTC_CXP_PAUTO_TDW1B1 : +_slot_set (btc,CXST_W1 , dm->slot_dur[CXST_W1 ], + tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 , dm->slot_dur[CXST_B1 ], + tbl_b1,SLOT_MIX ); +break ; +default : +break ; + } +break ; +case BTC_CXP_AUTO2 :/* TDMA Auto-Slot2 */ +_write_scbd (rtwdev,BTC_WSCB_TDMA , true); + *t = t_def[CXTD_AUTO2 ]; + +switch (policy_type) { +case BTC_CXP_AUTO2_TD3050 : +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +break ; +case BTC_CXP_AUTO2_TD3070 : +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 ,70 , tbl_b4,SLOT_MIX ); +break ; +case BTC_CXP_AUTO2_TD5050 : +_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +break ; +case BTC_CXP_AUTO2_TD6060 : +_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 ,60 , tbl_b4,SLOT_MIX ); +break ; +case BTC_CXP_AUTO2_TD2080 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 ,80 , tbl_b4,SLOT_MIX ); +break ; +case BTC_CXP_AUTO2_TDW1B4 :/* W1:B1 = user-define */ +_slot_set (btc,CXST_W1 , dm->slot_dur[CXST_W1 ], + tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 , dm->slot_dur[CXST_B1 ], + tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 , dm->slot_dur[CXST_B4 ], + tbl_b4,SLOT_MIX ); +break ; +default : +break ; + } +break ; +case BTC_CXP_PAUTO2 :/* PS-TDMA Auto-Slot2 */ +_write_scbd (rtwdev,BTC_WSCB_TDMA , true); + *t = t_def[CXTD_PAUTO2 ]; + +switch (policy_type) { +case BTC_CXP_PAUTO2_TD3050 : +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +break ; +case BTC_CXP_PAUTO2_TD3070 : +_slot_set (btc,CXST_W1 ,30 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 ,70 , tbl_b4,SLOT_MIX ); +break ; +case BTC_CXP_PAUTO2_TD5050 : +_slot_set (btc,CXST_W1 ,50 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 ,50 , tbl_b4,SLOT_MIX ); +break ; +case BTC_CXP_PAUTO2_TD6060 : +_slot_set (btc,CXST_W1 ,60 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 ,60 , tbl_b4,SLOT_MIX ); +break ; +case BTC_CXP_PAUTO2_TD2080 : +_slot_set (btc,CXST_W1 ,20 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 ,BTC_B1_MAX , tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 ,80 , tbl_b4,SLOT_MIX ); +break ; +case BTC_CXP_PAUTO2_TDW1B4 :/* W1:B1 = user-define */ +_slot_set (btc,CXST_W1 , dm->slot_dur[CXST_W1 ], + tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_B1 , dm->slot_dur[CXST_B1 ], + tbl_b1,SLOT_MIX ); +_slot_set (btc,CXST_B4 , dm->slot_dur[CXST_B4 ], + tbl_b4,SLOT_MIX ); +break ; +default : +break ; + } +break ; + } + +/* enter leak_slot after each null-1 */ +if (dm->leak_ap && dm->tdma.leak_n >1 ) +_tdma_set_lek (btc,1 ); + +if (dm->tdma_instant_excute) { + btc->dm.tdma.option_ctrl |=BIT (0 ); + btc->update_policy_force = true; + } } +EXPORT_SYMBOL (rtw89_btc_set_policy_v1);static void _set_gnt_bt (struct rtw89_dev *rtwdev,u8 phy_map,u8 state) {
@@ -5285,6 +5663,7 @@ static const char *steps_to_str(u16 step)CASE_BTC_POLICY_STR (OFF_EQ3 );CASE_BTC_POLICY_STR (OFF_BWB0 );CASE_BTC_POLICY_STR (OFF_BWB1 ); +CASE_BTC_POLICY_STR (OFF_BWB2 );CASE_BTC_POLICY_STR (OFFB_BWB0 );CASE_BTC_POLICY_STR (OFFE_DEF );CASE_BTC_POLICY_STR (OFFE_DEF2 );
@@ -5298,6 +5677,7 @@ static const char *steps_to_str(u16 step)CASE_BTC_POLICY_STR (FIX_TD2080 );CASE_BTC_POLICY_STR (FIX_TDW1B1 );CASE_BTC_POLICY_STR (FIX_TD4020 ); +CASE_BTC_POLICY_STR (FIX_TD4010ISO );CASE_BTC_POLICY_STR (PFIX_TD3030 );CASE_BTC_POLICY_STR (PFIX_TD5050 );CASE_BTC_POLICY_STR (PFIX_TD2030 );
drivers/net/wireless/realtek/rtw89/coex.h +2 -0
@@ -162,6 +162,8 @@ void rtw89_coex_act1_work(struct work_struct *work);void rtw89_coex_bt_devinfo_work (struct work_struct *work);void rtw89_coex_rfk_chk_work (struct work_struct *work);void rtw89_coex_power_on (struct rtw89_dev *rtwdev); +void rtw89_btc_set_policy (struct rtw89_dev *rtwdev,u16 policy_type); +void rtw89_btc_set_policy_v1 (struct rtw89_dev *rtwdev,u16 policy_type); static inline u8 rtw89_btc_phymap(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -2263,6 +2263,7 @@ struct rtw89_chip_ops {void (*btc_bt_aci_imp)(struct rtw89_dev *rtwdev);void (*btc_update_bt_cnt)(struct rtw89_dev *rtwdev);void (*btc_wl_s1_standby)(struct rtw89_dev *rtwdev,bool state); +void (*btc_set_policy)(struct rtw89_dev *rtwdev,u16 policy_type); };enum rtw89_dma_ch {
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2104,6 +2104,7 @@ static const struct rtw89_chip_ops rtw8852a_chip_ops = { .btc_bt_aci_imp = rtw8852a_btc_bt_aci_imp, .btc_update_bt_cnt = rtw8852a_btc_update_bt_cnt, .btc_wl_s1_standby = rtw8852a_btc_wl_s1_standby, + .btc_set_policy = rtw89_btc_set_policy, };const struct rtw89_chip_info rtw8852a_chip_info = {
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2934,6 +2934,7 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = { .btc_bt_aci_imp = rtw8852c_btc_bt_aci_imp, .btc_update_bt_cnt = rtw8852c_btc_update_bt_cnt, .btc_wl_s1_standby = rtw8852c_btc_wl_s1_standby, + .btc_set_policy = rtw89_btc_set_policy_v1, };const struct rtw89_chip_info rtw8852c_chip_info = {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 8/9 rtw89: coex: Add v1 Wi-Fi SCC coexistence policy
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Because the later firmware had patched some new feature, it can control the Wi-Fi/BT slots more efficiently. This patch enhance it for better Wi-Fi SCC mode performance.
--- drivers/net/wireless/realtek/rtw89/coex.c | 107 +++++++++++++++++++++- drivers/net/wireless/realtek/rtw89/core.h | 7 ++ 2 files changed, 112 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +105 -2
@@ -273,6 +273,21 @@ enum btc_cx_poicy_type {/* TDMA off + Ext-Ctrl + pri: E2G-slot block all BT */ BTC_CXP_OFFE_DEF2 = (BTC_CXP_OFFE <<8 ) |1 , +/* TDMA off + Ext-Ctrl + pri: default */ +BTC_CXP_OFFE_2GBWISOB = (BTC_CXP_OFFE <<8 ) |2 , + +/* TDMA off + Ext-Ctrl + pri: E2G-slot block all BT */ +BTC_CXP_OFFE_2GISOB = (BTC_CXP_OFFE <<8 ) |3 , + +/* TDMA off + Ext-Ctrl + pri: E2G-slot WL > BT */ +BTC_CXP_OFFE_2GBWMIXB = (BTC_CXP_OFFE <<8 ) |4 , + +/* TDMA off + Ext-Ctrl + pri: E2G/EBT-slot WL > BT */ +BTC_CXP_OFFE_WL = (BTC_CXP_OFFE <<8 ) |5 , + +/* TDMA off + Ext-Ctrl + pri: default */ +BTC_CXP_OFFE_2GBWMIXB2 = (BTC_CXP_OFFE <<8 ) |6 , +/* TDMA Fix slot-0: W1:B1 = 30:30 */ BTC_CXP_FIX_TD3030 = (BTC_CXP_FIX << 8) | 0,
@@ -440,6 +455,16 @@ enum btc_wl_link_mode {BTC_WLINK_MAX }; +enum btc_wl_mrole_type { +BTC_WLMROLE_NONE =0x0 , +BTC_WLMROLE_STA_GC , +BTC_WLMROLE_STA_GC_NOA , +BTC_WLMROLE_STA_GO , +BTC_WLMROLE_STA_GO_NOA , +BTC_WLMROLE_STA_STA , +BTC_WLMROLE_MAX +}; +enum btc_bt_hid_type {BTC_HID_218 =BIT (0 ),BTC_HID_418 =BIT (1 ),
@@ -1949,6 +1974,7 @@ static bool _check_freerun(struct rtw89_dev *rtwdev) }#define _tdma_set_flctrl (btc, flc) ({(btc)->dm.tdma.rxflctrl = flc; }) +#define _tdma_set_flctrl_role (btc, role) ({(btc)->dm.tdma.rxflctrl_role = role; })#define _tdma_set_tog (btc, wtg) ({(btc)->dm.tdma.wtgle_n = wtg; })#define _tdma_set_lek (btc, lek) ({(btc)->dm.tdma.leak_n = lek; })
@@ -2340,9 +2366,10 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_fbtc_tdma *t = &dm->tdma;struct rtw89_btc_fbtc_slot *s = dm->slot; +struct rtw89_btc_wl_role_info_v1 *wl_rinfo = &btc->cx.wl.role_info_v1;struct rtw89_btc_bt_hid_desc *hid = &btc->cx.bt.link_info.hid_desc;struct rtw89_btc_bt_hfp_desc *hfp = &btc->cx.bt.link_info.hfp_desc; -u8 type; +u8 type, null_role;u32 tbl_w1, tbl_b1, tbl_b4; type =FIELD_GET (BTC_CXP_MASK , policy_type);
@@ -2687,6 +2714,12 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)break ; } +if (wl_rinfo->link_mode ==BTC_WLINK_2G_SCC && dm->tdma.rxflctrl) { + null_role =FIELD_PREP (0x0f , dm->wl_scc.null_role1) | +FIELD_PREP (0xf0 , dm->wl_scc.null_role2); +_tdma_set_flctrl_role (btc, null_role); + } +/* enter leak_slot after each null-1 */ if (dm->leak_ap && dm->tdma.leak_n >1 )_tdma_set_lek (btc,1 );
@@ -3663,6 +3696,68 @@ static void _action_wl_2g_scc(struct rtw89_dev *rtwdev) } } +static void _action_wl_2g_scc_v1 (struct rtw89_dev *rtwdev) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_bt_info *bt = &btc->cx.bt; +struct rtw89_btc_dm *dm = &btc->dm; +struct rtw89_btc_wl_role_info_v1 *wl_rinfo = &wl->role_info_v1; +u16 policy_type =BTC_CXP_OFF_BT ; +u32 dur; + +if (btc->mdinfo.ant.type ==BTC_ANT_DEDICATED ) { + policy_type =BTC_CXP_OFF_EQ0 ; + }else { +/* shared-antenna */ +switch (wl_rinfo->mrole_type) { +case BTC_WLMROLE_STA_GC : + dm->wl_scc.null_role1 =RTW89_WIFI_ROLE_STATION ; + dm->wl_scc.null_role2 =RTW89_WIFI_ROLE_P2P_CLIENT ; + dm->wl_scc.ebt_null =0 ;/* no ext-slot-control */ +_action_by_bt (rtwdev); +return ; +case BTC_WLMROLE_STA_STA : + dm->wl_scc.null_role1 =RTW89_WIFI_ROLE_STATION ; + dm->wl_scc.null_role2 =RTW89_WIFI_ROLE_STATION ; + dm->wl_scc.ebt_null =0 ;/* no ext-slot-control */ +_action_by_bt (rtwdev); +return ; +case BTC_WLMROLE_STA_GC_NOA : +case BTC_WLMROLE_STA_GO : +case BTC_WLMROLE_STA_GO_NOA : + dm->wl_scc.null_role1 =RTW89_WIFI_ROLE_STATION ; + dm->wl_scc.null_role2 =RTW89_WIFI_ROLE_NONE ; + dur = wl_rinfo->mrole_noa_duration; + +if (wl->status.map._4way) { + dm->wl_scc.ebt_null =0 ; + policy_type =BTC_CXP_OFFE_WL ; + }else if (bt->link_info.status.map.connect ==0 ) { + dm->wl_scc.ebt_null =0 ; + policy_type =BTC_CXP_OFFE_2GISOB ; + }else if (bt->link_info.a2dp_desc.exist && + dur < btc->bt_req_len) { + dm->wl_scc.ebt_null =1 ;/* tx null at EBT */ + policy_type =BTC_CXP_OFFE_2GBWMIXB2 ; + }else if (bt->link_info.a2dp_desc.exist || + bt->link_info.pan_desc.exist) { + dm->wl_scc.ebt_null =1 ;/* tx null at EBT */ + policy_type =BTC_CXP_OFFE_2GBWISOB ; + }else { + dm->wl_scc.ebt_null =0 ; + policy_type =BTC_CXP_OFFE_2GBWISOB ; + } +break ; +default : +break ; + } + } + +_set_ant (rtwdev,NM_EXEC ,BTC_PHY_ALL ,BTC_ANT_W2G ); +_set_policy (rtwdev, policy_type,BTC_ACT_WL_2G_SCC ); +} +static void _action_wl_2g_ap (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc;
@@ -4384,7 +4479,10 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason)_action_wl_2g_gc (rtwdev);break ;case BTC_WLINK_2G_SCC : -_action_wl_2g_scc (rtwdev); +if (chip->chip_id ==RTL8852A ) +_action_wl_2g_scc (rtwdev); +else if (chip->chip_id ==RTL8852C ) +_action_wl_2g_scc_v1 (rtwdev);break ;case BTC_WLINK_2G_MCC :_action_wl_2g_mcc (rtwdev);
@@ -5667,6 +5765,11 @@ static const char *steps_to_str(u16 step)CASE_BTC_POLICY_STR (OFFB_BWB0 );CASE_BTC_POLICY_STR (OFFE_DEF );CASE_BTC_POLICY_STR (OFFE_DEF2 ); +CASE_BTC_POLICY_STR (OFFE_2GBWISOB ); +CASE_BTC_POLICY_STR (OFFE_2GISOB ); +CASE_BTC_POLICY_STR (OFFE_2GBWMIXB ); +CASE_BTC_POLICY_STR (OFFE_WL ); +CASE_BTC_POLICY_STR (OFFE_2GBWMIXB2 );CASE_BTC_POLICY_STR (FIX_TD3030 );CASE_BTC_POLICY_STR (FIX_TD5050 );CASE_BTC_POLICY_STR (FIX_TD2030 );
drivers/net/wireless/realtek/rtw89/core.h +7 -0
@@ -1160,6 +1160,12 @@ struct rtw89_btc_wl_role_info_bpos { u16 nan: 1; }; +struct rtw89_btc_wl_scc_ctrl { +u8 null_role1; +u8 null_role2; +u8 ebt_null;/* if tx null at EBT slot */ +}; +union rtw89_btc_wl_role_info_map {u16 val;struct rtw89_btc_wl_role_info_bpos role;
@@ -1708,6 +1714,7 @@ struct rtw89_btc_dm {struct rtw89_btc_rf_trx_para rf_trx_para;struct rtw89_btc_wl_tx_limit_para wl_tx_limit;struct rtw89_btc_dm_step dm_step; +struct rtw89_btc_wl_scc_ctrl wl_scc;union rtw89_btc_dm_error_map error;u32 cnt_dm[BTC_DCNT_NUM ];u32 cnt_notify[BTC_NCNT_NUM ];
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 9/9 rtw89: coex: Update Wi-Fi driver/firmware TDMA cycle report for RTL8852c
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Because RTL8852c firmware handshake use different structure definition with RTL8852a, so it's necessary to update a version for RTL8852c.
--- drivers/net/wireless/realtek/rtw89/coex.c | 61 ++++++++++++++++++++--- drivers/net/wireless/realtek/rtw89/core.h | 60 +++++++++++++++++++++- 2 files changed, 113 insertions(+), 8 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +54 -7
@@ -912,12 +912,14 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,struct rtw89_btc_fbtc_rpt_ctrl *prpt;struct rtw89_btc_fbtc_rpt_ctrl_v1 *prpt_v1;struct rtw89_btc_fbtc_cysta *pcysta_le32 =NULL ; +struct rtw89_btc_fbtc_cysta_v1 *pcysta_v1 =NULL ;struct rtw89_btc_fbtc_cysta_cpu pcysta[1 ];struct rtw89_btc_prpt *btc_prpt =NULL ;struct rtw89_btc_fbtc_slot *rtp_slot =NULL ;u8 rpt_type =0 , *rpt_content =NULL , *pfinfo =NULL ; -u16 wl_slot_set =0 ; +u16 wl_slot_set =0 , wl_slot_real =0 ;u32 trace_step = btc->ctrl.trace_step, rpt_len =0 , diff_t; +u32 cnt_leak_slot =0 , bt_slot_real =0 , cnt_rx_imr =0 ;u8 i; rtw89_debug(rtwdev, RTW89_DBG_BTC,
@@ -975,10 +977,16 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,break ;case BTC_RPT_TYPE_CYSTA : pcinfo = &pfwinfo->rpt_fbtc_cysta.cinfo; - pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_cysta.finfo); - pcysta_le32 = &pfwinfo->rpt_fbtc_cysta.finfo; -rtw89_btc_fbtc_cysta_to_cpu (pcysta_le32, pcysta); - pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo); +if (chip->chip_id ==RTL8852A ) { + pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_cysta.finfo); + pcysta_le32 = &pfwinfo->rpt_fbtc_cysta.finfo; +rtw89_btc_fbtc_cysta_to_cpu (pcysta_le32, pcysta); + pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo); + }else { + pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_cysta.finfo_v1); + pcysta_v1 = &pfwinfo->rpt_fbtc_cysta.finfo_v1; + pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo_v1); + } pcinfo->req_fver = chip->fcxcysta_ver; pcinfo->rx_len = rpt_len; pcinfo->rx_cnt++;
@@ -1177,7 +1185,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, sizeof(dm->slot_now))); } -if (rpt_type ==BTC_RPT_TYPE_CYSTA && +if (rpt_type ==BTC_RPT_TYPE_CYSTA && chip->chip_id ==RTL8852A && pcysta->cycles >=BTC_CYSTA_CHK_PERIOD ) {/* Check Leak-AP */ if (pcysta->slot_cnt[CXST_LK] != 0 &&
@@ -1200,8 +1208,47 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, }_chk_btc_err (rtwdev,BTC_DCNT_W1_FREEZE , pcysta->slot_cnt[CXST_W1 ]); -_chk_btc_err (rtwdev,BTC_DCNT_W1_FREEZE , pcysta->slot_cnt[CXST_W1 ]); +_chk_btc_err (rtwdev,BTC_DCNT_W1_FREEZE , pcysta->slot_cnt[CXST_B1 ]);_chk_btc_err (rtwdev,BTC_DCNT_CYCLE_FREEZE , (u32 )pcysta->cycles); + }else if (rpt_type ==BTC_RPT_TYPE_CYSTA && pcysta_v1 && +le16_to_cpu (pcysta_v1->cycles) >=BTC_CYSTA_CHK_PERIOD ) { + cnt_leak_slot =le32_to_cpu (pcysta_v1->slot_cnt[CXST_LK ]); + cnt_rx_imr =le32_to_cpu (pcysta_v1->leak_slot.cnt_rximr); +/* Check Leak-AP */ +if (cnt_leak_slot !=0 && cnt_rx_imr !=0 && + dm->tdma_now.rxflctrl) { +if (cnt_leak_slot <BTC_LEAK_AP_TH * cnt_rx_imr) + dm->leak_ap =1 ; + } + +/* Check diff time between real WL slot and W1 slot */ +if (dm->tdma_now.type ==CXTDMA_OFF ) { + wl_slot_set =le16_to_cpu (dm->slot_now[CXST_W1 ].dur); + wl_slot_real =le16_to_cpu (pcysta_v1->cycle_time.tavg[CXT_WL ]); +if (wl_slot_real > wl_slot_set) { + diff_t = wl_slot_real - wl_slot_set; +_chk_btc_err (rtwdev,BTC_DCNT_WL_SLOT_DRIFT , diff_t); + } + } + +/* Check diff time between real BT slot and EBT/E5G slot */ +if (dm->tdma_now.type ==CXTDMA_OFF && + dm->tdma_now.ext_ctrl ==CXECTL_EXT && + btc->bt_req_len !=0 ) { + bt_slot_real =le16_to_cpu (pcysta_v1->cycle_time.tavg[CXT_BT ]); + +if (btc->bt_req_len > bt_slot_real) { + diff_t = btc->bt_req_len - bt_slot_real; +_chk_btc_err (rtwdev,BTC_DCNT_BT_SLOT_DRIFT , diff_t); + } + } + +_chk_btc_err (rtwdev,BTC_DCNT_W1_FREEZE , +le32_to_cpu (pcysta_v1->slot_cnt[CXST_W1 ])); +_chk_btc_err (rtwdev,BTC_DCNT_B1_FREEZE , +le32_to_cpu (pcysta_v1->slot_cnt[CXST_B1 ])); +_chk_btc_err (rtwdev,BTC_DCNT_CYCLE_FREEZE , + (u32 )le16_to_cpu (pcysta_v1->cycles)); }if (rpt_type ==BTC_RPT_TYPE_CTRL && chip->chip_id ==RTL8852A ) {
drivers/net/wireless/realtek/rtw89/core.h +59 -1
78 lines not on this page · raw message
Signature · 1 line
2.25.1