wifi: rtw89: enhance dynamic mechanism per PHY
Ping-Ke Shih
maintainercover wifi: rtw89: enhance dynamic mechanism per PHY
To support MLO, two PHY work simultaneously. Enhance dynamic mechanism to support two PHY from one.
The logic are almost the same, so create two context instances for PHY 0/1. For hardware registers, only set registers according to certain PHY.
Ping-Ke Shih (8):
wifi: rtw89: phy: rename to RTW89_PHY_NUM as proper naming
wifi: rtw89: phy: add PHY context array to support functions per PHY
wifi: rtw89: phy: support env_monitor per PHY
wifi: rtw89: phy: support DIG per PHY
wifi: rtw89: phy: support ch_info per PHY
wifi: rtw89: phy: support EDCCA per PHY
wifi: rtw89: phy: support EDCCA log per PHY
wifi: rtw89: phy: disable CFO track when two PHY are working
simultaneously
drivers/net/wireless/realtek/rtw89/coex.c | 38 +- drivers/net/wireless/realtek/rtw89/core.c | 17 +- drivers/net/wireless/realtek/rtw89/core.h | 100 ++- drivers/net/wireless/realtek/rtw89/fw.h | 14 +- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 2 +- drivers/net/wireless/realtek/rtw89/phy.c | 703 ++++++++++-------- drivers/net/wireless/realtek/rtw89/phy.h | 7 +- drivers/net/wireless/realtek/rtw89/reg.h | 5 + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 15 +- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 15 +- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 15 +- .../net/wireless/realtek/rtw89/rtw8852bt.c | 15 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 15 +- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 15 +- drivers/net/wireless/realtek/rtw89/sar.c | 3 +- 16 files changed, 603 insertions(+), 378 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/8 wifi: rtw89: phy: rename to RTW89_PHY_NUM as proper naming
The meaning is number of PHY, not maximum ID of PHY. Change to proper naming.
No change logic at all.
--- drivers/net/wireless/realtek/rtw89/coex.c | 38 ++++++++++----------- drivers/net/wireless/realtek/rtw89/core.c | 4 +-- drivers/net/wireless/realtek/rtw89/core.h | 36 +++++++++---------- drivers/net/wireless/realtek/rtw89/fw.h | 14 ++++---- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 2 +- 6 files changed, 48 insertions(+), 48 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +19 -19
@@ -1602,7 +1602,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, 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++) +for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++)memcpy (&dm->gnt.band[i], &prpt->v4.gnt_val[i],sizeof (dm->gnt.band[i]));
@@ -1634,7 +1634,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, 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++) +for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++)memcpy (&dm->gnt.band[i], &prpt->v5.gnt_val[i][0 ],sizeof (dm->gnt.band[i]));
@@ -1661,7 +1661,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, wl->ver_info.fw =le32_to_cpu (prpt->v105.rpt_info.fw_ver); dm->wl_fw_cx_offload =0 ; -for (i =RTW89_PHY_0 ; i <RTW89_PHY_MAX ; i++) +for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++)memcpy (&dm->gnt.band[i], &prpt->v105.gnt_val[i][0 ],sizeof (dm->gnt.band[i]));
@@ -1687,7 +1687,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, wl->ver_info.fw_coex =le32_to_cpu (prpt->v7.rpt_info.cx_ver); wl->ver_info.fw =le32_to_cpu (prpt->v7.rpt_info.fw_ver); -for (i =RTW89_PHY_0 ; i <RTW89_PHY_MAX ; i++) +for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++)memcpy (&dm->gnt.band[i], &prpt->v7.gnt_val[i][0 ],sizeof (dm->gnt.band[i]));
@@ -1719,7 +1719,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, wl->ver_info.fw_coex =le32_to_cpu (prpt->v8.rpt_info.cx_ver); wl->ver_info.fw =le32_to_cpu (prpt->v8.rpt_info.fw_ver); -for (i =RTW89_PHY_0 ; i <RTW89_PHY_MAX ; i++) +for (i =RTW89_PHY_0 ; i <RTW89_PHY_NUM ; i++)memcpy (&dm->gnt.band[i], &prpt->v8.gnt_val[i][0 ],sizeof (dm->gnt.band[i]));
@@ -2706,7 +2706,7 @@ static void _set_gnt(struct rtw89_dev *rtwdev, u8 phy_map, u8 wl_state, u8 bt_stif (phy_map >BTC_PHY_ALL )return ; -for (i =0 ; i <RTW89_PHY_MAX ; i++) { +for (i =0 ; i <RTW89_PHY_NUM ; i++) {if (!(phy_map &BIT (i)))continue ;
@@ -2755,7 +2755,7 @@ static void _set_gnt_v1(struct rtw89_dev *rtwdev, u8 phy_map,if (phy_map >BTC_PHY_ALL )return ; -for (i =0 ; i <RTW89_PHY_MAX ; i++) { +for (i =0 ; i <RTW89_PHY_NUM ; i++) {if (!(phy_map &BIT (i)))continue ;
@@ -2955,7 +2955,7 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)if (ver->fwlrole ==0 ) { link_mode = wl->role_info.link_mode; -for (i =0 ; i <RTW89_PHY_MAX ; i++) { +for (i =0 ; i <RTW89_PHY_NUM ; i++) {if (wl->dbcc_info.real_band[i] ==RTW89_BAND_2G ) dbcc_2g_phy = i; }
@@ -4240,7 +4240,7 @@ static void _set_ant_v0(struct rtw89_dev *rtwdev, bool force_exec,case BTC_ANT_W2G :rtw89_chip_cfg_ctrl_path (rtwdev,BTC_CTRL_BY_WL );if (rtwdev->dbcc_en) { -for (i =0 ; i <RTW89_PHY_MAX ; i++) { +for (i =0 ; i <RTW89_PHY_NUM ; i++) { b2g = (wl_dinfo->real_band[i] ==RTW89_BAND_2G ); gnt_wl_ctrl = b2g ?BTC_GNT_HW :BTC_GNT_SW_HI ;
@@ -4905,9 +4905,9 @@ static void _set_btg_ctrl(struct rtw89_dev *rtwdev)if (rtwdev->dbcc_en) {if (ver->fwlrole ==0 ) { - wl_rinfo.dbcc_2g_phy =RTW89_PHY_MAX ; + wl_rinfo.dbcc_2g_phy =RTW89_PHY_NUM ; -for (i =0 ; i <RTW89_PHY_MAX ; i++) { +for (i =0 ; i <RTW89_PHY_NUM ; i++) {if (wl_dinfo->real_band[i] ==RTW89_BAND_2G ) wl_rinfo.dbcc_2g_phy = i; }
@@ -5798,7 +5798,7 @@ static void _update_wl_info(struct rtw89_dev *rtwdev) phy = wl_linfo[i].phy;/* check dbcc role */ -if (rtwdev->dbcc_en && phy <RTW89_PHY_MAX ) { +if (rtwdev->dbcc_en && phy <RTW89_PHY_NUM ) { wl_dinfo->role[phy] = wl_linfo[i].role; wl_dinfo->op_band[phy] = wl_linfo[i].band;_update_dbcc_band (rtwdev, phy);
@@ -5948,7 +5948,7 @@ static void _update_wl_info_v1(struct rtw89_dev *rtwdev) phy = wl_linfo[i].phy; -if (rtwdev->dbcc_en && phy <RTW89_PHY_MAX ) { +if (rtwdev->dbcc_en && phy <RTW89_PHY_NUM ) { wl_dinfo->role[phy] = wl_linfo[i].role; wl_dinfo->op_band[phy] = wl_linfo[i].band;_update_dbcc_band (rtwdev, phy);
@@ -6098,7 +6098,7 @@ static void _update_wl_info_v2(struct rtw89_dev *rtwdev) phy = wl_linfo[i].phy; -if (rtwdev->dbcc_en && phy <RTW89_PHY_MAX ) { +if (rtwdev->dbcc_en && phy <RTW89_PHY_NUM ) { wl_dinfo->role[phy] = wl_linfo[i].role; wl_dinfo->op_band[phy] = wl_linfo[i].band;_update_dbcc_band (rtwdev, phy);
@@ -6389,7 +6389,7 @@ static void _update_wl_info_v7(struct rtw89_dev *rtwdev, u8 rid)struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;struct rtw89_btc_wl_link_info *wl_linfo = wl->link_info;struct rtw89_btc_wl_active_role_v7 *act_role =NULL ; -u8 i, mode, cnt =0 , cnt_2g =0 , cnt_5g =0 , phy_now =RTW89_PHY_MAX , phy_dbcc; +u8 i, mode, cnt =0 , cnt_2g =0 , cnt_5g =0 , phy_now =RTW89_PHY_NUM , phy_dbcc;bool b2g = false, b5g = false, client_joined = false, client_inc_2g = false;u8 client_cnt_last[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {};u8 cid_role[RTW89_BE_BTC_WL_MAX_ROLE_NUMBER ] = {};
@@ -6400,7 +6400,7 @@ static void _update_wl_info_v7(struct rtw89_dev *rtwdev, u8 rid)memset (wl_rinfo,0 ,sizeof (*wl_rinfo));for (i =0 ; i <RTW89_PORT_NUM ; i++) { -if (!wl_linfo[i].active || wl_linfo[i].phy >=RTW89_PHY_MAX ) +if (!wl_linfo[i].active || wl_linfo[i].phy >=RTW89_PHY_NUM )continue ; act_role = &wl_rinfo->active_role[i];
@@ -6494,7 +6494,7 @@ static void _update_wl_info_v7(struct rtw89_dev *rtwdev, u8 rid) mode =_chk_dbcc (rtwdev, cid_ch, cid_phy, cid_role, &dbcc_2g_phy);/* correct 2G-located PHY band for gnt ctrl */ -if (dbcc_2g_phy <RTW89_PHY_MAX ) +if (dbcc_2g_phy <RTW89_PHY_NUM ) wl_dinfo->op_band[dbcc_2g_phy] =RTW89_BAND_2G ; }else if (b2g && b5g && cnt ==2 ) { mode =BTC_WLINK_25G_MCC ;
@@ -7187,7 +7187,7 @@ void rtw89_btc_ntfy_scan_start(struct rtw89_dev *rtwdev, u8 phy_idx, u8 band)"[BTC], %s(): phy_idx=%d, band=%d\n" , __func__, phy_idx, band); -if (phy_idx >=RTW89_PHY_MAX ) +if (phy_idx >=RTW89_PHY_NUM )return ; btc->dm.cnt_notify[BTC_NCNT_SCAN_START ]++;
@@ -7235,7 +7235,7 @@ void rtw89_btc_ntfy_switch_band(struct rtw89_dev *rtwdev, u8 phy_idx, u8 band)"[BTC], %s(): phy_idx=%d, band=%d\n" , __func__, phy_idx, band); -if (phy_idx >=RTW89_PHY_MAX ) +if (phy_idx >=RTW89_PHY_NUM )return ; btc->dm.cnt_notify[BTC_NCNT_SWITCH_BAND ]++;
drivers/net/wireless/realtek/rtw89/core.c +2 -2
@@ -4432,9 +4432,9 @@ static void rtw89_core_ppdu_sts_init(struct rtw89_dev *rtwdev) {int i; -for (i =0 ; i <RTW89_PHY_MAX ; i++) +for (i =0 ; i <RTW89_PHY_NUM ; i++)skb_queue_head_init (&rtwdev->ppdu_sts.rx_queue[i]); -for (i =0 ; i <RTW89_PHY_MAX ; i++) +for (i =0 ; i <RTW89_PHY_NUM ; i++) rtwdev->ppdu_sts.curr_rx_ppdu_cnt[i] =U8_MAX ; }
drivers/net/wireless/realtek/rtw89/core.h +18 -18
@@ -826,7 +826,7 @@ enum rtw89_mac_idx {enum rtw89_phy_idx {RTW89_PHY_0 =0 ,RTW89_PHY_1 =1 , -RTW89_PHY_MAX +RTW89_PHY_NUM , };#define __RTW89_MLD_MAX_LINK_NUM 2
@@ -1540,16 +1540,16 @@ struct rtw89_btc_u8_sta_chg { };struct rtw89_btc_wl_scan_info { -u8 band[RTW89_PHY_MAX ]; +u8 band[RTW89_PHY_NUM ];u8 phy_map;u8 rsvd; };struct rtw89_btc_wl_dbcc_info { -u8 op_band[RTW89_PHY_MAX ];/* op band in each phy */ -u8 scan_band[RTW89_PHY_MAX ];/* scan band in each phy */ -u8 real_band[RTW89_PHY_MAX ]; -u8 role[RTW89_PHY_MAX ];/* role in each phy */ +u8 op_band[RTW89_PHY_NUM ];/* op band in each phy */ +u8 scan_band[RTW89_PHY_NUM ];/* scan band in each phy */ +u8 real_band[RTW89_PHY_NUM ]; +u8 role[RTW89_PHY_NUM ];/* role in each phy */ };struct rtw89_btc_wl_active_role {
@@ -1898,7 +1898,7 @@ struct rtw89_btc_wl_info {u8 cn_report;u8 coex_mode;u8 pta_req_mac; -u8 bt_polut_type[RTW89_PHY_MAX ];/* BT polluted WL-Tx type for phy0/1 */ +u8 bt_polut_type[RTW89_PHY_NUM ];/* BT polluted WL-Tx type for phy0/1 */ bool is_5g_hi_channel;bool pta_reg_mac_chg;
@@ -2230,7 +2230,7 @@ struct rtw89_btc_fbtc_rpt_ctrl_v4 {struct rtw89_btc_fbtc_rpt_ctrl_wl_fw_info wl_fw_info;struct rtw89_btc_fbtc_rpt_ctrl_bt_mailbox bt_mbx_info;__le32 bt_cnt[BTC_BCNT_STA_MAX ]; -struct rtw89_mac_ax_gnt gnt_val[RTW89_PHY_MAX ]; +struct rtw89_mac_ax_gnt gnt_val[RTW89_PHY_NUM ]; } __packed;struct rtw89_btc_fbtc_rpt_ctrl_v5 {
@@ -2238,7 +2238,7 @@ struct rtw89_btc_fbtc_rpt_ctrl_v5 {u8 rsvd;__le16 rsvd1; -u8 gnt_val[RTW89_PHY_MAX ][4 ]; +u8 gnt_val[RTW89_PHY_NUM ][4 ];__le16 bt_cnt[BTC_BCNT_STA_MAX ];struct rtw89_btc_fbtc_rpt_ctrl_info_v5 rpt_info;
@@ -2250,7 +2250,7 @@ struct rtw89_btc_fbtc_rpt_ctrl_v105 {u8 rsvd;__le16 rsvd1; -u8 gnt_val[RTW89_PHY_MAX ][4 ]; +u8 gnt_val[RTW89_PHY_NUM ][4 ];__le16 bt_cnt[BTC_BCNT_STA_MAX_V105 ];struct rtw89_btc_fbtc_rpt_ctrl_info_v5 rpt_info;
@@ -2263,7 +2263,7 @@ struct rtw89_btc_fbtc_rpt_ctrl_v7 {u8 rsvd1;u8 rsvd2; -u8 gnt_val[RTW89_PHY_MAX ][4 ]; +u8 gnt_val[RTW89_PHY_NUM ][4 ];__le16 bt_cnt[BTC_BCNT_STA_MAX_V105 ];struct rtw89_btc_fbtc_rpt_ctrl_info_v8 rpt_info;
@@ -2276,7 +2276,7 @@ struct rtw89_btc_fbtc_rpt_ctrl_v8 {u8 rpt_len_max_l;/* BTC_RPT_MAX bit0~7 */ u8 rpt_len_max_h;/* BTC_RPT_MAX bit8~15 */ -u8 gnt_val[RTW89_PHY_MAX ][4 ]; +u8 gnt_val[RTW89_PHY_NUM ][4 ];__le16 bt_cnt[BTC_BCNT_STA_MAX_V105 ];struct rtw89_btc_fbtc_rpt_ctrl_info_v8 rpt_info;
@@ -4762,7 +4762,7 @@ struct rtw89_hal {struct rtw89_chanctx chanctx[NUM_OF_RTW89_CHANCTX ];struct cfg80211_chan_def roc_chandef; -bool entity_active[RTW89_PHY_MAX ]; +bool entity_active[RTW89_PHY_NUM ];bool entity_pause;enum rtw89_entity_mode entity_mode;struct rtw89_entity_mgnt entity_mgnt;
@@ -4973,7 +4973,7 @@ struct rtw89_dpk_bkup_para {struct rtw89_dpk_info {bool is_dpk_enable;bool is_dpk_reload_en; -u8 dpk_gs[RTW89_PHY_MAX ]; +u8 dpk_gs[RTW89_PHY_NUM ];u16 dc_i[RTW89_DPK_RF_PATH ][RTW89_DPK_BKUP_NUM ];u16 dc_q[RTW89_DPK_RF_PATH ][RTW89_DPK_BKUP_NUM ];u8 corr_val[RTW89_DPK_RF_PATH ][RTW89_DPK_BKUP_NUM ];
@@ -5299,8 +5299,8 @@ struct rtw89_lps_parm { };struct rtw89_ppdu_sts_info { -struct sk_buff_head rx_queue[RTW89_PHY_MAX ]; -u8 curr_rx_ppdu_cnt[RTW89_PHY_MAX ]; +struct sk_buff_head rx_queue[RTW89_PHY_NUM ]; +u8 curr_rx_ppdu_cnt[RTW89_PHY_NUM ]; };struct rtw89_early_h2c {
@@ -5419,8 +5419,8 @@ struct rtw89_phy_efuse_gain {bool offset_valid;bool comp_valid;s8 offset[RF_PATH_MAX ][RTW89_GAIN_OFFSET_NR ];/* S(8, 0) */ -s8 offset_base[RTW89_PHY_MAX ];/* S(8, 4) */ -s8 rssi_base[RTW89_PHY_MAX ];/* S(8, 4) */ +s8 offset_base[RTW89_PHY_NUM ];/* S(8, 4) */ +s8 rssi_base[RTW89_PHY_NUM ];/* S(8, 4) */ s8 comp[RF_PATH_MAX ][RTW89_SUBBAND_NR ];/* S(8, 0) */ };
drivers/net/wireless/realtek/rtw89/fw.h +7 -7
@@ -1803,14 +1803,14 @@ struct rtw89_h2c_lps_ml_cmn_info {u8 fmt_id;u8 rsvd0[3 ];__le32 mlo_dbcc_mode; -u8 central_ch[RTW89_PHY_MAX ]; -u8 pri_ch[RTW89_PHY_MAX ]; -u8 bw[RTW89_PHY_MAX ]; -u8 band[RTW89_PHY_MAX ]; -u8 bcn_rate_type[RTW89_PHY_MAX ]; +u8 central_ch[RTW89_PHY_NUM ]; +u8 pri_ch[RTW89_PHY_NUM ]; +u8 bw[RTW89_PHY_NUM ]; +u8 band[RTW89_PHY_NUM ]; +u8 bcn_rate_type[RTW89_PHY_NUM ];u8 rsvd1[2 ]; -__le16 tia_gain[RTW89_PHY_MAX ][TIA_GAIN_NUM ]; -u8 lna_gain[RTW89_PHY_MAX ][LNA_GAIN_NUM ]; +__le16 tia_gain[RTW89_PHY_NUM ][TIA_GAIN_NUM ]; +u8 lna_gain[RTW89_PHY_NUM ][LNA_GAIN_NUM ];u8 rsvd2[2 ]; } __packed;
drivers/net/wireless/realtek/rtw89/mac.c +1 -1
@@ -6031,7 +6031,7 @@ int rtw89_mac_cfg_ctrl_path_v1(struct rtw89_dev *rtwdev, bool wl)if (wl)return 0 ; -for (i =0 ; i <RTW89_PHY_MAX ; i++) { +for (i =0 ; i <RTW89_PHY_NUM ; i++) { g[i].gnt_bt_sw_en =1 ; g[i].gnt_bt =1 ; g[i].gnt_wl_sw_en =1 ;
drivers/net/wireless/realtek/rtw89/mac_be.c +1 -1
@@ -1865,7 +1865,7 @@ int rtw89_mac_cfg_ctrl_path_v2(struct rtw89_dev *rtwdev, bool wl)if (wl)return 0 ; -for (i =0 ; i <RTW89_PHY_MAX ; i++) { +for (i =0 ; i <RTW89_PHY_NUM ; i++) { g[i].gnt_bt_sw_en =1 ; g[i].gnt_bt =1 ; g[i].gnt_wl_sw_en =1 ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH 1/8] wifi: rtw89: phy: rename to RTW89_PHY_NUM as proper naming
Quoted 6 lines · Ping-Ke Shih
The meaning is number of PHY, not maximum ID of PHY. Change to proper naming.
No change logic at all.
Signed-off-by Ping-Ke Shih <[email protected]>
8 patch(es) applied to rtw-next branch of rtw.git, thanks.
f0dc53a7b77f wifi: rtw89: phy: rename to RTW89_PHY_NUM as proper naming 57a6cdf2feaf wifi: rtw89: phy: add PHY context array to support functions per PHY 11a625160a32 wifi: rtw89: phy: support env_monitor per PHYdc0ac60f2a92 wifi: rtw89: phy: support DIG per PHY786e485c61ef wifi: rtw89: phy: support ch_info per PHYaf5fa884e22f wifi: rtw89: phy: support EDCCA per PHY0a51f04a9afe wifi: rtw89: phy: support EDCCA log per PHY076652f56ed6 wifi: rtw89: phy: disable CFO track when two PHY are working simultaneously
Ping-Ke Shih
maintainerPATCH 2/8 wifi: rtw89: phy: add PHY context array to support functions per PHY
In reply to Ping-Ke ShihTo support MLO working on PHY 0 and PHY 1, extend existing PHY dynamic mechanism from PHY 0 to PHY 0/1.
Implement a 2 elements array for two PHY instances, and pass pointer of each element as argument to existing functions. Then existing algorithm is kept, unchanged.
Also provide iterate and get function to access PHY context.
--- drivers/net/wireless/realtek/rtw89/core.c | 3 ++ drivers/net/wireless/realtek/rtw89/core.h | 46 +++++++++++++++++++++++ 2 files changed, 49 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +3 -0
@@ -4867,6 +4867,9 @@ int rtw89_core_init(struct rtw89_dev *rtwdev) rtwdev->mlo_dbcc_mode =MLO_2_PLUS_0_1RF ; } + rtwdev->bbs[RTW89_PHY_0 ].phy_idx =RTW89_PHY_0 ; + rtwdev->bbs[RTW89_PHY_1 ].phy_idx =RTW89_PHY_1 ; +INIT_WORK (&btc->eapol_notify_work, rtw89_btc_ntfy_eapol_packet_work);INIT_WORK (&btc->arp_notify_work, rtw89_btc_ntfy_arp_packet_work);INIT_WORK (&btc->dhcp_notify_work, rtw89_btc_ntfy_dhcp_packet_work);
drivers/net/wireless/realtek/rtw89/core.h +46 -0
58 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/8 wifi: rtw89: phy: support env_monitor per PHY
In reply to Ping-Ke ShihThe env_monitor is to collect information of current operating channel as helper to make decision with better hardware parameters to adopt current environment.
Use PHY context as argument to control PHY accordingly, and use rtw89_phy_{write32,read32}_idx with phy_idx to access registers.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/phy.c | 306 +++++++++++++--------- drivers/net/wireless/realtek/rtw89/sar.c | 3 +- 3 files changed, 180 insertions(+), 131 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -1
@@ -5682,7 +5682,6 @@ struct rtw89_dev {struct rtw89_power_trim_info pwr_trim;struct rtw89_cfo_tracking_info cfo_tracking; -struct rtw89_env_monitor_info env_monitor;struct rtw89_dig_info dig;struct rtw89_phy_ch_info ch_info;union {
@@ -5695,6 +5694,7 @@ struct rtw89_dev {struct rtw89_bb_ctx {enum rtw89_phy_idx phy_idx; +struct rtw89_env_monitor_info env_monitor; } bbs[RTW89_PHY_NUM ];struct delayed_work track_work;
drivers/net/wireless/realtek/rtw89/phy.c +177 -129
539 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/sar.c +2 -1
@@ -411,7 +411,8 @@ static const struct rtw89_reg_def txpwr_regs[] = {void rtw89_tas_track (struct rtw89_dev *rtwdev) { -struct rtw89_env_monitor_info *env = &rtwdev->env_monitor; +struct rtw89_bb_ctx *bb =rtw89_get_bb_ctx (rtwdev,RTW89_PHY_0 ); +struct rtw89_env_monitor_info *env = &bb->env_monitor;const enum rtw89_sar_sources src = rtwdev->sar.src;u8 max_nss_num = rtwdev->chip->rf_path_num;struct rtw89_tas_info *tas = &rtwdev->tas;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/8 wifi: rtw89: phy: support DIG per PHY
In reply to Ping-Ke ShihDIG standing for dynamic initial gain is to define RX coverage. Adjust this value dynamically to gain good RX performance.
Use PHY context to extend DIG algorithm to support two PHY.
--- drivers/net/wireless/realtek/rtw89/core.c | 4 +- drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/phy.c | 224 +++++++++++++--------- drivers/net/wireless/realtek/rtw89/phy.h | 2 +- 4 files changed, 136 insertions(+), 96 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +3 -1
@@ -4925,6 +4925,7 @@ void rtw89_core_scan_complete(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link, bool hw_scan) {struct ieee80211_bss_conf *bss_conf; +struct rtw89_bb_ctx *bb;if (!rtwvif_link)return ;
@@ -4943,7 +4944,8 @@ void rtw89_core_scan_complete(struct rtw89_dev *rtwdev,rtw89_phy_config_edcca (rtwdev, false); rtwdev->scanning = false; - rtwdev->dig.bypass_dig = true; +rtw89_for_each_active_bb (rtwdev, bb) + bb->dig.bypass_dig = true;if (hw_scan && (rtwdev->hw->conf.flags &IEEE80211_CONF_IDLE ))ieee80211_queue_work (rtwdev->hw, &rtwdev->ips_work); }
drivers/net/wireless/realtek/rtw89/core.h +1 -1
@@ -5682,7 +5682,6 @@ struct rtw89_dev {struct rtw89_power_trim_info pwr_trim;struct rtw89_cfo_tracking_info cfo_tracking; -struct rtw89_dig_info dig;struct rtw89_phy_ch_info ch_info;union {struct rtw89_phy_bb_gain_info ax;
@@ -5695,6 +5694,7 @@ struct rtw89_dev {struct rtw89_bb_ctx {enum rtw89_phy_idx phy_idx;struct rtw89_env_monitor_info env_monitor; +struct rtw89_dig_info dig; } bbs[RTW89_PHY_NUM ];struct delayed_work track_work;
drivers/net/wireless/realtek/rtw89/phy.c +131 -93
425 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/phy.h +1 -1
@@ -985,7 +985,7 @@ void rtw89_phy_stat_track(struct rtw89_dev *rtwdev);void rtw89_phy_env_monitor_track (struct rtw89_dev *rtwdev);void rtw89_phy_set_phy_regs (struct rtw89_dev *rtwdev,u32 addr,u32 mask,u32 val); -void rtw89_phy_dig_reset (struct rtw89_dev *rtwdev); +void rtw89_phy_dig_reset (struct rtw89_dev *rtwdev,struct rtw89_bb_ctx *bb);void rtw89_phy_dig (struct rtw89_dev *rtwdev);void rtw89_phy_tx_path_div_track (struct rtw89_dev *rtwdev); void rtw89_phy_antdiv_parse(struct rtw89_dev *rtwdev,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/8 wifi: rtw89: phy: support ch_info per PHY
In reply to Ping-Ke ShihThe ch_info is to record current channel info such as minimum RSSI of connected stations, and to assist in dynamic mechanisms of DIG and EDCCA.
Move the struct to PHY context, so the dynamic mechanisms can use the info of the same PHY.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -5695,6 +5695,7 @@ struct rtw89_dev {enum rtw89_phy_idx phy_idx;struct rtw89_env_monitor_info env_monitor;struct rtw89_dig_info dig; +struct rtw89_phy_ch_info ch_info; } bbs[RTW89_PHY_NUM ];struct delayed_work track_work;
drivers/net/wireless/realtek/rtw89/phy.c +12 -6
@@ -5115,7 +5115,6 @@ static void rtw89_phy_stat_thermal_update(struct rtw89_dev *rtwdev)struct rtw89_phy_iter_rssi_data {struct rtw89_dev *rtwdev; -struct rtw89_phy_ch_info *ch_info;bool rssi_changed; };
@@ -5123,10 +5122,15 @@ staticvoid __rtw89_phy_stat_rssi_update_iter (struct rtw89_sta_link *rtwsta_link,struct rtw89_phy_iter_rssi_data *rssi_data) { -struct rtw89_phy_ch_info *ch_info = rssi_data->ch_info; +struct rtw89_vif_link *rtwvif_link = rtwsta_link->rtwvif_link; +struct rtw89_dev *rtwdev = rssi_data->rtwdev; +struct rtw89_phy_ch_info *ch_info; +struct rtw89_bb_ctx *bb;unsigned long rssi_curr; rssi_curr =ewma_rssi_read (&rtwsta_link->avg_rssi); + bb =rtw89_get_bb_ctx (rtwdev, rtwvif_link->phy_idx); + ch_info = &bb->ch_info;if (rssi_curr < ch_info->rssi_min) { ch_info->rssi_min = rssi_curr;
@@ -5157,11 +5161,13 @@ static void rtw89_phy_stat_rssi_update_iter(void *data,static void rtw89_phy_stat_rssi_update (struct rtw89_dev *rtwdev) { -struct rtw89_phy_iter_rssi_data rssi_data = {0 }; +struct rtw89_phy_iter_rssi_data rssi_data = {}; +struct rtw89_bb_ctx *bb; rssi_data.rtwdev = rtwdev; - rssi_data.ch_info = &rtwdev->ch_info; - rssi_data.ch_info->rssi_min =U8_MAX ; +rtw89_for_each_active_bb (rtwdev, bb) + bb->ch_info.rssi_min =U8_MAX ; +ieee80211_iterate_stations_atomic (rtwdev->hw, rtw89_phy_stat_rssi_update_iter, &rssi_data);
@@ -5919,7 +5925,7 @@ static const u16 fa_th_nolink[FA_TH_NUM] = {196, 352, 440, 528};static void rtw89_phy_dig_update_rssi_info (struct rtw89_dev *rtwdev,struct rtw89_bb_ctx *bb) { -struct rtw89_phy_ch_info *ch_info = &rtwdev->ch_info; +struct rtw89_phy_ch_info *ch_info = &bb->ch_info;struct rtw89_dig_info *dig = &bb->dig;bool is_linked = rtwdev->total_sta_assoc >0 ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/8 wifi: rtw89: phy: support EDCCA per PHY
In reply to Ping-Ke ShihDynamic mechanism EDCCA (Energy Detection Clear Channel Assessment) is to dynamically adjusted to make EDCCA suitable for situations.
Use PHY context to support two PHY.
For the EDCCA log part, registers to report EDCCA for PHY 1 is not a simple offset from PHY 0, so add them by separate patch.
--- drivers/net/wireless/realtek/rtw89/core.c | 6 +- drivers/net/wireless/realtek/rtw89/core.h | 3 +- drivers/net/wireless/realtek/rtw89/phy.c | 107 +++++++++++++--------- drivers/net/wireless/realtek/rtw89/phy.h | 5 +- 4 files changed, 73 insertions(+), 48 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +4 -2
@@ -4906,6 +4906,7 @@ void rtw89_core_scan_start(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwv {const struct rtw89_chan *chan =rtw89_chan_get (rtwdev, rtwvif_link->chanctx_idx); +struct rtw89_bb_ctx *bb =rtw89_get_bb_ctx (rtwdev, rtwvif_link->phy_idx); rtwdev->scanning = true;rtw89_leave_lps (rtwdev);
@@ -4916,7 +4917,7 @@ void rtw89_core_scan_start(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvrtw89_btc_ntfy_scan_start (rtwdev, rtwvif_link->phy_idx, chan->band_type);rtw89_chip_rfk_scan (rtwdev, rtwvif_link, true);rtw89_hci_recalc_int_mit (rtwdev); -rtw89_phy_config_edcca (rtwdev, true); +rtw89_phy_config_edcca (rtwdev, bb, true);rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL , mac_addr); }
@@ -4941,7 +4942,8 @@ void rtw89_core_scan_complete(struct rtw89_dev *rtwdev,rtw89_chip_rfk_scan (rtwdev, rtwvif_link, false);rtw89_btc_ntfy_scan_finish (rtwdev, rtwvif_link->phy_idx); -rtw89_phy_config_edcca (rtwdev, false); + bb =rtw89_get_bb_ctx (rtwdev, rtwvif_link->phy_idx); +rtw89_phy_config_edcca (rtwdev, bb, false); rtwdev->scanning = false;rtw89_for_each_active_bb (rtwdev, bb)
drivers/net/wireless/realtek/rtw89/core.h +1 -2
@@ -4767,7 +4767,6 @@ struct rtw89_hal {enum rtw89_entity_mode entity_mode;struct rtw89_entity_mgnt entity_mgnt; -struct rtw89_edcca_bak edcca_bak;u32 disabled_dm_bitmap;/* bitmap of enum rtw89_dm_type */ u8 thermal_prot_th;
@@ -5682,7 +5681,6 @@ struct rtw89_dev {struct rtw89_power_trim_info pwr_trim;struct rtw89_cfo_tracking_info cfo_tracking; -struct rtw89_phy_ch_info ch_info;union {struct rtw89_phy_bb_gain_info ax;struct rtw89_phy_bb_gain_info_be be;
@@ -5696,6 +5694,7 @@ struct rtw89_dev {struct rtw89_env_monitor_info env_monitor;struct rtw89_dig_info dig;struct rtw89_phy_ch_info ch_info; +struct rtw89_edcca_bak edcca_bak; } bbs[RTW89_PHY_NUM ];struct delayed_work track_work;
drivers/net/wireless/realtek/rtw89/phy.c +65 -42
170 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/phy.h +3 -2
@@ -1002,9 +1002,10 @@ void rtw89_phy_ul_tb_ctrl_track(struct rtw89_dev *rtwdev);u8 rtw89_encode_chan_idx (struct rtw89_dev *rtwdev,u8 central_ch,u8 band);void rtw89_decode_chan_idx (struct rtw89_dev *rtwdev,u8 chan_idx,u8 *ch,enum nl80211_band *band); -void rtw89_phy_config_edcca (struct rtw89_dev *rtwdev,bool scan); +void rtw89_phy_config_edcca (struct rtw89_dev *rtwdev, +struct rtw89_bb_ctx *bb,bool scan);void rtw89_phy_edcca_track (struct rtw89_dev *rtwdev); -void rtw89_phy_edcca_thre_calc (struct rtw89_dev *rtwdev); +void rtw89_phy_edcca_thre_calc (struct rtw89_dev *rtwdev,struct rtw89_bb_ctx *bb);enum rtw89_rf_path_bit rtw89_phy_get_kpath (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx); enum rtw89_rf_path rtw89_phy_get_syn_sel(struct rtw89_dev *rtwdev,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/8 wifi: rtw89: phy: support EDCCA log per PHY
In reply to Ping-Ke ShihThe registers of EDCCA log for PHY 1 isn't a simple offset, so define them accordingly. Then the function use register set to access reports according to phy_idx.
--- drivers/net/wireless/realtek/rtw89/core.h | 10 ++-- drivers/net/wireless/realtek/rtw89/phy.c | 48 +++++++++++-------- drivers/net/wireless/realtek/rtw89/reg.h | 5 ++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 15 ++++-- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 15 ++++-- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 15 ++++-- .../net/wireless/realtek/rtw89/rtw8852bt.c | 15 ++++-- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 15 ++++-- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 15 ++++-- 9 files changed, 104 insertions(+), 49 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +6 -4
@@ -4189,10 +4189,12 @@ struct rtw89_edcca_regs {u32 edcca_p_mask;u32 ppdu_level;u32 ppdu_mask; -u32 rpt_a; -u32 rpt_b; -u32 rpt_sel; -u32 rpt_sel_mask; +struct rtw89_edcca_p_regs { +u32 rpt_a; +u32 rpt_b; +u32 rpt_sel; +u32 rpt_sel_mask; + } p[RTW89_PHY_NUM ];u32 rpt_sel_be;u32 rpt_sel_be_mask;u32 tx_collision_t2r_st;
drivers/net/wireless/realtek/rtw89/phy.c +27 -21
98 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/reg.h +5 -0
@@ -8157,6 +8157,8 @@#define B_EDCCA_RPT_B_S40 BIT(4)#define B_EDCCA_RPT_B_S80 BIT(3)#define B_EDCCA_RPT_B_PATH_MASK GENMASK(2, 1) +#define R_EDCCA_RPT_P1_A 0x1740 +#define R_EDCCA_RPT_P1_B 0x1744#define R_SWSI_V1 0x174C#define B_SWSI_W_BUSY_V1 BIT(24)#define B_SWSI_R_BUSY_V1 BIT(25)
@@ -8222,6 +8224,7 @@#define B_TXCKEN_FORCE_ALL GENMASK(24, 0)#define R_EDCCA_RPT_SEL 0x20CC#define B_EDCCA_RPT_SEL_MSK GENMASK(2, 0) +#define B_EDCCA_RPT_SEL_P1_MSK GENMASK(5, 3)#define R_ADC_FIFO 0x20fc#define B_ADC_FIFO_RST GENMASK(31, 24)#define B_ADC_FIFO_RXK GENMASK(31, 16)
@@ -8291,6 +8294,8 @@#define B_P1_EN_SOUND_WO_NDP BIT(1)#define R_EDCCA_RPT_A_BE 0x2E38#define R_EDCCA_RPT_B_BE 0x2E3C +#define R_EDCCA_RPT_P1_A_BE 0x2E40 +#define R_EDCCA_RPT_P1_B_BE 0x2E44#define R_S1_HW_SI_DIS 0x3200#define B_S1_HW_SI_DIS_W_R_TRIG GENMASK(30, 28)#define R_P1_RXCK 0x32A0
drivers/net/wireless/realtek/rtw89/rtw8851b.c +11 -4
@@ -224,10 +224,17 @@ static const struct rtw89_edcca_regs rtw8851b_edcca_regs = { .edcca_p_mask = B_EDCCA_LVL_MSK1, .ppdu_level = R_SEG0R_EDCCA_LVL_V1, .ppdu_mask = B_EDCCA_LVL_MSK3, - .rpt_a = R_EDCCA_RPT_A, - .rpt_b = R_EDCCA_RPT_B, - .rpt_sel = R_EDCCA_RPT_SEL, - .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + .p = {{ + .rpt_a = R_EDCCA_RPT_A, + .rpt_b = R_EDCCA_RPT_B, + .rpt_sel = R_EDCCA_RPT_SEL, + .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + }, { + .rpt_a = R_EDCCA_RPT_P1_A, + .rpt_b = R_EDCCA_RPT_P1_B, + .rpt_sel = R_EDCCA_RPT_SEL, + .rpt_sel_mask = B_EDCCA_RPT_SEL_P1_MSK, + }}, .tx_collision_t2r_st = R_TX_COLLISION_T2R_ST, .tx_collision_t2r_st_mask = B_TX_COLLISION_T2R_ST_M, };
drivers/net/wireless/realtek/rtw89/rtw8852a.c +11 -4
@@ -522,10 +522,17 @@ static const struct rtw89_edcca_regs rtw8852a_edcca_regs = { .edcca_p_mask = B_EDCCA_LVL_MSK1, .ppdu_level = R_SEG0R_EDCCA_LVL, .ppdu_mask = B_EDCCA_LVL_MSK3, - .rpt_a = R_EDCCA_RPT_A, - .rpt_b = R_EDCCA_RPT_B, - .rpt_sel = R_EDCCA_RPT_SEL, - .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + .p = {{ + .rpt_a = R_EDCCA_RPT_A, + .rpt_b = R_EDCCA_RPT_B, + .rpt_sel = R_EDCCA_RPT_SEL, + .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + }, { + .rpt_a = R_EDCCA_RPT_P1_A, + .rpt_b = R_EDCCA_RPT_P1_B, + .rpt_sel = R_EDCCA_RPT_SEL, + .rpt_sel_mask = B_EDCCA_RPT_SEL_P1_MSK, + }}, .tx_collision_t2r_st = R_TX_COLLISION_T2R_ST, .tx_collision_t2r_st_mask = B_TX_COLLISION_T2R_ST_M, };
drivers/net/wireless/realtek/rtw89/rtw8852b.c +11 -4
@@ -189,10 +189,17 @@ static const struct rtw89_edcca_regs rtw8852b_edcca_regs = { .edcca_p_mask = B_EDCCA_LVL_MSK1, .ppdu_level = R_SEG0R_EDCCA_LVL_V1, .ppdu_mask = B_EDCCA_LVL_MSK3, - .rpt_a = R_EDCCA_RPT_A, - .rpt_b = R_EDCCA_RPT_B, - .rpt_sel = R_EDCCA_RPT_SEL, - .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + .p = {{ + .rpt_a = R_EDCCA_RPT_A, + .rpt_b = R_EDCCA_RPT_B, + .rpt_sel = R_EDCCA_RPT_SEL, + .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + }, { + .rpt_a = R_EDCCA_RPT_P1_A, + .rpt_b = R_EDCCA_RPT_P1_B, + .rpt_sel = R_EDCCA_RPT_SEL, + .rpt_sel_mask = B_EDCCA_RPT_SEL_P1_MSK, + }}, .tx_collision_t2r_st = R_TX_COLLISION_T2R_ST, .tx_collision_t2r_st_mask = B_TX_COLLISION_T2R_ST_M, };
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +11 -4
@@ -187,10 +187,17 @@ static const struct rtw89_edcca_regs rtw8852bt_edcca_regs = { .edcca_p_mask = B_EDCCA_LVL_MSK1, .ppdu_level = R_SEG0R_EDCCA_LVL_V1, .ppdu_mask = B_EDCCA_LVL_MSK3, - .rpt_a = R_EDCCA_RPT_A, - .rpt_b = R_EDCCA_RPT_B, - .rpt_sel = R_EDCCA_RPT_SEL, - .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + .p = {{ + .rpt_a = R_EDCCA_RPT_A, + .rpt_b = R_EDCCA_RPT_B, + .rpt_sel = R_EDCCA_RPT_SEL, + .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + }, { + .rpt_a = R_EDCCA_RPT_P1_A, + .rpt_b = R_EDCCA_RPT_P1_B, + .rpt_sel = R_EDCCA_RPT_SEL, + .rpt_sel_mask = B_EDCCA_RPT_SEL_P1_MSK, + }}, .tx_collision_t2r_st = R_TX_COLLISION_T2R_ST, .tx_collision_t2r_st_mask = B_TX_COLLISION_T2R_ST_M, };
drivers/net/wireless/realtek/rtw89/rtw8852c.c +11 -4
@@ -186,10 +186,17 @@ static const struct rtw89_edcca_regs rtw8852c_edcca_regs = { .edcca_p_mask = B_EDCCA_LVL_MSK1, .ppdu_level = R_SEG0R_EDCCA_LVL, .ppdu_mask = B_EDCCA_LVL_MSK3, - .rpt_a = R_EDCCA_RPT_A, - .rpt_b = R_EDCCA_RPT_B, - .rpt_sel = R_EDCCA_RPT_SEL, - .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + .p = {{ + .rpt_a = R_EDCCA_RPT_A, + .rpt_b = R_EDCCA_RPT_B, + .rpt_sel = R_EDCCA_RPT_SEL, + .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + }, { + .rpt_a = R_EDCCA_RPT_P1_A, + .rpt_b = R_EDCCA_RPT_P1_B, + .rpt_sel = R_EDCCA_RPT_SEL, + .rpt_sel_mask = B_EDCCA_RPT_SEL_P1_MSK, + }}, .tx_collision_t2r_st = R_TX_COLLISION_T2R_ST, .tx_collision_t2r_st_mask = B_TX_COLLISION_T2R_ST_M, };
drivers/net/wireless/realtek/rtw89/rtw8922a.c +11 -4
@@ -205,10 +205,17 @@ static const struct rtw89_edcca_regs rtw8922a_edcca_regs = { .edcca_p_mask = B_EDCCA_LVL_MSK1, .ppdu_level = R_SEG0R_PPDU_LVL_BE, .ppdu_mask = B_EDCCA_LVL_MSK1, - .rpt_a = R_EDCCA_RPT_A_BE, - .rpt_b = R_EDCCA_RPT_B_BE, - .rpt_sel = R_EDCCA_RPT_SEL_BE, - .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + .p = {{ + .rpt_a = R_EDCCA_RPT_A_BE, + .rpt_b = R_EDCCA_RPT_B_BE, + .rpt_sel = R_EDCCA_RPT_SEL_BE, + .rpt_sel_mask = B_EDCCA_RPT_SEL_MSK, + }, { + .rpt_a = R_EDCCA_RPT_P1_A_BE, + .rpt_b = R_EDCCA_RPT_P1_B_BE, + .rpt_sel = R_EDCCA_RPT_SEL_BE, + .rpt_sel_mask = B_EDCCA_RPT_SEL_P1_MSK, + }}, .rpt_sel_be = R_EDCCA_RPTREG_SEL_BE, .rpt_sel_be_mask = B_EDCCA_RPTREG_SEL_BE_MSK, .tx_collision_t2r_st = R_TX_COLLISION_T2R_ST_BE,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/8 wifi: rtw89: phy: disable CFO track when two PHY are working simultaneously
In reply to Ping-Ke ShihTo have good performance, adjust hardware XTAL to track CFO (carrier frequency offset). However, there is only one hardware XTAL, so it is not possible to track on two PHY simultaneously. It also can't track on single one PHY when two PHY are working, because the adjustment of XTAL will affect all PHY. Thus, disable CFO track for this case.
--- drivers/net/wireless/realtek/rtw89/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/phy.c +1 -1
@@ -4600,7 +4600,7 @@ static void rtw89_phy_cfo_dm(struct rtw89_dev *rtwdev) cfo->dcfo_avg =0 ;rtw89_debug (rtwdev,RTW89_DBG_CFO ,"CFO:total_sta_assoc=%d\n" , rtwdev->total_sta_assoc); -if (rtwdev->total_sta_assoc ==0 ) { +if (rtwdev->total_sta_assoc ==0 ||rtw89_is_mlo_1_1 (rtwdev)) {rtw89_phy_cfo_reset (rtwdev);return ; }
Signature · 1 line
2.25.1