| Message ID | 20230608082457.36020-1-dmantipov@yandex.ru (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [1/2,v3] wifi: rtw89: cleanup private data structures | expand |
> -----Original Message----- > From: Dmitry Antipov <dmantipov@yandex.ru> > Sent: Thursday, June 8, 2023 4:25 PM > To: Ping-Ke Shih <pkshih@realtek.com> > Cc: Kalle Valo <kvalo@kernel.org>; linux-wireless@vger.kernel.org; Dmitry Antipov <dmantipov@yandex.ru> > Subject: [PATCH 1/2] [v3] wifi: rtw89: cleanup private data structures > > Remove a bunch of unused (and set but unused) fields > from 'struct rtw89_btc_wl_nhm', 'struct rtw89_dle_info', > 'struct rtw89_hal' and 'struct rtw89_env_monitor_info' > driver-specific data structures, adjust related bits. > > Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> Acked-by: Ping-Ke Shih <pkshih@realtek.com> > --- > v3: adjust to match series [...]
Dmitry Antipov <dmantipov@yandex.ru> wrote: > Remove a bunch of unused (and set but unused) fields > from 'struct rtw89_btc_wl_nhm', 'struct rtw89_dle_info', > 'struct rtw89_hal' and 'struct rtw89_env_monitor_info' > driver-specific data structures, adjust related bits. > > Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> > Acked-by: Ping-Ke Shih <pkshih@realtek.com> Failed to build: drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c: In function '_iqk_init': drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c:1563:17: error: 'struct rtw89_iqk_info' has no member named 'thermal_rek_en' 1563 | iqk_info->thermal_rek_en = false; | ^~ drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c: In function '_doiqk': drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c:1592:17: error: 'struct rtw89_iqk_info' has no member named 'kcount' 1592 | iqk_info->kcount = 0; | ^~ make[6]: *** [scripts/Makefile.build:252: drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [scripts/Makefile.build:494: drivers/net/wireless/realtek/rtw89] Error 2 make[4]: *** [scripts/Makefile.build:494: drivers/net/wireless/realtek] Error 2 make[3]: *** [scripts/Makefile.build:494: drivers/net/wireless] Error 2 make[2]: *** [scripts/Makefile.build:494: drivers/net] Error 2 make[1]: *** [scripts/Makefile.build:494: drivers] Error 2 make: *** [Makefile:2026: .] Error 2 2 patches set to Changes Requested. 13271750 [1/2,v3] wifi: rtw89: cleanup private data structures 13271751 [2/2,v3] wifi: rtw89: cleanup rtw89_iqk_info and related code
On 6/13/23 11:38, Kalle Valo wrote:
> Failed to build
Hmm... works for me against upstream at fb054096aea0 using following configuration:
CONFIG_RTW89=m
CONFIG_RTW89_CORE=m
CONFIG_RTW89_PCI=m
CONFIG_RTW89_8852A=m
CONFIG_RTW89_8852B=m
CONFIG_RTW89_8852C=m
CONFIG_RTW89_8852AE=m
CONFIG_RTW89_8852BE=m
CONFIG_RTW89_8852CE=m
CONFIG_RTW89_DEBUG=y
CONFIG_RTW89_DEBUGMSG=y
CONFIG_RTW89_DEBUGFS=y
Dmitry
> -----Original Message----- > From: Dmitry Antipov <dmantipov@yandex.ru> > Sent: Tuesday, June 13, 2023 4:56 PM > To: Kalle Valo <kvalo@kernel.org> > Cc: Ping-Ke Shih <pkshih@realtek.com>; linux-wireless@vger.kernel.org > Subject: Re: [PATCH 1/2] [v3] wifi: rtw89: cleanup private data structures > > On 6/13/23 11:38, Kalle Valo wrote: > > > Failed to build > > Hmm... works for me against upstream at fb054096aea0 using following configuration: > > CONFIG_RTW89=m > CONFIG_RTW89_CORE=m > CONFIG_RTW89_PCI=m > CONFIG_RTW89_8852A=m > CONFIG_RTW89_8852B=m > CONFIG_RTW89_8852C=m > CONFIG_RTW89_8852AE=m > CONFIG_RTW89_8852BE=m > CONFIG_RTW89_8852CE=m > CONFIG_RTW89_DEBUG=y > CONFIG_RTW89_DEBUGMSG=y > CONFIG_RTW89_DEBUGFS=y > Rebase your patch on top of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git Then, enable CONFIG_RTW89_8851B=m CONFIG_RTW89_8851BE=m Ping-Ke
Dmitry Antipov <dmantipov@yandex.ru> writes: > On 6/13/23 11:38, Kalle Valo wrote: > >> Failed to build > > Hmm... works for me against upstream at fb054096aea0 using following configuration: > > CONFIG_RTW89=m > CONFIG_RTW89_CORE=m > CONFIG_RTW89_PCI=m > CONFIG_RTW89_8852A=m > CONFIG_RTW89_8852B=m > CONFIG_RTW89_8852C=m > CONFIG_RTW89_8852AE=m > CONFIG_RTW89_8852BE=m > CONFIG_RTW89_8852CE=m > CONFIG_RTW89_DEBUG=y > CONFIG_RTW89_DEBUGMSG=y > CONFIG_RTW89_DEBUGFS=y You should use wireless-next as the baseline for wireless patches: https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git/
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h index 6df386a38fb4..bea2e7210b70 100644 --- a/drivers/net/wireless/realtek/rtw89/core.h +++ b/drivers/net/wireless/realtek/rtw89/core.h @@ -1382,7 +1382,6 @@ struct rtw89_btc_wl_nhm { u8 current_status; u8 refresh; bool start_flag; - u8 last_ccx_rpt_stamp; s8 pwr_max; s8 pwr_min; }; @@ -3237,7 +3236,6 @@ enum rtw89_hcifc_mode { struct rtw89_dle_info { enum rtw89_qta_mode qta_mode; - u16 wde_pg_size; u16 ple_pg_size; u16 c0_rx_qta; u16 c1_rx_qta; @@ -3417,7 +3415,6 @@ struct rtw89_hal { u32 rx_fltr; u8 cv; u8 acv; - u32 sw_amsdu_max_size; u32 antenna_tx; u32 antenna_rx; u8 tx_nss; @@ -3815,35 +3812,16 @@ enum rtw89_ccx_edcca_opt_bw_idx { #define RTW89_FAHM_RPT_NUM 12 #define RTW89_IFS_CLM_NUM 4 struct rtw89_env_monitor_info { - u32 ccx_trigger_time; - u64 start_time; - u8 ccx_rpt_stamp; u8 ccx_watchdog_result; bool ccx_ongoing; u8 ccx_rac_lv; bool ccx_manual_ctrl; - u8 ccx_pre_rssi; - u16 clm_mntr_time; - u16 nhm_mntr_time; u16 ifs_clm_mntr_time; enum rtw89_ifs_clm_application ifs_clm_app; - u16 fahm_mntr_time; - u16 edcca_clm_mntr_time; u16 ccx_period; u8 ccx_unit_idx; - enum rtw89_ccx_edcca_opt_bw_idx ccx_edcca_opt_bw_idx; - u8 nhm_th[RTW89_NHM_TH_NUM]; u16 ifs_clm_th_l[RTW89_IFS_CLM_NUM]; u16 ifs_clm_th_h[RTW89_IFS_CLM_NUM]; - u8 fahm_numer_opt; - u8 fahm_denom_opt; - u8 fahm_th[RTW89_FAHM_TH_NUM]; - u16 clm_result; - u16 nhm_result[RTW89_NHM_RPT_NUM]; - u8 nhm_wgt[RTW89_NHM_RPT_NUM]; - u16 nhm_tx_cnt; - u16 nhm_cca_cnt; - u16 nhm_idle_cnt; u16 ifs_clm_tx; u16 ifs_clm_edcca_excl_cca; u16 ifs_clm_ofdmfa; @@ -3854,17 +3832,6 @@ struct rtw89_env_monitor_info { u8 ifs_clm_his[RTW89_IFS_CLM_NUM]; u16 ifs_clm_avg[RTW89_IFS_CLM_NUM]; u16 ifs_clm_cca[RTW89_IFS_CLM_NUM]; - u16 fahm_result[RTW89_FAHM_RPT_NUM]; - u16 fahm_denom_result; - u16 edcca_clm_result; - u8 clm_ratio; - u8 nhm_rpt[RTW89_NHM_RPT_NUM]; - u8 nhm_tx_ratio; - u8 nhm_cca_ratio; - u8 nhm_idle_ratio; - u8 nhm_ratio; - u16 nhm_result_sum; - u8 nhm_pwr; u8 ifs_clm_tx_ratio; u8 ifs_clm_edcca_excl_cca_ratio; u8 ifs_clm_cck_fa_ratio; @@ -3875,12 +3842,6 @@ struct rtw89_env_monitor_info { u16 ifs_clm_ofdm_fa_permil; u32 ifs_clm_ifs_avg[RTW89_IFS_CLM_NUM]; u32 ifs_clm_cca_avg[RTW89_IFS_CLM_NUM]; - u8 fahm_rpt[RTW89_FAHM_RPT_NUM]; - u16 fahm_result_sum; - u8 fahm_ratio; - u8 fahm_denom_ratio; - u8 fahm_pwr; - u8 edcca_clm_ratio; }; enum rtw89_ser_rcvy_step { diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c index 512de491a064..8c9471ece05a 100644 --- a/drivers/net/wireless/realtek/rtw89/mac.c +++ b/drivers/net/wireless/realtek/rtw89/mac.c @@ -716,11 +716,8 @@ static int hfc_reset_param(struct rtw89_dev *rtwdev) if (param_ini.pub_cfg) param->pub_cfg = *param_ini.pub_cfg; - if (param_ini.prec_cfg) { + if (param_ini.prec_cfg) param->prec_cfg = *param_ini.prec_cfg; - rtwdev->hal.sw_amsdu_max_size = - param->prec_cfg.wp_ch07_prec * HFC_PAGE_UNIT; - } if (param_ini.ch_cfg) param->ch_cfg = param_ini.ch_cfg; @@ -1497,7 +1494,6 @@ static const struct rtw89_dle_mem *get_dle_mem_cfg(struct rtw89_dev *rtwdev, return NULL; } - mac->dle_info.wde_pg_size = cfg->wde_size->pge_size; mac->dle_info.ple_pg_size = cfg->ple_size->pge_size; mac->dle_info.qta_mode = mode; mac->dle_info.c0_rx_qta = cfg->ple_min_qt->cma0_dma; diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c index c7e906123416..9ebc6e2a467f 100644 --- a/drivers/net/wireless/realtek/rtw89/phy.c +++ b/drivers/net/wireless/realtek/rtw89/phy.c @@ -3053,11 +3053,8 @@ static void rtw89_phy_ccx_top_setting_init(struct rtw89_dev *rtwdev) env->ccx_manual_ctrl = false; env->ccx_ongoing = false; env->ccx_rac_lv = RTW89_RAC_RELEASE; - env->ccx_rpt_stamp = 0; env->ccx_period = 0; env->ccx_unit_idx = RTW89_CCX_32_US; - env->ccx_trigger_time = 0; - env->ccx_edcca_opt_bw_idx = RTW89_CCX_EDCCA_BW20_0; rtw89_phy_set_phy_regs(rtwdev, R_CCX, B_CCX_EN_MSK, 1); rtw89_phy_set_phy_regs(rtwdev, R_CCX, B_CCX_TRIG_OPT_MSK, 1); @@ -3265,7 +3262,6 @@ static void rtw89_phy_ccx_trigger(struct rtw89_dev *rtwdev) rtw89_phy_set_phy_regs(rtwdev, R_IFS_COUNTER, B_IFS_COUNTER_CLR_MSK, 1); rtw89_phy_set_phy_regs(rtwdev, R_CCX, B_MEASUREMENT_TRIG_MSK, 1); - env->ccx_rpt_stamp++; env->ccx_ongoing = true; }
Remove a bunch of unused (and set but unused) fields from 'struct rtw89_btc_wl_nhm', 'struct rtw89_dle_info', 'struct rtw89_hal' and 'struct rtw89_env_monitor_info' driver-specific data structures, adjust related bits. Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> --- v3: adjust to match series --- drivers/net/wireless/realtek/rtw89/core.h | 39 ----------------------- drivers/net/wireless/realtek/rtw89/mac.c | 6 +--- drivers/net/wireless/realtek/rtw89/phy.c | 4 --- 3 files changed, 1 insertion(+), 48 deletions(-)