Commit 056b239f authored by Guo-Feng Fan's avatar Guo-Feng Fan Committed by Kalle Valo
Browse files

rtw88: 8822c: Add gap-k calibration to improve long range performance 



gap-k is a calibration mechanism to eliminate power gaps between
two nearly rate groups.

This mechanism improves performance in long range test by applying
proper power value to those rate groups which have nonlinear power gap.

Signed-off-by: default avatarGuo-Feng Fan <vincent_fann@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/20210419003748.3224-3-pkshih@realtek.com
parent f98bf9ee

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

+12 −0
Original line number Diff line number Diff line
@@ -350,6 +350,18 @@ void rtw_fw_do_iqk(struct rtw_dev *rtwdev, struct rtw_iqk_para *para) 
}

EXPORT_SYMBOL(rtw_fw_do_iqk);



void rtw_fw_inform_rfk_status(struct rtw_dev *rtwdev, bool start)

{

	u8 h2c_pkt[H2C_PKT_SIZE] = {0};



	SET_H2C_CMD_ID_CLASS(h2c_pkt, H2C_CMD_WIFI_CALIBRATION);



	RFK_SET_INFORM_START(h2c_pkt, start);



	rtw_fw_send_h2c_command(rtwdev, h2c_pkt);

}

EXPORT_SYMBOL(rtw_fw_inform_rfk_status);



void rtw_fw_query_bt_info(struct rtw_dev *rtwdev)

{

	u8 h2c_pkt[H2C_PKT_SIZE] = {0};

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

+5 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id) 
#define H2C_CMD_WL_CH_INFO		0x66

#define H2C_CMD_QUERY_BT_MP_INFO	0x67

#define H2C_CMD_BT_WIFI_CONTROL		0x69

#define H2C_CMD_WIFI_CALIBRATION	0x6d



#define H2C_CMD_KEEP_ALIVE		0x03

#define H2C_CMD_DISCONNECT_DECISION	0x04
@@ -542,6 +543,9 @@ static inline void rtw_h2c_pkt_set_header(u8 *h2c_pkt, u8 sub_id) 
	le32_get_bits(*((__le32 *)(_header) + 0x01), GENMASK(31, 16))

#define GET_FW_DUMP_TLV_VAL(_header)					\

	le32_get_bits(*((__le32 *)(_header) + 0x02), GENMASK(31, 0))



#define RFK_SET_INFORM_START(h2c_pkt, value)				\

	le32p_replace_bits((__le32 *)(h2c_pkt) + 0x00, value, BIT(8))

static inline struct rtw_c2h_cmd *get_c2h_from_skb(struct sk_buff *skb)

{

	u32 pkt_offset;
@@ -557,6 +561,7 @@ void rtw_fw_send_general_info(struct rtw_dev *rtwdev); 
void rtw_fw_send_phydm_info(struct rtw_dev *rtwdev);



void rtw_fw_do_iqk(struct rtw_dev *rtwdev, struct rtw_iqk_para *para);

void rtw_fw_inform_rfk_status(struct rtw_dev *rtwdev, bool start);

void rtw_fw_set_pwr_mode(struct rtw_dev *rtwdev);

void rtw_fw_set_pg_info(struct rtw_dev *rtwdev);

void rtw_fw_query_bt_info(struct rtw_dev *rtwdev);

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

+23 −0
Original line number Diff line number Diff line
@@ -1502,6 +1502,27 @@ struct rtw_iqk_info { 
	} result;

};



enum rtw_rf_band {

	RF_BAND_2G_CCK,

	RF_BAND_2G_OFDM,

	RF_BAND_5G_L,

	RF_BAND_5G_M,

	RF_BAND_5G_H,

	RF_BAND_MAX

};



#define RF_GAIN_NUM 11

#define RF_HW_OFFSET_NUM 10



struct rtw_gapk_info {

	u32 rf3f_bp[RF_BAND_MAX][RF_GAIN_NUM][RTW_RF_PATH_MAX];

	bool txgapk_bp_done;

	s8 offset[RF_GAIN_NUM][RTW_RF_PATH_MAX];

	s8 fianl_offset[RF_GAIN_NUM][RTW_RF_PATH_MAX];

	u8 read_txgain;

	u8 channel;

};



struct rtw_cfo_track {

	bool is_adjust;

	u8 crystal_cap;
@@ -1583,6 +1604,8 @@ struct rtw_dm_info { 
	struct ewma_snr ewma_snr[RTW_SNR_NUM];



	struct rtw_iqk_info iqk;

	struct rtw_gapk_info gapk;

	bool is_bt_iqk_timeout;

};



struct rtw_efuse {

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

+8 −0
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ 
#define REG_MCU_TST_CFG		0x84

#define VAL_FW_TRIGGER		0x1



#define REG_PMC_DBG_CTRL1	0xa8

#define BITS_PMC_BT_IQK_STS	GENMASK(22, 21)



#define REG_EFUSE_ACCESS	0x00CF

#define EFUSE_ACCESS_ON		0x69

#define EFUSE_ACCESS_OFF	0x00
@@ -360,6 +363,7 @@ 
#define REG_TX_PTCL_CTRL	0x0520

#define BIT_SIFS_BK_EN		BIT(12)

#define REG_TXPAUSE		0x0522

#define BIT_AC_QUEUE		GENMASK(7, 0)

#define REG_RD_CTRL		0x0524

#define BIT_DIS_TXOP_CFE	BIT(10)

#define BIT_DIS_LSIG_CFE	BIT(9)
@@ -644,10 +648,13 @@ 
#define RF_WLSEL	0x02

#define RF_DTXLOK	0x08

#define RF_CFGCH	0x18

#define BIT_BAND	GENMASK(18, 16)

#define RF_RCK		0x1d

#define RF_LUTWA	0x33

#define RF_LUTWD1	0x3e

#define RF_LUTWD0	0x3f

#define BIT_GAIN_EXT	BIT(12)

#define BIT_DATA_L	GENMASK(11, 0)

#define RF_T_METER	0x42

#define RF_BSPAD	0x54

#define RF_GAINTX	0x56
@@ -664,6 +671,7 @@ 
#define RF_RCKD		0xde

#define RF_TXADBG	0xde

#define RF_LUTDBG	0xdf

#define BIT_TXA_TANK	BIT(4)

#define RF_LUTWE2	0xee

#define RF_LUTWE	0xef

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

+697 −0

File changed.

Preview size limit exceeded, changes collapsed.