wifi: rtw89: coex: update to support latest firmware of RTL8922AE
Ping-Ke Shih
maintainercover wifi: rtw89: coex: update to support latest firmware of RTL8922AE
Update BT-coexistence accordingly for the latest firmware, which supports new events format, new messages from BT firmware and so on. Also, fine tune parameters to improve user experience reported in field.
Ching-Te Ku (11):
wifi: rtw89: coex: Add v1 Bluetooth AFH handshake for WiFi 7
wifi: rtw89: coex: Enable outsource info H2C command
wifi: rtw89: coex: Query Bluetooth TX power when firmware support
wifi: rtw89: coex: RTL8922A add Wi-Fi firmware support for v0.35.71.0
wifi: rtw89: coex: Get Bluetooth desired version by WiFi firmware
version
wifi: rtw89: coex: Update scoreboard to avoid Bluetooth re-link fail
wifi: rtw89: coex: Assign priority table before entering power save
wifi: rtw89: coex: Not to set slot duration to zero to avoid firmware
issue
wifi: rtw89: coex: Update Bluetooth slot length when Wi-Fi is scanning
wifi: rtw89: coex: RTL8852B coexistence Wi-Fi firmware support for
v0.29.122.0
wifi: rtw89: coex: Update Wi-Fi/Bluetooth coexistence version to 9.0.0
drivers/net/wireless/realtek/rtw89/coex.c | 297 ++++++++++++++++-- drivers/net/wireless/realtek/rtw89/core.h | 13 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 - drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 - drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 - .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 - drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 - drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 - 8 files changed, 282 insertions(+), 34 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/11 wifi: rtw89: coex: Add v1 Bluetooth AFH handshake for WiFi 7
From: Ching-Te Ku <[email protected]>
WiFi 7 generation has dual MAC, Coexistence need to find out the 2GHz WiFi connection in the connected links. And assign its channel to Bluetooth to make Bluetooth not to hop into WiFi channel.
--- drivers/net/wireless/realtek/rtw89/coex.c | 111 +++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +110 -1
@@ -3186,7 +3186,7 @@ static void _update_btc_state_map(struct rtw89_dev *rtwdev) } } -static void _set_bt_afh_info (struct rtw89_dev *rtwdev) +static void _set_bt_afh_info_v0 (struct rtw89_dev *rtwdev) {const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc;
@@ -3355,6 +3355,115 @@ static void _set_bt_afh_info(struct rtw89_dev *rtwdev) btc->cx.cnt_wl[BTC_WCNT_CH_UPDATE ]++; } +static void _set_bt_afh_info_v1 (struct rtw89_dev *rtwdev) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_wl_info *wl = &btc->cx.wl; +struct rtw89_btc_wl_role_info_v8 *wl_rinfo = &wl->role_info_v8; +struct rtw89_btc_wl_afh_info *wl_afh = &wl->afh_info; +struct rtw89_btc_bt_info *bt = &btc->cx.bt; +struct rtw89_btc_wl_rlink *rlink; +u8 en =0 , ch =0 , bw =0 , buf[3 ] = {}; +u8 i, j, link_mode; + +if (btc->manual_ctrl || wl->status.map.scan) +return ; + + link_mode = wl_rinfo->link_mode; + +for (i =0 ; i < btc->ver->max_role_num; i++) { +for (j =RTW89_MAC_0 ; j <RTW89_MAC_NUM ; j++) { +if (wl->status.map.rf_off || bt->whql_test || + link_mode ==BTC_WLINK_NOLINK || + link_mode ==BTC_WLINK_5G ) +break ; + + rlink = &wl_rinfo->rlink[i][j]; + +/* Don't care no-connected/non-2G-band role */ +if (!rlink->connected || !rlink->active || + rlink->rf_band !=RTW89_BAND_2G ) +continue ; + + en =1 ; + ch = rlink->ch; + bw = rlink->bw; + +if (link_mode ==BTC_WLINK_2G_MCC && + (rlink->role ==RTW89_WIFI_ROLE_AP || + rlink->role ==RTW89_WIFI_ROLE_P2P_GO || + rlink->role ==RTW89_WIFI_ROLE_P2P_CLIENT )) { +/* for 2.4G MCC, take role = ap/go/gc */ +break ; + }else if (link_mode !=BTC_WLINK_2G_SCC || + rlink->bw ==RTW89_CHANNEL_WIDTH_40 ) { +/* for 2.4G scc, take bw = 40M */ +break ; + } + } + } + +/* default AFH channel sapn = center-ch +- 6MHz */ +switch (bw) { +case RTW89_CHANNEL_WIDTH_20 : +if (btc->dm.freerun || btc->dm.fddt_train) + bw =48 ; +else + bw =20 + chip->afh_guard_ch *2 ; +break ; +case RTW89_CHANNEL_WIDTH_40 : +if (btc->dm.freerun) + bw =40 + chip->afh_guard_ch *2 ; +else + bw =40 ; +break ; +case RTW89_CHANNEL_WIDTH_5 : + bw =5 + chip->afh_guard_ch *2 ; +break ; +case RTW89_CHANNEL_WIDTH_10 : + bw =10 + chip->afh_guard_ch *2 ; +break ; +default : + en = false;/* turn off AFH info if invalid BW */ + bw =0 ; + ch =0 ; +break ; + } + +if (!en || ch >14 || ch ==0 ) { + en = false; + bw =0 ; + ch =0 ; + } + +if (wl_afh->en == en && + wl_afh->ch == ch && + wl_afh->bw == bw && + (!bt->enable.now || bt->enable.last)) +return ; + + wl_afh->en = buf[0 ]; + wl_afh->ch = buf[1 ]; + wl_afh->bw = buf[2 ]; + +if (_send_fw_cmd (rtwdev,BTFC_SET ,SET_BT_WL_CH_INFO , &wl->afh_info,3 )) { +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s(): en=%d, ch=%d, bw=%d\n" , + __func__, en, ch, bw); + + btc->cx.cnt_wl[BTC_WCNT_CH_UPDATE ]++; + } +} + +static void _set_bt_afh_info (struct rtw89_dev *rtwdev) +{ +if (rtwdev->chip->chip_id ==RTL8922A ) +_set_bt_afh_info_v1 (rtwdev); +else +_set_bt_afh_info_v0 (rtwdev); +} +static bool _check_freerun (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 01/11] wifi: rtw89: coex: Add v1 Bluetooth AFH handshake for WiFi 7
Quoted 8 lines · Ping-Ke Shih
From: Ching-Te Ku <[email protected]>
WiFi 7 generation has dual MAC, Coexistence need to find out the 2GHz WiFi connection in the connected links. And assign its channel to Bluetooth to make Bluetooth not to hop into WiFi channel.
Signed-off-by Ching-Te Ku <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
11 patch(es) applied to rtw-next branch of rtw.git, thanks.
d8643e681825 wifi: rtw89: coex: Add v1 Bluetooth AFH handshake for WiFi 7 39251e189e41 wifi: rtw89: coex: Enable outsource info H2C command 10a39b9fd7a1 wifi: rtw89: coex: Query Bluetooth TX power when firmware support 43be50111483 wifi: rtw89: coex: RTL8922A add Wi-Fi firmware support for v0.35.71.0 fc9b3028aae8 wifi: rtw89: coex: Get Bluetooth desired version by WiFi firmware version 3ba79eaee051 wifi: rtw89: coex: Update scoreboard to avoid Bluetooth re-link fail d997fb2f8c49 wifi: rtw89: coex: Assign priority table before entering power save a7feafea4ce8 wifi: rtw89: coex: Not to set slot duration to zero to avoid firmware issue 8ef99ee5d278 wifi: rtw89: coex: Update Bluetooth slot length when Wi-Fi is scanning 206a8f999fcb wifi: rtw89: coex: RTL8852B coexistence Wi-Fi firmware support for v0.29.122.0 c5ef95e29166 wifi: rtw89: coex: Update Wi-Fi/Bluetooth coexistence version to 9.0.0
Ping-Ke Shih
maintainerPATCH 2/11 wifi: rtw89: coex: Enable outsource info H2C command
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The before several patches collect driver information, then this patch packet these information as outsource info and update to firmware by H2C command.
--- drivers/net/wireless/realtek/rtw89/coex.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +10 -0
@@ -5561,6 +5561,16 @@ static void _action_common(struct rtw89_dev *rtwdev) wl->scbd_change = false; btc->cx.cnt_wl[BTC_WCNT_SCBDUPDATE ]++; } + +if (btc->ver->fcxosi) { +if (memcmp (&dm->ost_info_last, &dm->ost_info, +sizeof (dm->ost_info_last)) || + dm->run_reason ==BTC_RSN_NTFY_INIT || + dm->run_reason ==BTC_RSN_NTFY_RADIO_STATE ) { + dm->ost_info_last = dm->ost_info; +_fw_set_drv_info (rtwdev,CXDRVINFO_OSI ); + } + } btc->dm.tdma_instant_excute =0 ; wl->pta_reg_mac_chg = false; }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/11 wifi: rtw89: coex: Query Bluetooth TX power when firmware support
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Add firmware report to monitor Bluetooth TX power/gain settings, so that we can check it works as expected or not.
--- drivers/net/wireless/realtek/rtw89/coex.c | 101 +++++++++++++++++++++- drivers/net/wireless/realtek/rtw89/core.h | 11 +++ 2 files changed, 110 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +99 -2
@@ -153,8 +153,8 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtcrpt = 8, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7, .fcxstep = 7, .fcxnullsta = 7, .fcxmreg = 7, .fcxgpiodbg = 7, .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, - .fwlrole = 8, .frptmap = 3, .fcxctrl = 7, .fcxinit = 7, - .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_type = 2, .info_buf = 1800, + .fwlrole = 8, .frptmap = 4, .fcxctrl = 7, .fcxinit = 7, + .fwevntrptl = 1, .fwc2hfunc = 3, .drvinfo_type = 2, .info_buf = 1800, .max_role_num = 6, .fcxosi = 1, .fcxmlo = 1, }, {RTL8922A, RTW89_FW_VER_CODE(0, 35, 8, 0),
@@ -333,6 +333,7 @@ enum btc_btf_set_report_en {RPT_EN_BT_DEVICE_INFO ,RPT_EN_BT_AFH_MAP ,RPT_EN_BT_AFH_MAP_LE , +RPT_EN_BT_TX_PWR_LVL ,RPT_EN_FW_STEP_INFO ,RPT_EN_TEST , RPT_EN_WL_ALL,
@@ -896,6 +897,9 @@ static int _send_fw_cmd(struct rtw89_dev *rtwdev, u8 h2c_class, u8 h2c_func,return ret; } +#define BTC_BT_DEF_BR_TX_PWR 4 +#define BTC_BT_DEF_LE_TX_PWR 4 +static void _reset_btc_var (struct rtw89_dev *rtwdev,u8 type) {struct rtw89_btc *btc = &rtwdev->btc;
@@ -964,6 +968,9 @@ static void _reset_btc_var(struct rtw89_dev *rtwdev, u8 type)if (type &BTC_RESET_MDINFO )memset (&btc->mdinfo,0 ,sizeof (btc->mdinfo)); + + bt->link_info.bt_txpwr_desc.br_dbm =BTC_BT_DEF_BR_TX_PWR ; + bt->link_info.bt_txpwr_desc.le_dbm =BTC_BT_DEF_LE_TX_PWR ; }static u8 _search_reg_index (struct rtw89_dev *rtwdev,u8 mreg_num,u16 reg_type,u32 target)
@@ -2381,6 +2388,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map) bit_map =BIT (6 );break ;case 3 : +case 4 : bit_map =BIT (5 );break ;default :
@@ -2395,6 +2403,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map) bit_map =BIT (5 );break ;case 3 : +case 4 : bit_map =BIT (6 );break ;default :
@@ -2407,12 +2416,27 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map) bit_map =BIT (8 );break ;case 3 : +case 4 : bit_map =BIT (7 );break ;default :break ; }break ; +case RPT_EN_BT_TX_PWR_LVL : +switch (ver->frptmap) { +case 0 : +case 1 : +case 2 : +case 3 : +break ; +case 4 : + bit_map =BIT (8 ); +break ; +default : +break ; + } +break ;case RPT_EN_FW_STEP_INFO :switch (ver->frptmap) {case 1 :
@@ -2422,6 +2446,9 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)case 3 : bit_map =BIT (8 );break ; +case 4 : + bit_map =BIT (9 ); +break ;default :break ; }
@@ -2439,6 +2466,9 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)case 3 : bit_map =GENMASK (2 ,0 ) |BIT (8 );break ; +case 4 : + bit_map =GENMASK (2 ,0 ) |BIT (9 ); +break ;default :break ; }
@@ -2455,6 +2485,9 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)case 3 : bit_map =GENMASK (7 ,3 );break ; +case 4 : + bit_map =GENMASK (8 ,3 ); +break ;default :break ; }
@@ -2471,6 +2504,9 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)case 3 : bit_map =GENMASK (8 ,0 );break ; +case 4 : + bit_map =GENMASK (9 ,0 ); +break ;default :break ; }
@@ -2487,6 +2523,9 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)case 3 : bit_map =GENMASK (8 ,2 );break ; +case 4 : + bit_map =GENMASK (9 ,2 ); +break ;default :break ; }
@@ -7379,6 +7418,25 @@ static void _update_bt_scbd(struct rtw89_dev *rtwdev, bool only_update)_run_coex (rtwdev,BTC_RSN_UPDATE_BT_SCBD ); } +#define BTC_BTINFO_PWR_LEN 5 +static void _update_bt_txpwr_info (struct rtw89_dev *rtwdev,u8 *buf,u32 len) +{ +struct rtw89_btc_bt_info *bt = &rtwdev->btc.cx.bt; +struct rtw89_btc_bt_link_info *b = &bt->link_info; + +if (len !=BTC_BTINFO_PWR_LEN ) +return ; + +if (!memcmp (bt->txpwr_info, buf,sizeof (bt->txpwr_info))) { +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s return by info duplicate!\n" , __func__); +return ; + } + +memcpy (bt->txpwr_info, buf,BTC_BTINFO_MAX ); +memcpy (&b->bt_txpwr_desc, &buf[2 ],sizeof (b->bt_txpwr_desc)); +} +static bool _chk_wl_rfk_request (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc;
@@ -8617,6 +8675,8 @@ static u8 rtw89_btc_c2h_get_index_by_ver(struct rtw89_dev *rtwdev, u8 func)return BTF_EVNT_BUF_OVERFLOW ; else if (ver->fwc2hfunc == 2) return func; + else if (ver->fwc2hfunc == 3) + return BTF_EVNT_BUF_OVERFLOW; else return BTF_EVNT_MAX;case BTF_EVNT_BUF_OVERFLOW :
@@ -8626,11 +8686,20 @@ static u8 rtw89_btc_c2h_get_index_by_ver(struct rtw89_dev *rtwdev, u8 func)return BTF_EVNT_C2H_LOOPBACK ; else if (ver->fwc2hfunc == 2) return func; + else if (ver->fwc2hfunc == 3) + return BTF_EVNT_C2H_LOOPBACK; else return BTF_EVNT_MAX;case BTF_EVNT_C2H_LOOPBACK :if (ver->fwc2hfunc ==2 )return func; +else if (ver->fwc2hfunc ==3 ) +return BTF_EVNT_BT_LEAUDIO_INFO ; +else +return BTF_EVNT_MAX ; +case BTF_EVNT_BT_QUERY_TXPWR : +if (ver->fwc2hfunc ==3 ) +return func;else return BTF_EVNT_MAX ;case BTF_EVNT_MAX :
@@ -8693,6 +8762,9 @@ void rtw89_btc_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,case BTF_EVNT_CX_RUNINFO : btc->dm.cnt_dm[BTC_DCNT_CX_RUNINFO ]++;break ; +case BTF_EVNT_BT_QUERY_TXPWR : + btc->cx.cnt_bt[BTC_BCNT_BTTXPWR_UPDATE ]++; +_update_bt_txpwr_info (rtwdev, buf, len); } }
@@ -8965,8 +9037,11 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_bt_info *bt = &cx->bt;struct rtw89_btc_wl_info *wl = &cx->wl; +u32 ver_main =FIELD_GET (GENMASK (31 ,24 ), wl->ver_info.fw_coex);struct rtw89_btc_bt_link_info *bt_linfo = &bt->link_info;union rtw89_btc_module_info *md = &btc->mdinfo; +s8 br_dbm = bt->link_info.bt_txpwr_desc.br_dbm; +s8 le_dbm = bt->link_info.bt_txpwr_desc.le_dbm;char *p = buf, *end = buf + bufsz;u8 *afh = bt_linfo->afh_map;u8 *afh_le = bt_linfo->afh_map_le;
@@ -9099,6 +9174,28 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) p +=scnprintf (p, end - p,"\n" ); } +if (ver_main >=9 && bt_linfo->profile_cnt.now) +rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_TX_PWR_LVL , true); +else +rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_TX_PWR_LVL , false); + +if (cx->cnt_bt[BTC_BCNT_BTTXPWR_UPDATE ]) { + p +=scnprintf (p, end - p, +" %-15s : br_index:0x%x, le_index:0x%x" , +"[bt_txpwr_lvl]" , + bt->link_info.bt_txpwr_desc.br_gain_index, + bt->link_info.bt_txpwr_desc.le_gain_index); + p +=scnprintf (p, end - p,", br_dbm:%d dBm" , br_dbm); + p +=scnprintf (p, end - p,", le_dbm:%d dBm" , le_dbm); + }else { + p +=scnprintf (p, end - p, +" %-15s : br_index:NA, le_index:NA, br_dbm:%d dBm[def], le_dbm:%d dBm[def]" , +"[bt_txpwr_lvl]" , + bt->link_info.bt_txpwr_desc.br_dbm, + bt->link_info.bt_txpwr_desc.le_dbm); + } + p +=scnprintf (p, end - p,"\n" ); +if (bt_linfo->profile_cnt.now || bt_linfo->status.map.ble_connect)rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_AFH_MAP , true);else
drivers/net/wireless/realtek/rtw89/core.h +11 -0
@@ -1322,6 +1322,7 @@ enum rtw89_btc_bt_state_cnt {BTC_BCNT_POLUT_NOW ,BTC_BCNT_POLUT_DIFF ,BTC_BCNT_RATECHG , +BTC_BCNT_BTTXPWR_UPDATE , BTC_BCNT_NUM, };
@@ -1810,6 +1811,13 @@ union rtw89_btc_bt_state_map {#define BTC_BT_AFH_GROUP 12#define BTC_BT_AFH_LE_GROUP 5 +struct rtw89_btc_bt_txpwr_desc { +s8 br_dbm; +s8 le_dbm; +u8 br_gain_index; +u8 le_gain_index; +}; +struct rtw89_btc_bt_link_info {struct rtw89_btc_u8_sta_chg profile_cnt;struct rtw89_btc_bool_sta_chg multi_link;
@@ -1819,6 +1827,7 @@ struct rtw89_btc_bt_link_info {struct rtw89_btc_bt_a2dp_desc a2dp_desc;struct rtw89_btc_bt_pan_desc pan_desc;union rtw89_btc_bt_state_map status; +struct rtw89_btc_bt_txpwr_desc bt_txpwr_desc;u8 sut_pwr_level[BTC_PROFILE_MAX ];u8 golden_rx_shift[BTC_PROFILE_MAX ];
@@ -2089,6 +2098,7 @@ struct rtw89_btc_bt_info {union rtw89_btc_bt_rfk_info_map rfk_info;u8 raw_info[BTC_BTINFO_MAX ];/* raw bt info from mailbox */ +u8 txpwr_info[BTC_BTINFO_MAX ];u8 rssi_level;u32 scbd;
@@ -3042,6 +3052,7 @@ enum rtw89_btc_btf_fw_event {BTF_EVNT_BT_LEAUDIO_INFO =7 ,/* fwc2hfunc > 1 */ BTF_EVNT_BUF_OVERFLOW ,BTF_EVNT_C2H_LOOPBACK , +BTF_EVNT_BT_QUERY_TXPWR ,/* fwc2hfunc > 3 */ BTF_EVNT_MAX, };
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/11 wifi: rtw89: coex: RTL8922A add Wi-Fi firmware support for v0.35.71.0
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The latest Wi-Fi firmware no feature update with Wi-Fi/Bluetooth coexistence. The patch describe the features support version.
--- drivers/net/wireless/realtek/rtw89/coex.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +8 -0
@@ -149,6 +149,14 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_type = 1, .info_buf = 1800, .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, }, + {RTL8922A ,RTW89_FW_VER_CODE (0 ,35 ,71 ,0 ), + .fcxbtcrpt = 8, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7, + .fcxstep = 7, .fcxnullsta = 7, .fcxmreg = 7, .fcxgpiodbg = 7, + .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, + .fwlrole = 8, .frptmap = 4, .fcxctrl = 7, .fcxinit = 7, + .fwevntrptl = 1, .fwc2hfunc = 3, .drvinfo_type = 2, .info_buf = 1800, + .max_role_num = 6, .fcxosi = 1, .fcxmlo = 1, + }, {RTL8922A, RTW89_FW_VER_CODE(0, 35, 63, 0), .fcxbtcrpt = 8, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7, .fcxstep = 7, .fcxnullsta = 7, .fcxmreg = 7, .fcxgpiodbg = 7,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/11 wifi: rtw89: coex: Get Bluetooth desired version by WiFi firmware version
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Because when Wi-Fi/Bluetooth want to communicate with each other, their contact window are their firmware. So the desired version code is more reasonable to change with firmware version.
--- drivers/net/wireless/realtek/rtw89/coex.c | 34 +++++++++---------- drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 - drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 - drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 - .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 - drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 - drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 - 8 files changed, 18 insertions(+), 24 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +17 -17
@@ -139,7 +139,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, .fwlrole = 7, .frptmap = 3, .fcxctrl = 7, .fcxinit = 7, .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_type = 1, .info_buf = 1800, - .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 8, }, {RTL8852BT ,RTW89_FW_VER_CODE (0 ,29 ,90 ,0 ), .fcxbtcrpt = 7, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7,
@@ -147,7 +147,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, .fwlrole = 7, .frptmap = 3, .fcxctrl = 7, .fcxinit = 7, .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_type = 1, .info_buf = 1800, - .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 8, }, {RTL8922A ,RTW89_FW_VER_CODE (0 ,35 ,71 ,0 ), .fcxbtcrpt = 8, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7,
@@ -155,7 +155,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, .fwlrole = 8, .frptmap = 4, .fcxctrl = 7, .fcxinit = 7, .fwevntrptl = 1, .fwc2hfunc = 3, .drvinfo_type = 2, .info_buf = 1800, - .max_role_num = 6, .fcxosi = 1, .fcxmlo = 1, + .max_role_num = 6, .fcxosi = 1, .fcxmlo = 1, .bt_desired = 9, }, {RTL8922A ,RTW89_FW_VER_CODE (0 ,35 ,63 ,0 ), .fcxbtcrpt = 8, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7,
@@ -163,7 +163,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, .fwlrole = 8, .frptmap = 4, .fcxctrl = 7, .fcxinit = 7, .fwevntrptl = 1, .fwc2hfunc = 3, .drvinfo_type = 2, .info_buf = 1800, - .max_role_num = 6, .fcxosi = 1, .fcxmlo = 1, + .max_role_num = 6, .fcxosi = 1, .fcxmlo = 1, .bt_desired = 9, }, {RTL8922A ,RTW89_FW_VER_CODE (0 ,35 ,8 ,0 ), .fcxbtcrpt = 8, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7,
@@ -171,7 +171,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, .fwlrole = 8, .frptmap = 3, .fcxctrl = 7, .fcxinit = 7, .fwevntrptl = 1, .fwc2hfunc = 1, .drvinfo_type = 1, .info_buf = 1800, - .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, {RTL8851B ,RTW89_FW_VER_CODE (0 ,29 ,29 ,0 ), .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5,
@@ -179,7 +179,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 2, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1800, - .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, {RTL8852C ,RTW89_FW_VER_CODE (0 ,27 ,57 ,0 ), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3,
@@ -187,7 +187,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1280, - .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, {RTL8852C ,RTW89_FW_VER_CODE (0 ,27 ,42 ,0 ), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3,
@@ -195,7 +195,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 2, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1280, - .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, {RTL8852C ,RTW89_FW_VER_CODE (0 ,27 ,0 ,0 ), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3,
@@ -203,7 +203,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 2, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1280, - .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, {RTL8852B ,RTW89_FW_VER_CODE (0 ,29 ,29 ,0 ), .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5,
@@ -211,7 +211,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 2, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1800, - .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, {RTL8852B ,RTW89_FW_VER_CODE (0 ,29 ,14 ,0 ), .fcxbtcrpt = 5, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 4,
@@ -219,7 +219,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1800, - .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, {RTL8852B ,RTW89_FW_VER_CODE (0 ,27 ,0 ,0 ), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3,
@@ -227,7 +227,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 1, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1280, - .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, {RTL8852A ,RTW89_FW_VER_CODE (0 ,13 ,37 ,0 ), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3,
@@ -235,7 +235,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 2, .fcxbtdevinfo = 1, .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 0, .drvinfo_type = 0, .info_buf = 1280, - .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, {RTL8852A ,RTW89_FW_VER_CODE (0 ,13 ,0 ,0 ), .fcxbtcrpt = 1, .fcxtdma = 1, .fcxslots = 1, .fcxcysta = 2,
@@ -243,7 +243,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, .fwlrole = 0, .frptmap = 0, .fcxctrl = 0, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 0, .drvinfo_type = 0, .info_buf = 1024, - .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, },/* keep it to be the last as default entry */
@@ -253,7 +253,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtver = 1, .fcxbtscan = 1, .fcxbtafh = 1, .fcxbtdevinfo = 1, .fwlrole = 0, .frptmap = 0, .fcxctrl = 0, .fcxinit = 0, .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1024, - .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, };
@@ -8823,8 +8823,8 @@ static int _show_cx_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) p +=scnprintf (p, end - p,"BT_FW_coex:%d(%s, desired:%d)\n" , bt->ver_info.fw_coex, - (bt->ver_info.fw_coex >= chip->btcx_desired ? -"Match" :"Mismatch" ), chip->btcx_desired); + (bt->ver_info.fw_coex >= ver->bt_desired ? +"Match" :"Mismatch" ), ver->bt_desired);if (bt->enable.now && bt->ver_info.fw ==0 )rtw89_btc_fw_en_rpt (rtwdev,RPT_EN_BT_VER_INFO , true);
drivers/net/wireless/realtek/rtw89/core.h +1 -1
@@ -3199,6 +3199,7 @@ struct rtw89_btc_ver {u8 max_role_num;u8 fcxosi;u8 fcxmlo; +u8 bt_desired; };struct rtw89_btc_btf_fwinfo {
@@ -4422,7 +4423,6 @@ struct rtw89_chip_info {u32 para_ver;u32 wlcx_desired; -u8 btcx_desired;u8 scbd;u8 mailbox;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +0 -1
@@ -2529,7 +2529,6 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .phycap_size = 128, .para_ver = 0, .wlcx_desired = 0x06000000, - .btcx_desired = 0x7, .scbd = 0x1, .mailbox = 0x1,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +0 -1
@@ -2247,7 +2247,6 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .phycap_size = 128, .para_ver = 0x0, .wlcx_desired = 0x06000000, - .btcx_desired = 0x7, .scbd = 0x1, .mailbox = 0x1,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +0 -1
@@ -883,7 +883,6 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .phycap_size = 128, .para_ver = 0, .wlcx_desired = 0x05050000, - .btcx_desired = 0x5, .scbd = 0x1, .mailbox = 0x1,
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +0 -1
@@ -816,7 +816,6 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .phycap_size = 128, .para_ver = 0, .wlcx_desired = 0x070e0000, - .btcx_desired = 0x7, .scbd = 0x1, .mailbox = 0x1,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +0 -1
@@ -3070,7 +3070,6 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .phycap_size = 0x60, .para_ver = 0x1, .wlcx_desired = 0x06000000, - .btcx_desired = 0x7, .scbd = 0x1, .mailbox = 0x1,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +0 -1
@@ -2923,7 +2923,6 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .phycap_size = 0x38, .para_ver = 0xf, .wlcx_desired = 0x07110000, - .btcx_desired = 0x7, .scbd = 0x1, .mailbox = 0x1,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/11 wifi: rtw89: coex: Update scoreboard to avoid Bluetooth re-link fail
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
When platform resume, there will have fail rate when Bluetooth try to re-link. And when Bluetooth is booting up, it will run the ROM code first, then load the firmware code from file. Catch this change and set the mechanism for Bluetooth re-link.
--- drivers/net/wireless/realtek/rtw89/coex.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +2 -0
@@ -7420,6 +7420,8 @@ static void _update_bt_scbd(struct rtw89_dev *rtwdev, bool only_update) bt->rfk_info.map.req = !!(val &BTC_BSCB_RFK_REQ ); bt->hi_lna_rx = !!(val &BTC_BSCB_BT_HILNA ); bt->link_info.status.map.connect = !!(val &BTC_BSCB_BT_CONNECT ); +if (bt->run_patch_code != !!(val &BTC_BSCB_PATCH_CODE )) + status_change = true; bt->run_patch_code = !!(val &BTC_BSCB_PATCH_CODE );if (!only_update && status_change)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/11 wifi: rtw89: coex: Assign priority table before entering power save
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
When Wi-Fi firmware scan, it will update the priority tables, and if stay at these priority tables then enter power saving will trigger Bluetooth issues. So update the priority before entering power saving.
--- drivers/net/wireless/realtek/rtw89/coex.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +9 -0
@@ -3996,6 +3996,15 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)u32 tbl_w1, tbl_b1, tbl_b4;u16 dur_2; +if (wl->status.map.lps) { +_slot_set_le (btc,CXST_E2G , s_def[CXST_E2G ].dur, + s_def[CXST_E2G ].cxtbl, s_def[CXST_E2G ].cxtype); +_slot_set_le (btc,CXST_E5G , s_def[CXST_E5G ].dur, + s_def[CXST_E5G ].cxtbl, s_def[CXST_E5G ].cxtype); +_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, + s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype); + } + type =FIELD_GET (BTC_CXP_MASK , policy_type);if (btc->ant_type ==BTC_ANT_SHARED ) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/11 wifi: rtw89: coex: Not to set slot duration to zero to avoid firmware issue
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
If the duration set to zero, Wi-Fi firmware will trigger some unexpected issue when firmware try to enable timer.
--- drivers/net/wireless/realtek/rtw89/coex.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +6 -6
@@ -4125,13 +4125,13 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)switch (policy_type) {case BTC_CXP_OFFE_2GBWISOB :/* for normal-case */ -_slot_set (btc,CXST_E2G ,0 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_E2G ,5 , tbl_w1,SLOT_ISO );_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype);_slot_set_dur (btc,CXST_EBT , dur_2);break ;case BTC_CXP_OFFE_2GISOB :/* for bt no-link */ -_slot_set (btc,CXST_E2G ,0 , cxtbl[1 ],SLOT_ISO ); +_slot_set (btc,CXST_E2G ,5 , cxtbl[1 ],SLOT_ISO );_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype);_slot_set_dur (btc,CXST_EBT , dur_2);
@@ -4157,15 +4157,15 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)break ;case BTC_CXP_OFFE_2GBWMIXB :if (a2dp->exist) -_slot_set (btc,CXST_E2G ,0 , cxtbl[2 ],SLOT_MIX ); +_slot_set (btc,CXST_E2G ,5 , cxtbl[2 ],SLOT_MIX );else -_slot_set (btc,CXST_E2G ,0 , tbl_w1,SLOT_MIX ); +_slot_set (btc,CXST_E2G ,5 , tbl_w1,SLOT_MIX );_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype);break ;case BTC_CXP_OFFE_WL :/* for 4-way */ -_slot_set (btc,CXST_E2G ,0 , cxtbl[1 ],SLOT_MIX ); -_slot_set (btc,CXST_EBT ,0 , cxtbl[1 ],SLOT_MIX ); +_slot_set (btc,CXST_E2G ,5 , cxtbl[1 ],SLOT_MIX ); +_slot_set (btc,CXST_EBT ,5 , cxtbl[1 ],SLOT_MIX );break ;default :break ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/11 wifi: rtw89: coex: Update Bluetooth slot length when Wi-Fi is scanning
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
If Wi-Fi isn't connected to AP, the firmware scan will not switch to operation channel. Bluetooth may not have enough time to TX data. This patch extend the slot to let Bluetooth can TX more to avoid audio lag.
--- drivers/net/wireless/realtek/rtw89/coex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +1 -1
@@ -4160,7 +4160,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)_slot_set (btc,CXST_E2G ,5 , cxtbl[2 ],SLOT_MIX ); else _slot_set(btc, CXST_E2G, 5, tbl_w1, SLOT_MIX); -_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, +_slot_set_le (btc,CXST_EBT ,cpu_to_le16 (40 ), s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype);break ;case BTC_CXP_OFFE_WL :/* for 4-way */
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/11 wifi: rtw89: coex: RTL8852B coexistence Wi-Fi firmware support for v0.29.122.0
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Add format version of Wi-Fi firmware commands/events for firmware version v0.29.122.0.
--- drivers/net/wireless/realtek/rtw89/coex.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +8 -0
@@ -205,6 +205,14 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_type = 0, .info_buf = 1280, .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, }, + {RTL8852B ,RTW89_FW_VER_CODE (0 ,29 ,122 ,0 ), + .fcxbtcrpt = 8, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7, + .fcxstep = 7, .fcxnullsta = 7, .fcxmreg = 7, .fcxgpiodbg = 7, + .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, + .fwlrole = 7, .frptmap = 3, .fcxctrl = 7, .fcxinit = 7, + .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_type = 1, .info_buf = 1800, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 8, + }, {RTL8852B, RTW89_FW_VER_CODE(0, 29, 29, 0), .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5, .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 2, .fcxgpiodbg = 1,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 11/11 wifi: rtw89: coex: Update Wi-Fi/Bluetooth coexistence version to 9.0.0
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The version 9 support the WiFi7 related functions.
--- drivers/net/wireless/realtek/rtw89/coex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +1 -1
@@ -11,7 +11,7 @@#include "ps.h" #include "reg.h" -#define RTW89_COEX_VERSION 0x07000413 +#define RTW89_COEX_VERSION 0x09000013#define FCXDEF_STEP 50/* MUST <= FCXMAX_STEP and match with wl fw*/ #define BTC_E2G_LIMIT_DEF 80
Signature · 1 line
2.25.1