Commit 7ae7784e authored by Po-Hao Huang's avatar Po-Hao Huang Committed by Kalle Valo
Browse files

rtw88: 8822c: add LC calibration for RTL8822C 



Fix power tracking issue by replacing unnecessary IQ calibration
with LC calibration.
When thermal difference exceeds limitation, let RF circuit adjsut
its characteristic to fit in current environment.

Signed-off-by: default avatarPo-Hao Huang <phhuang@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210319054218.3319-6-pkshih@realtek.com
parent a0839883

drivers/net/wireless/realtek/rtw88/main.h

+2 −0
Original line number Diff line number Diff line
@@ -1167,6 +1167,7 @@ struct rtw_chip_info { 
	bool en_dis_dpd;

	u16 dpd_ratemask;

	u8 iqk_threshold;

	u8 lck_threshold;

	const struct rtw_pwr_track_tbl *pwr_track_tbl;



	u8 bfer_su_max_num;
@@ -1535,6 +1536,7 @@ struct rtw_dm_info { 
	u32 rrsr_mask_min;

	u8 thermal_avg[RTW_RF_PATH_MAX];

	u8 thermal_meter_k;

	u8 thermal_meter_lck;

	s8 delta_power_index[RTW_RF_PATH_MAX];

	s8 delta_power_index_last[RTW_RF_PATH_MAX];

	u8 default_ofdm_index;

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

+14 −0
Original line number Diff line number Diff line
@@ -2220,6 +2220,20 @@ s8 rtw_phy_pwrtrack_get_pwridx(struct rtw_dev *rtwdev, 
}

EXPORT_SYMBOL(rtw_phy_pwrtrack_get_pwridx);



bool rtw_phy_pwrtrack_need_lck(struct rtw_dev *rtwdev)

{

	struct rtw_dm_info *dm_info = &rtwdev->dm_info;

	u8 delta_lck;



	delta_lck = abs(dm_info->thermal_avg[0] - dm_info->thermal_meter_lck);

	if (delta_lck >= rtwdev->chip->lck_threshold) {

		dm_info->thermal_meter_lck = dm_info->thermal_avg[0];

		return true;

	}

	return false;

}

EXPORT_SYMBOL(rtw_phy_pwrtrack_need_lck);



bool rtw_phy_pwrtrack_need_iqk(struct rtw_dev *rtwdev)

{

	struct rtw_dm_info *dm_info = &rtwdev->dm_info;

drivers/net/wireless/realtek/rtw88/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ u8 rtw_phy_pwrtrack_get_delta(struct rtw_dev *rtwdev, u8 path); 
s8 rtw_phy_pwrtrack_get_pwridx(struct rtw_dev *rtwdev,

			       struct rtw_swing_table *swing_table,

			       u8 tbl_path, u8 therm_path, u8 delta);

bool rtw_phy_pwrtrack_need_lck(struct rtw_dev *rtwdev);

bool rtw_phy_pwrtrack_need_iqk(struct rtw_dev *rtwdev);

void rtw_phy_config_swing_table(struct rtw_dev *rtwdev,

				struct rtw_swing_table *swing_table);

drivers/net/wireless/realtek/rtw88/reg.h

+5 −0
Original line number Diff line number Diff line
@@ -653,8 +653,13 @@ 
#define RF_TXATANK	0x64

#define RF_TRXIQ	0x66

#define RF_RXIQGEN	0x8d

#define RF_SYN_PFD	0xb0

#define RF_XTALX2	0xb8

#define RF_SYN_CTRL	0xbb

#define RF_MALSEL	0xbe

#define RF_SYN_AAC	0xc9

#define RF_AAC_CTRL	0xca

#define RF_FAST_LCK	0xcc

#define RF_RCKD		0xde

#define RF_TXADBG	0xde

#define RF_LUTDBG	0xdf

drivers/net/wireless/realtek/rtw88/rtw8822c.c

+25 −2
Original line number Diff line number Diff line
@@ -1126,6 +1126,7 @@ static void rtw8822c_pwrtrack_init(struct rtw_dev *rtwdev) 


	dm_info->pwr_trk_triggered = false;

	dm_info->thermal_meter_k = rtwdev->efuse.thermal_meter_k;

	dm_info->thermal_meter_lck = rtwdev->efuse.thermal_meter_k;

}



static void rtw8822c_phy_set_param(struct rtw_dev *rtwdev)
@@ -2117,6 +2118,26 @@ static void rtw8822c_false_alarm_statistics(struct rtw_dev *rtwdev) 
	rtw_write32_set(rtwdev, REG_RX_BREAK, BIT_COM_RX_GCK_EN);

}



static void rtw8822c_do_lck(struct rtw_dev *rtwdev)

{

	u32 val;



	rtw_write_rf(rtwdev, RF_PATH_A, RF_SYN_CTRL, RFREG_MASK, 0x80010);

	rtw_write_rf(rtwdev, RF_PATH_A, RF_SYN_PFD, RFREG_MASK, 0x1F0FA);

	fsleep(1);

	rtw_write_rf(rtwdev, RF_PATH_A, RF_AAC_CTRL, RFREG_MASK, 0x80000);

	rtw_write_rf(rtwdev, RF_PATH_A, RF_SYN_AAC, RFREG_MASK, 0x80001);

	read_poll_timeout(rtw_read_rf, val, val != 0x1, 1000, 100000,

			  true, rtwdev, RF_PATH_A, RF_AAC_CTRL, 0x1000);

	rtw_write_rf(rtwdev, RF_PATH_A, RF_SYN_PFD, RFREG_MASK, 0x1F0F8);

	rtw_write_rf(rtwdev, RF_PATH_B, RF_SYN_CTRL, RFREG_MASK, 0x80010);



	rtw_write_rf(rtwdev, RF_PATH_A, RF_FAST_LCK, RFREG_MASK, 0x0f000);

	rtw_write_rf(rtwdev, RF_PATH_A, RF_FAST_LCK, RFREG_MASK, 0x4f000);

	fsleep(1);

	rtw_write_rf(rtwdev, RF_PATH_A, RF_FAST_LCK, RFREG_MASK, 0x0f000);

}



static void rtw8822c_do_iqk(struct rtw_dev *rtwdev)

{

	struct rtw_iqk_para para = {0};
@@ -3547,11 +3568,12 @@ static void __rtw8822c_pwr_track(struct rtw_dev *rtwdev) 


	rtw_phy_config_swing_table(rtwdev, &swing_table);



	if (rtw_phy_pwrtrack_need_lck(rtwdev))

		rtw8822c_do_lck(rtwdev);



	for (i = 0; i < rtwdev->hal.rf_path_num; i++)

		rtw8822c_pwr_track_path(rtwdev, &swing_table, i);



	if (rtw_phy_pwrtrack_need_iqk(rtwdev))

		rtw8822c_do_iqk(rtwdev);

}



static void rtw8822c_pwr_track(struct rtw_dev *rtwdev)
@@ -4361,6 +4383,7 @@ struct rtw_chip_info rtw8822c_hw_spec = { 
	.dpd_ratemask = DIS_DPD_RATEALL,

	.pwr_track_tbl = &rtw8822c_rtw_pwr_track_tbl,

	.iqk_threshold = 8,

	.lck_threshold = 8,

	.bfer_su_max_num = 2,

	.bfer_mu_max_num = 1,

	.rx_ldpc = true,