Commit c7845551 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtw89: 8852c: phy: configure TSSI bandedge 



TSSI is used to manage TX power with thermal value as a factor. This patch
is to configure bandedge to TX proper waveform.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220414062027.62638-5-pkshih@realtek.com
parent c6badab2

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

+1 −0
Original line number Diff line number Diff line
@@ -2380,6 +2380,7 @@ struct rtw89_chip_info { 
	const struct rtw89_phy_table *nctl_table;

	const struct rtw89_txpwr_table *byr_table;

	const struct rtw89_phy_dig_gain_table *dig_table;

	const struct rtw89_phy_tssi_dbw_table *tssi_dbw_table;

	const s8 (*txpwr_lmt_2g)[RTW89_2G_BW_NUM][RTW89_NTX_NUM]

				[RTW89_RS_LMT_NUM][RTW89_BF_NUM]

				[RTW89_REGD_NUM][RTW89_2G_CH_NUM];

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

+106 −0
Original line number Diff line number Diff line
@@ -3420,3 +3420,109 @@ rtw89_rfk_parser(struct rtw89_dev *rtwdev, const struct rtw89_rfk_tbl *tbl) 
		_rfk_handler[p->flag](rtwdev, p);

}

EXPORT_SYMBOL(rtw89_rfk_parser);



#define RTW89_TSSI_FAST_MODE_NUM 4



static const struct rtw89_reg_def rtw89_tssi_fastmode_regs_flat[RTW89_TSSI_FAST_MODE_NUM] = {

	{0xD934, 0xff0000},

	{0xD934, 0xff000000},

	{0xD938, 0xff},

	{0xD934, 0xff00},

};



static const struct rtw89_reg_def rtw89_tssi_fastmode_regs_level[RTW89_TSSI_FAST_MODE_NUM] = {

	{0xD930, 0xff0000},

	{0xD930, 0xff000000},

	{0xD934, 0xff},

	{0xD930, 0xff00},

};



static

void rtw89_phy_tssi_ctrl_set_fast_mode_cfg(struct rtw89_dev *rtwdev,

					   enum rtw89_mac_idx mac_idx,

					   enum rtw89_tssi_bandedge_cfg bandedge_cfg,

					   u32 val)

{

	const struct rtw89_reg_def *regs;

	u32 reg;

	int i;



	if (bandedge_cfg == RTW89_TSSI_BANDEDGE_FLAT)

		regs = rtw89_tssi_fastmode_regs_flat;

	else

		regs = rtw89_tssi_fastmode_regs_level;



	for (i = 0; i < RTW89_TSSI_FAST_MODE_NUM; i++) {

		reg = rtw89_mac_reg_by_idx(regs[i].addr, mac_idx);

		rtw89_write32_mask(rtwdev, reg, regs[i].mask, val);

	}

}



static const struct rtw89_reg_def rtw89_tssi_bandedge_regs_flat[RTW89_TSSI_SBW_NUM] = {

	{0xD91C, 0xff000000},

	{0xD920, 0xff},

	{0xD920, 0xff00},

	{0xD920, 0xff0000},

	{0xD920, 0xff000000},

	{0xD924, 0xff},

	{0xD924, 0xff00},

	{0xD914, 0xff000000},

	{0xD918, 0xff},

	{0xD918, 0xff00},

	{0xD918, 0xff0000},

	{0xD918, 0xff000000},

	{0xD91C, 0xff},

	{0xD91C, 0xff00},

	{0xD91C, 0xff0000},

};



static const struct rtw89_reg_def rtw89_tssi_bandedge_regs_level[RTW89_TSSI_SBW_NUM] = {

	{0xD910, 0xff},

	{0xD910, 0xff00},

	{0xD910, 0xff0000},

	{0xD910, 0xff000000},

	{0xD914, 0xff},

	{0xD914, 0xff00},

	{0xD914, 0xff0000},

	{0xD908, 0xff},

	{0xD908, 0xff00},

	{0xD908, 0xff0000},

	{0xD908, 0xff000000},

	{0xD90C, 0xff},

	{0xD90C, 0xff00},

	{0xD90C, 0xff0000},

	{0xD90C, 0xff000000},

};



