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

wifi: rtw89: 8851b: add NCTL post table 



NCTL (nano-controller) is used to assist RF calibration that sends
commands to NCTL so it can reduce IO from driver. 8851B needs additional
settings, so add a table to do things.

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/20230421024551.29994-4-pkshih@realtek.com
parent 99ff8da5

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

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

	const struct rtw89_phy_table *rf_table[RF_PATH_MAX];

	const struct rtw89_phy_table *nctl_table;

	const struct rtw89_rfk_tbl *nctl_post_table;

	const struct rtw89_txpwr_table *byr_table;

	const struct rtw89_phy_dig_gain_table *dig_table;

	const struct rtw89_dig_regs *dig_regs;

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

+5 −1
Original line number Diff line number Diff line
@@ -1401,6 +1401,7 @@ static void rtw89_phy_init_rf_nctl(struct rtw89_dev *rtwdev) 
	rtw89_phy_write32_set(rtwdev, R_IOQ_IQK_DPK, 0x3);

	rtw89_phy_write32_set(rtwdev, R_GNT_BT_WGT_EN, 0x1);

	rtw89_phy_write32_set(rtwdev, R_P0_PATH_RST, 0x8000000);

	if (chip->chip_id != RTL8851B)

		rtw89_phy_write32_set(rtwdev, R_P1_PATH_RST, 0x8000000);

	if (chip->chip_id == RTL8852B)

		rtw89_phy_write32_set(rtwdev, R_IOQ_IQK_DPK, 0x2);
@@ -1415,6 +1416,9 @@ static void rtw89_phy_init_rf_nctl(struct rtw89_dev *rtwdev) 


	nctl_table = chip->nctl_table;

	rtw89_phy_init_reg(rtwdev, nctl_table, rtw89_phy_config_bb_reg, NULL);



	if (chip->nctl_post_table)

		rtw89_rfk_parser(rtwdev, chip->nctl_post_table);

}



static u32 rtw89_phy0_phy1_offset(struct rtw89_dev *rtwdev, u32 addr)

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

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include "phy.h"

#include "reg.h"

#include "rtw8851b.h"

#include "rtw8851b_rfk_table.h"

#include "rtw8851b_table.h"

#include "txrx.h"

#include "util.h"
@@ -44,6 +45,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { 
	.bb_gain_table		= &rtw89_8851b_phy_bb_gain_table,

	.rf_table		= {&rtw89_8851b_phy_radioa_table,},

	.nctl_table		= &rtw89_8851b_phy_nctl_table,

	.nctl_post_table	= &rtw8851b_nctl_post_defs_tbl,

	.byr_table		= &rtw89_8851b_byr_table,

	.dflt_parms		= &rtw89_8851b_dflt_parms,

	.rfe_parms_conf		= rtw89_8851b_rfe_parms_conf,

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

+1 −0
Original line number Diff line number Diff line
@@ -2085,6 +2085,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { 
	.rf_table		= {&rtw89_8852a_phy_radioa_table,

				   &rtw89_8852a_phy_radiob_table,},

	.nctl_table		= &rtw89_8852a_phy_nctl_table,

	.nctl_post_table	= NULL,

	.byr_table		= &rtw89_8852a_byr_table,

	.dflt_parms		= &rtw89_8852a_dflt_parms,

	.rfe_parms_conf		= NULL,

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

+1 −0
Original line number Diff line number Diff line
@@ -2522,6 +2522,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { 
	.rf_table		= {&rtw89_8852b_phy_radioa_table,

				   &rtw89_8852b_phy_radiob_table,},

	.nctl_table		= &rtw89_8852b_phy_nctl_table,

	.nctl_post_table	= NULL,

	.byr_table		= &rtw89_8852b_byr_table,

	.dflt_parms		= &rtw89_8852b_dflt_parms,

	.rfe_parms_conf		= NULL,