Commit 65a9140e authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo
Browse files

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: default avatarDmitry Antipov <dmantipov@yandex.ru>
Acked-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230614081555.91395-1-dmantipov@yandex.ru
parent 7edbd53a

drivers/net/wireless/realtek/rtw89/core.h

+0 −39
Original line number Diff line number Diff line
@@ -1405,7 +1405,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;

};
@@ -3301,7 +3300,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;
@@ -3484,7 +3482,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;
@@ -3890,35 +3887,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;
@@ -3929,17 +3907,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;
@@ -3950,12 +3917,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 {

drivers/net/wireless/realtek/rtw89/mac.c

+1 −5
Original line number Diff line number Diff line
@@ -758,11 +758,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;
@@ -1541,7 +1538,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;

drivers/net/wireless/realtek/rtw89/phy.c

+0 −4
Original line number Diff line number Diff line
@@ -3188,11 +3188,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);
@@ -3400,7 +3397,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;

}