wifi: rtw89: coex: add more firmware command and event formats for newer version
Ping-Ke Shih
maintainercover wifi: rtw89: coex: add more firmware command and event formats for newer version
In order to support newer firmware including WiFi 6 chips, add necessary firmware command and events formats, and define needed version by chip and firmware version.
Ching-Te Ku (13):
wifi: rtw89: coex: Add version 107 TX/RX info for firmware feature
wifi: rtw89: coex: Add version 9 report control info
wifi: rtw89: coex: Fix unexpected grant-signal assignee
wifi: rtw89: coex: Branch out version 105 firmware report map index
wifi: rtw89: coex: Refine chip initial related structure
wifi: rtw89: coex: Add driver info H2C command index version 103
wifi: rtw89: coex: Fix Wi-Fi role info H2C command header issue
wifi: rtw89: coex: Add firmware 0.29.133.X support for RTL8852B family
wifi: rtw89: coex: Add TDMA version 4
wifi: rtw89: coex: Add slots version 2
wifi: rtw89: coex: Add cycle status report version 105
wifi: rtw89: coex: Add wifi role info version 101
wifi: rtw89: coex: Add firmware 0.27.97.X support for RTL8852C
drivers/net/wireless/realtek/rtw89/coex.c | 672 ++++++++++++++---- drivers/net/wireless/realtek/rtw89/coex.h | 8 +- drivers/net/wireless/realtek/rtw89/core.h | 137 +++- drivers/net/wireless/realtek/rtw89/fw.c | 303 ++++++-- drivers/net/wireless/realtek/rtw89/fw.h | 64 ++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 128 ++-- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 62 +- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 66 +- .../net/wireless/realtek/rtw89/rtw8852bt.c | 71 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 62 +- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 53 +- drivers/net/wireless/realtek/rtw89/rtw8922d.c | 149 ++-- 12 files changed, 1198 insertions(+), 577 deletions(-)
base-commit: 730dbda6dc70d29180eb2a7e9fa36823838bb042
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/13 wifi: rtw89: coex: Add version 107 TX/RX info for firmware feature
From: Ching-Te Ku <[email protected]>
The previous version 7 format is for Dual-Bluetooth using. This patch is for single Bluetooth solution using. Driver will summary Wi-Fi now status for firmware to train RF parameters & TDMA mechanism.
--- drivers/net/wireless/realtek/rtw89/coex.c | 27 ++++-- drivers/net/wireless/realtek/rtw89/fw.c | 112 ++++++++++++++++------ drivers/net/wireless/realtek/rtw89/fw.h | 24 +++++ 3 files changed, 126 insertions(+), 37 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +19 -8
@@ -3081,10 +3081,15 @@ static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 index)if (ver->drvinfo_ver >1 ) index =3 ; +if (ver->fcxtrx ==0 ) +return ; +if (ver->fcxtrx ==7 )rtw89_fw_h2c_cxdrv_trx_v7 (rtwdev, index);else if (ver->fcxtrx ==9 )rtw89_fw_h2c_cxdrv_trx_v9 (rtwdev, index); +else if (ver->fcxtrx ==107 ) +rtw89_fw_h2c_cxdrv_trx_v107 (rtwdev, index);break ;case CXDRVINFO_RFK :if (ver->drvinfo_ver !=0 )
@@ -3096,7 +3101,7 @@ static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 index)if (ver->drvinfo_ver ==3 ) index =4 ; -if (ver->fcxtrx ==7 ) +if (ver->fcxtrx ==7 || ver->fcxtrx ==107 )rtw89_fw_h2c_cxtxpwr_v7 (rtwdev, index);else if (ver->fcxtrx ==9 )rtw89_fw_h2c_cxtxpwr_v9 (rtwdev, index);
@@ -3358,7 +3363,8 @@ static void _set_wl_tx_power(struct rtw89_dev *rtwdev, u32 level, u8 phy_map) dm->rf_trx_para.wl_tx_power[RTW89_PHY_0 ], dm->rf_trx_para.wl_tx_power[RTW89_PHY_1]); -if (ver->fcxtrx ==7 && chip->chip_id ==RTL8922A ) { +if ((ver->fcxtrx ==7 && chip->chip_id ==RTL8922A ) || + ver->fcxtrx ==107 ) {_fw_set_drv_info (rtwdev,CXDRVINFO_TXPWR ); }else if (ver->fcxtrx ==9 ) {_fw_set_drv_info (rtwdev,CXDRVINFO_TXPWR );
@@ -3632,12 +3638,17 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)u8 bid =BTC_BT_1ST , lv;u32 wl_stb_chg; -if (ver->fcxtrx ==9 && chip->rf_para_ulink_v9) { - ul_para_num = chip->rf_para_ulink_num_v9; - dl_para_num = chip->rf_para_dlink_num_v9; -_set_rf_trx_para_v9 (rtwdev); -return ; - }else if (ver->fcxtrx ==0 && chip->rf_para_ulink_v0) { +if (ver->fcxtrx ==9 ) { +/* Early v9 need to assign UL/DL RF para at driver */ +if (chip->rf_para_ulink_v9) { + ul_para_num = chip->rf_para_ulink_num_v9; + dl_para_num = chip->rf_para_dlink_num_v9; + }else { +_set_rf_trx_para_v9 (rtwdev); +return ; + } + }else if ((ver->fcxtrx ==0 || ver->fcxtrx ==7 || ver->fcxtrx ==107 ) && + chip->rf_para_ulink_v0) { ul_para_num = chip->rf_para_ulink_num_v0; dl_para_num = chip->rf_para_dlink_num_v0; }else {
drivers/net/wireless/realtek/rtw89/fw.c +83 -29
185 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +24 -0
@@ -2517,6 +2517,23 @@ struct rtw89_btc_trx_info_v7_u8 {u8 rsvd2; } __packed; +struct rtw89_btc_trx_info_v107_u8 { +u8 tx_lvl; +u8 rx_lvl; +u8 wl_rssi; +u8 bt_rssi; + +s8 wl_tx_power; +s8 wl_rx_gain; +s8 bt_tx_power; +s8 bt_rx_gain; + +u8 cn; +s8 nhm; +u8 bt_profile; +u8 rsvd2; +} __packed; +struct rtw89_btc_trx_info_le {__le16 tx_rate;__le16 rx_rate;
@@ -2538,6 +2555,12 @@ struct rtw89_h2c_cxtrx_v7 {struct rtw89_btc_trx_info_le v7_le; } __packed; +struct rtw89_h2c_cxtrx_v107 { +struct rtw89_h2c_cxhdr_v7 hdr; +struct rtw89_btc_trx_info_v107_u8 v107_u8; +struct rtw89_btc_trx_info_le v7_le; +} __packed; +struct rtw89_h2c_cxtxpwr_v7 {struct rtw89_h2c_cxhdr_v7 hdr;u8 pwr;
@@ -5395,6 +5418,7 @@ int rtw89_fw_h2c_cxdrv_ctrl_v7(struct rtw89_dev *rtwdev, u8 type);int rtw89_fw_h2c_cxdrv_ctrl_v9 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_trx_v7 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_trx_v9 (struct rtw89_dev *rtwdev,u8 type); +int rtw89_fw_h2c_cxdrv_trx_v107 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_rfk (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxtxpwr_v7 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxtxpwr_v9 (struct rtw89_dev *rtwdev,u8 type);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 01/13] wifi: rtw89: coex: Add version 107 TX/RX info for firmware feature
Quoted 8 lines · Ping-Ke Shih
From: Ching-Te Ku <[email protected]>
The previous version 7 format is for Dual-Bluetooth using. This patch is for single Bluetooth solution using. Driver will summary Wi-Fi now status for firmware to train RF parameters & TDMA mechanism.
Signed-off-by Ching-Te Ku <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
13 patch(es) applied to rtw-next branch of rtw.git, thanks.
0427315a6ed1 wifi: rtw89: coex: Add version 107 TX/RX info for firmware feature 4bedf26e132c wifi: rtw89: coex: Add version 9 report control info b5bfb43844e1 wifi: rtw89: coex: Fix unexpected grant-signal assignee 00961e2705b7 wifi: rtw89: coex: Branch out version 105 firmware report map index 49989a3fef37 wifi: rtw89: coex: Refine chip initial related structure 81d30a7be825 wifi: rtw89: coex: Add driver info H2C command index version 103 35b569b60aa0 wifi: rtw89: coex: Fix Wi-Fi role info H2C command header issue 58b1bde3712e wifi: rtw89: coex: Add firmware 0.29.133.X support for RTL8852B family 42a83b5f13e3 wifi: rtw89: coex: Add TDMA version 4b87da03ee7e9 wifi: rtw89: coex: Add slots version 2b8892add7e51 wifi: rtw89: coex: Add cycle status report version 105 236badaa50b3 wifi: rtw89: coex: Add wifi role info version 101 38c58d541cfe wifi: rtw89: coex: Add firmware 0.27.97.X support for RTL8852C
Ping-Ke Shih
maintainerPATCH 2/13 wifi: rtw89: coex: Add version 9 report control info
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
WiFi firmware will save its build date/time and package into C2H event then send to driver. It helps to analyze what kind of firmware was loaded now. Remove unnecessary memory set.
--- drivers/net/wireless/realtek/rtw89/coex.c | 166 +++++++++++++++++++++- drivers/net/wireless/realtek/rtw89/core.h | 18 +++ 2 files changed, 178 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +160 -6
@@ -1670,6 +1670,10 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pfinfo = &pfwinfo->rpt_ctrl.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v7); fwsubver->fcxbtcrpt = pfwinfo->rpt_ctrl.finfo.v7.fver; + }else if (ver->fcxbtcrpt ==9 ) { + pfinfo = &pfwinfo->rpt_ctrl.finfo.v9; + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v9); + fwsubver->fcxbtcrpt = pfwinfo->rpt_ctrl.finfo.v9.fver; }else if (ver->fcxbtcrpt ==11 ) { pfinfo = &pfwinfo->rpt_ctrl.finfo.v11; pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v11);
@@ -2075,6 +2079,46 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,else dm->error.map.h2c_c2h_buffer_mismatch = false; +_chk_btc_err (rtwdev,BTC_DCNT_BTCNT_HANG ,0 ); +_chk_btc_err (rtwdev,BTC_DCNT_RPT_HANG , val1); +_chk_btc_err (rtwdev,BTC_DCNT_WL_FW_VER_MATCH ,0 ); +_chk_btc_err (rtwdev,BTC_DCNT_BTTX_HANG ,0 ); + }else if (ver->fcxbtcrpt ==9 ) { + prpt->v9 = pfwinfo->rpt_ctrl.finfo.v9; + pfwinfo->rpt_en_map =le32_to_cpu (prpt->v9.rpt_info.en); + wl->ver_info.fw_coex =le32_to_cpu (prpt->v9.rpt_info.cx_ver); + wl->ver_info.fw =le32_to_cpu (prpt->v9.rpt_info.fw_ver); + +memcpy (wl->ver_info.build_time, + prpt->v9.build_time, +sizeof (wl->ver_info.build_time)); +memcpy (wl->ver_info.build_date, + prpt->v9.build_date, +sizeof (wl->ver_info.build_date)); + +for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) +memcpy (&dm->gnt_val[i], &prpt->v9.gnt_val[i], +sizeof (dm->gnt_val[i])); + + bt->bcnt[BTC_BCNT_HIPRI_TX ] = +le16_to_cpu (prpt->v9.bt_cnt[BTC_BCNT_HI_TX_V105 ]); + bt->bcnt[BTC_BCNT_HIPRI_RX ] = +le16_to_cpu (prpt->v9.bt_cnt[BTC_BCNT_HI_RX_V105 ]); + bt->bcnt[BTC_BCNT_LOPRI_TX ] = +le16_to_cpu (prpt->v9.bt_cnt[BTC_BCNT_LO_TX_V105 ]); + bt->bcnt[BTC_BCNT_LOPRI_RX ] = +le16_to_cpu (prpt->v9.bt_cnt[BTC_BCNT_LO_RX_V105 ]); + + val1 =le16_to_cpu (prpt->v9.bt_cnt[BTC_BCNT_POLLUTED_V105 ]); +if (val1 > bt->bcnt[BTC_BCNT_POLUT_NOW ]) + val1 -= bt->bcnt[BTC_BCNT_POLUT_NOW ];/* diff */ + + bt->bcnt[BTC_BCNT_POLUT_DIFF ] = val1; + bt->bcnt[BTC_BCNT_POLUT_NOW ] = +le16_to_cpu (prpt->v9.bt_cnt[BTC_BCNT_POLLUTED_V105 ]); + + dm->pta_owner = prpt->v9.pta_owner; +_chk_btc_err (rtwdev,BTC_DCNT_BTCNT_HANG ,0 );_chk_btc_err (rtwdev,BTC_DCNT_RPT_HANG , val1);_chk_btc_err (rtwdev,BTC_DCNT_WL_FW_VER_MATCH ,0 );
@@ -2085,14 +2129,9 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, wl->ver_info.fw_coex =le32_to_cpu (prpt->v11.rpt_info.cx_ver); wl->ver_info.fw =le32_to_cpu (prpt->v11.rpt_info.fw_ver); -memset (wl->ver_info.build_time,0 , -sizeof (wl->ver_info.build_time));memcpy (wl->ver_info.build_time, prpt->v11.build_time,sizeof (wl->ver_info.build_time)); - -memset (wl->ver_info.build_date,0 , -sizeof (wl->ver_info.build_date));memcpy (wl->ver_info.build_date, prpt->v11.build_date,sizeof (wl->ver_info.build_date));
@@ -2881,6 +2920,7 @@ static void rtw89_btc_fw_en_rpt(struct rtw89_dev *rtwdev,if (btc->ver->fcxbtcrpt ==7 || btc->ver->fcxbtcrpt ==8 || + btc->ver->fcxbtcrpt ==9 || btc->ver->fcxbtcrpt ==11 ) { r.v8.type =SET_REPORT_EN ; r.v8.fver = btc->ver->fcxbtcrpt;
@@ -9175,9 +9215,10 @@ static int _show_cx_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) ver_hotfix =FIELD_GET (GENMASK (15 ,8 ), wl->ver_info.fw); id_branch =FIELD_GET (GENMASK (7 ,0 ), wl->ver_info.fw); p +=scnprintf (p, end - p, -" %-15s : WL_FW:%d.%d.%d.%d, BT_FW:0x%x(%s)\n" , +" %-15s : WL_FW:%d.%d.%d.%d(built:%.12s-%.12s), BT_FW:0x%x(%s)\n" ,"[sub_module]" , ver_main, ver_sub, ver_hotfix, id_branch, + wl->ver_info.build_time, wl->ver_info.build_date, bt->ver_info.fw, bt->run_patch_code ?"patch" :"ROM" );if (ver->fcxinit ==7 ) {
@@ -12138,6 +12179,117 @@ static int _show_summary_v8(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)return p - buf; } +static int _show_summary_v9 (struct rtw89_dev *rtwdev,char *buf,size_t bufsz) +{ +struct rtw89_btc_btf_fwinfo *pfwinfo = &rtwdev->btc.fwinfo; +struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ; +struct rtw89_btc_fbtc_rpt_ctrl_v9 *prptctrl =NULL ; +struct rtw89_btc_cx *cx = &rtwdev->btc.cx; +struct rtw89_btc_dm *dm = &rtwdev->btc.dm; +struct rtw89_btc_wl_info *wl = &cx->wl; +u32 *cnt = rtwdev->btc.dm.cnt_notify; +char *p = buf, *end = buf + bufsz; +u32 cnt_sum =0 ; +u8 i; + +if (!(dm->coex_info_map &BTC_COEX_INFO_SUMMARY )) +return 0 ; + + p +=scnprintf (p, end - p,"%s" , +"\n\r========== [Statistics] ==========" ); + + pcinfo = &pfwinfo->rpt_ctrl.cinfo; +if (pcinfo->valid && wl->status.map.lps !=BTC_LPS_RF_OFF && + !wl->status.map.rf_off) { + prptctrl = &pfwinfo->rpt_ctrl.finfo.v9; + + p +=scnprintf (p, end - p, +"\n\r %-15s : h2c_cnt=%d(fail:%d, fw_recv:%d), c2h_cnt=%d(fw_send:%d, len:%d, " , +"[summary]" , pfwinfo->cnt_h2c, + pfwinfo->cnt_h2c_fail, +le16_to_cpu (prptctrl->rpt_info.cnt_h2c), + pfwinfo->cnt_c2h, +le16_to_cpu (prptctrl->rpt_info.cnt_c2h), +le16_to_cpu (prptctrl->rpt_info.len_c2h)); + + p +=scnprintf (p, end - p, +"rpt_cnt=%d(fw_send:%d), rpt_map=0x%x" , + pfwinfo->event[BTF_EVNT_RPT ], +le16_to_cpu (prptctrl->rpt_info.cnt), +le32_to_cpu (prptctrl->rpt_info.en)); + +if (dm->error.map.wl_fw_hang) + p +=scnprintf (p, end - p," (WL FW Hang!!)" ); + + p +=scnprintf (p, end - p, +"\n\r %-15s : send_ok:%d, send_fail:%d, recv:%d, " , +"[mailbox]" , +le32_to_cpu (prptctrl->bt_mbx_info.cnt_send_ok), +le32_to_cpu (prptctrl->bt_mbx_info.cnt_send_fail), +le32_to_cpu (prptctrl->bt_mbx_info.cnt_recv)); + + p +=scnprintf (p, end - p, +"A2DP_empty:%d(stop:%d/tx:%d/ack:%d/nack:%d)" , +le32_to_cpu (prptctrl->bt_mbx_info.a2dp.cnt_empty), +le32_to_cpu (prptctrl->bt_mbx_info.a2dp.cnt_flowctrl), +le32_to_cpu (prptctrl->bt_mbx_info.a2dp.cnt_tx), +le32_to_cpu (prptctrl->bt_mbx_info.a2dp.cnt_ack), +le32_to_cpu (prptctrl->bt_mbx_info.a2dp.cnt_nack)); + + p +=scnprintf (p, end - p, +"\n\r %-15s : wl_rfk[req:%d/go:%d/reject:%d/tout:%d/time:%dms]" , +"[RFK/LPS]" , wl->wcnt[BTC_WCNT_RFK_REQ ], + wl->wcnt[BTC_WCNT_RFK_GO ], + wl->wcnt[BTC_WCNT_RFK_REJECT ], + wl->wcnt[BTC_WCNT_RFK_TIMEOUT ], + wl->rfk_info.proc_time); + + p +=scnprintf (p, end - p,", bt_rfk[req:%d]" , +le16_to_cpu (prptctrl->bt_cnt[BTC_BCNT_RFK_REQ ])); + + p +=scnprintf (p, end - p,", AOAC[RF_on:%d/RF_off:%d]" , +le16_to_cpu (prptctrl->rpt_info.cnt_aoac_rf_on), +le16_to_cpu (prptctrl->rpt_info.cnt_aoac_rf_off)); + }else { + p +=scnprintf (p, end - p, +"\n\r %-15s : h2c_cnt=%d(fail:%d), c2h_cnt=%d (lps=%d/rf_off=%d)" , +"[summary]" , + pfwinfo->cnt_h2c, pfwinfo->cnt_h2c_fail, + pfwinfo->cnt_c2h, + wl->status.map.lps, wl->status.map.rf_off); + } + +for (i =0 ; i <BTC_NCNT_NUM ; i++) + cnt_sum += dm->cnt_notify[i]; + + p +=scnprintf (p, end - p, +"\n\r %-15s : total=%d, show_coex_info=%d, power_on=%d, init_coex=%d, " , +"[notify_cnt]" , + cnt_sum, cnt[BTC_NCNT_SHOW_COEX_INFO ], + cnt[BTC_NCNT_POWER_ON ], cnt[BTC_NCNT_INIT_COEX ]); + + p +=scnprintf (p, end - p, +"power_off=%d, radio_state=%d, role_info=%d, wl_rfk=%d, wl_sta=%d" , + cnt[BTC_NCNT_POWER_OFF ], cnt[BTC_NCNT_RADIO_STATE ], + cnt[BTC_NCNT_ROLE_INFO ], cnt[BTC_NCNT_WL_RFK ], + cnt[BTC_NCNT_WL_STA ]); + + p +=scnprintf (p, end - p, +"\n\r %-15s : scan_start=%d, scan_finish=%d, switch_band=%d, switch_chbw=%d, special_pkt=%d, " , +"[notify_cnt]" , + cnt[BTC_NCNT_SCAN_START ], cnt[BTC_NCNT_SCAN_FINISH ], + cnt[BTC_NCNT_SWITCH_BAND ], cnt[BTC_NCNT_SWITCH_CHBW ], + cnt[BTC_NCNT_SPECIAL_PACKET ]); + + p +=scnprintf (p, end - p, +"timer=%d, customerize=%d, hub_msg=%d, chg_fw=%d, send_cc=%d" , + cnt[BTC_NCNT_TIMER ], cnt[BTC_NCNT_CUSTOMERIZE ], + rtwdev->btc.hubmsg_cnt, cnt[BTC_NCNT_RESUME_DL_FW ], + cnt[BTC_NCNT_COUNTRYCODE ]); + +return p - buf; +} +static int _show_summary_v11 (struct rtw89_dev *rtwdev,char *buf,size_t bufsz) {struct rtw89_btc_btf_fwinfo *pfwinfo = &rtwdev->btc.fwinfo;
@@ -12311,6 +12463,8 @@ ssize_t rtw89_btc_dump_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) p +=_show_summary_v7 (rtwdev, p, end - p); else if (ver->fcxbtcrpt == 8) p += _show_summary_v8(rtwdev, p, end - p); + else if (ver->fcxbtcrpt == 9) + p += _show_summary_v9(rtwdev, p, end - p); else if (ver->fcxbtcrpt == 11) p += _show_summary_v11(rtwdev, p, end - p);
drivers/net/wireless/realtek/rtw89/core.h +18 -0
@@ -2788,6 +2788,23 @@ struct rtw89_btc_fbtc_rpt_ctrl_v8 {struct rtw89_btc_fbtc_rpt_ctrl_bt_mailbox bt_mbx_info; } __packed; +#define RTW89_BTC_TIME_DATE_FMT 12 +struct rtw89_btc_fbtc_rpt_ctrl_v9 { +u8 fver; +u8 ext_req_exist; +u8 pta_owner; +u8 rsvd; + +u8 build_time[RTW89_BTC_TIME_DATE_FMT ]; +u8 build_date[RTW89_BTC_TIME_DATE_FMT ]; + +u8 gnt_val[RTW89_PHY_NUM ][4 ];/* gwl/gbt012 refer to struct btc_gnt_ctrl */ +__le16 bt_cnt[BTC_BCNT_STA_MAX_V105 ]; + +struct rtw89_btc_fbtc_rpt_ctrl_info_v8 rpt_info; +struct rtw89_btc_fbtc_rpt_ctrl_bt_mailbox bt_mbx_info; +} __packed; +struct rtw89_btc_fbtc_rpt_ctrl_v11 {u8 fver;u8 rsvd0;
@@ -2815,6 +2832,7 @@ union rtw89_btc_fbtc_rpt_ctrl_ver_info {struct rtw89_btc_fbtc_rpt_ctrl_v105 v105;struct rtw89_btc_fbtc_rpt_ctrl_v7 v7;struct rtw89_btc_fbtc_rpt_ctrl_v8 v8; +struct rtw89_btc_fbtc_rpt_ctrl_v9 v9;struct rtw89_btc_fbtc_rpt_ctrl_v11 v11; };
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/13 wifi: rtw89: coex: Fix unexpected grant-signal assignee
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The C2H report is for knowing what the grant-signal setting is now, not for applying new grant-signal setting.
--- drivers/net/wireless/realtek/rtw89/coex.c | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +12 -12
@@ -1935,8 +1935,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, dm->wl_fw_cx_offload = !!le32_to_cpu (prpt->v4.wl_fw_info.cx_offload);for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt_set[i], &prpt->v4.gnt_val[i], -sizeof (dm->gnt_set[i])); +memcpy (&dm->gnt_val[i], &prpt->v4.gnt_val[i], +sizeof (dm->gnt_val[i])); bt->bcnt[BTC_BCNT_HIPRI_TX ] =le32_to_cpu (prpt->v4.bt_cnt[BTC_BCNT_HI_TX ]);
@@ -1967,8 +1967,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, dm->wl_fw_cx_offload =0 ;for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt_set[i], &prpt->v5.gnt_val[i], -sizeof (dm->gnt_set[i])); +memcpy (&dm->gnt_val[i], &prpt->v5.gnt_val[i], +sizeof (dm->gnt_val[i])); bt->bcnt[BTC_BCNT_HIPRI_TX ] =le16_to_cpu (prpt->v5.bt_cnt[BTC_BCNT_HI_TX ]);
@@ -1994,8 +1994,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, dm->wl_fw_cx_offload =0 ;for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt_set[i], &prpt->v105.gnt_val[i], -sizeof (dm->gnt_set[i])); +memcpy (&dm->gnt_val[i], &prpt->v105.gnt_val[i], +sizeof (dm->gnt_val[i])); bt->bcnt[BTC_BCNT_HIPRI_TX ] =le16_to_cpu (prpt->v105.bt_cnt[BTC_BCNT_HI_TX_V105 ]);
@@ -2020,8 +2020,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, wl->ver_info.fw =le32_to_cpu (prpt->v7.rpt_info.fw_ver);for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt_set[i], &prpt->v7.gnt_val[i], -sizeof (dm->gnt_set[i])); +memcpy (&dm->gnt_val[i], &prpt->v7.gnt_val[i], +sizeof (dm->gnt_val[i])); bt->bcnt[BTC_BCNT_HIPRI_TX ] =le16_to_cpu (prpt->v7.bt_cnt[BTC_BCNT_HI_TX_V105 ]);
@@ -2052,8 +2052,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, wl->ver_info.fw =le32_to_cpu (prpt->v8.rpt_info.fw_ver);for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt_set[i], &prpt->v8.gnt_val[i], -sizeof (dm->gnt_set[i])); +memcpy (&dm->gnt_val[i], &prpt->v8.gnt_val[i], +sizeof (dm->gnt_val[i])); bt->bcnt[BTC_BCNT_HIPRI_TX ] =le16_to_cpu (prpt->v8.bt_cnt[BTC_BCNT_HI_TX_V105 ]);
@@ -2137,8 +2137,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, sizeof(wl->ver_info.build_date));for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++) -memcpy (&dm->gnt_set[i], &prpt->v11.gnt_val[i][0 ], -sizeof (dm->gnt_set[i])); +memcpy (&dm->gnt_val[i], &prpt->v11.gnt_val[i][0 ], +sizeof (dm->gnt_val[i]));for (i =BTC_BT_1ST ; i <=BTC_BT_EXT ; i++) {if (i ==BTC_BT_EXT ) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/13 wifi: rtw89: coex: Branch out version 105 firmware report map index
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
RTL8852B in firmware 0.29.133.X do not support BT-TX-PWR report, re-index and branch out to version 105.
--- drivers/net/wireless/realtek/rtw89/coex.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +11 -0
@@ -2707,6 +2707,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)case 3 :case 4 :case 5 : +case 105 : bit_map =BIT (5 );break ;default :
@@ -2723,6 +2724,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)case 3 :case 4 :case 5 : +case 105 : bit_map =BIT (6 );break ;default :
@@ -2737,6 +2739,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)case 3 :case 4 :case 5 : +case 105 : bit_map =BIT (7 );break ;default :
@@ -2749,6 +2752,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)case 1 :case 2 :case 3 : +case 105 :break ;case 4 :case 5 :
@@ -2765,6 +2769,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map) bit_map =BIT (7 );break ;case 3 : +case 105 : bit_map =BIT (8 );break ;case 4 :
@@ -2778,6 +2783,8 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)case RPT_EN_TEST :if (ver->frptmap ==5 ) bit_map =BIT (10 ); +else if (ver->frptmap ==105 ) + bit_map =BIT (9 );else bit_map =BIT (31 );break ;
@@ -2789,6 +2796,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map) bit_map =GENMASK (2 ,0 );break ;case 3 : +case 105 : bit_map =GENMASK (2 ,0 ) |BIT (8 );break ;case 4 :
@@ -2809,6 +2817,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map) bit_map =GENMASK (6 ,3 ) |BIT (8 );break ;case 3 : +case 105 : bit_map =GENMASK (7 ,3 );break ;case 4 :
@@ -2833,6 +2842,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map)break ;case 4 :case 5 : +case 105 : bit_map =GENMASK (9 ,0 );break ;default :
@@ -2849,6 +2859,7 @@ static u32 rtw89_btc_fw_rpt_ver(struct rtw89_dev *rtwdev, u32 rpt_map) bit_map =GENMASK (6 ,2 ) |BIT (8 );break ;case 3 : +case 105 : bit_map =GENMASK (8 ,2 );break ;case 4 :
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/13 wifi: rtw89: coex: Refine chip initial related structure
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Due to the firmware version become more and more, the version divided branch coding method make the related code scattered everywhere, and too much version macro, rearrange the code, assign the value to version format only when H2C commands.
--- drivers/net/wireless/realtek/rtw89/coex.c | 123 ++++----------- drivers/net/wireless/realtek/rtw89/core.h | 89 +++++++++-- drivers/net/wireless/realtek/rtw89/fw.c | 101 +++++++++--- drivers/net/wireless/realtek/rtw89/fw.h | 5 + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 128 +++++---------- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 62 +++----- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 66 +++----- .../net/wireless/realtek/rtw89/rtw8852bt.c | 71 ++++----- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 62 +++----- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 53 +++---- drivers/net/wireless/realtek/rtw89/rtw8922d.c | 149 +++++++++--------- 11 files changed, 423 insertions(+), 486 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +32 -91
@@ -1142,13 +1142,7 @@ static void _reset_btc_var(struct rtw89_dev *rtwdev, u8 type)if (type &BTC_RESET_MDINFO ) {memset (&btc->mdinfo,0 ,sizeof (btc->mdinfo)); - -if (ver->fcxinit ==10 ) - btc->mdinfo.md_v10.ant.isolation =RTW89_BTC_DEFAULT_ANISO ; -else if (ver->fcxinit ==7 ) - btc->mdinfo.md_v7.ant.isolation =RTW89_BTC_DEFAULT_ANISO ; -else - btc->mdinfo.md.ant.isolation =RTW89_BTC_DEFAULT_ANISO ; + btc->mdinfo.ant.isolation =RTW89_BTC_DEFAULT_ANISO ; } }
@@ -1169,27 +1163,22 @@ static void _get_reg_status(struct rtw89_dev *rtwdev, u8 type, u8 *val) {struct rtw89_btc *btc = &rtwdev->btc;const struct rtw89_btc_ver *ver = btc->ver; -union rtw89_btc_module_info *md = &btc->mdinfo; +struct rtw89_btc_module *md = &btc->mdinfo;union rtw89_btc_fbtc_mreg_val *pmreg;u32 pre_agc_addr =R_BTC_BB_PRE_AGC_S1 ;u32 reg_val; -u8 idx, switch_type; - -if (ver->fcxinit ==7 ) - switch_type = md->md_v7.switch_type; -else - switch_type = md->md.switch_type; +u8 idx;if (btc->btg_pos ==RF_PATH_A ) pre_agc_addr =R_BTC_BB_PRE_AGC_S0 ;switch (type) {case BTC_CSTATUS_TXDIV_POS : -if (switch_type ==BTC_SWITCH_INTERNAL ) +if (md->bt0_sw_type ==BTC_SWITCH_INTERNAL ) *val =BTC_ANT_DIV_MAIN ;break ;case BTC_CSTATUS_RXDIV_POS : -if (switch_type ==BTC_SWITCH_INTERNAL ) +if (md->bt0_sw_type ==BTC_SWITCH_INTERNAL ) *val =BTC_ANT_DIV_MAIN ;break ;case BTC_CSTATUS_BB_GNT_MUX :
@@ -3098,7 +3087,7 @@ static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 index)switch (index) {case CXDRVINFO_INIT : -if (ver->fcxinit ==7 ) +if (ver->fcxinit ==7 || ver->fcxinit ==107 )rtw89_fw_h2c_cxdrv_init_v7 (rtwdev, index);else if (ver->fcxinit ==10 )rtw89_fw_h2c_cxdrv_init_v10 (rtwdev, index);
@@ -4206,14 +4195,7 @@ static bool _check_freerun(struct rtw89_dev *rtwdev)struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;struct rtw89_btc_bt_link_info *bt_linfo = &bt->link_info;struct rtw89_btc_bt_hid_desc *hid = &bt_linfo->hid_desc; -union rtw89_btc_module_info *md = &btc->mdinfo; -const struct rtw89_btc_ver *ver = btc->ver; -u8 isolation; - -if (ver->fcxinit ==7 ) - isolation = md->md_v7.ant.isolation; -else - isolation = md->md.ant.isolation; +struct rtw89_btc_module *md = &btc->mdinfo;if (btc->ant_type ==BTC_ANT_SHARED ) { btc->dm.trx_para_level =0 ;
@@ -4237,7 +4219,7 @@ static bool _check_freerun(struct rtw89_dev *rtwdev) }/* TODO get isolation by BT psd */ -if (isolation >=BTC_FREERUN_ANTISO_MIN ) { +if (md->ant.isolation >=BTC_FREERUN_ANTISO_MIN ) { btc->dm.trx_para_level =5 ;return true; }
@@ -6177,21 +6159,14 @@ static void _wl_req_mac(struct rtw89_dev *rtwdev, u8 mac)static void _update_zb_coex_tbl (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; -const struct rtw89_btc_ver *ver = btc->ver;u32 zb_tbl0 =0xda5a5a5a , zb_tbl1 =0xda5a5a5a ;u8 link_mode_chg = btc->cx.wl.link_mode_chg;u8 mode = btc->cx.wl.role_info.link_mode; -u8 wa_type;if (btc->dm.run_reason !=BTC_RSN_NTFY_INIT && !link_mode_chg)return ; -if (ver->fcxinit ==7 ) - wa_type = btc->mdinfo.md_v7.wa_type; -else - wa_type = btc->mdinfo.md.wa_type; - -if (!(wa_type &BTC_WA_HFP_ZB )) +if (!(btc->mdinfo.wa_type &BTC_WA_HFP_ZB ))return ; if (btc->dm.tdd_bind.rf_band == BIT(RTW89_BAND_5G) ||
@@ -8106,40 +8081,26 @@ static void _set_init_info(struct rtw89_dev *rtwdev) {const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc; -const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_wl_info *wl = &btc->cx.wl; -if (ver->fcxinit ==10 ) { - dm->init_info.init_v10.init_mode = wl->coex_mode; - dm->init_info.init_v10.wl_init_ok = wl->status.map.init_ok; - dm->init_info.init_v10.endian_type =BTC_PLATFORM_LITTLE_ENDIAN ; - - dm->init_info.init_v10.module = btc->mdinfo.md_v10; - - dm->init_info.init_v10.bt0_function = cx->bt0.func_type; - dm->init_info.init_v10.bt1_function = cx->bt1.func_type; - dm->init_info.init_v10.bt2_function = cx->bt_ext.func_type; - - dm->init_info.init_v10.pta_mode =RTW89_MAC_AX_COEX_RTK_MODE ; - dm->init_info.init_v10.pta_direction =RTW89_MAC_AX_COEX_INNER ; - }else if (ver->fcxinit ==7 ) { - dm->init_info.init_v7.wl_only = (u8 )dm->wl_only; - dm->init_info.init_v7.bt_only = (u8 )dm->bt_only; - dm->init_info.init_v7.wl_init_ok = (u8 )wl->status.map.init_ok; - dm->init_info.init_v7.cx_other = btc->cx.bt_ext.func_type; - dm->init_info.init_v7.wl_guard_ch = chip->afh_guard_ch; - dm->init_info.init_v7.module = btc->mdinfo.md_v7; - }else { - dm->init_info.init.wl_only = (u8 )dm->wl_only; - dm->init_info.init.bt_only = (u8 )dm->bt_only; - dm->init_info.init.wl_init_ok = (u8 )wl->status.map.init_ok; - dm->init_info.init.dbcc_en = rtwdev->dbcc_en; - dm->init_info.init.cx_other = btc->cx.bt_ext.func_type; - dm->init_info.init.wl_guard_ch = chip->afh_guard_ch; - dm->init_info.init.module = btc->mdinfo.md; - } + dm->init_info.init_mode = wl->coex_mode; + dm->init_info.wl_init_ok = wl->status.map.init_ok; + dm->init_info.endian_type =BTC_PLATFORM_LITTLE_ENDIAN ; + dm->init_info.bt0_function = cx->bt0.func_type; + dm->init_info.bt1_function = cx->bt1.func_type; + dm->init_info.bt2_function = cx->bt_ext.func_type; + dm->init_info.pta_mode =RTW89_MAC_AX_COEX_RTK_MODE ; + dm->init_info.pta_direction =RTW89_MAC_AX_COEX_INNER ; + dm->init_info.wl_only = dm->wl_only; + dm->init_info.bt_only = dm->bt_only; + dm->init_info.wl_init_ok = wl->status.map.init_ok; + dm->init_info.cx_other = btc->cx.bt_ext.func_type; + dm->init_info.wl_guard_ch = chip->afh_guard_ch; + dm->init_info.dbcc_en = rtwdev->dbcc_en; + + dm->init_info.module = btc->mdinfo;_fw_set_drv_info (rtwdev,CXDRVINFO_INIT );_fw_set_drv_info (rtwdev,CXDRVINFO_CTRL );
@@ -9175,7 +9136,7 @@ void rtw89_btc_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,static int _show_cx_info (struct rtw89_dev *rtwdev,char *buf,size_t bufsz) { -union rtw89_btc_module_info *md = &rtwdev->btc.mdinfo; +struct rtw89_btc_module *md = &rtwdev->btc.mdinfo;const struct rtw89_chip_info *chip = rtwdev->chip;const struct rtw89_btc_ver *ver = rtwdev->btc.ver;struct rtw89_hal *hal = &rtwdev->hal;
@@ -9184,7 +9145,6 @@ static int _show_cx_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)struct rtw89_btc_bt_info *bt = &btc->cx.bt0;struct rtw89_btc_wl_info *wl = &btc->cx.wl;u32 ver_main =0 , ver_sub =0 , ver_hotfix =0 , id_branch =0 ; -u8 cv, rfe, iso, ant_num, ant_single_pos;char *p = buf, *end = buf + bufsz;if (!(dm->coex_info_map &BTC_COEX_INFO_CX ))
@@ -9232,25 +9192,12 @@ static int _show_cx_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) wl->ver_info.build_time, wl->ver_info.build_date, bt->ver_info.fw, bt->run_patch_code ? "patch" : "ROM"); -if (ver->fcxinit ==7 ) { - cv = md->md_v7.kt_ver; - rfe = md->md_v7.rfe_type; - iso = md->md_v7.ant.isolation; - ant_num = md->md_v7.ant.num; - ant_single_pos = md->md_v7.ant.single_pos; - }else { - cv = md->md.cv; - rfe = md->md.rfe_type; - iso = md->md.ant.isolation; - ant_num = md->md.ant.num; - ant_single_pos = md->md.ant.single_pos; - } - p +=scnprintf (p, end - p," %-15s : cv:%x, rfe_type:0x%x, ant_iso:%d, ant_pg:%d, %s" , -"[hw_info]" , cv, rfe, iso, ant_num, - ant_num >1 ?"" : - ant_single_pos ?"1Ant_Pos:S1, " :"1Ant_Pos:S0, " ); +"[hw_info]" , + md->kt_ver, md->rfe_type, md->ant.isolation, + md->ant.num, md->ant.num >1 ?"" : + md->ant.single_pos ?"1Ant_Pos:S1, " :"1Ant_Pos:S0, " ); p += scnprintf(p, end - p, "3rd_coex:%d, dbcc:%d, tx_num:%d, rx_num:%d\n",
@@ -9417,7 +9364,7 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)struct rtw89_btc_bt_info *bt = &cx->bt0;struct rtw89_btc_wl_info *wl = &cx->wl;struct rtw89_btc_bt_link_info *bt_linfo = &bt->link_info; -union rtw89_btc_module_info *md = &btc->mdinfo; +struct rtw89_btc_module *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;u8 hw_band = wl->role_info.pta_req_band;
@@ -9425,23 +9372,17 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)char *p = buf, *end = buf + bufsz;u8 *afh = bt_linfo->afh_map;u8 *afh_le = bt_linfo->afh_map_le; -u8 bt_pos;if (!(btc->dm.coex_info_map &BTC_COEX_INFO_BT ))return 0 ; -if (ver->fcxinit ==7 ) - bt_pos = md->md_v7.bt_pos; -else - bt_pos = md->md.bt_pos; - p +=scnprintf (p, end - p,"========== [BT Status] ==========\n" ); p +=scnprintf (p, end - p," %-15s : enable:%s, btg:%s%s, connect:%s, " ,"[status]" , bt->enable.now ?"Y" :"N" , bt->btg_type ?"Y" :"N" , - (bt->enable.now && (bt->btg_type != bt_pos) ? + (bt->enable.now && (bt->btg_type != md->bt0_pos) ?"(efuse-mismatch!!)" :"" ), (bt_linfo->status.map.connect ?"Y" :"N" ));
drivers/net/wireless/realtek/rtw89/core.h +78 -11
157 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.c +79 -22
142 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +5 -0
@@ -2593,6 +2593,11 @@ struct rtw89_h2c_cxinit_v7 {struct rtw89_btc_init_info_v7 init; } __packed; +struct rtw89_h2c_cxinit_v107 { +struct rtw89_h2c_cxhdr_v7 hdr; +struct rtw89_btc_init_info_v107 init; +} __packed; +struct rtw89_h2c_cxinit_v10 {struct rtw89_h2c_cxhdr_v7 hdr;struct rtw89_btc_init_info_v10 init;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +40 -88
148 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852a.c +18 -44
74 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852b.c +20 -46
76 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +33 -38
79 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852c.c +18 -44
74 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8922a.c +26 -27
79 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8922d.c +74 -75
227 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/13 wifi: rtw89: coex: Add driver info H2C command index version 103
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The 0.29.133.X firmware driver info H2C index maximum is 5, to prevent switch case fall through and send unexpected H2C commands, add version code 103 as judgment.
--- drivers/net/wireless/realtek/rtw89/coex.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +7 -6
@@ -3138,7 +3138,7 @@ static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 index)rtw89_fw_h2c_cxdrv_rfk (rtwdev, index);break ;case CXDRVINFO_TXPWR : -if (ver->drvinfo_ver ==3 ) +if (ver->drvinfo_ver ==3 || ver->drvinfo_ver ==103 ) index =4 ;if (ver->fcxtrx ==7 || ver->fcxtrx ==107 )
@@ -3147,26 +3147,27 @@ static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 index)rtw89_fw_h2c_cxtxpwr_v9 (rtwdev, index);break ;case CXDRVINFO_FDDT : -if (ver->drvinfo_ver ==3 ) +if (ver->drvinfo_ver ==3 || ver->drvinfo_ver ==103 ) index =5 ;else return ; -rtw89_debug (rtwdev,RTW89_DBG_BTC ,"drv_info FDDT index=%d\n" , index);break ;case CXDRVINFO_MLO : +if (!ver->fcxmlo || ver->drvinfo_ver ==103 ) +return ; +if (ver->drvinfo_ver ==3 ) index =6 ;else return ; -rtw89_debug (rtwdev,RTW89_DBG_BTC ,"drv_info MLO index=%d\n" , index);break ;case CXDRVINFO_OSI : -if (!ver->fcxosi) +if (!ver->fcxosi || ver->drvinfo_ver ==103 )return ; -if (ver->drvinfo_ver >1 ) +if (ver->drvinfo_ver ==3 ) index =7 ;else return ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/13 wifi: rtw89: coex: Fix Wi-Fi role info H2C command header issue
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The function to filled up H2C command data is the last step in the driver, the next step is going to firmware. So the structure version number should not included driver local branch number (like firmware is v5, but driver branch to v105), it should be assigned as a explicit version number which paired with firmware.
--- drivers/net/wireless/realtek/rtw89/fw.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +6 -2
@@ -6255,6 +6255,10 @@ int rtw89_fw_h2c_cxdrv_role_v7(struct rtw89_dev *rtwdev, u8 type)skb_put (skb, len); h2c = (struct rtw89_h2c_cxrole_v7 *)skb->data; + h2c->hdr.type = type; + h2c->hdr.ver =7 ; + h2c->hdr.len = len -H2C_LEN_CXDRVHDR_V7 ; + h2c->r.connect_cnt = r->connect_cnt; h2c->r.link_mode = r->link_mode; h2c->r.link_mode_chg = r->link_mode_chg;
@@ -6323,7 +6327,7 @@ int rtw89_fw_h2c_cxdrv_role_v8(struct rtw89_dev *rtwdev, u8 type) h2c = (struct rtw89_h2c_cxrole_v8 *)skb->data; h2c->hdr.type = type; - h2c->hdr.ver = rtwdev->btc.ver->fwlrole; + h2c->hdr.ver =8 ; h2c->hdr.len = len -H2C_LEN_CXDRVHDR_V7 ; h2c->r.connect_cnt = r->connect_cnt; h2c->r.link_mode = r->link_mode;
@@ -6397,7 +6401,7 @@ int rtw89_fw_h2c_cxdrv_role_v10(struct rtw89_dev *rtwdev, u8 type) h2c = (struct rtw89_h2c_cxrole_v10 *)skb->data; h2c->hdr.type = type; - h2c->hdr.ver = rtwdev->btc.ver->fwlrole; + h2c->hdr.ver =10 ; h2c->hdr.len = len -H2C_LEN_CXDRVHDR_V7 ;for (j =RTW89_MAC_0 ; j <=RTW89_MAC_1 ; j++) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/13 wifi: rtw89: coex: Add firmware 0.29.133.X support for RTL8852B family
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The new firmware modified GPIO setup structure format for third party chip set I/O control & offloaded Wi-Fi TRX status to firmware for training traffic RF-Parameters & TDMA mechanism.
--- drivers/net/wireless/realtek/rtw89/coex.c | 27 +++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +27 -0
@@ -142,6 +142,15 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .max_role_num = 6, .fcxosi = 6, .fcxmlo = 2, .bt_desired = 8, .fcxtrx = 9, }, + {RTL8852BT ,RTW89_FW_VER_CODE (0 ,29 ,133 ,0 ), + .fcxbtcrpt = 9, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7, + .fcxstep = 7, .fcxnullsta = 7, .fcxmreg = 7, .fcxgpiodbg = 8, + .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, + .fwlrole = 7, .frptmap = 5, .fcxctrl = 7, .fcxinit = 107, + .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_ver = 103, .info_buf = 1800, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 8, + .fcxtrx = 107, + }, {RTL8852BT, RTW89_FW_VER_CODE(0, 29, 122, 0), .fcxbtcrpt = 8, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7, .fcxstep = 7, .fcxnullsta = 7, .fcxmreg = 7, .fcxgpiodbg = 7,
@@ -187,6 +196,15 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, .fcxtrx = 0, }, + {RTL8851B ,RTW89_FW_VER_CODE (0 ,29 ,133 ,0 ), + .fcxbtcrpt = 9, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7, + .fcxstep = 7, .fcxnullsta = 7, .fcxmreg = 7, .fcxgpiodbg = 8, + .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, + .fwlrole = 7, .frptmap = 5, .fcxctrl = 7, .fcxinit = 107, + .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_ver = 103, .info_buf = 1800, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 8, + .fcxtrx = 107, + }, {RTL8851B, RTW89_FW_VER_CODE(0, 29, 29, 0), .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5, .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 2, .fcxgpiodbg = 1,
@@ -223,6 +241,15 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, .fcxtrx = 0, }, + {RTL8852B ,RTW89_FW_VER_CODE (0 ,29 ,133 ,0 ), + .fcxbtcrpt = 9, .fcxtdma = 7, .fcxslots = 7, .fcxcysta = 7, + .fcxstep = 7, .fcxnullsta = 7, .fcxmreg = 7, .fcxgpiodbg = 8, + .fcxbtver = 7, .fcxbtscan = 7, .fcxbtafh = 7, .fcxbtdevinfo = 7, + .fwlrole = 7, .frptmap = 105, .fcxctrl = 7, .fcxinit = 107, + .fwevntrptl = 1, .fwc2hfunc = 2, .drvinfo_ver = 103, .info_buf = 1800, + .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 8, + .fcxtrx = 107, + }, {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,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/13 wifi: rtw89: coex: Add TDMA version 4
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
TDMA version 4 uses new TLV-Header to package TDMA information, patch related entry for version 4.
--- drivers/net/wireless/realtek/rtw89/coex.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +5 -3
@@ -1705,7 +1705,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pfinfo = &pfwinfo->rpt_fbtc_tdma.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_tdma.finfo.v1); fwsubver->fcxtdma =0 ; - }else if (ver->fcxtdma ==3 || ver->fcxtdma ==7 ) { + }else if (ver->fcxtdma ==3 || ver->fcxtdma ==4 || + ver->fcxtdma ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_tdma.finfo.v3; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_tdma.finfo.v3); fwsubver->fcxtdma = pfwinfo->rpt_fbtc_tdma.finfo.v3.fver;
@@ -2212,7 +2213,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,memcmp (&dm->tdma_now, &pfwinfo->rpt_fbtc_tdma.finfo.v1, sizeof(dm->tdma_now))); - else if (ver->fcxtdma == 3 || ver->fcxtdma == 7) + else if (ver->fcxtdma == 3 || ver->fcxtdma == 4 || + ver->fcxtdma == 7) _chk_btc_err(rtwdev, BTC_DCNT_TDMA_NONSYNC, memcmp(&dm->tdma_now, &pfwinfo->rpt_fbtc_tdma.finfo.v3.tdma,
@@ -2559,7 +2561,7 @@ static void _append_tdma(struct rtw89_dev *rtwdev) tlv->len =sizeof (*v); *v = dm->tdma; btc->policy_len +=BTC_TLV_HDR_LEN +sizeof (*v); - }else if (ver->fcxtdma ==7 ) { + }else if (ver->fcxtdma ==7 || ver->fcxtdma ==4 ) { tlv_v7 = (struct rtw89_btc_btf_tlv_v7 *)&btc->policy[len]; tlv_v7->len =sizeof (dm->tdma); tlv_v7->ver = ver->fcxtdma;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/13 wifi: rtw89: coex: Add slots version 2
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Slots structure version 2 uses new TLV-Header to package slots information, patch related entry for version 2.
--- drivers/net/wireless/realtek/rtw89/coex.c | 54 ++++++++++++++++------- drivers/net/wireless/realtek/rtw89/coex.h | 8 ++-- drivers/net/wireless/realtek/rtw89/core.h | 9 ++++ 3 files changed, 51 insertions(+), 20 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +38 -16
@@ -1133,7 +1133,7 @@ static void _reset_btc_var(struct rtw89_dev *rtwdev, u8 type)/* set the slot_now table to original */ btc->dm.tdma_now = t_def[CXTD_OFF ]; btc->dm.tdma = t_def[CXTD_OFF ]; -if (ver->fcxslots >=7 ) { +if (ver->fcxslots >=2 ) {for (i =0 ; i <ARRAY_SIZE (s_def); i++) { btc->dm.slot.v7[i].dur = s_def[i].dur; btc->dm.slot.v7[i].cxtype = s_def[i].cxtype;
@@ -1721,6 +1721,10 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pfinfo = &pfwinfo->rpt_fbtc_slots.finfo.v1; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_slots.finfo.v1); fwsubver->fcxslots = pfwinfo->rpt_fbtc_slots.finfo.v1.fver; + }else if (ver->fcxslots ==2 ) { + pfinfo = &pfwinfo->rpt_fbtc_slots.finfo.v2; + pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_slots.finfo.v2); + fwsubver->fcxslots = pfwinfo->rpt_fbtc_slots.finfo.v2.fver; }else if (ver->fcxslots ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_slots.finfo.v7; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_slots.finfo.v7);
@@ -2232,6 +2236,15 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,memcmp (dm->slot_now.v7, pfwinfo->rpt_fbtc_slots.finfo.v7.slot, sizeof(dm->slot_now.v7))); + }else if (ver->fcxslots ==2 ) { +rtw89_debug (rtwdev,RTW89_DBG_BTC , +"[BTC], %s(): check %d %zu\n" , + __func__,BTC_DCNT_SLOT_NONSYNC , +sizeof (dm->slot_now.v7)); +_chk_btc_err (rtwdev,BTC_DCNT_SLOT_NONSYNC , +memcmp (dm->slot_now.v7, + pfwinfo->rpt_fbtc_slots.finfo.v2.slot, +sizeof (dm->slot_now.v7))); }else if (ver->fcxslots ==1 ) { rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): check %d %zu\n",
@@ -2687,7 +2700,7 @@ static void _append_slot(struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; -if (btc->ver->fcxslots ==7 ) +if (btc->ver->fcxslots ==2 || btc->ver->fcxslots ==7 )_append_slot_v7 (rtwdev);else _append_slot_v1 (rtwdev);
@@ -2902,7 +2915,7 @@ static void rtw89_btc_fw_set_slots(struct rtw89_dev *rtwdev)struct rtw89_btc_dm *dm = &btc->dm;u16 n, len; -if (ver->fcxslots ==7 ) { +if (ver->fcxslots ==2 || ver->fcxslots ==7 ) { len =sizeof (*tlv_v7) +sizeof (dm->slot.v7); tlv_v7 =kmalloc (len,GFP_KERNEL );if (!tlv_v7)
@@ -3096,7 +3109,7 @@ static void _fw_set_policy(struct rtw89_dev *rtwdev, u16 policy_type, btc->policy, btc->policy_len);if (!ret) {memcpy (&dm->tdma_now, &dm->tdma,sizeof (dm->tdma_now)); -if (btc->ver->fcxslots ==7 ) +if (btc->ver->fcxslots ==2 || btc->ver->fcxslots ==7 )memcpy (&dm->slot_now.v7, &dm->slot.v7,sizeof (dm->slot_now.v7));else memcpy (&dm->slot_now.v1, &dm->slot.v1,sizeof (dm->slot_now.v1));
@@ -4404,7 +4417,6 @@ 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;struct rtw89_btc_fbtc_tdma *t = &dm->tdma; -struct rtw89_btc_fbtc_slot *s = dm->slot.v1;u8 type;u32 tbl_w1, tbl_b1, tbl_b4;bool tdma_on = false;
@@ -4428,14 +4440,16 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)switch (type) {case BTC_CXP_USERDEF0 : *t = t_def[CXTD_OFF ]; - s[CXST_OFF ] = s_def[CXST_OFF ]; +_slot_set_le (btc,CXST_OFF , s_def[CXST_OFF ].dur, + s_def[CXST_OFF ].cxtbl, s_def[CXST_OFF ].cxtype);_slot_set_tbl (btc,CXST_OFF , cxtbl[2 ]); btc->update_policy_force = true;break ;case BTC_CXP_OFF :/* TDMA off */ tdma_on = false; *t = t_def[CXTD_OFF ]; - s[CXST_OFF ] = s_def[CXST_OFF ]; +_slot_set_le (btc,CXST_OFF , s_def[CXST_OFF ].dur, + s_def[CXST_OFF ].cxtbl, s_def[CXST_OFF ].cxtype);switch (policy_type) {case BTC_CXP_OFF_BT :
@@ -4498,16 +4512,23 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type) *t = t_def[CXTD_OFF_EXT ];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 ]; +_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); +_slot_set_le (btc,CXST_ENULL , s_def[CXST_ENULL ].dur, + s_def[CXST_ENULL ].cxtbl, s_def[CXST_ENULL ].cxtype);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 ]; +_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); +_slot_set_le (btc,CXST_ENULL , s_def[CXST_ENULL ].dur, + s_def[CXST_ENULL ].cxtbl, s_def[CXST_ENULL ].cxtype);break ; }break ;
@@ -10081,6 +10102,7 @@ static int _show_fbtc_tdma(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)static int _show_fbtc_slots (struct rtw89_dev *rtwdev,char *buf,size_t bufsz) {struct rtw89_btc *btc = &rtwdev->btc; +const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_dm *dm = &btc->dm;char *p = buf, *end = buf + bufsz;u16 dur, cxtype;
@@ -10088,11 +10110,11 @@ static int _show_fbtc_slots(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)u8 i =0 ;for (i =0 ; i <CXST_MAX ; i++) { -if (btc->ver->fcxslots ==1 ) { +if (ver->fcxslots ==1 ) { dur =le16_to_cpu (dm->slot_now.v1[i].dur); tbl =le32_to_cpu (dm->slot_now.v1[i].cxtbl); cxtype =le16_to_cpu (dm->slot_now.v1[i].cxtype); - }else if (btc->ver->fcxslots ==7 ) { + }else if (ver->fcxslots ==2 || ver->fcxslots ==7 ) { dur =le16_to_cpu (dm->slot_now.v7[i].dur); tbl =le32_to_cpu (dm->slot_now.v7[i].cxtbl); cxtype =le16_to_cpu (dm->slot_now.v7[i].cxtype);
drivers/net/wireless/realtek/rtw89/coex.h +4 -4
@@ -424,7 +424,7 @@ void _slot_set_le(struct rtw89_btc *btc, u8 sid, __le16 dura, __le32 tbl, __le16 btc->dm.slot.v1[sid].dur = dura; btc->dm.slot.v1[sid].cxtbl = tbl; btc->dm.slot.v1[sid].cxtype = type; - }else if (btc->ver->fcxslots ==7 ) { + }else if (btc->ver->fcxslots ==2 || btc->ver->fcxslots ==7 ) { btc->dm.slot.v7[sid].dur = dura; btc->dm.slot.v7[sid].cxtype = type; btc->dm.slot.v7[sid].cxtbl = tbl;
@@ -442,7 +442,7 @@ void _slot_set_dur(struct rtw89_btc *btc, u8 sid, u16 dura) {if (btc->ver->fcxslots ==1 ) btc->dm.slot.v1[sid].dur =cpu_to_le16 (dura); -else if (btc->ver->fcxslots ==7 ) +else if (btc->ver->fcxslots ==2 || btc->ver->fcxslots ==7 ) btc->dm.slot.v7[sid].dur =cpu_to_le16 (dura); }
@@ -451,7 +451,7 @@ void _slot_set_type(struct rtw89_btc *btc, u8 sid, u16 type) {if (btc->ver->fcxslots ==1 ) btc->dm.slot.v1[sid].cxtype =cpu_to_le16 (type); -else if (btc->ver->fcxslots ==7 ) +else if (btc->ver->fcxslots ==2 || btc->ver->fcxslots ==7 ) btc->dm.slot.v7[sid].cxtype =cpu_to_le16 (type); }
@@ -460,7 +460,7 @@ void _slot_set_tbl(struct rtw89_btc *btc, u8 sid, u32 tbl) {if (btc->ver->fcxslots ==1 ) btc->dm.slot.v1[sid].cxtbl =cpu_to_le32 (tbl); -else if (btc->ver->fcxslots ==7 ) +else if (btc->ver->fcxslots ==2 || btc->ver->fcxslots ==7 ) btc->dm.slot.v7[sid].cxtbl =cpu_to_le32 (tbl); }
drivers/net/wireless/realtek/rtw89/core.h +9 -0
@@ -3091,6 +3091,14 @@ struct rtw89_btc_fbtc_slot_v7 {__le32 cxtbl; } __packed; +struct rtw89_btc_fbtc_slots_v2 { +u8 fver;/* btc_ver::fcxslots */ +u8 tbl_num; +__le16 rsvd; +__le32 update_map; +struct rtw89_btc_fbtc_slot_v7 slot[CXST_MAX ]; +} __packed; +struct rtw89_btc_fbtc_slot_u16 {__le16 dur;/* slot duration */ __le16 cxtype;
@@ -3116,6 +3124,7 @@ struct rtw89_btc_fbtc_slots_v7 {union rtw89_btc_fbtc_slots_info {struct rtw89_btc_fbtc_slots v1; +struct rtw89_btc_fbtc_slots_v2 v2;struct rtw89_btc_fbtc_slots_v7 v7; } __packed;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 11/13 wifi: rtw89: coex: Add cycle status report version 105
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The exists version 5 format has FDDT(frequency divided training) related information. But the feature wasn't support for RTL8852C now, so firmware will not send the related reference value.
--- drivers/net/wireless/realtek/rtw89/coex.c | 197 ++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 21 +++ 2 files changed, 218 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +197 -0
@@ -1757,6 +1757,11 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcysta->v5 = pfwinfo->rpt_fbtc_cysta.finfo.v5; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v5); fwsubver->fcxcysta = pfwinfo->rpt_fbtc_cysta.finfo.v5.fver; + }else if (ver->fcxcysta ==105 ) { + pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v105; + pcysta->v105 = pfwinfo->rpt_fbtc_cysta.finfo.v105; + pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v105); + fwsubver->fcxcysta = pfwinfo->rpt_fbtc_cysta.finfo.v105.fver; }else if (ver->fcxcysta ==7 ) { pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v7; pcysta->v7 = pfwinfo->rpt_fbtc_cysta.finfo.v7;
@@ -2434,6 +2439,58 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, le16_to_cpu(pcysta->v5.slot_cnt[CXST_B1]));_chk_btc_err (rtwdev,BTC_DCNT_CYCLE_HANG ,le16_to_cpu (pcysta->v5.cycles)); + }else if (ver->fcxcysta ==105 ) { +if (dm->fddt_train ==BTC_FDDT_ENABLE ) +break ; + + cnt_leak_slot =le16_to_cpu (pcysta->v105.slot_cnt[CXST_LK ]); + cnt_rx_imr =le32_to_cpu (pcysta->v105.leak_slot.cnt_rximr); + +/* Check Leak-AP */ +if (cnt_leak_slot !=0 && cnt_rx_imr !=0 && + dm->tdma_now.rxflctrl) { +if (le16_to_cpu (pcysta->v5.cycles) >=BTC_CYSTA_CHK_PERIOD && + 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 ) { +if (ver->fcxslots ==1 ) + wl_slot_set =le16_to_cpu (dm->slot_now.v1[CXST_W1 ].dur); +else if (ver->fcxslots ==7 ) + wl_slot_set =le16_to_cpu (dm->slot_now.v7[CXST_W1 ].dur); + wl_slot_real =le16_to_cpu (pcysta->v105.cycle_time.tavg[CXT_WL ]); + +if (wl_slot_real > wl_slot_set) + diff_t = wl_slot_real - wl_slot_set; +else + diff_t = wl_slot_set - wl_slot_real; + } +_chk_btc_err (rtwdev,BTC_DCNT_WL_SLOT_DRIFT , diff_t); + +/* Check diff time between real BT slot and EBT/E5G slot */ + bt_slot_set = btc->bt_req_len[RTW89_PHY_0 ]; + bt_slot_real =le16_to_cpu (pcysta->v105.cycle_time.tavg[CXT_BT ]); + diff_t =0 ; +if (dm->tdma_now.type ==CXTDMA_OFF && + dm->tdma_now.ext_ctrl ==CXECTL_EXT && + bt_slot_set !=0 ) { +if (bt_slot_set > bt_slot_real) + diff_t = bt_slot_set - bt_slot_real; +else + diff_t = bt_slot_real - bt_slot_set; + } + +_chk_btc_err (rtwdev,BTC_DCNT_BT_SLOT_DRIFT , diff_t); +_chk_btc_err (rtwdev,BTC_DCNT_E2G_HANG , +le16_to_cpu (pcysta->v105.slot_cnt[CXST_E2G ])); +_chk_btc_err (rtwdev,BTC_DCNT_W1_HANG , +le16_to_cpu (pcysta->v105.slot_cnt[CXST_W1 ])); +_chk_btc_err (rtwdev,BTC_DCNT_B1_HANG , +le16_to_cpu (pcysta->v105.slot_cnt[CXST_B1 ])); +_chk_btc_err (rtwdev,BTC_DCNT_CYCLE_HANG , +le16_to_cpu (pcysta->v105.cycles)); }else if (ver->fcxcysta ==7 ) {if (dm->fddt_train ==BTC_FDDT_ENABLE )break ;
@@ -10690,6 +10747,144 @@ static int _show_fbtc_cysta_v5(struct rtw89_dev *rtwdev, char *buf, size_t bufszreturn p - buf; } +static int _show_fbtc_cysta_v105 (struct rtw89_dev *rtwdev,char *buf,size_t bufsz) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_bt_a2dp_desc *a2dp = &btc->cx.bt0.link_info.a2dp_desc; +struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo; +struct rtw89_btc_dm *dm = &btc->dm; +struct rtw89_btc_fbtc_a2dp_trx_stat_v4 *a2dp_trx; +struct rtw89_btc_fbtc_cysta_v105 *pcysta; +struct rtw89_btc_rpt_cmn_info *pcinfo; +u8 i, cnt =0 , slot_pair, divide_cnt; +u16 cycle, c_begin, c_end, store_index; +char *p = buf, *end = buf + bufsz; + + pcinfo = &pfwinfo->rpt_fbtc_cysta.cinfo; +if (!pcinfo->valid) +return 0 ; + + pcysta = &pfwinfo->rpt_fbtc_cysta.finfo.v105; + p +=scnprintf (p, end - p, +" %-15s : cycle:%d, bcn[all:%d/all_ok:%d/bt:%d/bt_ok:%d]" , +"[cycle_cnt]" , +le16_to_cpu (pcysta->cycles), +le16_to_cpu (pcysta->bcn_cnt[CXBCN_ALL ]), +le16_to_cpu (pcysta->bcn_cnt[CXBCN_ALL_OK ]), +le16_to_cpu (pcysta->bcn_cnt[CXBCN_BT_SLOT ]), +le16_to_cpu (pcysta->bcn_cnt[CXBCN_BT_OK ])); + +for (i =0 ; i <CXST_MAX ; i++) { +if (!le16_to_cpu (pcysta->slot_cnt[i])) +continue ; + + p +=scnprintf (p, end - p,", %s:%d" ,id_to_slot (i), +le16_to_cpu (pcysta->slot_cnt[i])); + } + +if (dm->tdma_now.rxflctrl) + p +=scnprintf (p, end - p,", leak_rx:%d" , +le32_to_cpu (pcysta->leak_slot.cnt_rximr)); + +if (pcysta->collision_cnt) + p +=scnprintf (p, end - p,", collision:%d" , + pcysta->collision_cnt); + +if (le16_to_cpu (pcysta->skip_cnt)) + p +=scnprintf (p, end - p,", skip:%d" , +le16_to_cpu (pcysta->skip_cnt)); + + p +=scnprintf (p, end - p,"\n" ); + + p +=scnprintf (p, end - p," %-15s : avg_t[wl:%d/bt:%d/lk:%d.%03d]" , +"[cycle_time]" , +le16_to_cpu (pcysta->cycle_time.tavg[CXT_WL ]), +le16_to_cpu (pcysta->cycle_time.tavg[CXT_BT ]), +le16_to_cpu (pcysta->leak_slot.tavg) /1000 , +le16_to_cpu (pcysta->leak_slot.tavg) %1000 ); + p +=scnprintf (p, end - p, +", max_t[wl:%d/bt:%d/lk:%d.%03d]\n" , +le16_to_cpu (pcysta->cycle_time.tmax[CXT_WL ]), +le16_to_cpu (pcysta->cycle_time.tmax[CXT_BT ]), +le16_to_cpu (pcysta->leak_slot.tmax) /1000 , +le16_to_cpu (pcysta->leak_slot.tmax) %1000 ); + + cycle =le16_to_cpu (pcysta->cycles); +if (cycle <=1 ) + goto out; + +/* 1 cycle record 1 wl-slot and 1 bt-slot */ + slot_pair =BTC_CYCLE_SLOT_MAX /2 ; + +if (cycle <= slot_pair) + c_begin =1 ; +else + c_begin = cycle - slot_pair +1 ; + + c_end = cycle; + +if (a2dp->exist) + divide_cnt =3 ; +else + divide_cnt =BTC_CYCLE_SLOT_MAX /4 ; + +if (c_begin > c_end) + goto out; + +for (cycle = c_begin; cycle <= c_end; cycle++) { + cnt++; + store_index = ((cycle -1 ) % slot_pair) *2 ; + +if (cnt % divide_cnt ==1 ) + p +=scnprintf (p, end - p," %-15s : " , +"[cycle_step]" ); + + p +=scnprintf (p, end - p,"->b%02d" , +le16_to_cpu (pcysta->slot_step_time[store_index])); +if (a2dp->exist) { + a2dp_trx = &pcysta->a2dp_trx[store_index]; + p +=scnprintf (p, end - p,"(%d/%d/%dM/%d/%d/%d)" , + a2dp_trx->empty_cnt, + a2dp_trx->retry_cnt, + a2dp_trx->tx_rate ?3 :2 , + a2dp_trx->tx_cnt, + a2dp_trx->ack_cnt, + a2dp_trx->nack_cnt); + } + p +=scnprintf (p, end - p,"->w%02d" , +le16_to_cpu (pcysta->slot_step_time[store_index +1 ])); +if (a2dp->exist) { + a2dp_trx = &pcysta->a2dp_trx[store_index +1 ]; + p +=scnprintf (p, end - p,"(%d/%d/%dM/%d/%d/%d)" , + a2dp_trx->empty_cnt, + a2dp_trx->retry_cnt, + a2dp_trx->tx_rate ?3 :2 , + a2dp_trx->tx_cnt, + a2dp_trx->ack_cnt, + a2dp_trx->nack_cnt); + } +if (cnt % divide_cnt ==0 || cnt == c_end) + p +=scnprintf (p, end - p,"\n" ); + } + +if (a2dp->exist) { + p +=scnprintf (p, end - p, +" %-15s : a2dp_ept:%d, a2dp_late:%d" , +"[a2dp_t_sta]" , +le16_to_cpu (pcysta->a2dp_ept.cnt), +le16_to_cpu (pcysta->a2dp_ept.cnt_timeout)); + + p +=scnprintf (p, end - p,", avg_t:%d, max_t:%d" , +le16_to_cpu (pcysta->a2dp_ept.tavg), +le16_to_cpu (pcysta->a2dp_ept.tmax)); + + p +=scnprintf (p, end - p,"\n" ); + } + +out: +return p - buf; +} +static int _show_fbtc_cysta_v7 (struct rtw89_dev *rtwdev,char *buf,size_t bufsz) {struct rtw89_btc_bt_info *bt = &rtwdev->btc.cx.bt0;
@@ -11081,6 +11276,8 @@ static int _show_fw_dm_msg(struct rtw89_dev *rtwdev, char *buf, size_t bufsz) p +=_show_fbtc_cysta_v4 (rtwdev, p, end - p); else if (ver->fcxcysta == 5) p += _show_fbtc_cysta_v5(rtwdev, p, end - p); + else if (ver->fcxcysta == 105) + p += _show_fbtc_cysta_v105(rtwdev, p, end - p); else if (ver->fcxcysta == 7) p += _show_fbtc_cysta_v7(rtwdev, p, end - p);
drivers/net/wireless/realtek/rtw89/core.h +21 -0
@@ -3352,6 +3352,26 @@ struct rtw89_btc_fbtc_cysta_v5 { /* statistics for cycles */__le32 except_map; } __packed; +struct rtw89_btc_fbtc_cysta_v105 { +u8 fver; +u8 rsvd; +u8 collision_cnt; +u8 except_cnt; +u8 wl_rx_err_ratio[BTC_CYCLE_SLOT_MAX ]; + +__le16 skip_cnt; +__le16 cycles; + +__le16 slot_step_time[BTC_CYCLE_SLOT_MAX ]; +__le16 slot_cnt[CXST_MAX ]; +__le16 bcn_cnt[CXBCN_MAX ]; +struct rtw89_btc_fbtc_cycle_time_info_v5 cycle_time; +struct rtw89_btc_fbtc_cycle_leak_info leak_slot; +struct rtw89_btc_fbtc_cycle_a2dp_empty_info a2dp_ept; +struct rtw89_btc_fbtc_a2dp_trx_stat_v4 a2dp_trx[BTC_CYCLE_SLOT_MAX ]; +__le32 except_map; +} __packed; +struct rtw89_btc_fbtc_cysta_v7 {/* statistics for cycles */ u8 fver;u8 rsvd;
@@ -3381,6 +3401,7 @@ union rtw89_btc_fbtc_cysta_info {struct rtw89_btc_fbtc_cysta_v3 v3;struct rtw89_btc_fbtc_cysta_v4 v4;struct rtw89_btc_fbtc_cysta_v5 v5; +struct rtw89_btc_fbtc_cysta_v105 v105;struct rtw89_btc_fbtc_cysta_v7 v7; };
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 12/13 wifi: rtw89: coex: Add wifi role info version 101
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The structure active_role which describes the using Wi-Fi role format is different with the exist v1. Add branch to cover the difference.
--- drivers/net/wireless/realtek/rtw89/coex.c | 13 ++-- drivers/net/wireless/realtek/rtw89/fw.c | 82 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 35 ++++++++++ 3 files changed, 125 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +8 -5
@@ -3198,6 +3198,8 @@ static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 index)rtw89_fw_h2c_cxdrv_role (rtwdev, index); else if (ver->fwlrole == 1) rtw89_fw_h2c_cxdrv_role_v1(rtwdev, index); + else if (ver->fwlrole == 101) + rtw89_fw_h2c_cxdrv_role_v101(rtwdev, index); else if (ver->fwlrole == 2) rtw89_fw_h2c_cxdrv_role_v2(rtwdev, index); else if (ver->fwlrole == 7)
@@ -6873,6 +6875,7 @@ static void _update_wl_link_mode(struct rtw89_dev *rtwdev, u8 hw_band, u8 type)struct rtw89_btc_wl_mlo_info *mlo_info = &wl->mlo_info;struct rtw89_btc_wl_role_info *r = &wl->role_info;u8 p2p_exist = wl->role_info.p2p_exist; +u8 rver = ver->fwlrole;if (hw_band ==RTW89_PHY_1 ) p2p_exist = wl->role_info.p2p_exist_hb1;
@@ -6893,7 +6896,7 @@ static void _update_wl_link_mode(struct rtw89_dev *rtwdev, u8 hw_band, u8 type) r->link_mode =BTC_WLINK_STA ; } -if (ver->fwlrole >=10 ) +if (rver >=10 && rver <100 )break ;if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) {
@@ -6921,7 +6924,7 @@ static void _update_wl_link_mode(struct rtw89_dev *rtwdev, u8 hw_band, u8 type) r->link_mode =BTC_WLINK_SCC ; } -if (ver->fwlrole >=10 ) +if (rver >=10 && rver <100 )break ;if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) {
@@ -6941,7 +6944,7 @@ static void _update_wl_link_mode(struct rtw89_dev *rtwdev, u8 hw_band, u8 type)else r->link_mode =BTC_WLINK_STA ; -if (ver->fwlrole >=10 ) +if (rver >=10 && rver <100 )break ;if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G )
@@ -6959,7 +6962,7 @@ static void _update_wl_link_mode(struct rtw89_dev *rtwdev, u8 hw_band, u8 type)*/ r->link_mode =BTC_WLINK_DB_MCC ; -if (ver->fwlrole >=10 ) +if (rver >=10 && rver <100 )break ; r->link_mode_v0 =BTC_WLINK_V0_25G_MCC ;
@@ -6968,7 +6971,7 @@ static void _update_wl_link_mode(struct rtw89_dev *rtwdev, u8 hw_band, u8 type)/* MLMR only support STA now (2024) */ r->link_mode =BTC_WLINK_STA ; -if (ver->fwlrole >=10 ) +if (rver >=10 && rver <100 )break ;if (mlo_info->hwb_rf_band[hw_band] !=RTW89_BAND_2G ) {
drivers/net/wireless/realtek/rtw89/fw.c +82 -0
88 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +35 -0
@@ -2603,6 +2603,40 @@ struct rtw89_h2c_cxinit_v10 {struct rtw89_btc_init_info_v10 init; } __packed; +#define RTW89_H2C_CXROLE_V101_ROLE_STAT_CONNTECTED BIT(0) +#define RTW89_H2C_CXROLE_V101_ROLE_STAT_PID GENMASK(3, 1) +#define RTW89_H2C_CXROLE_V101_ROLE_STAT_PHY BIT(4) +#define RTW89_H2C_CXROLE_V101_ROLE_STAT_NOA BIT(5) +#define RTW89_H2C_CXROLE_V101_ROLE_STAT_BADN GENMASK(7, 6) + +#define RTW89_H2C_CXROLE_V101_CLIPS_BW_CLIENTPS BIT(0) +#define RTW89_H2C_CXROLE_V101_CLIPS_BW_BW GENMASK(7, 1) + +#define RTW89_H2C_CXROLE_V101_DBCC_EN BIT(0) +#define RTW89_H2C_CXROLE_V101_DBCC_CHG BIT(1) +#define RTW89_H2C_CXROLE_V101_DBCC_2G_PHY GENMASK(3, 2) +#define RTW89_H2C_CXROLE_V101_DBCC_LINKMODE_CHG BIT(4) +#define RTW89_H2C_CXROLE_V101_DBCC_RSVD GENMASK(31, 5) + +struct rtw89_btc_wl_active_role_v101 { +u8 map_role_status; +u8 map_clips_bw; +u8 role; +u8 ch; +__le32 noa_duration; +} __packed; + +struct rtw89_h2c_cxrole_v101 { +struct rtw89_h2c_cxhdr hdr; +u8 connect_cnt; +u8 link_mode; +__le16 role_map; +struct rtw89_btc_wl_active_role_v101 act_role[RTW89_PORT_NUM ]; +__le32 mrole_type; +__le32 mrole_noa_duration; +__le32 map_dbcc_linkmode_chg; +} __packed; +static inline void RTW89_SET_FWCMD_CXROLE_CONNECT_CNT (void *cmd,u8 val) {u8p_replace_bits ((u8 *)(cmd) +2 , val,GENMASK (7 ,0 ));
@@ -5412,6 +5446,7 @@ int rtw89_fw_h2c_cxdrv_init_v7(struct rtw89_dev *rtwdev, u8 type);int rtw89_fw_h2c_cxdrv_init_v10 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_role (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_role_v1 (struct rtw89_dev *rtwdev,u8 type); +int rtw89_fw_h2c_cxdrv_role_v101 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_role_v2 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_role_v7 (struct rtw89_dev *rtwdev,u8 type);int rtw89_fw_h2c_cxdrv_role_v8 (struct rtw89_dev *rtwdev,u8 type);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 13/13 wifi: rtw89: coex: Add firmware 0.27.97.X support for RTL8852C
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Newer firmware is using the new TLV-Header format, without this patch it will lead driver run into length mismatch state.
--- drivers/net/wireless/realtek/rtw89/coex.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +9 -0
@@ -214,6 +214,15 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .max_role_num = 6, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, .fcxtrx = 0, }, + {RTL8852C ,RTW89_FW_VER_CODE (0 ,27 ,97 ,0 ), + .fcxbtcrpt = 4, .fcxtdma = 4, .fcxslots = 2, .fcxcysta = 105, + .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 2, .fcxgpiodbg = 1, + .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, + .fwlrole = 101, .frptmap = 3, .fcxctrl = 1, .fcxinit = 0, + .fwevntrptl = 0, .fwc2hfunc = 1, .drvinfo_ver = 0, .info_buf = 1280, + .max_role_num = 5, .fcxosi = 0, .fcxmlo = 0, .bt_desired = 7, + .fcxtrx = 107, + }, {RTL8852C, RTW89_FW_VER_CODE(0, 27, 57, 0), .fcxbtcrpt = 4, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 3, .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 1, .fcxgpiodbg = 1,
Signature · 1 line
2.25.1