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

rtw88: 8822c: add CFO tracking 



Add CFO tracking, which stands for central frequency offset tracking, to
adjust oscillator to align central frequency of connected AP. Then, it can
yield better performance.

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/20210416030901.7099-1-pkshih@realtek.com
parent c544d89b

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

+8 −0
Original line number Diff line number Diff line
@@ -406,4 +406,12 @@ void rtw_coex_switchband_notify(struct rtw_dev *rtwdev, u8 type); 
void rtw_coex_wl_status_change_notify(struct rtw_dev *rtwdev, u32 type);

void rtw_coex_display_coex_info(struct rtw_dev *rtwdev, struct seq_file *m);



static inline bool rtw_coex_disabled(struct rtw_dev *rtwdev)

{

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;



	return coex_stat->bt_disabled;

}



#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ enum rtw_debug_mask { 
	RTW_DBG_PS		= 0x00000400,

	RTW_DBG_BF		= 0x00000800,

	RTW_DBG_WOW		= 0x00001000,

	RTW_DBG_CFO		= 0x00002000,



	RTW_DBG_ALL		= 0xffffffff

};

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

+13 −0
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ struct rtw_rx_pkt_stat { 


	struct rtw_sta_info *si;

	struct ieee80211_vif *vif;

	struct ieee80211_hdr *hdr;

};



DECLARE_EWMA(tp, 10, 2);
@@ -838,6 +839,8 @@ struct rtw_chip_ops { 
			      struct ieee80211_bss_conf *conf);

	void (*cfg_csi_rate)(struct rtw_dev *rtwdev, u8 rssi, u8 cur_rate,

			     u8 fixrate_en, u8 *new_rate);

	void (*cfo_init)(struct rtw_dev *rtwdev);

	void (*cfo_track)(struct rtw_dev *rtwdev);



	/* for coex */

	void (*coex_set_init)(struct rtw_dev *rtwdev);
@@ -1499,6 +1502,15 @@ struct rtw_iqk_info { 
	} result;

};



struct rtw_cfo_track {

	bool is_adjust;

	u8 crystal_cap;

	s32 cfo_tail[RTW_RF_PATH_MAX];

	s32 cfo_cnt[RTW_RF_PATH_MAX];

	u32 packet_count;

	u32 packet_count_pre;

};



#define RRSR_INIT_2G 0x15f

#define RRSR_INIT_5G 0x150
@@ -1552,6 +1564,7 @@ struct rtw_dm_info { 
	u8 dack_dck[RTW_RF_PATH_MAX][2][DACK_DCK_BACKUP_NUM];



	struct rtw_dpk_info dpk_info;

	struct rtw_cfo_track cfo_track;



	/* [bandwidth 0:20M/1:40M][number of path] */

	u8 cck_pd_lv[2][RTW_RF_PATH_MAX];

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

+66 −0
Original line number Diff line number Diff line
@@ -119,6 +119,14 @@ static void rtw_phy_cck_pd_init(struct rtw_dev *rtwdev) 
	dm_info->cck_fa_avg = CCK_FA_AVG_RESET;

}



static void rtw_phy_cfo_init(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;



	if (chip->ops->cfo_init)

		chip->ops->cfo_init(rtwdev);

}



void rtw_phy_init(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;
@@ -140,6 +148,7 @@ void rtw_phy_init(struct rtw_dev *rtwdev) 
	rtw_phy_cck_pd_init(rtwdev);



	dm_info->iqk.done = false;

	rtw_phy_cfo_init(rtwdev);

}

EXPORT_SYMBOL(rtw_phy_init);
@@ -528,6 +537,62 @@ static void rtw_phy_dpk_track(struct rtw_dev *rtwdev) 
		chip->ops->dpk_track(rtwdev);

}



struct rtw_rx_addr_match_data {

	struct rtw_dev *rtwdev;

	struct ieee80211_hdr *hdr;

	struct rtw_rx_pkt_stat *pkt_stat;

	u8 *bssid;

};



static void rtw_phy_parsing_cfo_iter(void *data, u8 *mac,

				     struct ieee80211_vif *vif)

{

	struct rtw_rx_addr_match_data *iter_data = data;

	struct rtw_dev *rtwdev = iter_data->rtwdev;

	struct rtw_rx_pkt_stat *pkt_stat = iter_data->pkt_stat;

	struct rtw_dm_info *dm_info = &rtwdev->dm_info;

	struct rtw_cfo_track *cfo = &dm_info->cfo_track;

	u8 *bssid = iter_data->bssid;

	u8 i;



	if (!ether_addr_equal(vif->bss_conf.bssid, bssid))

		return;



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

		cfo->cfo_tail[i] += pkt_stat->cfo_tail[i];

		cfo->cfo_cnt[i]++;

	}



	cfo->packet_count++;

}



void rtw_phy_parsing_cfo(struct rtw_dev *rtwdev,

			 struct rtw_rx_pkt_stat *pkt_stat)

{

	struct ieee80211_hdr *hdr = pkt_stat->hdr;

	struct rtw_rx_addr_match_data data = {};



	if (pkt_stat->crc_err || pkt_stat->icv_err || !pkt_stat->phy_status ||

	    ieee80211_is_ctl(hdr->frame_control))

		return;



	data.rtwdev = rtwdev;

	data.hdr = hdr;

	data.pkt_stat = pkt_stat;

	data.bssid = get_hdr_bssid(hdr);



	rtw_iterate_vifs_atomic(rtwdev, rtw_phy_parsing_cfo_iter, &data);

}

EXPORT_SYMBOL(rtw_phy_parsing_cfo);



static void rtw_phy_cfo_track(struct rtw_dev *rtwdev)

{

	struct rtw_chip_info *chip = rtwdev->chip;



	if (chip->ops->cfo_track)

		chip->ops->cfo_track(rtwdev);

}



#define CCK_PD_FA_LV1_MIN	1000

#define CCK_PD_FA_LV0_MAX	500
@@ -630,6 +695,7 @@ void rtw_phy_dynamic_mechanism(struct rtw_dev *rtwdev) 
	rtw_phy_dig(rtwdev);

	rtw_phy_cck_pd(rtwdev);

	rtw_phy_ra_track(rtwdev);

	rtw_phy_cfo_track(rtwdev);

	rtw_phy_dpk_track(rtwdev);

	rtw_phy_pwr_track(rtwdev);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ 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);

void rtw_phy_parsing_cfo(struct rtw_dev *rtwdev,

			 struct rtw_rx_pkt_stat *pkt_stat);



struct rtw_txpwr_lmt_cfg_pair {

	u8 regd;