Commit 686317a2 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo
Browse files

wifi: rtw89: cleanup rtw89_iqk_info and related code 



Drop useless '_iqk_track()' and 'rtw8852a_iqk_track()' (they
just change 'thermal_rek_en' field which is set but unused
and so removed as well) functions, set but unused 'kcount'
field of 'struct rtw89_iqk_info', and convert 'thermal' to
local variables where appropriate (it doesn't need to have
longer storage duration because it is actually used for the
debugging purposes only).

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-2-dmantipov@yandex.ru
parent 65a9140e

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

+0 −3
Original line number Diff line number Diff line
@@ -3610,7 +3610,6 @@ struct rtw89_iqk_info { 
	u8 iqk_band[RTW89_IQK_PATH_NR];

	u8 iqk_ch[RTW89_IQK_PATH_NR];

	u8 iqk_bw[RTW89_IQK_PATH_NR];

	u8 kcount;

	u8 iqk_times;

	u8 version;

	u32 nb_txcfir[RTW89_IQK_PATH_NR];
@@ -3625,8 +3624,6 @@ struct rtw89_iqk_info { 
	bool iqk_xym_en;

	bool iqk_sram_en;

	bool iqk_cfir_en;

	u8 thermal[RTW89_IQK_PATH_NR];

	bool thermal_rek_en;

	u32 syn1to2;

	u8 iqk_mcc_ch[RTW89_IQK_CHS_NR][RTW89_IQK_PATH_NR];

	u8 iqk_table_idx[RTW89_IQK_PATH_NR];

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

+0 −2
Original line number Diff line number Diff line
@@ -1560,7 +1560,6 @@ static void _iqk_init(struct rtw89_dev *rtwdev) 
	iqk_info->iqk_sram_en = false;

	iqk_info->iqk_cfir_en = false;

	iqk_info->iqk_xym_en = false;

	iqk_info->thermal_rek_en = false;

	iqk_info->iqk_times = 0x0;



	for (idx = 0; idx < RTW89_IQK_CHS_NR; idx++) {
@@ -1589,7 +1588,6 @@ static void _doiqk(struct rtw89_dev *rtwdev, bool force, 
	rtw89_debug(rtwdev, RTW89_DBG_RFK,

		    "[IQK]==========IQK strat!!!!!==========\n");

	iqk_info->iqk_times++;

	iqk_info->kcount = 0;

	iqk_info->version = RTW8851B_IQK_VER;



	rtw89_debug(rtwdev, RTW89_DBG_RFK, "[IQK]Test Ver 0x%x\n", iqk_info->version);

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

+0 −1
Original line number Diff line number Diff line
@@ -1338,7 +1338,6 @@ static void rtw8852a_rfk_scan(struct rtw89_dev *rtwdev, bool start) 
static void rtw8852a_rfk_track(struct rtw89_dev *rtwdev)

{

	rtw8852a_dpk_track(rtwdev);

	rtw8852a_iqk_track(rtwdev);

	rtw8852a_tssi_track(rtwdev);

}

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

+2 −34
Original line number Diff line number Diff line
@@ -1284,11 +1284,8 @@ static void _iqk_info_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx, 
	u32 tmp = 0x0;

	bool flag = 0x0;



	iqk_info->thermal[path] =

		ewma_thermal_read(&rtwdev->phystat.avg_thermal[path]);

	iqk_info->thermal_rek_en = false;

	rtw89_debug(rtwdev, RTW89_DBG_RFK, "[IQK]S%d_thermal = %d\n", path,

		    iqk_info->thermal[path]);

	rtw89_debug(rtwdev, RTW89_DBG_RFK, "[IQK]S%d_thermal = %lu\n", path,

		    ewma_thermal_read(&rtwdev->phystat.avg_thermal[path]));

	rtw89_debug(rtwdev, RTW89_DBG_RFK, "[IQK]S%d_LOK_COR_fail= %d\n", path,

		    iqk_info->lok_cor_fail[0][path]);

	rtw89_debug(rtwdev, RTW89_DBG_RFK, "[IQK]S%d_LOK_FIN_fail= %d\n", path,
@@ -1536,28 +1533,6 @@ static void _iqk_dbcc(struct rtw89_dev *rtwdev, u8 path) 
	_iqk_afebb_restore(rtwdev, phy_idx, path);

}



static void _iqk_track(struct rtw89_dev *rtwdev)

{

	struct rtw89_iqk_info *iqk = &rtwdev->iqk;

	u8 path = 0x0;

	u8 cur_ther;



	if (iqk->iqk_band[0] == RTW89_BAND_2G)

		return;

	if (iqk->iqk_bw[0] < RTW89_CHANNEL_WIDTH_80)

		return;



	/* only check path 0 */

	for (path = 0; path < 1; path++) {

		cur_ther = ewma_thermal_read(&rtwdev->phystat.avg_thermal[path]);



		if (abs(cur_ther - iqk->thermal[path]) > RTW8852A_IQK_THR_REK)

			iqk->thermal_rek_en = true;

		else

			iqk->thermal_rek_en = false;

	}

}



static void _rck(struct rtw89_dev *rtwdev, enum rtw89_rf_path path)

{

	u32 rf_reg5, rck_val = 0;
@@ -1616,7 +1591,6 @@ static void _iqk_init(struct rtw89_dev *rtwdev) 
	iqk_info->iqk_sram_en = false;

	iqk_info->iqk_cfir_en = false;

	iqk_info->iqk_xym_en = false;

	iqk_info->thermal_rek_en = false;

	iqk_info->iqk_times = 0x0;



	for (ch = 0; ch < RTW89_IQK_CHS_NR; ch++) {
@@ -1645,7 +1619,6 @@ static void _doiqk(struct rtw89_dev *rtwdev, bool force, 
	rtw89_debug(rtwdev, RTW89_DBG_RFK,

		    "[IQK]==========IQK start!!!!!==========\n");

	iqk_info->iqk_times++;

	iqk_info->kcount = 0;

	iqk_info->version = RTW8852A_IQK_VER;



	rtw89_debug(rtwdev, RTW89_DBG_RFK, "[IQK]Test Ver 0x%x\n", iqk_info->version);
@@ -3655,11 +3628,6 @@ void rtw8852a_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx) 
	rtw89_btc_ntfy_wl_rfk(rtwdev, phy_map, BTC_WRFKT_IQK, BTC_WRFK_STOP);

}



void rtw8852a_iqk_track(struct rtw89_dev *rtwdev)

{

	_iqk_track(rtwdev);

}



void rtw8852a_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,

		     bool is_afe)

{

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

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
void rtw8852a_rck(struct rtw89_dev *rtwdev);

void rtw8852a_dack(struct rtw89_dev *rtwdev);

void rtw8852a_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx);

void rtw8852a_iqk_track(struct rtw89_dev *rtwdev);

void rtw8852a_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,

		     bool is_afe);

void rtw8852a_dpk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy);