wifi: rtw89: coex: second patchset to adopt BTC version
Ping-Ke Shih
maintainercover wifi: rtw89: coex: second patchset to adopt BTC version
In former patchset, we introduce BTC version to support various firmware version and features, and this is second patchset to adjust code to adopt BTC version step by step.
There are about 10 remaining patches that will separate into two patchset, and will send out later.
Ching-Te Ku (7):
wifi: rtw89: coex: Remove le32 to CPU translator at firmware cycle
report
wifi: rtw89: coex: Rename BTC firmware cycle report by feature version
wifi: rtw89: coex: Add v4 version firmware cycle report
wifi: rtw89: coex: Change firmware control report to version separate
wifi: rtw89: coex: Add v5 firmware control report
wifi: rtw89: coex: only read Bluetooth counter of report version 1 for
RTL8852A
wifi: rtw89: coex: Update WiFi role info H2C report
drivers/net/wireless/realtek/rtw89/coex.c | 687 ++++++++++++------ drivers/net/wireless/realtek/rtw89/core.h | 122 +++- drivers/net/wireless/realtek/rtw89/fw.c | 36 +- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 4 + 4 files changed, 617 insertions(+), 232 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/7 wifi: rtw89: coex: Remove le32 to CPU translator at firmware cycle report
From: Ching-Te Ku <[email protected]>
There are at least 2 version of cycle report format. If the code keep translating the report to local variable, the numbers of variable in check btc report function will out of maximum variable numbers. And most of these variable are using only one time, it is not necessary to store at memory.
--- drivers/net/wireless/realtek/rtw89/coex.c | 190 +++++++--------------- 1 file changed, 60 insertions(+), 130 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +60 -130
@@ -910,76 +910,6 @@ static void _update_bt_report(struct rtw89_dev *rtwdev, u8 rpt_type, u8 *pfinfo) } } -struct rtw89_btc_fbtc_cysta_cpu { -u8 fver; -u8 rsvd; -u16 cycles; -u16 cycles_a2dp[CXT_FLCTRL_MAX ]; -u16 a2dpept; -u16 a2dpeptto; -u16 tavg_cycle[CXT_MAX ]; -u16 tmax_cycle[CXT_MAX ]; -u16 tmaxdiff_cycle[CXT_MAX ]; -u16 tavg_a2dp[CXT_FLCTRL_MAX ]; -u16 tmax_a2dp[CXT_FLCTRL_MAX ]; -u16 tavg_a2dpept; -u16 tmax_a2dpept; -u16 tavg_lk; -u16 tmax_lk; -u32 slot_cnt[CXST_MAX ]; -u32 bcn_cnt[CXBCN_MAX ]; -u32 leakrx_cnt; -u32 collision_cnt; -u32 skip_cnt; -u32 exception; -u32 except_cnt; -u16 tslot_cycle[BTC_CYCLE_SLOT_MAX ]; -}; - -static void rtw89_btc_fbtc_cysta_to_cpu (const struct rtw89_btc_fbtc_cysta *src, -struct rtw89_btc_fbtc_cysta_cpu *dst) -{ -static_assert (sizeof (*src) ==sizeof (*dst)); - -#define __CPY_U8 (_x) ({dst->_x = src->_x; }) -#define __CPY_LE16 (_x) ({dst->_x = le16_to_cpu(src->_x); }) -#define __CPY_LE16S (_x) ({int _i; for (_i = 0; _i < ARRAY_SIZE(dst->_x); _i++) \ - dst->_x[_i] = le16_to_cpu(src->_x[_i]); }) -#define __CPY_LE32 (_x) ({dst->_x = le32_to_cpu(src->_x); }) -#define __CPY_LE32S (_x) ({int _i; for (_i = 0; _i < ARRAY_SIZE(dst->_x); _i++) \ - dst->_x[_i] = le32_to_cpu(src->_x[_i]); }) - -__CPY_U8 (fver); -__CPY_U8 (rsvd); -__CPY_LE16 (cycles); -__CPY_LE16S (cycles_a2dp); -__CPY_LE16 (a2dpept); -__CPY_LE16 (a2dpeptto); -__CPY_LE16S (tavg_cycle); -__CPY_LE16S (tmax_cycle); -__CPY_LE16S (tmaxdiff_cycle); -__CPY_LE16S (tavg_a2dp); -__CPY_LE16S (tmax_a2dp); -__CPY_LE16 (tavg_a2dpept); -__CPY_LE16 (tmax_a2dpept); -__CPY_LE16 (tavg_lk); -__CPY_LE16 (tmax_lk); -__CPY_LE32S (slot_cnt); -__CPY_LE32S (bcn_cnt); -__CPY_LE32 (leakrx_cnt); -__CPY_LE32 (collision_cnt); -__CPY_LE32 (skip_cnt); -__CPY_LE32 (exception); -__CPY_LE32 (except_cnt); -__CPY_LE16S (tslot_cycle); - -#undef __CPY_U8 -#undef __CPY_LE16 -#undef __CPY_LE16S -#undef __CPY_LE32 -#undef __CPY_LE32S -} -#define BTC_LEAK_AP_TH 10#define BTC_CYSTA_CHK_PERIOD 100
@@ -1002,9 +932,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,struct rtw89_btc_bt_info *bt = &btc->cx.bt;struct rtw89_btc_fbtc_rpt_ctrl *prpt;struct rtw89_btc_fbtc_rpt_ctrl_v1 *prpt_v1; -struct rtw89_btc_fbtc_cysta *pcysta_le32 =NULL ; +struct rtw89_btc_fbtc_cysta *pcysta =NULL ;struct rtw89_btc_fbtc_cysta_v1 *pcysta_v1 =NULL ; -struct rtw89_btc_fbtc_cysta_cpu pcysta[1 ];struct rtw89_btc_prpt *btc_prpt =NULL ;void *rpt_content =NULL , *pfinfo =NULL ;u8 rpt_type =0 ;
@@ -1066,8 +995,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pcinfo = &pfwinfo->rpt_fbtc_cysta.cinfo;if (chip->chip_id ==RTL8852A ) { pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo; - pcysta_le32 = &pfwinfo->rpt_fbtc_cysta.finfo; -rtw89_btc_fbtc_cysta_to_cpu (pcysta_le32, pcysta); + pcysta = &pfwinfo->rpt_fbtc_cysta.finfo; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo); }else { pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo_v1;
@@ -1259,13 +1187,13 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,break ;case BTC_RPT_TYPE_CYSTA :if (chip->chip_id ==RTL8852A ) { -if (pcysta->cycles <BTC_CYSTA_CHK_PERIOD ) +if (le16_to_cpu (pcysta->cycles) <BTC_CYSTA_CHK_PERIOD )break ;/* Check Leak-AP */ -if (pcysta->slot_cnt[CXST_LK ] !=0 && - pcysta->leakrx_cnt !=0 && dm->tdma_now.rxflctrl) { -if (pcysta->slot_cnt[CXST_LK ] < -BTC_LEAK_AP_TH * pcysta->leakrx_cnt) +if (le32_to_cpu (pcysta->slot_cnt[CXST_LK ]) !=0 && +le32_to_cpu (pcysta->leakrx_cnt) !=0 && dm->tdma_now.rxflctrl) { +if (le32_to_cpu (pcysta->slot_cnt[CXST_LK ]) < +BTC_LEAK_AP_TH *le32_to_cpu (pcysta->leakrx_cnt)) dm->leak_ap =1 ; }
@@ -1276,18 +1204,18 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,else wl_slot_set =le16_to_cpu (dm->slot_now[CXST_W1 ].dur); -if (pcysta->tavg_cycle[CXT_WL ] > wl_slot_set) { - diff_t = pcysta->tavg_cycle[CXT_WL ] - wl_slot_set; +if (le16_to_cpu (pcysta->tavg_cycle[CXT_WL ]) > wl_slot_set) { + diff_t =le16_to_cpu (pcysta->tavg_cycle[CXT_WL ]) - wl_slot_set;_chk_btc_err (rtwdev,BTC_DCNT_WL_SLOT_DRIFT , diff_t); }_chk_btc_err (rtwdev,BTC_DCNT_W1_FREEZE , - pcysta->slot_cnt[CXST_W1 ]); +le32_to_cpu (pcysta->slot_cnt[CXST_W1 ]));_chk_btc_err (rtwdev,BTC_DCNT_W1_FREEZE , - pcysta->slot_cnt[CXST_B1 ]); +le32_to_cpu (pcysta->slot_cnt[CXST_B1 ]));_chk_btc_err (rtwdev,BTC_DCNT_CYCLE_FREEZE , - (u32 )pcysta->cycles); +le16_to_cpu (pcysta->cycles)); }else {if (le16_to_cpu (pcysta_v1->cycles) <BTC_CYSTA_CHK_PERIOD )break ;
@@ -6385,7 +6313,6 @@ static void _show_fbtc_cysta(struct rtw89_dev *rtwdev, struct seq_file *m)struct rtw89_btc_bt_a2dp_desc *a2dp = &btc->cx.bt.link_info.a2dp_desc;struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ;struct rtw89_btc_fbtc_cysta *pcysta_le32 =NULL ; -struct rtw89_btc_fbtc_cysta_cpu pcysta[1 ];union rtw89_btc_fbtc_rxflct r;u8 i, cnt =0 , slot_pair;u16 cycle, c_begin, c_end, store_index;
@@ -6395,64 +6322,65 @@ static void _show_fbtc_cysta(struct rtw89_dev *rtwdev, struct seq_file *m)return ; pcysta_le32 = &pfwinfo->rpt_fbtc_cysta.finfo; -rtw89_btc_fbtc_cysta_to_cpu (pcysta_le32, pcysta);seq_printf (m," %-15s : cycle:%d, bcn[all:%d/all_ok:%d/bt:%d/bt_ok:%d]" , -"[cycle_cnt]" , pcysta->cycles, pcysta->bcn_cnt[CXBCN_ALL ], - pcysta->bcn_cnt[CXBCN_ALL_OK ], - pcysta->bcn_cnt[CXBCN_BT_SLOT ], - pcysta->bcn_cnt[CXBCN_BT_OK ]); +"[cycle_cnt]" , +le16_to_cpu (pcysta_le32->cycles), +le32_to_cpu (pcysta_le32->bcn_cnt[CXBCN_ALL ]), +le32_to_cpu (pcysta_le32->bcn_cnt[CXBCN_ALL_OK ]), +le32_to_cpu (pcysta_le32->bcn_cnt[CXBCN_BT_SLOT ]), +le32_to_cpu (pcysta_le32->bcn_cnt[CXBCN_BT_OK ]));for (i =0 ; i <CXST_MAX ; i++) { -if (!pcysta->slot_cnt[i]) +if (!le32_to_cpu (pcysta_le32->slot_cnt[i]))continue ; -seq_printf (m, -", %d:%d" , (u32 )i, pcysta->slot_cnt[i]); +seq_printf (m,", %d:%d" , (u32 )i, +le32_to_cpu (pcysta_le32->slot_cnt[i])); }if (dm->tdma_now.rxflctrl) { -seq_printf (m, -", leak_rx:%d" , pcysta->leakrx_cnt); +seq_printf (m,", leak_rx:%d" , +le32_to_cpu (pcysta_le32->leakrx_cnt)); } -if (pcysta->collision_cnt) { -seq_printf (m, -", collision:%d" , pcysta->collision_cnt); +if (le32_to_cpu (pcysta_le32->collision_cnt)) { +seq_printf (m,", collision:%d" , +le32_to_cpu (pcysta_le32->collision_cnt)); } -if (pcysta->skip_cnt) { -seq_printf (m, -", skip:%d" , pcysta->skip_cnt); +if (le32_to_cpu (pcysta_le32->skip_cnt)) { +seq_printf (m,", skip:%d" , +le32_to_cpu (pcysta_le32->skip_cnt)); }seq_puts (m,"\n" );seq_printf (m," %-15s : avg_t[wl:%d/bt:%d/lk:%d.%03d]" ,"[cycle_time]" , - pcysta->tavg_cycle[CXT_WL ], - pcysta->tavg_cycle[CXT_BT ], - pcysta->tavg_lk /1000 , pcysta->tavg_lk %1000 ); -seq_printf (m, -", max_t[wl:%d/bt:%d/lk:%d.%03d]" , - pcysta->tmax_cycle[CXT_WL ], - pcysta->tmax_cycle[CXT_BT ], - pcysta->tmax_lk /1000 , pcysta->tmax_lk %1000 ); -seq_printf (m, -", maxdiff_t[wl:%d/bt:%d]\n" , - pcysta->tmaxdiff_cycle[CXT_WL ], - pcysta->tmaxdiff_cycle[CXT_BT ]); - -if (pcysta->cycles ==0 ) +le16_to_cpu (pcysta_le32->tavg_cycle[CXT_WL ]), +le16_to_cpu (pcysta_le32->tavg_cycle[CXT_BT ]), +le16_to_cpu (pcysta_le32->tavg_lk) /1000 , +le16_to_cpu (pcysta_le32->tavg_lk) %1000 ); +seq_printf (m,", max_t[wl:%d/bt:%d/lk:%d.%03d]" , +le16_to_cpu (pcysta_le32->tmax_cycle[CXT_WL ]), +le16_to_cpu (pcysta_le32->tmax_cycle[CXT_BT ]), +le16_to_cpu (pcysta_le32->tmax_lk) /1000 , +le16_to_cpu (pcysta_le32->tmax_lk) %1000 ); +seq_printf (m,", maxdiff_t[wl:%d/bt:%d]\n" , +le16_to_cpu (pcysta_le32->tmaxdiff_cycle[CXT_WL ]), +le16_to_cpu (pcysta_le32->tmaxdiff_cycle[CXT_BT ])); + +if (le16_to_cpu (pcysta_le32->cycles) ==0 )return ;/* 1 cycle record 1 wl-slot and 1 bt-slot */ slot_pair =BTC_CYCLE_SLOT_MAX /2 ; -if (pcysta->cycles <= slot_pair) +if (le16_to_cpu (pcysta_le32->cycles) <= slot_pair) c_begin =1 ;else - c_begin = pcysta->cycles - slot_pair +1 ; + c_begin =le16_to_cpu (pcysta_le32->cycles) - slot_pair +1 ; - c_end = pcysta->cycles; + c_end =le16_to_cpu (pcysta_le32->cycles);for (cycle = c_begin; cycle <= c_end; cycle++) { cnt++;
@@ -6461,13 +6389,13 @@ static void _show_fbtc_cysta(struct rtw89_dev *rtwdev, struct seq_file *m)if (cnt % (BTC_CYCLE_SLOT_MAX /4 ) ==1 )seq_printf (m," %-15s : ->b%02d->w%02d" ,"[cycle_step]" , - pcysta->tslot_cycle[store_index], - pcysta->tslot_cycle[store_index +1 ]); +le16_to_cpu (pcysta_le32->tslot_cycle[store_index]), +le16_to_cpu (pcysta_le32->tslot_cycle[store_index +1 ]));else seq_printf (m,"->b%02d->w%02d" , - pcysta->tslot_cycle[store_index], - pcysta->tslot_cycle[store_index +1 ]); +le16_to_cpu (pcysta_le32->tslot_cycle[store_index]), +le16_to_cpu (pcysta_le32->tslot_cycle[store_index +1 ]));if (cnt % (BTC_CYCLE_SLOT_MAX /4 ) ==0 || cnt == c_end)seq_puts (m,"\n" ); }
@@ -6476,28 +6404,30 @@ static void _show_fbtc_cysta(struct rtw89_dev *rtwdev, struct seq_file *m)seq_printf (m," %-15s : a2dp_ept:%d, a2dp_late:%d" ,"[a2dp_t_sta]" , - pcysta->a2dpept, pcysta->a2dpeptto); +le16_to_cpu (pcysta_le32->a2dpept), +le16_to_cpu (pcysta_le32->a2dpeptto));seq_printf (m,", avg_t:%d, max_t:%d" , - pcysta->tavg_a2dpept, pcysta->tmax_a2dpept); +le16_to_cpu (pcysta_le32->tavg_a2dpept), +le16_to_cpu (pcysta_le32->tmax_a2dpept)); r.val = dm->tdma_now.rxflctrl;if (r.type && r.tgln_n) {seq_printf (m,", cycle[PSTDMA:%d/TDMA:%d], " , - pcysta->cycles_a2dp[CXT_FLCTRL_ON ], - pcysta->cycles_a2dp[CXT_FLCTRL_OFF ]); +le16_to_cpu (pcysta_le32->cycles_a2dp[CXT_FLCTRL_ON ]), +le16_to_cpu (pcysta_le32->cycles_a2dp[CXT_FLCTRL_OFF ]));seq_printf (m,"avg_t[PSTDMA:%d/TDMA:%d], " , - pcysta->tavg_a2dp[CXT_FLCTRL_ON ], - pcysta->tavg_a2dp[CXT_FLCTRL_OFF ]); +le16_to_cpu (pcysta_le32->tavg_a2dp[CXT_FLCTRL_ON ]), +le16_to_cpu (pcysta_le32->tavg_a2dp[CXT_FLCTRL_OFF ]));seq_printf (m,"max_t[PSTDMA:%d/TDMA:%d]" , - pcysta->tmax_a2dp[CXT_FLCTRL_ON ], - pcysta->tmax_a2dp[CXT_FLCTRL_OFF ]); +le16_to_cpu (pcysta_le32->tmax_a2dp[CXT_FLCTRL_ON ]), +le16_to_cpu (pcysta_le32->tmax_a2dp[CXT_FLCTRL_OFF ])); }seq_puts (m,"\n" ); }
Signature · 1 line
2.25.1
Re: [PATCH 1/7] wifi: rtw89: coex: Remove le32 to CPU translator at firmware cycle report
Quoted 10 lines · Ping-Ke Shih
From: Ching-Te Ku <[email protected]>
There are at least 2 version of cycle report format. If the code keep translating the report to local variable, the numbers of variable in check btc report function will out of maximum variable numbers. And most of these variable are using only one time, it is not necessary to store at memory.
Signed-off-by Ching-Te Ku <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
7 patches applied to wireless-next.git, thanks.
f643d08642b8 wifi: rtw89: coex: Remove le32 to CPU translator at firmware cycle report fab895b31982 wifi: rtw89: coex: Rename BTC firmware cycle report by feature version 202c3b5c276f wifi: rtw89: coex: Add v4 version firmware cycle report b02e3f5c344d wifi: rtw89: coex: Change firmware control report to version separate 0c06fd47335a wifi: rtw89: coex: Add v5 firmware control report891b6a3f9407 wifi: rtw89: coex: only read Bluetooth counter of report version 1 for RTL8852A 3f625adc61a0 wifi: rtw89: coex: Update WiFi role info H2C report
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH 2/7 wifi: rtw89: coex: Rename BTC firmware cycle report by feature version
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Because there are new report format in the upcoming patches, to make the logic more readable, rename the related structure by their version number. And to support the several version at the same time, add union definition to include all the versions.
--- drivers/net/wireless/realtek/rtw89/coex.c | 107 +++++++++++----------- drivers/net/wireless/realtek/rtw89/core.h | 14 +-- 2 files changed, 64 insertions(+), 57 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +56 -51
@@ -932,8 +932,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,struct rtw89_btc_bt_info *bt = &btc->cx.bt;struct rtw89_btc_fbtc_rpt_ctrl *prpt;struct rtw89_btc_fbtc_rpt_ctrl_v1 *prpt_v1; -struct rtw89_btc_fbtc_cysta *pcysta =NULL ; -struct rtw89_btc_fbtc_cysta_v1 *pcysta_v1 =NULL ; +union rtw89_btc_fbtc_cysta_info *pcysta =NULL ;struct rtw89_btc_prpt *btc_prpt =NULL ;void *rpt_content =NULL , *pfinfo =NULL ;u8 rpt_type =0 ;
@@ -993,14 +992,17 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,break ;case BTC_RPT_TYPE_CYSTA : pcinfo = &pfwinfo->rpt_fbtc_cysta.cinfo; -if (chip->chip_id ==RTL8852A ) { - pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo; - pcysta = &pfwinfo->rpt_fbtc_cysta.finfo; - pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo); + pcysta = &pfwinfo->rpt_fbtc_cysta.finfo; +if (ver->fcxcysta ==2 ) { + pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v2; + pcysta->v2 = pfwinfo->rpt_fbtc_cysta.finfo.v2; + pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v2); + }else if (ver->fcxcysta ==3 ) { + pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v3; + pcysta->v3 = pfwinfo->rpt_fbtc_cysta.finfo.v3; + pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v3); }else { - pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo_v1; - pcysta_v1 = &pfwinfo->rpt_fbtc_cysta.finfo_v1; - pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo_v1); + goto err; } pcinfo->req_fver = ver->fcxcysta;break ;
@@ -1186,14 +1188,14 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, sizeof(dm->slot_now)));break ;case BTC_RPT_TYPE_CYSTA : -if (chip->chip_id ==RTL8852A ) { -if (le16_to_cpu (pcysta->cycles) <BTC_CYSTA_CHK_PERIOD ) +if (ver->fcxcysta ==2 ) { +if (le16_to_cpu (pcysta->v2.cycles) <BTC_CYSTA_CHK_PERIOD )break ;/* Check Leak-AP */ -if (le32_to_cpu (pcysta->slot_cnt[CXST_LK ]) !=0 && -le32_to_cpu (pcysta->leakrx_cnt) !=0 && dm->tdma_now.rxflctrl) { -if (le32_to_cpu (pcysta->slot_cnt[CXST_LK ]) < -BTC_LEAK_AP_TH *le32_to_cpu (pcysta->leakrx_cnt)) +if (le32_to_cpu (pcysta->v2.slot_cnt[CXST_LK ]) !=0 && +le32_to_cpu (pcysta->v2.leakrx_cnt) !=0 && dm->tdma_now.rxflctrl) { +if (le32_to_cpu (pcysta->v2.slot_cnt[CXST_LK ]) < +BTC_LEAK_AP_TH *le32_to_cpu (pcysta->v2.leakrx_cnt)) dm->leak_ap =1 ; }
@@ -1204,24 +1206,24 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,else wl_slot_set =le16_to_cpu (dm->slot_now[CXST_W1 ].dur); -if (le16_to_cpu (pcysta->tavg_cycle[CXT_WL ]) > wl_slot_set) { - diff_t =le16_to_cpu (pcysta->tavg_cycle[CXT_WL ]) - wl_slot_set; +if (le16_to_cpu (pcysta->v2.tavg_cycle[CXT_WL ]) > wl_slot_set) { + diff_t =le16_to_cpu (pcysta->v2.tavg_cycle[CXT_WL ]) - wl_slot_set;_chk_btc_err (rtwdev,BTC_DCNT_WL_SLOT_DRIFT , diff_t); }_chk_btc_err (rtwdev,BTC_DCNT_W1_FREEZE , -le32_to_cpu (pcysta->slot_cnt[CXST_W1 ])); +le32_to_cpu (pcysta->v2.slot_cnt[CXST_W1 ]));_chk_btc_err (rtwdev,BTC_DCNT_W1_FREEZE , -le32_to_cpu (pcysta->slot_cnt[CXST_B1 ])); +le32_to_cpu (pcysta->v2.slot_cnt[CXST_B1 ]));_chk_btc_err (rtwdev,BTC_DCNT_CYCLE_FREEZE , -le16_to_cpu (pcysta->cycles)); - }else { -if (le16_to_cpu (pcysta_v1->cycles) <BTC_CYSTA_CHK_PERIOD ) +le16_to_cpu (pcysta->v2.cycles)); + }else if (ver->fcxcysta ==3 ) { +if (le16_to_cpu (pcysta->v3.cycles) <BTC_CYSTA_CHK_PERIOD )break ; - cnt_leak_slot =le32_to_cpu (pcysta_v1->slot_cnt[CXST_LK ]); - cnt_rx_imr =le32_to_cpu (pcysta_v1->leak_slot.cnt_rximr); + cnt_leak_slot =le32_to_cpu (pcysta->v3.slot_cnt[CXST_LK ]); + cnt_rx_imr =le32_to_cpu (pcysta->v3.leak_slot.cnt_rximr);/* Check Leak-AP */ if (cnt_leak_slot != 0 && cnt_rx_imr != 0 &&
@@ -1233,7 +1235,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,/* Check diff time between real WL slot and W1 slot */ if (dm->tdma_now.type ==CXTDMA_OFF ) { wl_slot_set =le16_to_cpu (dm->slot_now[CXST_W1 ].dur); - wl_slot_real =le16_to_cpu (pcysta_v1->cycle_time.tavg[CXT_WL ]); + wl_slot_real =le16_to_cpu (pcysta->v3.cycle_time.tavg[CXT_WL ]);if (wl_slot_real > wl_slot_set) { diff_t = wl_slot_real - wl_slot_set;_chk_btc_err (rtwdev,BTC_DCNT_WL_SLOT_DRIFT , diff_t);
@@ -1244,8 +1246,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,if (dm->tdma_now.type ==CXTDMA_OFF && dm->tdma_now.ext_ctrl ==CXECTL_EXT && btc->bt_req_len !=0 ) { - bt_slot_real =le16_to_cpu (pcysta_v1->cycle_time.tavg[CXT_BT ]); - + bt_slot_real =le16_to_cpu (pcysta->v3.cycle_time.tavg[CXT_BT ]);if (btc->bt_req_len > bt_slot_real) { diff_t = btc->bt_req_len - bt_slot_real;_chk_btc_err (rtwdev,BTC_DCNT_BT_SLOT_DRIFT , diff_t);
@@ -1253,11 +1254,13 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, }_chk_btc_err (rtwdev,BTC_DCNT_W1_FREEZE , -le32_to_cpu (pcysta_v1->slot_cnt[CXST_W1 ])); +le32_to_cpu (pcysta->v3.slot_cnt[CXST_W1 ]));_chk_btc_err (rtwdev,BTC_DCNT_B1_FREEZE , -le32_to_cpu (pcysta_v1->slot_cnt[CXST_B1 ])); +le32_to_cpu (pcysta->v3.slot_cnt[CXST_B1 ]));_chk_btc_err (rtwdev,BTC_DCNT_CYCLE_FREEZE , - (u32 )le16_to_cpu (pcysta_v1->cycles)); +le16_to_cpu (pcysta->v3.cycles)); + }else { + goto err; }break ;case BTC_RPT_TYPE_BT_VER :
@@ -6160,21 +6163,23 @@ static void _show_dm_info(struct rtw89_dev *rtwdev, struct seq_file *m)static void _show_error (struct rtw89_dev *rtwdev,struct seq_file *m) { -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_btf_fwinfo *pfwinfo = &btc->fwinfo; -struct rtw89_btc_fbtc_cysta *pcysta; -struct rtw89_btc_fbtc_cysta_v1 *pcysta_v1; +union rtw89_btc_fbtc_cysta_info *pcysta;u32 except_cnt, exception_map; -if (chip->chip_id ==RTL8852A ) { - pcysta = &pfwinfo->rpt_fbtc_cysta.finfo; - except_cnt =le32_to_cpu (pcysta->except_cnt); - exception_map =le32_to_cpu (pcysta->exception); + pcysta = &pfwinfo->rpt_fbtc_cysta.finfo; +if (ver->fcxcysta ==2 ) { + pcysta->v2 = pfwinfo->rpt_fbtc_cysta.finfo.v2; + except_cnt =le32_to_cpu (pcysta->v2.except_cnt); + exception_map =le32_to_cpu (pcysta->v2.exception); + }else if (ver->fcxcysta ==3 ) { + pcysta->v3 = pfwinfo->rpt_fbtc_cysta.finfo.v3; + except_cnt =le32_to_cpu (pcysta->v3.except_cnt); + exception_map =le32_to_cpu (pcysta->v3.except_map); }else { - pcysta_v1 = &pfwinfo->rpt_fbtc_cysta.finfo_v1; - except_cnt =le32_to_cpu (pcysta_v1->except_cnt); - exception_map =le32_to_cpu (pcysta_v1->except_map); +return ; } if (pfwinfo->event[BTF_EVNT_BUF_OVERFLOW] == 0 && except_cnt == 0 &&
@@ -6305,14 +6310,14 @@ static void _show_fbtc_slots(struct rtw89_dev *rtwdev, struct seq_file *m) } } -static void _show_fbtc_cysta (struct rtw89_dev *rtwdev,struct seq_file *m) +static void _show_fbtc_cysta_v2 (struct rtw89_dev *rtwdev,struct seq_file *m) {struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo;struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_bt_a2dp_desc *a2dp = &btc->cx.bt.link_info.a2dp_desc;struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ; -struct rtw89_btc_fbtc_cysta *pcysta_le32 =NULL ; +struct rtw89_btc_fbtc_cysta_v2 *pcysta_le32 =NULL ;union rtw89_btc_fbtc_rxflct r;u8 i, cnt =0 , slot_pair;u16 cycle, c_begin, c_end, store_index;
@@ -6321,7 +6326,7 @@ static void _show_fbtc_cysta(struct rtw89_dev *rtwdev, struct seq_file *m)if (!pcinfo->valid)return ; - pcysta_le32 = &pfwinfo->rpt_fbtc_cysta.finfo; + pcysta_le32 = &pfwinfo->rpt_fbtc_cysta.finfo.v2; seq_printf(m, " %-15s : cycle:%d, bcn[all:%d/all_ok:%d/bt:%d/bt_ok:%d]", "[cycle_cnt]",
@@ -6433,14 +6438,14 @@ static void _show_fbtc_cysta(struct rtw89_dev *rtwdev, struct seq_file *m) } } -static void _show_fbtc_cysta_v1 (struct rtw89_dev *rtwdev,struct seq_file *m) +static void _show_fbtc_cysta_v3 (struct rtw89_dev *rtwdev,struct seq_file *m) {struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_bt_a2dp_desc *a2dp = &btc->cx.bt.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 *a2dp_trx; -struct rtw89_btc_fbtc_cysta_v1 *pcysta; +struct rtw89_btc_fbtc_cysta_v3 *pcysta;struct rtw89_btc_rpt_cmn_info *pcinfo;u8 i, cnt =0 , slot_pair, divide_cnt;u16 cycle, c_begin, c_end, store_index;
@@ -6449,7 +6454,7 @@ static void _show_fbtc_cysta_v1(struct rtw89_dev *rtwdev, struct seq_file *m)if (!pcinfo->valid)return ; - pcysta = &pfwinfo->rpt_fbtc_cysta.finfo_v1; + pcysta = &pfwinfo->rpt_fbtc_cysta.finfo.v3; seq_printf(m, " %-15s : cycle:%d, bcn[all:%d/all_ok:%d/bt:%d/bt_ok:%d]", "[cycle_cnt]",
@@ -6708,8 +6713,8 @@ static void _show_fbtc_step(struct rtw89_dev *rtwdev, struct seq_file *m)static void _show_fw_dm_msg (struct rtw89_dev *rtwdev,struct seq_file *m) { -const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_btc *btc = &rtwdev->btc; +const struct rtw89_btc_ver *ver = btc->ver;if (!(btc->dm.coex_info_map &BTC_COEX_INFO_DM ))return ;
@@ -6718,10 +6723,10 @@ static void _show_fw_dm_msg(struct rtw89_dev *rtwdev, struct seq_file *m)_show_fbtc_tdma (rtwdev, m);_show_fbtc_slots (rtwdev, m); -if (chip->chip_id ==RTL8852A ) -_show_fbtc_cysta (rtwdev, m); -else -_show_fbtc_cysta_v1 (rtwdev, m); +if (ver->fcxcysta ==2 ) +_show_fbtc_cysta_v2 (rtwdev, m); +else if (ver->fcxcysta ==3 ) +_show_fbtc_cysta_v3 (rtwdev, m);_show_fbtc_nullsta (rtwdev, m);_show_fbtc_step (rtwdev, m);
drivers/net/wireless/realtek/rtw89/core.h +8 -6
@@ -1681,7 +1681,7 @@ struct rtw89_btc_fbtc_steps_v1 {struct rtw89_btc_fbtc_step step[FCXMAX_STEP ]; } __packed; -struct rtw89_btc_fbtc_cysta {/* statistics for cycles */ +struct rtw89_btc_fbtc_cysta_v2 {/* statistics for cycles */ u8 fver;/* btc_ver::fcxcysta */ u8 rsvd;__le16 cycles;/* total cycle number */
@@ -1743,7 +1743,7 @@ struct rtw89_btc_fbtc_cycle_leak_info {__le16 tmax;/* max leak-slot time */ } __packed; -struct rtw89_btc_fbtc_cysta_v1 {/* statistics for cycles */ +struct rtw89_btc_fbtc_cysta_v3 {/* statistics for cycles */ u8 fver;u8 rsvd;__le16 cycles;/* total cycle number */
@@ -1761,6 +1761,11 @@ struct rtw89_btc_fbtc_cysta_v1 { /* statistics for cycles */__le32 except_map; } __packed; +union rtw89_btc_fbtc_cysta_info { +struct rtw89_btc_fbtc_cysta_v2 v2; +struct rtw89_btc_fbtc_cysta_v3 v3; +}; +struct rtw89_btc_fbtc_cynullsta {/* cycle null statistics */ u8 fver;/* btc_ver::fcxnullsta */ u8 rsvd;
@@ -1961,10 +1966,7 @@ struct rtw89_btc_rpt_fbtc_slots {struct rtw89_btc_rpt_fbtc_cysta {struct rtw89_btc_rpt_cmn_info cinfo;/* common info, by driver */ -union { -struct rtw89_btc_fbtc_cysta finfo;/* info from fw for 52A*/ -struct rtw89_btc_fbtc_cysta_v1 finfo_v1;/* info from fw for 52C*/ - }; +union rtw89_btc_fbtc_cysta_info finfo; };struct rtw89_btc_rpt_fbtc_step {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/7 wifi: rtw89: coex: Add v4 version firmware cycle report
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
To support v4 version firmware cycle report, apply the related structure and functions. v4 cycle report add a group of status to show how the free-run/TDMA training goes to. It is a firmware mechanism that can auto adjust coexistence mode between TDMA and free run mechanism at 3 antenna solution.
--- drivers/net/wireless/realtek/rtw89/coex.c | 185 ++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 67 ++++++++ 2 files changed, 252 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +185 -0
@@ -1001,6 +1001,10 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v3; pcysta->v3 = pfwinfo->rpt_fbtc_cysta.finfo.v3; pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v3); + }else if (ver->fcxcysta ==4 ) { + pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo.v4; + pcysta->v4 = pfwinfo->rpt_fbtc_cysta.finfo.v4; + pcinfo->req_len =sizeof (pfwinfo->rpt_fbtc_cysta.finfo.v4); }else { goto err; }
@@ -1259,6 +1263,48 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, le32_to_cpu(pcysta->v3.slot_cnt[CXST_B1]));_chk_btc_err (rtwdev,BTC_DCNT_CYCLE_FREEZE ,le16_to_cpu (pcysta->v3.cycles)); + }else if (ver->fcxcysta ==4 ) { +if (le16_to_cpu (pcysta->v4.cycles) <BTC_CYSTA_CHK_PERIOD ) +break ; + + cnt_leak_slot =le16_to_cpu (pcysta->v4.slot_cnt[CXST_LK ]); + cnt_rx_imr =le32_to_cpu (pcysta->v4.leak_slot.cnt_rximr); + +/* Check Leak-AP */ +if (cnt_leak_slot !=0 && cnt_rx_imr !=0 && + dm->tdma_now.rxflctrl) { +if (cnt_leak_slot <BTC_LEAK_AP_TH * cnt_rx_imr) + dm->leak_ap =1 ; + } + +/* Check diff time between real WL slot and W1 slot */ +if (dm->tdma_now.type ==CXTDMA_OFF ) { + wl_slot_set =le16_to_cpu (dm->slot_now[CXST_W1 ].dur); + wl_slot_real =le16_to_cpu (pcysta->v4.cycle_time.tavg[CXT_WL ]); +if (wl_slot_real > wl_slot_set) { + diff_t = wl_slot_real - wl_slot_set; +_chk_btc_err (rtwdev,BTC_DCNT_WL_SLOT_DRIFT , diff_t); + } + } + +/* Check diff time between real BT slot and EBT/E5G slot */ +if (dm->tdma_now.type ==CXTDMA_OFF && + dm->tdma_now.ext_ctrl ==CXECTL_EXT && + btc->bt_req_len !=0 ) { + bt_slot_real =le16_to_cpu (pcysta->v4.cycle_time.tavg[CXT_BT ]); + +if (btc->bt_req_len > bt_slot_real) { + diff_t = btc->bt_req_len - bt_slot_real; +_chk_btc_err (rtwdev,BTC_DCNT_BT_SLOT_DRIFT , diff_t); + } + } + +_chk_btc_err (rtwdev,BTC_DCNT_W1_FREEZE , +le16_to_cpu (pcysta->v4.slot_cnt[CXST_W1 ])); +_chk_btc_err (rtwdev,BTC_DCNT_B1_FREEZE , +le16_to_cpu (pcysta->v4.slot_cnt[CXST_B1 ])); +_chk_btc_err (rtwdev,BTC_DCNT_CYCLE_FREEZE , +le16_to_cpu (pcysta->v4.cycles)); }else { goto err; }
@@ -6178,6 +6224,10 @@ static void _show_error(struct rtw89_dev *rtwdev, struct seq_file *m) pcysta->v3 = pfwinfo->rpt_fbtc_cysta.finfo.v3; except_cnt =le32_to_cpu (pcysta->v3.except_cnt); exception_map =le32_to_cpu (pcysta->v3.except_map); + }else if (ver->fcxcysta ==4 ) { + pcysta->v4 = pfwinfo->rpt_fbtc_cysta.finfo.v4; + except_cnt = pcysta->v4.except_cnt; + exception_map =le32_to_cpu (pcysta->v4.except_map); }else {return ; }
@@ -6569,6 +6619,139 @@ static void _show_fbtc_cysta_v3(struct rtw89_dev *rtwdev, struct seq_file *m) } } +static void _show_fbtc_cysta_v4 (struct rtw89_dev *rtwdev,struct seq_file *m) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_bt_a2dp_desc *a2dp = &btc->cx.bt.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_v4 *pcysta; +struct rtw89_btc_rpt_cmn_info *pcinfo; +u8 i, cnt =0 , slot_pair, divide_cnt; +u16 cycle, c_begin, c_end, store_index; + + pcinfo = &pfwinfo->rpt_fbtc_cysta.cinfo; +if (!pcinfo->valid) +return ; + + pcysta = &pfwinfo->rpt_fbtc_cysta.finfo.v4; +seq_printf (m, +" %-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 ; + +seq_printf (m,", %s:%d" ,id_to_slot (i), +le16_to_cpu (pcysta->slot_cnt[i])); + } + +if (dm->tdma_now.rxflctrl) +seq_printf (m,", leak_rx:%d" , +le32_to_cpu (pcysta->leak_slot.cnt_rximr)); + +if (pcysta->collision_cnt) +seq_printf (m,", collision:%d" , pcysta->collision_cnt); + +if (le16_to_cpu (pcysta->skip_cnt)) +seq_printf (m,", skip:%d" , +le16_to_cpu (pcysta->skip_cnt)); + +seq_puts (m,"\n" ); + +seq_printf (m," %-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 ); +seq_printf (m, +", max_t[wl:%d/bt:%d/lk:%d.%03d]" , +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 ); +seq_printf (m, +", maxdiff_t[wl:%d/bt:%d]\n" , +le16_to_cpu (pcysta->cycle_time.tmaxdiff[CXT_WL ]), +le16_to_cpu (pcysta->cycle_time.tmaxdiff[CXT_BT ])); + + cycle =le16_to_cpu (pcysta->cycles); +if (cycle ==0 ) +return ; + +/* 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 ; + +for (cycle = c_begin; cycle <= c_end; cycle++) { + cnt++; + store_index = ((cycle -1 ) % slot_pair) *2 ; + +if (cnt % divide_cnt ==1 ) { +seq_printf (m,"\n\r %-15s : " ,"[cycle_step]" ); + }else { +seq_printf (m,"->b%02d" , +le16_to_cpu (pcysta->slot_step_time[store_index])); +if (a2dp->exist) { + a2dp_trx = &pcysta->a2dp_trx[store_index]; +seq_printf (m,"(%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); + } +seq_printf (m,"->w%02d" , +le16_to_cpu (pcysta->slot_step_time[store_index +1 ])); +if (a2dp->exist) { + a2dp_trx = &pcysta->a2dp_trx[store_index +1 ]; +seq_printf (m,"(%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 % (BTC_CYCLE_SLOT_MAX /4 ) ==0 || cnt == c_end) +seq_puts (m,"\n" ); + } + +if (a2dp->exist) { +seq_printf (m,"%-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)); + +seq_printf (m,", avg_t:%d, max_t:%d" , +le16_to_cpu (pcysta->a2dp_ept.tavg), +le16_to_cpu (pcysta->a2dp_ept.tmax)); + +seq_puts (m,"\n" ); + } +} +static void _show_fbtc_nullsta (struct rtw89_dev *rtwdev,struct seq_file *m) {const struct rtw89_chip_info *chip = rtwdev->chip;
@@ -6727,6 +6910,8 @@ static void _show_fw_dm_msg(struct rtw89_dev *rtwdev, struct seq_file *m)_show_fbtc_cysta_v2 (rtwdev, m); else if (ver->fcxcysta == 3) _show_fbtc_cysta_v3(rtwdev, m); + else if (ver->fcxcysta == 4) + _show_fbtc_cysta_v4(rtwdev, m);_show_fbtc_nullsta (rtwdev ,m );_show_fbtc_step (rtwdev, m);
drivers/net/wireless/realtek/rtw89/core.h +67 -0
88 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/7 wifi: rtw89: coex: Change firmware control report to version separate
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
The rtw89 driver may support more than 1 version of Wi-Fi firmware for certain chips. In order to support all the firmware, change to select logic by firmware feature version code. Type control version 4 will monitor Bluetooth PTA hardware counters at firmware and C2H to driver, but version 1 will not do this.
--- drivers/net/wireless/realtek/rtw89/coex.c | 76 ++++++++++++----------- drivers/net/wireless/realtek/rtw89/core.h | 14 +++-- 2 files changed, 48 insertions(+), 42 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +40 -36
@@ -930,8 +930,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_bt_info *bt = &btc->cx.bt; -struct rtw89_btc_fbtc_rpt_ctrl *prpt; -struct rtw89_btc_fbtc_rpt_ctrl_v1 *prpt_v1; +union rtw89_btc_fbtc_rpt_ctrl_ver_info *prpt =NULL ;union rtw89_btc_fbtc_cysta_info *pcysta =NULL ;struct rtw89_btc_prpt *btc_prpt =NULL ;void *rpt_content =NULL , *pfinfo =NULL ;
@@ -962,12 +961,15 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,switch (rpt_type) {case BTC_RPT_TYPE_CTRL : pcinfo = &pfwinfo->rpt_ctrl.cinfo; -if (chip->chip_id ==RTL8852A ) { - pfinfo = &pfwinfo->rpt_ctrl.finfo; - pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo); + prpt = &pfwinfo->rpt_ctrl.finfo; +if (ver->fcxbtcrpt ==1 ) { + pfinfo = &pfwinfo->rpt_ctrl.finfo.v1; + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v1); + }else if (ver->fcxbtcrpt ==4 ) { + pfinfo = &pfwinfo->rpt_ctrl.finfo.v4; + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v4); }else { - pfinfo = &pfwinfo->rpt_ctrl.finfo_v1; - pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo_v1); + goto err; } pcinfo->req_fver = ver->fcxbtcrpt;break ;
@@ -1109,12 +1111,12 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,switch (rpt_type) {case BTC_RPT_TYPE_CTRL : -if (chip->chip_id ==RTL8852A ) { - prpt = &pfwinfo->rpt_ctrl.finfo; - btc->fwinfo.rpt_en_map = prpt->rpt_enable; - wl->ver_info.fw_coex = prpt->wl_fw_coex_ver; - wl->ver_info.fw = prpt->wl_fw_ver; - dm->wl_fw_cx_offload = !!prpt->wl_fw_cx_offload; +if (ver->fcxbtcrpt ==1 ) { + prpt->v1 = pfwinfo->rpt_ctrl.finfo.v1; + btc->fwinfo.rpt_en_map = prpt->v1.rpt_enable; + wl->ver_info.fw_coex = prpt->v1.wl_fw_coex_ver; + wl->ver_info.fw = prpt->v1.wl_fw_ver; + dm->wl_fw_cx_offload = !!prpt->v1.wl_fw_cx_offload;_chk_btc_err (rtwdev,BTC_DCNT_RPT_FREEZE , pfwinfo->event[BTF_EVNT_RPT ]);
@@ -1129,38 +1131,40 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,rtw89_mac_get_plt_cnt (rtwdev,RTW89_MAC_0 ); } - }else { - prpt_v1 = &pfwinfo->rpt_ctrl.finfo_v1; - btc->fwinfo.rpt_en_map =le32_to_cpu (prpt_v1->rpt_info.en); - wl->ver_info.fw_coex =le32_to_cpu (prpt_v1->wl_fw_info.cx_ver); - wl->ver_info.fw =le32_to_cpu (prpt_v1->wl_fw_info.fw_ver); - dm->wl_fw_cx_offload = !!le32_to_cpu (prpt_v1->wl_fw_info.cx_offload); + }else if (ver->fcxbtcrpt ==4 ) { + prpt->v4 = pfwinfo->rpt_ctrl.finfo.v4; + btc->fwinfo.rpt_en_map =le32_to_cpu (prpt->v4.rpt_info.en); + wl->ver_info.fw_coex =le32_to_cpu (prpt->v4.wl_fw_info.cx_ver); + wl->ver_info.fw =le32_to_cpu (prpt->v4.wl_fw_info.fw_ver); + dm->wl_fw_cx_offload = !!le32_to_cpu (prpt->v4.wl_fw_info.cx_offload);for (i =RTW89_PHY_0 ; i <RTW89_PHY_MAX ; i++) -memcpy (&dm->gnt.band[i], &prpt_v1->gnt_val[i], +memcpy (&dm->gnt.band[i], &prpt->v4.gnt_val[i],sizeof (dm->gnt.band[i])); btc->cx.cnt_bt[BTC_BCNT_HIPRI_TX ] = -le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_HI_TX ]); +le32_to_cpu (prpt->v4.bt_cnt[BTC_BCNT_HI_TX ]); btc->cx.cnt_bt[BTC_BCNT_HIPRI_RX ] = -le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_HI_RX ]); +le32_to_cpu (prpt->v4.bt_cnt[BTC_BCNT_HI_RX ]); btc->cx.cnt_bt[BTC_BCNT_LOPRI_TX ] = -le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_LO_TX ]); +le32_to_cpu (prpt->v4.bt_cnt[BTC_BCNT_LO_TX ]); btc->cx.cnt_bt[BTC_BCNT_LOPRI_RX ] = -le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_LO_RX ]); +le32_to_cpu (prpt->v4.bt_cnt[BTC_BCNT_LO_RX ]); btc->cx.cnt_bt[BTC_BCNT_POLUT ] = -le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_POLLUTED ]); +le32_to_cpu (prpt->v4.bt_cnt[BTC_BCNT_POLLUTED ]);_chk_btc_err (rtwdev,BTC_DCNT_BTCNT_FREEZE ,0 );_chk_btc_err (rtwdev,BTC_DCNT_RPT_FREEZE , pfwinfo->event[BTF_EVNT_RPT ]); -if (le32_to_cpu (prpt_v1->bt_cnt[BTC_BCNT_RFK_TIMEOUT ]) >0 ) +if (le32_to_cpu (prpt->v4.bt_cnt[BTC_BCNT_RFK_TIMEOUT ]) >0 ) bt->rfk_info.map.timeout =1 ;else bt->rfk_info.map.timeout =0 ; dm->error.map.bt_rfk_timeout = bt->rfk_info.map.timeout; + }else { + goto err; }break ;case BTC_RPT_TYPE_TDMA :
@@ -7061,12 +7065,12 @@ static void _show_mreg(struct rtw89_dev *rtwdev, struct seq_file *m)seq_puts (m,"\n" ); } -static void _show_summary (struct rtw89_dev *rtwdev,struct seq_file *m) +static void _show_summary_v1 (struct rtw89_dev *rtwdev,struct seq_file *m) {struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo;struct rtw89_btc_rpt_cmn_info *pcinfo =NULL ; -struct rtw89_btc_fbtc_rpt_ctrl *prptctrl =NULL ; +struct rtw89_btc_fbtc_rpt_ctrl_v1 *prptctrl =NULL ;struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_dm *dm = &btc->dm;struct rtw89_btc_wl_info *wl = &cx->wl;
@@ -7081,7 +7085,7 @@ static void _show_summary(struct rtw89_dev *rtwdev, struct seq_file *m) pcinfo = &pfwinfo->rpt_ctrl.cinfo;if (pcinfo->valid && !wl->status.map.lps && !wl->status.map.rf_off) { - prptctrl = &pfwinfo->rpt_ctrl.finfo; + prptctrl = &pfwinfo->rpt_ctrl.finfo.v1; seq_printf(m, " %-15s : h2c_cnt=%d(fail:%d, fw_recv:%d), c2h_cnt=%d(fw_send:%d), ",
@@ -7165,11 +7169,11 @@ static void _show_summary(struct rtw89_dev *rtwdev, struct seq_file *m) cnt[BTC_NCNT_CUSTOMERIZE]); } -static void _show_summary_v1 (struct rtw89_dev *rtwdev,struct seq_file *m) +static void _show_summary_v4 (struct rtw89_dev *rtwdev,struct seq_file *m) {struct rtw89_btc *btc = &rtwdev->btc;struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo; -struct rtw89_btc_fbtc_rpt_ctrl_v1 *prptctrl; +struct rtw89_btc_fbtc_rpt_ctrl_v4 *prptctrl;struct rtw89_btc_rpt_cmn_info *pcinfo;struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_dm *dm = &btc->dm;
@@ -7185,7 +7189,7 @@ static void _show_summary_v1(struct rtw89_dev *rtwdev, struct seq_file *m) pcinfo = &pfwinfo->rpt_ctrl.cinfo;if (pcinfo->valid && !wl->status.map.lps && !wl->status.map.rf_off) { - prptctrl = &pfwinfo->rpt_ctrl.finfo_v1; + prptctrl = &pfwinfo->rpt_ctrl.finfo.v4; seq_printf(m, " %-15s : h2c_cnt=%d(fail:%d, fw_recv:%d), c2h_cnt=%d(fw_send:%d), ",
@@ -7279,9 +7283,9 @@ static void _show_summary_v1(struct rtw89_dev *rtwdev, struct seq_file *m)void rtw89_btc_dump_info (struct rtw89_dev *rtwdev,struct seq_file *m) { -const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_fw_suit *fw_suit = &rtwdev->fw.normal;struct rtw89_btc *btc = &rtwdev->btc; +const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_cx *cx = &btc->cx;struct rtw89_btc_bt_info *bt = &cx->bt;
@@ -7310,10 +7314,10 @@ void rtw89_btc_dump_info(struct rtw89_dev *rtwdev, struct seq_file *m)_show_dm_info (rtwdev, m);_show_fw_dm_msg (rtwdev, m);_show_mreg (rtwdev, m); -if (chip->chip_id ==RTL8852A ) -_show_summary (rtwdev, m); -else +if (ver->fcxbtcrpt ==1 )_show_summary_v1 (rtwdev, m); +else if (ver->fcxbtcrpt ==4 ) +_show_summary_v4 (rtwdev, m); }void rtw89_coex_recognize_ver (struct rtw89_dev *rtwdev)
drivers/net/wireless/realtek/rtw89/core.h +8 -6
@@ -1480,7 +1480,7 @@ enum rtw89_btc_bt_sta_counter {BTC_BCNT_STA_MAX }; -struct rtw89_btc_fbtc_rpt_ctrl { +struct rtw89_btc_fbtc_rpt_ctrl_v1 {u16 fver;/* btc_ver::fcxbtcrpt */ u16 rpt_cnt;/* tmr counters */ u32 wl_fw_coex_ver;/* match which driver's coex version */
@@ -1533,7 +1533,7 @@ struct rtw89_btc_fbtc_rpt_ctrl_bt_mailbox {struct rtw89_btc_fbtc_rpt_ctrl_a2dp_empty a2dp; } __packed; -struct rtw89_btc_fbtc_rpt_ctrl_v1 { +struct rtw89_btc_fbtc_rpt_ctrl_v4 {u8 fver;u8 rsvd;__le16 rsvd1;
@@ -1544,6 +1544,11 @@ struct rtw89_btc_fbtc_rpt_ctrl_v1 {struct rtw89_mac_ax_gnt gnt_val[RTW89_PHY_MAX ]; } __packed; +union rtw89_btc_fbtc_rpt_ctrl_ver_info { +struct rtw89_btc_fbtc_rpt_ctrl_v1 v1; +struct rtw89_btc_fbtc_rpt_ctrl_v4 v4; +}; +enum rtw89_fbtc_ext_ctrl_type {CXECTL_OFF =0x0 ,/* tdma off */ CXECTL_B2 =0x1 ,/* allow B2 (beacon-early) */
@@ -2015,10 +2020,7 @@ union rtw89_btc_fbtc_btafh_info {struct rtw89_btc_report_ctrl_state {struct rtw89_btc_rpt_cmn_info cinfo;/* common info, by driver */ -union { -struct rtw89_btc_fbtc_rpt_ctrl finfo;/* info from fw for 52A*/ -struct rtw89_btc_fbtc_rpt_ctrl_v1 finfo_v1;/* info from fw for 52C*/ - }; +union rtw89_btc_fbtc_rpt_ctrl_ver_info finfo; };struct rtw89_btc_rpt_fbtc_tdma {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/7 wifi: rtw89: coex: Add v5 firmware control report
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Comparing v5 control report to v4 version, v5 reduce some of variable's size to reduce firmware code size. And change the grant signal report format.
--- drivers/net/wireless/realtek/rtw89/coex.c | 148 ++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 27 ++++ 2 files changed, 175 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.c +148 -0
@@ -968,6 +968,9 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, }else if (ver->fcxbtcrpt ==4 ) { pfinfo = &pfwinfo->rpt_ctrl.finfo.v4; pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v4); + }else if (ver->fcxbtcrpt ==5 ) { + pfinfo = &pfwinfo->rpt_ctrl.finfo.v5; + pcinfo->req_len =sizeof (pfwinfo->rpt_ctrl.finfo.v5); }else { goto err; }
@@ -1162,6 +1165,33 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,else bt->rfk_info.map.timeout =0 ; + dm->error.map.bt_rfk_timeout = bt->rfk_info.map.timeout; + }else if (ver->fcxbtcrpt ==5 ) { + prpt->v5 = pfwinfo->rpt_ctrl.finfo.v5; + pfwinfo->rpt_en_map =le32_to_cpu (prpt->v5.rpt_info.en); + wl->ver_info.fw_coex =le32_to_cpu (prpt->v5.rpt_info.cx_ver); + wl->ver_info.fw =le32_to_cpu (prpt->v5.rpt_info.fw_ver); + dm->wl_fw_cx_offload =0 ; + +for (i =RTW89_PHY_0 ; i <RTW89_PHY_MAX ; i++) +memcpy (&dm->gnt.band[i], &prpt->v5.gnt_val[i][0 ], +sizeof (dm->gnt.band[i])); + + btc->cx.cnt_bt[BTC_BCNT_HIPRI_TX ] = +le16_to_cpu (prpt->v5.bt_cnt[BTC_BCNT_HI_TX ]); + btc->cx.cnt_bt[BTC_BCNT_HIPRI_RX ] = +le16_to_cpu (prpt->v5.bt_cnt[BTC_BCNT_HI_RX ]); + btc->cx.cnt_bt[BTC_BCNT_LOPRI_TX ] = +le16_to_cpu (prpt->v5.bt_cnt[BTC_BCNT_LO_TX ]); + btc->cx.cnt_bt[BTC_BCNT_LOPRI_RX ] = +le16_to_cpu (prpt->v5.bt_cnt[BTC_BCNT_LO_RX ]); + btc->cx.cnt_bt[BTC_BCNT_POLUT ] = +le16_to_cpu (prpt->v5.bt_cnt[BTC_BCNT_POLLUTED ]); + +_chk_btc_err (rtwdev,BTC_DCNT_BTCNT_FREEZE ,0 ); +_chk_btc_err (rtwdev,BTC_DCNT_RPT_FREEZE , + pfwinfo->event[BTF_EVNT_RPT ]); + dm->error.map.bt_rfk_timeout = bt->rfk_info.map.timeout; }else { goto err;
@@ -7281,6 +7311,122 @@ static void _show_summary_v4(struct rtw89_dev *rtwdev, struct seq_file *m) cnt[BTC_NCNT_CUSTOMERIZE]); } +static void _show_summary_v5 (struct rtw89_dev *rtwdev,struct seq_file *m) +{ +struct rtw89_btc *btc = &rtwdev->btc; +struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo; +struct rtw89_btc_fbtc_rpt_ctrl_v5 *prptctrl; +struct rtw89_btc_rpt_cmn_info *pcinfo; +struct rtw89_btc_cx *cx = &btc->cx; +struct rtw89_btc_dm *dm = &btc->dm; +struct rtw89_btc_wl_info *wl = &cx->wl; +u32 cnt_sum =0 , *cnt = btc->dm.cnt_notify; +u8 i; + +if (!(dm->coex_info_map &BTC_COEX_INFO_SUMMARY )) +return ; + +seq_puts (m,"========== [Statistics] ==========\n" ); + + pcinfo = &pfwinfo->rpt_ctrl.cinfo; +if (pcinfo->valid && !wl->status.map.lps && !wl->status.map.rf_off) { + prptctrl = &pfwinfo->rpt_ctrl.finfo.v5; + +seq_printf (m, +" %-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)); + +seq_printf (m, +"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) +seq_puts (m," (WL FW Hang!!)" ); +seq_puts (m,"\n" ); +seq_printf (m, +" %-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)); + +seq_printf (m, +"A2DP_empty:%d(stop:%d, tx:%d, ack:%d, nack:%d)\n" , +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)); + +seq_printf (m, +" %-15s : wl_rfk[req:%d/go:%d/reject:%d/tout:%d]" , +"[RFK/LPS]" , cx->cnt_wl[BTC_WCNT_RFK_REQ ], + cx->cnt_wl[BTC_WCNT_RFK_GO ], + cx->cnt_wl[BTC_WCNT_RFK_REJECT ], + cx->cnt_wl[BTC_WCNT_RFK_TIMEOUT ]); + +seq_printf (m, +", bt_rfk[req:%d]" , +le16_to_cpu (prptctrl->bt_cnt[BTC_BCNT_RFK_REQ ])); + +seq_printf (m, +", 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 { +seq_puts (m,"\n" ); +seq_printf (m, +" %-15s : h2c_cnt=%d(fail:%d), c2h_cnt=%d" , +"[summary]" , pfwinfo->cnt_h2c, + pfwinfo->cnt_h2c_fail, pfwinfo->cnt_c2h); + } + +if (!pcinfo->valid || pfwinfo->len_mismch || pfwinfo->fver_mismch || + pfwinfo->err[BTFRE_EXCEPTION ]) { +seq_puts (m,"\n" ); +seq_printf (m, +" %-15s : WL FW rpt error!![rpt_ctrl_valid:%d/len:" +"0x%x/ver:0x%x/ex:%d/lps=%d/rf_off=%d]" , +"[ERROR]" , pcinfo->valid, pfwinfo->len_mismch, + pfwinfo->fver_mismch, pfwinfo->err[BTFRE_EXCEPTION ], + wl->status.map.lps, wl->status.map.rf_off); + } + +for (i =0 ; i <BTC_NCNT_NUM ; i++) + cnt_sum += dm->cnt_notify[i]; + +seq_puts (m,"\n" ); +seq_printf (m, +" %-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 ]); + +seq_printf (m, +"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 ]); + +seq_puts (m,"\n" ); +seq_printf (m, +" %-15s : scan_start=%d, scan_finish=%d, switch_band=%d, special_pkt=%d, " , +"[notify_cnt]" , + cnt[BTC_NCNT_SCAN_START ], cnt[BTC_NCNT_SCAN_FINISH ], + cnt[BTC_NCNT_SWITCH_BAND ], cnt[BTC_NCNT_SPECIAL_PACKET ]); + +seq_printf (m, +"timer=%d, control=%d, customerize=%d" , + cnt[BTC_NCNT_TIMER ], cnt[BTC_NCNT_CONTROL ], + cnt[BTC_NCNT_CUSTOMERIZE ]); +} +void rtw89_btc_dump_info (struct rtw89_dev *rtwdev,struct seq_file *m) {struct rtw89_fw_suit *fw_suit = &rtwdev->fw.normal;
@@ -7318,6 +7464,8 @@ void rtw89_btc_dump_info(struct rtw89_dev *rtwdev, struct seq_file *m)_show_summary_v1 (rtwdev, m); else if (ver->fcxbtcrpt == 4) _show_summary_v4(rtwdev, m); + else if (ver->fcxbtcrpt == 5) + _show_summary_v5(rtwdev, m); }void rtw89_coex_recognize_ver (struct rtw89_dev *rtwdev)
drivers/net/wireless/realtek/rtw89/core.h +27 -0
@@ -1512,6 +1512,20 @@ struct rtw89_btc_fbtc_rpt_ctrl_info {__le32 cnt_aoac_rf_off;/* rf-off counter for aoac switch notify */ } __packed; +struct rtw89_btc_fbtc_rpt_ctrl_info_v5 { +__le32 cx_ver;/* match which driver's coex version */ +__le32 fw_ver; +__le32 en;/* report map */ + +__le16 cnt;/* fw report counter */ +__le16 cnt_c2h;/* fw send c2h counter */ +__le16 cnt_h2c;/* fw recv h2c counter */ +__le16 len_c2h;/* The total length of the last C2H */ + +__le16 cnt_aoac_rf_on;/* rf-on counter for aoac switch notify */ +__le16 cnt_aoac_rf_off;/* rf-off counter for aoac switch notify */ +} __packed; +struct rtw89_btc_fbtc_rpt_ctrl_wl_fw_info {__le32 cx_ver;/* match which driver's coex version */ __le32 cx_offload;
@@ -1544,9 +1558,22 @@ struct rtw89_btc_fbtc_rpt_ctrl_v4 {struct rtw89_mac_ax_gnt gnt_val[RTW89_PHY_MAX ]; } __packed; +struct rtw89_btc_fbtc_rpt_ctrl_v5 { +u8 fver; +u8 rsvd; +__le16 rsvd1; + +u8 gnt_val[RTW89_PHY_MAX ][4 ]; +__le16 bt_cnt[BTC_BCNT_STA_MAX ]; + +struct rtw89_btc_fbtc_rpt_ctrl_info_v5 rpt_info; +struct rtw89_btc_fbtc_rpt_ctrl_bt_mailbox bt_mbx_info; +} __packed; +union rtw89_btc_fbtc_rpt_ctrl_ver_info {struct rtw89_btc_fbtc_rpt_ctrl_v1 v1;struct rtw89_btc_fbtc_rpt_ctrl_v4 v4; +struct rtw89_btc_fbtc_rpt_ctrl_v5 v5; };enum rtw89_fbtc_ext_ctrl_type {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/7 wifi: rtw89: coex: only read Bluetooth counter of report version 1 for RTL8852A
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Only when firmware control report version is 1, need to get the counter by reading the register. The other version will monitor the counter at firmware. And upstream branch only RTL8852A has this old version.
--- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/realtek/rtw89/rtw8852a.c +4 -0
@@ -1878,9 +1878,13 @@ staticvoid rtw8852a_btc_update_bt_cnt (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; +const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_cx *cx = &btc->cx;u32 val; +if (ver->fcxbtcrpt !=1 ) +return ; + val =rtw89_read32 (rtwdev,R_AX_BT_STAST_HIGH ); cx->cnt_bt[BTC_BCNT_HIPRI_TX ] =FIELD_GET (B_AX_STATIS_BT_HI_TX_MASK , val); cx->cnt_bt[BTC_BCNT_HIPRI_RX ] =FIELD_GET (B_AX_STATIS_BT_HI_RX_MASK , val);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/7 wifi: rtw89: coex: Update WiFi role info H2C report
In reply to Ping-Ke ShihFrom: Ching-Te Ku <[email protected]>
Change style to feature version separate. And because there are different WiFi roles number in the firmware, it will make structure length longer or shorter, so update the length calculator to cover the difference.
--- drivers/net/wireless/realtek/rtw89/coex.c | 7 +++-- drivers/net/wireless/realtek/rtw89/fw.c | 36 +++++++++++++++-------- 2 files changed, 27 insertions(+), 16 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +4 -3
@@ -1772,16 +1772,17 @@ static void _fw_set_policy(struct rtw89_dev *rtwdev, u16 policy_type,static void _fw_set_drv_info (struct rtw89_dev *rtwdev,u8 type) { -const struct rtw89_chip_info *chip = rtwdev->chip; +struct rtw89_btc *btc = &rtwdev->btc; +const struct rtw89_btc_ver *ver = btc->ver;switch (type) {case CXDRVINFO_INIT :rtw89_fw_h2c_cxdrv_init (rtwdev);break ;case CXDRVINFO_ROLE : -if (chip->chip_id ==RTL8852A ) +if (ver->fwlrole ==0 )rtw89_fw_h2c_cxdrv_role (rtwdev); -else +else if (ver->fwlrole ==1 )rtw89_fw_h2c_cxdrv_role_v1 (rtwdev);break ;case CXDRVINFO_CTRL :
drivers/net/wireless/realtek/rtw89/fw.c +23 -13
@@ -1818,33 +1818,36 @@ int rtw89_fw_h2c_cxdrv_init(struct rtw89_dev *rtwdev)#define PORT_DATA_OFFSET 4#define H2C_LEN_CXDRVINFO_ROLE_DBCC_LEN 12 -#define H2C_LEN_CXDRVINFO_ROLE (4 + 12 * RTW89_PORT_NUM + H2C_LEN_CXDRVHDR) -#define H2C_LEN_CXDRVINFO_ROLE_V1 (4 + 16 * RTW89_PORT_NUM + \ - H2C_LEN_CXDRVINFO_ROLE_DBCC_LEN + \ - H2C_LEN_CXDRVHDR) +#define H2C_LEN_CXDRVINFO_ROLE_SIZE (max_role_num) \ + (4 + 12 * (max_role_num) + H2C_LEN_CXDRVHDR) +int rtw89_fw_h2c_cxdrv_role (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; +const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_wl_role_info *role_info = &wl->role_info;struct rtw89_btc_wl_role_info_bpos *bpos = &role_info->role_map.role;struct rtw89_btc_wl_active_role *active = role_info->active_role;struct sk_buff *skb; +u32 len;u8 offset =0 ;u8 *cmd;int ret;int i; - skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,H2C_LEN_CXDRVINFO_ROLE ); + len =H2C_LEN_CXDRVINFO_ROLE_SIZE (ver->max_role_num); + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for h2c cxdrv_role\n" );return -ENOMEM ; } -skb_put (skb,H2C_LEN_CXDRVINFO_ROLE ); +skb_put (skb, len); cmd = skb->data;RTW89_SET_FWCMD_CXHDR_TYPE (cmd,CXDRVINFO_ROLE ); -RTW89_SET_FWCMD_CXHDR_LEN (cmd,H2C_LEN_CXDRVINFO_ROLE -H2C_LEN_CXDRVHDR ); +RTW89_SET_FWCMD_CXHDR_LEN (cmd, len -H2C_LEN_CXDRVHDR );RTW89_SET_FWCMD_CXROLE_CONNECT_CNT (cmd, role_info->connect_cnt);RTW89_SET_FWCMD_CXROLE_LINK_MODE (cmd, role_info->link_mode);
@@ -1881,7 +1884,7 @@ int rtw89_fw_h2c_cxdrv_role(struct rtw89_dev *rtwdev)rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C ,H2C_CAT_OUTSRC ,BTFC_SET ,SET_DRV_INFO ,0 ,0 , -H2C_LEN_CXDRVINFO_ROLE ); + len); ret =rtw89_h2c_tx (rtwdev, skb, false);if (ret) {
@@ -1896,28 +1899,35 @@ int rtw89_fw_h2c_cxdrv_role(struct rtw89_dev *rtwdev)return ret; } +#define H2C_LEN_CXDRVINFO_ROLE_SIZE_V1 (max_role_num) \ + (4 + 16 * (max_role_num) + H2C_LEN_CXDRVINFO_ROLE_DBCC_LEN + H2C_LEN_CXDRVHDR) +int rtw89_fw_h2c_cxdrv_role_v1 (struct rtw89_dev *rtwdev) {struct rtw89_btc *btc = &rtwdev->btc; +const struct rtw89_btc_ver *ver = btc->ver;struct rtw89_btc_wl_info *wl = &btc->cx.wl;struct rtw89_btc_wl_role_info_v1 *role_info = &wl->role_info_v1;struct rtw89_btc_wl_role_info_bpos *bpos = &role_info->role_map.role;struct rtw89_btc_wl_active_role_v1 *active = role_info->active_role_v1;struct sk_buff *skb; +u32 len;u8 *cmd, offset;int ret;int i; - skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,H2C_LEN_CXDRVINFO_ROLE_V1 ); + len =H2C_LEN_CXDRVINFO_ROLE_SIZE_V1 (ver->max_role_num); + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for h2c cxdrv_role\n" );return -ENOMEM ; } -skb_put (skb,H2C_LEN_CXDRVINFO_ROLE_V1 ); +skb_put (skb, len); cmd = skb->data;RTW89_SET_FWCMD_CXHDR_TYPE (cmd,CXDRVINFO_ROLE ); -RTW89_SET_FWCMD_CXHDR_LEN (cmd,H2C_LEN_CXDRVINFO_ROLE_V1 -H2C_LEN_CXDRVHDR ); +RTW89_SET_FWCMD_CXHDR_LEN (cmd, len -H2C_LEN_CXDRVHDR );RTW89_SET_FWCMD_CXROLE_CONNECT_CNT (cmd, role_info->connect_cnt);RTW89_SET_FWCMD_CXROLE_LINK_MODE (cmd, role_info->link_mode);
@@ -1953,7 +1963,7 @@ int rtw89_fw_h2c_cxdrv_role_v1(struct rtw89_dev *rtwdev)RTW89_SET_FWCMD_CXROLE_ACT_NOA_DUR (cmd, active->noa_duration, i, offset); } - offset =H2C_LEN_CXDRVINFO_ROLE_V1 -H2C_LEN_CXDRVINFO_ROLE_DBCC_LEN ; + offset = len -H2C_LEN_CXDRVINFO_ROLE_DBCC_LEN ;RTW89_SET_FWCMD_CXROLE_MROLE_TYPE (cmd, role_info->mrole_type, offset);RTW89_SET_FWCMD_CXROLE_MROLE_NOA (cmd, role_info->mrole_noa_duration, offset);RTW89_SET_FWCMD_CXROLE_DBCC_EN (cmd, role_info->dbcc_en, offset);
@@ -1964,7 +1974,7 @@ int rtw89_fw_h2c_cxdrv_role_v1(struct rtw89_dev *rtwdev)rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C ,H2C_CAT_OUTSRC ,BTFC_SET ,SET_DRV_INFO ,0 ,0 , -H2C_LEN_CXDRVINFO_ROLE_V1 ); + len); ret =rtw89_h2c_tx (rtwdev, skb, false);if (ret) {
Signature · 1 line
2.25.1