void rtw89_phy_tssi_ctrl_set_bandedge_cfg(struct rtw89_dev *rtwdev,

					  enum rtw89_mac_idx mac_idx,

					  enum rtw89_tssi_bandedge_cfg bandedge_cfg)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;

	const struct rtw89_reg_def *regs;

	const u32 *data;

	u32 reg;

	int i;



	if (bandedge_cfg >= RTW89_TSSI_CFG_NUM)

		return;



	if (bandedge_cfg == RTW89_TSSI_BANDEDGE_FLAT)

		regs = rtw89_tssi_bandedge_regs_flat;

	else

		regs = rtw89_tssi_bandedge_regs_level;



	data = chip->tssi_dbw_table->data[bandedge_cfg];



	for (i = 0; i < RTW89_TSSI_SBW_NUM; i++) {

		reg = rtw89_mac_reg_by_idx(regs[i].addr, mac_idx);

		rtw89_write32_mask(rtwdev, reg, regs[i].mask, data[i]);

	}



	reg = rtw89_mac_reg_by_idx(R_AX_BANDEDGE_CFG, mac_idx);

	rtw89_write32_mask(rtwdev, reg, B_AX_BANDEDGE_CFG_IDX_MASK, bandedge_cfg);



	rtw89_phy_tssi_ctrl_set_fast_mode_cfg(rtwdev, mac_idx, bandedge_cfg,

					      data[RTW89_TSSI_SBW20]);

}

EXPORT_SYMBOL(rtw89_phy_tssi_ctrl_set_bandedge_cfg);

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

+36 −0
Original line number Diff line number Diff line
@@ -221,6 +221,35 @@ enum rtw89_dig_gain_tia_idx { 
	RTW89_DIG_GAIN_TIA_IDX1 = 1

};



enum rtw89_tssi_bandedge_cfg {

	RTW89_TSSI_BANDEDGE_FLAT,

	RTW89_TSSI_BANDEDGE_LOW,

	RTW89_TSSI_BANDEDGE_MID,

	RTW89_TSSI_BANDEDGE_HIGH,



	RTW89_TSSI_CFG_NUM,

};



enum rtw89_tssi_sbw_idx {

	RTW89_TSSI_SBW20,

	RTW89_TSSI_SBW40_0,

	RTW89_TSSI_SBW40_1,

	RTW89_TSSI_SBW80_0,

	RTW89_TSSI_SBW80_1,

	RTW89_TSSI_SBW80_2,

	RTW89_TSSI_SBW80_3,

	RTW89_TSSI_SBW160_0,

	RTW89_TSSI_SBW160_1,

	RTW89_TSSI_SBW160_2,

	RTW89_TSSI_SBW160_3,

	RTW89_TSSI_SBW160_4,

	RTW89_TSSI_SBW160_5,

	RTW89_TSSI_SBW160_6,

	RTW89_TSSI_SBW160_7,



	RTW89_TSSI_SBW_NUM,

};



struct rtw89_txpwr_byrate_cfg {

	enum rtw89_band band;

	enum rtw89_nss nss;
@@ -263,6 +292,10 @@ struct rtw89_phy_dig_gain_table { 
	const struct rtw89_phy_dig_gain_cfg *cfg_tia_a;

};



struct rtw89_phy_tssi_dbw_table {

	u32 data[RTW89_TSSI_CFG_NUM][RTW89_TSSI_SBW_NUM];

};



struct rtw89_phy_reg3_tbl {

	const struct rtw89_reg3_def *reg3;

	int size;
@@ -446,5 +479,8 @@ void rtw89_phy_set_phy_regs(struct rtw89_dev *rtwdev, u32 addr, u32 mask, 
void rtw89_phy_dig_reset(struct rtw89_dev *rtwdev);

void rtw89_phy_dig(struct rtw89_dev *rtwdev);

void rtw89_phy_set_bss_color(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif);

void rtw89_phy_tssi_ctrl_set_bandedge_cfg(struct rtw89_dev *rtwdev,

					  enum rtw89_mac_idx mac_idx,

					  enum rtw89_tssi_bandedge_cfg bandedge_cfg);



#endif

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

+5 −0
Original line number Diff line number Diff line
@@ -2958,6 +2958,11 @@ 
#define R_AX_PWR_MACID_LMT_TABLE0 0xD36C

#define R_AX_PWR_MACID_LMT_TABLE127 0xD568



#define R_AX_TSSI_CTRL_HEAD 0xD908

#define R_AX_BANDEDGE_CFG 0xD94C

#define B_AX_BANDEDGE_CFG_IDX_MASK GENMASK(31, 30)

#define R_AX_TSSI_CTRL_TAIL 0xD95C



#define R_AX_TXPWR_IMR 0xD9E0

#define R_AX_TXPWR_IMR_C1 0xF9E0

#define R_AX_TXPWR_ISR 0xD9E4

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

+1 −0
Original line number Diff line number Diff line
@@ -2113,6 +2113,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { 
	.txpwr_factor_rf	= 2,

	.txpwr_factor_mac	= 1,

	.dig_table		= &rtw89_8852a_phy_dig_table,

	.tssi_dbw_table		= NULL,

	.support_bands		= BIT(NL80211_BAND_2GHZ) |

				  BIT(NL80211_BAND_5GHZ),

	.support_bw160		= false,