rtw88: switch WiFi to 1ss mode to get better experience with BT HID gaming device
Ping-Ke Shih
maintainerv2 cover rtw88: switch WiFi to 1ss mode to get better experience with BT HID gaming device
The BT HID gaming controller uses high frequency BT traffic to quickly reflect user's operation. Then, it occupies too much timeslot, and WiFi doesn't have enough time to TX/RX data, and leads low throughput. To handle this case, switch WiFi to 1SS mode and coexistence uses freerun operation mode.
v2: use well-known abbreviations in commit messages.
Chin-Yen Lee (1):
rtw88: 8822ce: add support for TX/RX 1ss mode
Ching-Te Ku (5):
rtw88: coex: Improve WLAN throughput when HFP COEX
rtw88: coex: update BT PTA counter regularly
rtw88: coex: Add WLAN MIMO power saving for Bluetooth gaming
controller
rtw88: coex: Add C2H/H2C handshake with BT mailbox for asking HID Info
rtw88: coex: Update rtl8822c COEX version to 22020720
drivers/net/wireless/realtek/rtw88/coex.c | 298 ++++++++++++++++-- drivers/net/wireless/realtek/rtw88/coex.h | 5 + drivers/net/wireless/realtek/rtw88/debug.c | 4 +- drivers/net/wireless/realtek/rtw88/fw.c | 15 + drivers/net/wireless/realtek/rtw88/fw.h | 9 + drivers/net/wireless/realtek/rtw88/main.c | 36 ++- drivers/net/wireless/realtek/rtw88/main.h | 48 ++- drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 43 ++- drivers/net/wireless/realtek/rtw88/tx.c | 2 +- 12 files changed, 426 insertions(+), 37 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/6 rtw88: 8822ce: add support for TX/RX 1ss mode
From: Chin-Yen Lee <[email protected]>
In some case, wifi chip need to be configed to be TX/RX 1ss mode. For this mode, wifi components, such as MAC/BB/RF, need to be specially set, and driver need to send SMPS action frame to inform AP.
--- drivers/net/wireless/realtek/rtw88/debug.c | 4 ++- drivers/net/wireless/realtek/rtw88/main.c | 33 ++++++++++++++++++- drivers/net/wireless/realtek/rtw88/main.h | 5 ++- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + drivers/net/wireless/realtek/rtw88/tx.c | 2 +- 5 files changed, 41 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw88/debug.c +3 -1
@@ -715,8 +715,10 @@ static int rtw_debugfs_get_phy_info(struct seq_file *m, void *v)seq_printf (m,"Current CH(fc) = %u\n" , rtwdev->hal.current_channel);seq_printf (m,"Current BW = %u\n" , rtwdev->hal.current_band_width);seq_printf (m,"Current IGI = 0x%x\n" , dm_info->igi_history[0 ]); -seq_printf (m,"TP {Tx, Rx} = {%u, %u}Mbps\n\n" , +seq_printf (m,"TP {Tx, Rx} = {%u, %u}Mbps\n" , stats->tx_throughput, stats->rx_throughput); +seq_printf (m,"1SS for TX and RX = %c\n\n" , rtwdev->hal.txrx_1ss ? +'Y' :'N' );seq_puts (m,"==========[Tx Phy Info]========\n" );seq_puts (m,"[Tx Rate] = " );
drivers/net/wireless/realtek/rtw88/main.c +32 -1
@@ -1135,7 +1135,7 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) ldpc_en =HT_LDPC_EN ; } -if (efuse->hw_cap.nss ==1 ) +if (efuse->hw_cap.nss ==1 || rtwdev->hal.txrx_1ss) ra_mask &=RA_MASK_VHT_RATES_1SS |RA_MASK_HT_RATES_1SS ;if (hal->current_band_type ==RTW_BAND_5G ) {
@@ -1570,6 +1570,37 @@ static void rtw_unset_supported_band(struct ieee80211_hw *hw,kfree (hw->wiphy->bands[NL80211_BAND_5GHZ ]); } +static void rtw_vif_smps_iter (void *data,u8 *mac, +struct ieee80211_vif *vif) +{ +struct rtw_dev *rtwdev = (struct rtw_dev *)data; + +if (vif->type !=NL80211_IFTYPE_STATION || !vif->bss_conf.assoc) +return ; + +if (rtwdev->hal.txrx_1ss) +ieee80211_request_smps (vif,IEEE80211_SMPS_STATIC ); +else +ieee80211_request_smps (vif,IEEE80211_SMPS_OFF ); +} + +void rtw_set_txrx_1ss (struct rtw_dev *rtwdev,bool txrx_1ss) +{ +struct rtw_chip_info *chip = rtwdev->chip; +struct rtw_hal *hal = &rtwdev->hal; + +if (!chip->ops->config_txrx_mode || rtwdev->hal.txrx_1ss == txrx_1ss) +return ; + + rtwdev->hal.txrx_1ss = txrx_1ss; +if (txrx_1ss) + chip->ops->config_txrx_mode (rtwdev,BB_PATH_A ,BB_PATH_A , false); +else + chip->ops->config_txrx_mode (rtwdev, hal->antenna_tx, + hal->antenna_rx, false); +rtw_iterate_vifs_atomic (rtwdev, rtw_vif_smps_iter, rtwdev); +} +static void __update_firmware_feature (struct rtw_dev *rtwdev,struct rtw_fw_state *fw) {
drivers/net/wireless/realtek/rtw88/main.h +4 -1
@@ -874,6 +874,8 @@ struct rtw_chip_ops {enum rtw_bb_path tx_path_1ss, enum rtw_bb_path tx_path_cck, bool is_tx2_path); +void (*config_txrx_mode)(struct rtw_dev *rtwdev,u8 tx_path, +u8 rx_path,bool is_tx2_path);/* for coex */ void (*coex_set_init)(struct rtw_dev *rtwdev);
@@ -1867,6 +1869,7 @@ struct rtw_hal {u32 antenna_tx;u32 antenna_rx;u8 bfee_sts_cap; +bool txrx_1ss;/* protect tx power section */ struct mutex tx_power_mutex;
@@ -2123,5 +2126,5 @@ void rtw_core_fw_scan_notify(struct rtw_dev *rtwdev, bool start);int rtw_dump_fw (struct rtw_dev *rtwdev,const u32 ocp_src,u32 size,u32 fwcd_item);int rtw_dump_reg (struct rtw_dev *rtwdev,const u32 addr,const u32 size); - +void rtw_set_txrx_1ss (struct rtw_dev *rtwdev,bool config_1ss);#endif
drivers/net/wireless/realtek/rtw88/rtw8822c.c +1 -0
@@ -4962,6 +4962,7 @@ static struct rtw_chip_ops rtw8822c_ops = { .cfo_init = rtw8822c_cfo_init, .cfo_track = rtw8822c_cfo_track, .config_tx_path = rtw8822c_config_tx_path, + .config_txrx_mode = rtw8822c_config_trx_mode, .coex_set_init = rtw8822c_coex_cfg_init, .coex_set_ant_switch = NULL,
drivers/net/wireless/realtek/rtw88/tx.c +1 -1
@@ -353,7 +353,7 @@ static void rtw_tx_data_pkt_info_update(struct rtw_dev *rtwdev, bw = si->bw_mode; rate_id = si->rate_id; - stbc = si->stbc_en; + stbc = rtwdev->hal.txrx_1ss ? false : si->stbc_en; ldpc = si->ldpc_en; out:
Signature · 1 line
2.25.1
Re: [PATCH v2 1/6] rtw88: 8822ce: add support for TX/RX 1ss mode
Quoted 8 lines · Ping-Ke Shih
From: Chin-Yen Lee <[email protected]>
In some case, wifi chip need to be configed to be TX/RX 1ss mode. For this mode, wifi components, such as MAC/BB/RF, need to be specially set, and driver need to send SMPS action frame to inform AP.
Signed-off-by Chin-Yen Lee <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
6 patches applied to wireless-next.git, thanks.
04e00ac94f6c rtw88: 8822ce: add support for TX/RX 1ss mode 176989b412b6 rtw88: coex: Improve WLAN throughput when HFP COEX 349d858ba7b1 rtw88: coex: update BT PTA counter regularly0c496a7d6f6a rtw88: coex: Add WLAN MIMO power saving for Bluetooth gaming controller fc3c66d324fd rtw88: coex: Add C2H/H2C handshake with BT mailbox for asking HID Info 052e4a9d87eb rtw88: coex: Update rtl8822c COEX version to 22020720
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/6 rtw88: coex: Improve WLAN throughput when HFP COEX
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Disable power save TDMA mechanism under HFP COEX, so WLAN can TX/RX full time.
--- drivers/net/wireless/realtek/rtw88/coex.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw88/coex.c +2 -7
@@ -1816,13 +1816,8 @@ static void rtw_coex_action_bt_hfp(struct rtw_dev *rtwdev)if (efuse->share_ant) {/* Shared-Ant */ -if (coex_stat->bt_multi_link) { - table_case =10 ; - tdma_case =17 ; - }else { - table_case =10 ; - tdma_case =5 ; - } + table_case =10 ; + tdma_case =5 ; }else {/* Non-Shared-Ant */ if (coex_stat->bt_multi_link) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/6 rtw88: coex: update BT PTA counter regularly
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
If BT PTA counter can not update regularly, it will lead coex mechanism run into some unexpected state.
--- drivers/net/wireless/realtek/rtw88/coex.c | 46 +++++++++++++++++------ drivers/net/wireless/realtek/rtw88/coex.h | 1 + drivers/net/wireless/realtek/rtw88/main.c | 2 + 3 files changed, 37 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw88/coex.c +34 -12
@@ -460,6 +460,29 @@ static void rtw_coex_gnt_workaround(struct rtw_dev *rtwdev, bool force, u8 mode)rtw_coex_set_gnt_fix (rtwdev); } +static void rtw_coex_monitor_bt_ctr (struct rtw_dev *rtwdev) +{ +struct rtw_coex *coex = &rtwdev->coex; +struct rtw_coex_stat *coex_stat = &coex->stat; +u32 tmp; + + tmp =rtw_read32 (rtwdev,REG_BT_ACT_STATISTICS ); + coex_stat->hi_pri_tx =FIELD_GET (MASKLWORD , tmp); + coex_stat->hi_pri_rx =FIELD_GET (MASKHWORD , tmp); + + tmp =rtw_read32 (rtwdev,REG_BT_ACT_STATISTICS_1 ); + coex_stat->lo_pri_tx =FIELD_GET (MASKLWORD , tmp); + coex_stat->lo_pri_rx =FIELD_GET (MASKHWORD , tmp); + +rtw_write8 (rtwdev,REG_BT_COEX_ENH_INTR_CTRL , +BIT_R_GRANTALL_WLMASK |BIT_STATIS_BT_EN ); + +rtw_dbg (rtwdev,RTW_DBG_COEX , +"[BTCoex], Hi-Pri Rx/Tx: %d/%d, Lo-Pri Rx/Tx: %d/%d\n" , + coex_stat->hi_pri_rx, coex_stat->hi_pri_tx, + coex_stat->lo_pri_rx, coex_stat->lo_pri_tx); +} +static void rtw_coex_monitor_bt_enable (struct rtw_dev *rtwdev) {struct rtw_chip_info *chip = rtwdev->chip;
@@ -3170,6 +3193,17 @@ void rtw_coex_wl_status_change_notify(struct rtw_dev *rtwdev, u32 type)rtw_coex_run_coex (rtwdev,COEX_RSN_WLSTATUS ); } +void rtw_coex_wl_status_check (struct rtw_dev *rtwdev) +{ +struct rtw_coex_stat *coex_stat = &rtwdev->coex.stat; + +if ((coex_stat->wl_under_lps && !coex_stat->wl_force_lps_ctrl) || + coex_stat->wl_under_ips) +return ; + +rtw_coex_monitor_bt_ctr (rtwdev); +} +void rtw_coex_bt_relink_work (struct work_struct *work) { struct rtw_dev *rtwdev = container_of(work, struct rtw_dev,
@@ -3653,7 +3687,6 @@ void rtw_coex_display_coex_info(struct rtw_dev *rtwdev, struct seq_file *m)u16 score_board_WB, score_board_BW;u32 wl_reg_6c0, wl_reg_6c4, wl_reg_6c8, wl_reg_778, wl_reg_6cc;u32 lte_coex, bt_coex; -u32 bt_hi_pri, bt_lo_pri;int i; score_board_BW =rtw_coex_read_scbd (rtwdev);
@@ -3664,17 +3697,6 @@ void rtw_coex_display_coex_info(struct rtw_dev *rtwdev, struct seq_file *m) wl_reg_6cc =rtw_read32 (rtwdev,REG_BT_COEX_TABLE_H ); wl_reg_778 =rtw_read8 (rtwdev,REG_BT_STAT_CTRL ); - bt_hi_pri =rtw_read32 (rtwdev,REG_BT_ACT_STATISTICS ); - bt_lo_pri =rtw_read32 (rtwdev,REG_BT_ACT_STATISTICS_1 ); -rtw_write8 (rtwdev,REG_BT_COEX_ENH_INTR_CTRL , -BIT_R_GRANTALL_WLMASK |BIT_STATIS_BT_EN ); - - coex_stat->hi_pri_tx =FIELD_GET (MASKLWORD , bt_hi_pri); - coex_stat->hi_pri_rx =FIELD_GET (MASKHWORD , bt_hi_pri); - - coex_stat->lo_pri_tx =FIELD_GET (MASKLWORD , bt_lo_pri); - coex_stat->lo_pri_rx =FIELD_GET (MASKHWORD , bt_lo_pri); - sys_lte =rtw_read8 (rtwdev,0x73 ); lte_coex =rtw_coex_read_indirect_reg (rtwdev,0x38 ); bt_coex =rtw_coex_read_indirect_reg (rtwdev,0x54 );
drivers/net/wireless/realtek/rtw88/coex.h +1 -0
@@ -404,6 +404,7 @@ void rtw_coex_bt_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length);void rtw_coex_wl_fwdbginfo_notify (struct rtw_dev *rtwdev,u8 *buf,u8 length);void rtw_coex_switchband_notify (struct rtw_dev *rtwdev,u8 type);void rtw_coex_wl_status_change_notify (struct rtw_dev *rtwdev,u32 type); +void rtw_coex_wl_status_check (struct rtw_dev *rtwdev);void rtw_coex_display_coex_info (struct rtw_dev *rtwdev,struct seq_file *m);static inline bool rtw_coex_disabled (struct rtw_dev *rtwdev)
drivers/net/wireless/realtek/rtw88/main.c +2 -0
@@ -207,6 +207,8 @@ static void rtw_watch_dog_work(struct work_struct *work)else clear_bit (RTW_FLAG_BUSY_TRAFFIC , rtwdev->flags); +rtw_coex_wl_status_check (rtwdev); +if (busy_traffic !=test_bit (RTW_FLAG_BUSY_TRAFFIC , rtwdev->flags))rtw_coex_wl_status_change_notify (rtwdev,0 );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 4/6 rtw88: coex: Add WLAN MIMO power saving for Bluetooth gaming controller
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
To keep high sensitivity reaction, Bluetooth gaming controller will send packet very frequently, it will make WLAN performance very poor. To solve this situation, MIMO PS mechanism makes WLAN/BT own an antenna itself, WLAN quits 2SS performance but it can get a stable 1SS performance and Bluetooth gaming controller can keep sensitivity reaction at the same time.
--- drivers/net/wireless/realtek/rtw88/coex.c | 113 +++++++++++++++++- drivers/net/wireless/realtek/rtw88/coex.h | 2 + drivers/net/wireless/realtek/rtw88/main.h | 3 + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 38 ++++-- 7 files changed, 148 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw88/coex.c +111 -2
@@ -211,6 +211,10 @@ static void rtw_coex_wl_ccklock_detect(struct rtw_dev *rtwdev)bool is_cck_lock_rate = false; +if (coex_stat->wl_coex_mode !=COEX_WLINK_2G1PORT && + coex_stat->wl_coex_mode !=COEX_WLINK_2GFREE ) +return ; +if (coex_dm->bt_status ==COEX_BTSTATUS_INQ_PAGE || coex_stat->bt_setup_link) { coex_stat->wl_cck_lock = false;
@@ -803,7 +807,9 @@ static void rtw_coex_update_bt_link_info(struct rtw_dev *rtwdev)static void rtw_coex_update_wl_ch_info (struct rtw_dev *rtwdev,u8 type) {struct rtw_chip_info *chip = rtwdev->chip; +struct rtw_efuse *efuse = &rtwdev->efuse;struct rtw_coex_dm *coex_dm = &rtwdev->coex.dm; +struct rtw_coex_stat *coex_stat = &rtwdev->coex.stat;u8 link =0 ;u8 center_chan =0 ;u8 bw;
@@ -814,7 +820,9 @@ static void rtw_coex_update_wl_ch_info(struct rtw_dev *rtwdev, u8 type)if (type !=COEX_MEDIA_DISCONNECT ) center_chan = rtwdev->hal.current_channel; -if (center_chan ==0 ) { +if (center_chan ==0 || + (efuse->share_ant && center_chan <=14 && + coex_stat->wl_coex_mode !=COEX_WLINK_2GFREE )) { link =0 ; center_chan =0 ; bw =0 ;
@@ -953,6 +961,23 @@ static void rtw_coex_set_gnt_wl(struct rtw_dev *rtwdev, u8 state)rtw_coex_write_indirect_reg (rtwdev,LTE_COEX_CTRL ,0x0300 , state); } +static void rtw_coex_mimo_ps (struct rtw_dev *rtwdev,bool force,bool state) +{ +struct rtw_coex_stat *coex_stat = &rtwdev->coex.stat; + +if (!force && state == coex_stat->wl_mimo_ps) +return ; + + coex_stat->wl_mimo_ps = state; + +rtw_set_txrx_1ss (rtwdev, state); + +rtw_coex_update_wl_ch_info (rtwdev, (u8 )coex_stat->wl_connected); + +rtw_dbg (rtwdev,RTW_DBG_COEX , +"[BTCoex], %s(): state = %d\n" , __func__, state); +} +static void rtw_btc_wltoggle_table_a (struct rtw_dev *rtwdev,bool force,u8 table_case) {
@@ -1129,7 +1154,8 @@ static void rtw_coex_set_tdma(struct rtw_dev *rtwdev, u8 byte1, u8 byte2, ps_type =COEX_PS_WIFI_NATIVE ;rtw_coex_power_save_state (rtwdev, ps_type,0x0 ,0x0 ); - }else if (byte1 &BIT (4 ) && !(byte1 &BIT (5 ))) { + }else if ((byte1 &BIT (4 ) && !(byte1 &BIT (5 ))) || + coex_stat->wl_coex_mode ==COEX_WLINK_2GFREE ) {rtw_dbg (rtwdev,RTW_DBG_COEX ,"[BTCoex], %s(): Force LPS (byte1 = 0x%x)\n" , __func__, byte1);
@@ -1825,6 +1851,54 @@ static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev)rtw_coex_tdma (rtwdev, false, tdma_case | slot_type); } +static void rtw_coex_action_bt_game_hid (struct rtw_dev *rtwdev) +{ +struct rtw_coex *coex = &rtwdev->coex; +struct rtw_coex_stat *coex_stat = &coex->stat; +struct rtw_efuse *efuse = &rtwdev->efuse; +struct rtw_coex_dm *coex_dm = &coex->dm; +struct rtw_chip_info *chip = rtwdev->chip; +u8 table_case, tdma_case; + +rtw_dbg (rtwdev,RTW_DBG_COEX ,"[BTCoex], %s()\n" , __func__); +rtw_coex_set_ant_path (rtwdev, false,COEX_SET_ANT_2G ); + +if (efuse->share_ant) { + coex_stat->wl_coex_mode =COEX_WLINK_2GFREE ; +if (coex_stat->bt_whck_test) + table_case =2 ; +else if (coex_stat->wl_linkscan_proc || coex_stat->bt_hid_exist) + table_case =33 ; +else if (coex_stat->bt_setup_link || coex_stat->bt_inq_page) + table_case =0 ; +else if (coex_stat->bt_a2dp_exist) + table_case =34 ; +else + table_case =33 ; + + tdma_case =0 ; + }else { +if (COEX_RSSI_HIGH (coex_dm->wl_rssi_state[1 ])) + tdma_case =112 ; +else + tdma_case =113 ; + + table_case =121 ; + } + +if (coex_stat->wl_coex_mode ==COEX_WLINK_2GFREE ) { +if (coex_stat->wl_tput_dir ==COEX_WL_TPUT_TX ) +rtw_coex_set_rf_para (rtwdev, chip->wl_rf_para_tx[6 ]); +else +rtw_coex_set_rf_para (rtwdev, chip->wl_rf_para_rx[5 ]); + }else { +rtw_coex_set_rf_para (rtwdev, chip->wl_rf_para_rx[0 ]); + } + +rtw_coex_table (rtwdev, false, table_case); +rtw_coex_tdma (rtwdev, false, tdma_case); +} +static void rtw_coex_action_bt_hfp (struct rtw_dev *rtwdev) {struct rtw_coex *coex = &rtwdev->coex;
@@ -2242,8 +2316,10 @@ static void rtw_coex_action_bt_a2dp_pan_hid(struct rtw_dev *rtwdev)static void rtw_coex_action_wl_under5g (struct rtw_dev *rtwdev) { +struct rtw_coex *coex = &rtwdev->coex;struct rtw_efuse *efuse = &rtwdev->efuse;struct rtw_chip_info *chip = rtwdev->chip; +struct rtw_coex_stat *coex_stat = &coex->stat;u8 table_case, tdma_case;rtw_dbg (rtwdev,RTW_DBG_COEX ,"[BTCoex], %s()\n" , __func__);
@@ -2253,6 +2329,9 @@ static void rtw_coex_action_wl_under5g(struct rtw_dev *rtwdev)rtw_coex_write_scbd (rtwdev,COEX_SCBD_FIX2M , false); +if (coex_stat->bt_game_hid_exist && coex_stat->wl_linkscan_proc) + coex_stat->wl_coex_mode =COEX_WLINK_2GFREE ; +if (efuse->share_ant) {/* Shared-Ant */ table_case =0 ;
@@ -2440,6 +2519,7 @@ static void rtw_coex_action_wl_connected(struct rtw_dev *rtwdev)static void rtw_coex_run_coex (struct rtw_dev *rtwdev,u8 reason) {struct rtw_coex *coex = &rtwdev->coex; +struct rtw_chip_info *chip = rtwdev->chip;struct rtw_coex_dm *coex_dm = &coex->dm;struct rtw_coex_stat *coex_stat = &coex->stat;bool rf4ce_en = false;
@@ -2512,6 +2592,11 @@ static void rtw_coex_run_coex(struct rtw_dev *rtwdev, u8 reason) goto exit; } +if (coex_stat->bt_game_hid_exist && coex_stat->wl_connected) { +rtw_coex_action_bt_game_hid (rtwdev); + goto exit; + } +if (coex_stat->bt_whck_test) {rtw_coex_action_bt_whql_test (rtwdev); goto exit;
@@ -2548,6 +2633,18 @@ static void rtw_coex_run_coex(struct rtw_dev *rtwdev, u8 reason) } exit: + +if (chip->wl_mimo_ps_support) { +if (coex_stat->wl_coex_mode ==COEX_WLINK_2GFREE ) { +if (coex_dm->reason ==COEX_RSN_2GMEDIA ) +rtw_coex_mimo_ps (rtwdev, true, true); +else +rtw_coex_mimo_ps (rtwdev, false, true); + }else { +rtw_coex_mimo_ps (rtwdev, false, false); + } + } +rtw_coex_gnt_workaround (rtwdev, false, coex_stat->wl_coex_mode);rtw_coex_limited_wl (rtwdev); }
@@ -3152,6 +3249,17 @@ void rtw_coex_bt_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length) coex_stat->bt_a2dp_bitpool =0 ; coex_stat->bt_a2dp_sink = ((coex_stat->bt_info_hb3 &BIT (7 )) ==BIT (7 )); +if (chip->wl_mimo_ps_support && !coex_stat->bt_inq_page) { +if ((coex_stat->bt_info_lb2 &COEX_INFO_CONNECTION ) && + (coex_stat->hi_pri_tx + coex_stat->hi_pri_rx > +COEX_BT_GAMEHID_CNT ) && !coex_stat->bt_slave) { + coex_stat->bt_game_hid_exist = true; +rtw_dbg (rtwdev,RTW_DBG_COEX , +"[BTCoex], BT game controller exisit!!\n" ); + }else { + coex_stat->bt_game_hid_exist = false; + } + }rtw_coex_update_bt_link_info (rtwdev);rtw_coex_run_coex (rtwdev,COEX_RSN_BTINFO );
@@ -3666,6 +3774,7 @@ static const char *rtw_coex_get_wl_coex_mode(u8 coex_wl_link_mode)switch (coex_wl_link_mode) { case_WLINK(2G1PORT); case_WLINK(5G); + case_WLINK(2GFREE);default :return "Unknown" ; }
drivers/net/wireless/realtek/rtw88/coex.h +2 -0
@@ -11,6 +11,7 @@#define COEX_MIN_DELAY 10/* delay unit in ms */ #define COEX_RFK_TIMEOUT 600/* RFK timeout in ms */ +#define COEX_BT_GAMEHID_CNT 800#define COEX_RF_OFF 0x0#define COEX_RF_ON 0x1
@@ -172,6 +173,7 @@ enum coex_bt_profile {enum coex_wl_link_mode {COEX_WLINK_2G1PORT =0x0 ,COEX_WLINK_5G =0x3 , +COEX_WLINK_2GFREE =0x7 ,COEX_WLINK_MAX };
drivers/net/wireless/realtek/rtw88/main.h +3 -0
@@ -1242,6 +1242,7 @@ struct rtw_chip_info {bool scbd_support;bool new_scbd10_def;/* true: fix 2M(8822c) */ bool ble_hid_profile_support; +bool wl_mimo_ps_support;u8 pstdma_type;/* 0: LPSoff, 1:LPSon */ u8 bt_rssi_type;u8 ant_isolation;
@@ -1384,6 +1385,7 @@ struct rtw_coex_stat {bool bt_slave;bool bt_418_hid_exist;bool bt_ble_hid_exist; +bool bt_game_hid_exist;bool bt_mailbox_reply;bool wl_under_lps;
@@ -1404,6 +1406,7 @@ struct rtw_coex_stat {bool wl_connecting;bool wl_slot_toggle;bool wl_slot_toggle_change;/* if toggle to no-toggle */ +bool wl_mimo_ps;u32 bt_supported_version;u32 bt_supported_feature;
drivers/net/wireless/realtek/rtw88/rtw8723d.c +1 -0
@@ -2753,6 +2753,7 @@ struct rtw_chip_info rtw8723d_hw_spec = { .scbd_support = true, .new_scbd10_def = true, .ble_hid_profile_support = false, + .wl_mimo_ps_support = false, .pstdma_type = COEX_PSTDMA_FORCE_LPSOFF, .bt_rssi_type = COEX_BTRSSI_RATIO, .ant_isolation = 15,
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -0
@@ -1925,6 +1925,7 @@ struct rtw_chip_info rtw8821c_hw_spec = { .scbd_support = true, .new_scbd10_def = false, .ble_hid_profile_support = false, + .wl_mimo_ps_support = false, .pstdma_type = COEX_PSTDMA_FORCE_LPSOFF, .bt_rssi_type = COEX_BTRSSI_RATIO, .ant_isolation = 15,
drivers/net/wireless/realtek/rtw88/rtw8822b.c +1 -0
@@ -2554,6 +2554,7 @@ struct rtw_chip_info rtw8822b_hw_spec = { .scbd_support = true, .new_scbd10_def = false, .ble_hid_profile_support = false, + .wl_mimo_ps_support = false, .pstdma_type = COEX_PSTDMA_FORCE_LPSOFF, .bt_rssi_type = COEX_BTRSSI_RATIO, .ant_isolation = 15,
drivers/net/wireless/realtek/rtw88/rtw8822c.c +29 -9
@@ -2996,19 +2996,34 @@ static void rtw8822c_coex_cfg_gnt_fix(struct rtw_dev *rtwdev)* enable "DAC off if GNT_WL = 0" for non-shared-antenna * disable 0x1c30[22] = 0, * enable: 0x1c30[22] = 1, 0x1c38[12] = 0, 0x1c38[28] = 1 -* -* disable WL-S1 BB chage RF mode if GNT_BT +*/ +if (coex_stat->wl_coex_mode ==COEX_WLINK_2GFREE ) { +rtw_write8_mask (rtwdev,REG_ANAPAR +2 , +BIT_ANAPAR_BTPS >>16 ,0 ); + }else { +rtw_write8_mask (rtwdev,REG_ANAPAR +2 , +BIT_ANAPAR_BTPS >>16 ,1 ); +rtw_write8_mask (rtwdev,REG_RSTB_SEL +1 , +BIT_DAC_OFF_ENABLE ,0 ); +rtw_write8_mask (rtwdev,REG_RSTB_SEL +3 , +BIT_DAC_OFF_ENABLE ,1 ); + } + +/* disable WL-S1 BB chage RF mode if GNT_BT * since RF TRx mask can do it */ -rtw_write8_mask (rtwdev,REG_ANAPAR +2 ,BIT_ANAPAR_BTPS >>16 ,1 ); -rtw_write8_mask (rtwdev,REG_RSTB_SEL +1 ,BIT_DAC_OFF_ENABLE ,0 ); -rtw_write8_mask (rtwdev,REG_RSTB_SEL +3 ,BIT_DAC_OFF_ENABLE ,1 ); -rtw_write8_mask (rtwdev,REG_IGN_GNTBT4 ,BIT_PI_IGNORE_GNT_BT ,1 ); +rtw_write8_mask (rtwdev,REG_IGN_GNTBT4 , +BIT_PI_IGNORE_GNT_BT ,1 );/* disable WL-S0 BB chage RF mode if wifi is at 5G, * or antenna path is separated */ -if (coex_stat->wl_coex_mode ==COEX_WLINK_5G || +if (coex_stat->wl_coex_mode ==COEX_WLINK_2GFREE ) { +rtw_write8_mask (rtwdev,REG_IGN_GNT_BT1 , +BIT_PI_IGNORE_GNT_BT ,1 ); +rtw_write8_mask (rtwdev,REG_NOMASK_TXBT , +BIT_NOMASK_TXBT_ENABLE ,1 ); + }else if (coex_stat->wl_coex_mode ==COEX_WLINK_5G || coex->under_5g || !efuse->share_ant) {if (coex_stat->kt_ver >=3 ) { rtw_write8_mask(rtwdev, REG_IGN_GNT_BT1,
@@ -5008,6 +5023,8 @@ static const struct coex_table_para table_sant_8822c[] = { {0x66556aaa, 0x6a5a6aaa}, /*case-30*/ {0xffffffff, 0x5aaa5aaa}, {0x56555555, 0x5a5a5aaa}, + {0xdaffdaff, 0xdaffdaff}, + {0xddffddff, 0xddffddff}, };/* Non-Shared-Antenna Coex Table */
@@ -5108,7 +5125,8 @@ static const struct coex_rf_para rf_para_tx_8822c[] = { {8, 17, true, 4}, {7, 18, true, 4}, {6, 19, true, 4}, - {5, 20, true, 4} + {5, 20, true, 4}, + {0, 21, true, 4} /* for gamg hid */ }; static const struct coex_rf_para rf_para_rx_8822c[] = {
@@ -5117,7 +5135,8 @@ static const struct coex_rf_para rf_para_rx_8822c[] = { {3, 24, true, 5}, {2, 26, true, 5}, {1, 27, true, 5}, - {0, 28, true, 5} + {0, 28, true, 5}, + {0, 28, true, 5} /* for gamg hid */ };static_assert (ARRAY_SIZE (rf_para_tx_8822c) ==ARRAY_SIZE (rf_para_rx_8822c));
@@ -5360,6 +5379,7 @@ struct rtw_chip_info rtw8822c_hw_spec = { .scbd_support = true, .new_scbd10_def = true, .ble_hid_profile_support = true, + .wl_mimo_ps_support = true, .pstdma_type = COEX_PSTDMA_FORCE_LPSOFF, .bt_rssi_type = COEX_BTRSSI_DBM, .ant_isolation = 15,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 5/6 rtw88: coex: Add C2H/H2C handshake with BT mailbox for asking HID Info
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
In order to recognize the gaming controller HID, make a C2H/H2C/Mailbox handshake to collect all the connected information from BT.
--- drivers/net/wireless/realtek/rtw88/coex.c | 150 ++++++++++++++++++++-- drivers/net/wireless/realtek/rtw88/coex.h | 2 + drivers/net/wireless/realtek/rtw88/fw.c | 15 +++ drivers/net/wireless/realtek/rtw88/fw.h | 9 ++ drivers/net/wireless/realtek/rtw88/main.c | 1 + drivers/net/wireless/realtek/rtw88/main.h | 40 ++++++ 6 files changed, 206 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw88/coex.c +139 -11
@@ -2375,6 +2375,7 @@ static void rtw_coex_action_wl_native_lps(struct rtw_dev *rtwdev)struct rtw_coex *coex = &rtwdev->coex;struct rtw_efuse *efuse = &rtwdev->efuse;struct rtw_chip_info *chip = rtwdev->chip; +struct rtw_coex_stat *coex_stat = &coex->stat;u8 table_case, tdma_case;if (coex->under_5g)
@@ -2383,7 +2384,6 @@ static void rtw_coex_action_wl_native_lps(struct rtw_dev *rtwdev)rtw_dbg (rtwdev,RTW_DBG_COEX ,"[BTCoex], %s()\n" , __func__);rtw_coex_set_ant_path (rtwdev, false,COEX_SET_ANT_2G ); -rtw_coex_set_rf_para (rtwdev, chip->wl_rf_para_rx[0 ]);if (efuse->share_ant) {/* Shared-Ant */
@@ -2395,6 +2395,16 @@ static void rtw_coex_action_wl_native_lps(struct rtw_dev *rtwdev) tdma_case =100 ; } +if (coex_stat->bt_game_hid_exist) { + coex_stat->wl_coex_mode =COEX_WLINK_2GFREE ; +if (coex_stat->wl_tput_dir ==COEX_WL_TPUT_TX ) +rtw_coex_set_rf_para (rtwdev, chip->wl_rf_para_tx[6 ]); +else +rtw_coex_set_rf_para (rtwdev, chip->wl_rf_para_rx[5 ]); + }else { +rtw_coex_set_rf_para (rtwdev, chip->wl_rf_para_rx[0 ]); + } +rtw_coex_table (rtwdev, false, table_case);rtw_coex_tdma (rtwdev, false, tdma_case); }
@@ -3249,20 +3259,138 @@ void rtw_coex_bt_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length) coex_stat->bt_a2dp_bitpool =0 ; coex_stat->bt_a2dp_sink = ((coex_stat->bt_info_hb3 &BIT (7 )) ==BIT (7 )); -if (chip->wl_mimo_ps_support && !coex_stat->bt_inq_page) { -if ((coex_stat->bt_info_lb2 &COEX_INFO_CONNECTION ) && - (coex_stat->hi_pri_tx + coex_stat->hi_pri_rx > -COEX_BT_GAMEHID_CNT ) && !coex_stat->bt_slave) { - coex_stat->bt_game_hid_exist = true; -rtw_dbg (rtwdev,RTW_DBG_COEX , -"[BTCoex], BT game controller exisit!!\n" ); + +rtw_coex_update_bt_link_info (rtwdev); +rtw_coex_run_coex (rtwdev,COEX_RSN_BTINFO ); +} + +#define COEX_BT_HIDINFO_MTK 0x46 +static const u8 coex_bt_hidinfo_ps[] = {0x57 ,0x69 ,0x72 }; +static const u8 coex_bt_hidinfo_xb[] = {0x58 ,0x62 ,0x6f }; + +void rtw_coex_bt_hid_info_notify (struct rtw_dev *rtwdev,u8 *buf,u8 length) +{ +struct rtw_coex *coex = &rtwdev->coex; +struct rtw_chip_info *chip = rtwdev->chip; +struct rtw_coex_stat *coex_stat = &coex->stat; +struct rtw_coex_hid *hidinfo; +struct rtw_coex_hid_info_a *hida; +struct rtw_coex_hid_handle_list *hl, *bhl; +u8 sub_id = buf[2 ], gamehid_cnt =0 , handle, i; +bool cur_game_hid_exist, complete; + +if (!chip->wl_mimo_ps_support && + (sub_id ==COEX_BT_HIDINFO_LIST || sub_id ==COEX_BT_HIDINFO_A )) +return ; + +rtw_dbg (rtwdev,RTW_DBG_COEX , +"[BTCoex], HID info notify, sub_id = 0x%x\n" , sub_id); + +switch (sub_id) { +case COEX_BT_HIDINFO_LIST : + hl = &coex_stat->hid_handle_list; + bhl = (struct rtw_coex_hid_handle_list *)buf; +if (!memcmp (hl, bhl,sizeof (*hl))) +return ; + coex_stat->hid_handle_list = *bhl; +memset (&coex_stat->hid_info,0 ,sizeof (coex_stat->hid_info)); +for (i =0 ; i <COEX_BT_HIDINFO_HANDLE_NUM ; i++) { + hidinfo = &coex_stat->hid_info[i]; +if (hl->handle[i] !=COEX_BT_HIDINFO_NOTCON && + hl->handle[i] !=0 ) + hidinfo->hid_handle = hl->handle[i]; + } +break ; +case COEX_BT_HIDINFO_A : + hida = (struct rtw_coex_hid_info_a *)buf; + handle = hida->handle; +for (i =0 ; i <COEX_BT_HIDINFO_HANDLE_NUM ; i++) { + hidinfo = &coex_stat->hid_info[i]; +if (hidinfo->hid_handle == handle) { + hidinfo->hid_vendor = hida->vendor; +memcpy (hidinfo->hid_name, hida->name, +sizeof (hidinfo->hid_name)); + hidinfo->hid_info_completed = true; +break ; + } + } +break ; + } +for (i =0 ; i <COEX_BT_HIDINFO_HANDLE_NUM ; i++) { + hidinfo = &coex_stat->hid_info[i]; + complete = hidinfo->hid_info_completed; + handle = hidinfo->hid_handle; +if (!complete || handle ==COEX_BT_HIDINFO_NOTCON || + handle ==0 || handle >=COEX_BT_BLE_HANDLE_THRS ) { + hidinfo->is_game_hid = false; +continue ; + } + +if (hidinfo->hid_vendor ==COEX_BT_HIDINFO_MTK ) { +if ((memcmp (hidinfo->hid_name, + coex_bt_hidinfo_ps, +COEX_BT_HIDINFO_NAME )) ==0 ) + hidinfo->is_game_hid = true; +else if ((memcmp (hidinfo->hid_name, + coex_bt_hidinfo_xb, +COEX_BT_HIDINFO_NAME )) ==0 ) + hidinfo->is_game_hid = true; +else + hidinfo->is_game_hid = false; }else { - coex_stat->bt_game_hid_exist = false; + hidinfo->is_game_hid = false; } +if (hidinfo->is_game_hid) + gamehid_cnt++; } -rtw_coex_update_bt_link_info (rtwdev); -rtw_coex_run_coex (rtwdev,COEX_RSN_BTINFO ); +if (gamehid_cnt >0 ) + cur_game_hid_exist = true; +else + cur_game_hid_exist = false; + +if (cur_game_hid_exist != coex_stat->bt_game_hid_exist) { + coex_stat->bt_game_hid_exist = cur_game_hid_exist; +rtw_dbg (rtwdev,RTW_DBG_COEX , +"[BTCoex], HID info changed!bt_game_hid_exist = %d!\n" , + coex_stat->bt_game_hid_exist); +rtw_coex_run_coex (rtwdev,COEX_RSN_BTSTATUS ); + } +} + +void rtw_coex_query_bt_hid_list (struct rtw_dev *rtwdev) +{ +struct rtw_coex *coex = &rtwdev->coex; +struct rtw_chip_info *chip = rtwdev->chip; +struct rtw_coex_stat *coex_stat = &coex->stat; +struct rtw_coex_hid *hidinfo; +u8 i, handle; +bool complete; + +if (!chip->wl_mimo_ps_support || coex_stat->wl_under_ips || + (coex_stat->wl_under_lps && !coex_stat->wl_force_lps_ctrl)) +return ; + +if (!coex_stat->bt_hid_exist && + !((coex_stat->bt_info_lb2 &COEX_INFO_CONNECTION ) && + (coex_stat->hi_pri_tx + coex_stat->hi_pri_rx > +COEX_BT_GAMEHID_CNT ))) +return ; + +rtw_fw_coex_query_hid_info (rtwdev,COEX_BT_HIDINFO_LIST ,0 ); + +for (i =0 ; i <COEX_BT_HIDINFO_HANDLE_NUM ; i++) { + hidinfo = &coex_stat->hid_info[i]; + complete = hidinfo->hid_info_completed; + handle = hidinfo->hid_handle; +if (handle ==0 || handle ==COEX_BT_HIDINFO_NOTCON || + handle >=COEX_BT_BLE_HANDLE_THRS || complete) +continue ; + +rtw_fw_coex_query_hid_info (rtwdev, +COEX_BT_HIDINFO_A , + handle); + } }void rtw_coex_wl_fwdbginfo_notify (struct rtw_dev *rtwdev,u8 *buf,u8 length)
drivers/net/wireless/realtek/rtw88/coex.h +2 -0
@@ -403,10 +403,12 @@ void rtw_coex_scan_notify(struct rtw_dev *rtwdev, u8 type);void rtw_coex_connect_notify (struct rtw_dev *rtwdev,u8 type);void rtw_coex_media_status_notify (struct rtw_dev *rtwdev,u8 type);void rtw_coex_bt_info_notify (struct rtw_dev *rtwdev,u8 *buf,u8 length); +void rtw_coex_bt_hid_info_notify (struct rtw_dev *rtwdev,u8 *buf,u8 length);void rtw_coex_wl_fwdbginfo_notify (struct rtw_dev *rtwdev,u8 *buf,u8 length);void rtw_coex_switchband_notify (struct rtw_dev *rtwdev,u8 type);void rtw_coex_wl_status_change_notify (struct rtw_dev *rtwdev,u32 type);void rtw_coex_wl_status_check (struct rtw_dev *rtwdev); +void rtw_coex_query_bt_hid_list (struct rtw_dev *rtwdev);void rtw_coex_display_coex_info (struct rtw_dev *rtwdev,struct seq_file *m);static inline bool rtw_coex_disabled (struct rtw_dev *rtwdev)
drivers/net/wireless/realtek/rtw88/fw.c +15 -0
@@ -233,6 +233,9 @@ void rtw_fw_c2h_cmd_handle(struct rtw_dev *rtwdev, struct sk_buff *skb)case C2H_BT_INFO :rtw_coex_bt_info_notify (rtwdev, c2h->payload, len);break ; +case C2H_BT_HID_INFO : +rtw_coex_bt_hid_info_notify (rtwdev, c2h->payload, len); +break ;case C2H_WLAN_INFO :rtw_coex_wl_fwdbginfo_notify (rtwdev, c2h->payload, len);break ;
@@ -538,6 +541,18 @@ void rtw_fw_coex_tdma_type(struct rtw_dev *rtwdev,rtw_fw_send_h2c_command (rtwdev, h2c_pkt); } +void rtw_fw_coex_query_hid_info (struct rtw_dev *rtwdev,u8 sub_id,u8 data) +{ +u8 h2c_pkt[H2C_PKT_SIZE ] = {0 }; + +SET_H2C_CMD_ID_CLASS (h2c_pkt,H2C_CMD_QUERY_BT_HID_INFO ); + +SET_COEX_QUERY_HID_INFO_SUBID (h2c_pkt, sub_id); +SET_COEX_QUERY_HID_INFO_DATA1 (h2c_pkt, data); + +rtw_fw_send_h2c_command (rtwdev, h2c_pkt); +} +void rtw_fw_bt_wifi_control (struct rtw_dev *rtwdev,u8 op_code,u8 *data) {u8 h2c_pkt[H2C_PKT_SIZE ] = {0 };
drivers/net/wireless/realtek/rtw88/fw.h +9 -0
@@ -47,6 +47,7 @@ enum rtw_c2h_cmd_id {C2H_CCX_TX_RPT =0x03 ,C2H_BT_INFO =0x09 ,C2H_BT_MP_INFO =0x0b , +C2H_BT_HID_INFO =0x45 ,C2H_RA_RPT =0x0c ,C2H_HW_FEATURE_REPORT =0x19 , C2H_WLAN_INFO = 0x27,
@@ -529,6 +530,7 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id)#define H2C_CMD_QUERY_BT_MP_INFO 0x67#define H2C_CMD_BT_WIFI_CONTROL 0x69#define H2C_CMD_WIFI_CALIBRATION 0x6d +#define H2C_CMD_QUERY_BT_HID_INFO 0x73#define H2C_CMD_KEEP_ALIVE 0x03#define H2C_CMD_DISCONNECT_DECISION 0x04
@@ -681,6 +683,11 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id)#define SET_BT_WIFI_CONTROL_DATA5 (h2c_pkt, value) \ le32p_replace_bits((__le32 *)(h2c_pkt) + 0x01, value, GENMASK(23, 16)) +#define SET_COEX_QUERY_HID_INFO_SUBID (h2c_pkt, value) \ + le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(15, 8)) +#define SET_COEX_QUERY_HID_INFO_DATA1 (h2c_pkt, value) \ + le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, GENMASK(23, 16)) +#define SET_KEEP_ALIVE_ENABLE (h2c_pkt, value) \ le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(8))#define SET_KEEP_ALIVE_ADOPT (h2c_pkt, value) \
@@ -780,6 +787,8 @@ void rtw_fw_force_bt_tx_power(struct rtw_dev *rtwdev, u8 bt_pwr_dec_lvl);void rtw_fw_bt_ignore_wlan_action (struct rtw_dev *rtwdev,bool enable);void rtw_fw_coex_tdma_type (struct rtw_dev *rtwdev,u8 para1,u8 para2,u8 para3,u8 para4,u8 para5); +void rtw_fw_coex_query_hid_info (struct rtw_dev *rtwdev,u8 sub_id,u8 data); +void rtw_fw_bt_wifi_control (struct rtw_dev *rtwdev,u8 op_code,u8 *data);void rtw_fw_send_rssi_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si);void rtw_fw_send_ra_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si);
drivers/net/wireless/realtek/rtw88/main.c +1 -0
@@ -208,6 +208,7 @@ static void rtw_watch_dog_work(struct work_struct *work)clear_bit (RTW_FLAG_BUSY_TRAFFIC , rtwdev->flags);rtw_coex_wl_status_check (rtwdev); +rtw_coex_query_bt_hid_list (rtwdev);if (busy_traffic !=test_bit (RTW_FLAG_BUSY_TRAFFIC , rtwdev->flags))rtw_coex_wl_status_change_notify (rtwdev,0 );
drivers/net/wireless/realtek/rtw88/main.h +40 -0
@@ -1355,6 +1355,42 @@ struct rtw_coex_dm {#define COEX_BTINFO_LENGTH_MAX 10#define COEX_BTINFO_LENGTH 7 +#define COEX_BT_HIDINFO_LIST 0x0 +#define COEX_BT_HIDINFO_A 0x1 +#define COEX_BT_HIDINFO_NAME 3 + +#define COEX_BT_HIDINFO_LENGTH 6 +#define COEX_BT_HIDINFO_HANDLE_NUM 4 +#define COEX_BT_HIDINFO_C2H_HANDLE 0 +#define COEX_BT_HIDINFO_C2H_VENDOR 1 +#define COEX_BT_BLE_HANDLE_THRS 0x10 +#define COEX_BT_HIDINFO_NOTCON 0xff + +struct rtw_coex_hid { +u8 hid_handle; +u8 hid_vendor; +u8 hid_name[COEX_BT_HIDINFO_NAME ]; +bool hid_info_completed; +bool is_game_hid; +}; + +struct rtw_coex_hid_handle_list { +u8 cmd_id; +u8 len; +u8 subid; +u8 handle_cnt; +u8 handle[COEX_BT_HIDINFO_HANDLE_NUM ]; +} __packed; + +struct rtw_coex_hid_info_a { +u8 cmd_id; +u8 len; +u8 subid; +u8 handle; +u8 vendor; +u8 name[COEX_BT_HIDINFO_NAME ]; +} __packed; +struct rtw_coex_stat {bool bt_disabled;bool bt_disabled_pre;
@@ -1386,6 +1422,7 @@ struct rtw_coex_stat {bool bt_418_hid_exist;bool bt_ble_hid_exist;bool bt_game_hid_exist; +bool bt_hid_handle_cnt;bool bt_mailbox_reply;bool wl_under_lps;
@@ -1464,6 +1501,9 @@ struct rtw_coex_stat {u32 darfrc;u32 darfrch; + +struct rtw_coex_hid hid_info[COEX_BT_HIDINFO_HANDLE_NUM ]; +struct rtw_coex_hid_handle_list hid_handle_list; };struct rtw_coex {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 6/6 rtw88: coex: Update rtl8822c COEX version to 22020720
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Enable Wi-Fi/BT mailbox 0x45 handshake and Wi-Fi MIMO power save mechanism for Bluetooth gaming controller.
BTCOEX Version: 22020720-2020Desired_BT_Coex_Ver: 0x20Desired_WL_FW_Ver: 9.9.11
--- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw88/rtw8822c.c +2 -2
@@ -5374,8 +5374,8 @@ struct rtw_chip_info rtw8822c_hw_spec = { .wowlan_stub = &rtw_wowlan_stub_8822c, .max_sched_scan_ssids = 4, #endif - .coex_para_ver = 0x2103181c, - .bt_desired_ver = 0x1c, + .coex_para_ver = 0x22020720, + .bt_desired_ver = 0x20, .scbd_support = true, .new_scbd10_def = true, .ble_hid_profile_support = true,
Signature · 1 line
2.25.1