wifi: rtw89: update/add PHY settings for WiFi 7 chips
Ping-Ke Shih
maintainercover wifi: rtw89: update/add PHY settings for WiFi 7 chips
Add many PHY stuffs to support coming WiFi 7 chips: Add to parse parameters of RX gain from firmware file, and then set these values to registers according to specified channel. Update registers and logic to share DIG flow with WiFi 7. Set TX power registers called BB wrapper because these registers are used by BB but resides in MAC register domain. WiFi 7 chips have additional settings of channel info to get desired reports.
A set of NCTL pre-settings ops is introduced to configure conditional settings before loading parameters from firmware file. Parameters could contain a special value (0xbabecafe) as a dummy, so exclude it accordingly.
Cheng-Chieh Hsieh (1):
wifi: rtw89: 8922a: update the register used in DIG and the DIG flow
Chung-Hsuan Hung (2):
wifi: rtw89: phy: add parser to support RX gain dynamic setting flow
wifi: rtw89: 8922a: set RX gain along with set_channel operation
Ping-Ke Shih (5):
wifi: rtw89: phy: move bb_gain_info used by WiFi 6 chips to union
wifi: rtw89: phy: ignore special data from BB parameter file
wifi: rtw89: 8922a: add NCTL pre-settings for WiFi 7 chips
wifi: rtw89: phy: add BB wrapper of TX power for WiFi 7 chips
wifi: rtw89: phy: set channel_info for WiFi 7 chips
drivers/net/wireless/realtek/rtw89/core.h | 69 +++- drivers/net/wireless/realtek/rtw89/phy.c | 45 ++- drivers/net/wireless/realtek/rtw89/phy.h | 62 ++++ drivers/net/wireless/realtek/rtw89/phy_be.c | 312 ++++++++++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 79 +++++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 4 +- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 4 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 209 ++++++++++++ 9 files changed, 767 insertions(+), 19 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/8 wifi: rtw89: phy: move bb_gain_info used by WiFi 6 chips to union
WiFi 7 chips use different bb_gain_info struct, so move existing struct to a union in advance. This doesn't change logic at all.
--- drivers/net/wireless/realtek/rtw89/core.h | 4 +++- drivers/net/wireless/realtek/rtw89/phy.c | 8 ++++---- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 4 ++-- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 4 ++-- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +3 -1
@@ -4824,7 +4824,9 @@ struct rtw89_dev {struct rtw89_env_monitor_info env_monitor;struct rtw89_dig_info dig;struct rtw89_phy_ch_info ch_info; -struct rtw89_phy_bb_gain_info bb_gain; +union { +struct rtw89_phy_bb_gain_info ax; + } bb_gain;struct rtw89_phy_efuse_gain efuse_gain;struct rtw89_phy_ul_tb_info ul_tb_info;struct rtw89_antdiv_info antdiv;
drivers/net/wireless/realtek/rtw89/phy.c +4 -4
@@ -929,7 +929,7 @@ static void rtw89_phy_cfg_bb_gain_error(struct rtw89_dev *rtwdev, union rtw89_phy_bb_gain_arg arg, u32 data) { - struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain; + struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;u8 type = arg.type;u8 path = arg.path;u8 gband = arg.gain_band;
@@ -968,7 +968,7 @@ static void rtw89_phy_cfg_bb_rpl_ofst(struct rtw89_dev *rtwdev, union rtw89_phy_bb_gain_arg arg, u32 data) { - struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain; + struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;u8 rxsc_start = arg.rxsc_start;u8 bw = arg.bw;u8 path = arg.path;
@@ -1050,7 +1050,7 @@ static void rtw89_phy_cfg_bb_gain_bypass(struct rtw89_dev *rtwdev, union rtw89_phy_bb_gain_arg arg, u32 data) { - struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain; + struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;u8 type = arg.type;u8 path = arg.path;u8 gband = arg.gain_band;
@@ -1077,7 +1077,7 @@ static void rtw89_phy_cfg_bb_gain_op1db(struct rtw89_dev *rtwdev, union rtw89_phy_bb_gain_arg arg, u32 data) { - struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain; + struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;u8 type = arg.type;u8 path = arg.path;u8 gband = arg.gain_band;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +2 -2
@@ -901,7 +901,7 @@ static void rtw8851b_set_gain_error(struct rtw89_dev *rtwdev, enum rtw89_subband subband, enum rtw89_rf_path path) { -const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain; +const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;u8 gain_band =rtw89_subband_to_bb_gain_band (subband);s32 val;u32 reg;
@@ -987,7 +987,7 @@ static void rtw8851b_set_gain_offset(struct rtw89_dev *rtwdev,static void rtw8851b_set_rxsc_rpl_comp (struct rtw89_dev *rtwdev,enum rtw89_subband subband) { -const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain; +const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;u8 band =rtw89_subband_to_bb_gain_band (subband);u32 val;
drivers/net/wireless/realtek/rtw89/rtw8852b.c +2 -2
@@ -988,7 +988,7 @@ static void rtw8852b_set_gain_error(struct rtw89_dev *rtwdev, enum rtw89_subband subband, enum rtw89_rf_path path) { -const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain; +const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;u8 gain_band =rtw89_subband_to_bb_gain_band (subband);s32 val;u32 reg;
@@ -1086,7 +1086,7 @@ static void rtw8852b_set_gain_offset(struct rtw89_dev *rtwdev,static void rtw8852b_set_rxsc_rpl_comp (struct rtw89_dev *rtwdev,enum rtw89_subband subband) { -const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain; +const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;u8 band =rtw89_subband_to_bb_gain_band (subband);u32 val;
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -1
@@ -842,7 +842,7 @@ static void rtw8852c_set_gain_error(struct rtw89_dev *rtwdev, enum rtw89_subband subband, enum rtw89_rf_path path) { -const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain; +const struct rtw89_phy_bb_gain_info *gain = &rtwdev->bb_gain.ax;u8 gain_band =rtw89_subband_to_bb_gain_band (subband);s32 val;u32 reg;
Signature · 1 line
2.25.1
Re: [PATCH 1/8] wifi: rtw89: phy: move bb_gain_info used by WiFi 6 chips to union
Quoted 4 lines · Ping-Ke Shih
WiFi 7 chips use different
bb_gain_infostruct, so move existing struct to a union in advance. This doesn't change logic at all.Signed-off-by Ping-Ke Shih <[email protected]>
8 patches applied to wireless-next.git, thanks.
9225b9734670 wifi: rtw89: phy: move bb_gain_info used by WiFi 6 chips to union 0edcdd82337a wifi: rtw89: phy: add parser to support RX gain dynamic setting flow cac432a08537 wifi: rtw89: 8922a: set RX gain along with set_channel operation d16f34b084d9 wifi: rtw89: 8922a: update the register used in DIG and the DIG flow 0377e2a77201 wifi: rtw89: phy: ignore special data from BB parameter file c207e14d9328 wifi: rtw89: 8922a: add NCTL pre-settings for WiFi 7 chips ce84ecbdc168 wifi: rtw89: phy: add BB wrapper of TX power for WiFi 7 chips 6bd232192261 wifi: rtw89: phy: set channel_info for WiFi 7 chips
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH 2/8 wifi: rtw89: phy: add parser to support RX gain dynamic setting flow
In reply to Ping-Ke ShihFrom: Chung-Hsuan Hung <[email protected]>
Add RX gain offset dynamic setting flow according to different bands and bandwidths. RX gain offset values will be different according to different channel bands, therefore, this dynamic mechanism is needed while channel is changed. Add this to parse data from the element of firmware file, and then we can use them easier at runtime.
--- drivers/net/wireless/realtek/rtw89/core.h | 64 +++++++ drivers/net/wireless/realtek/rtw89/phy.c | 11 +- drivers/net/wireless/realtek/rtw89/phy.h | 36 ++++ drivers/net/wireless/realtek/rtw89/phy_be.c | 175 ++++++++++++++++++++ 4 files changed, 281 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +64 -0
@@ -4605,6 +4605,48 @@ enum rtw89_phy_bb_gain_band { RTW89_BB_GAIN_BAND_NR, }; +enum rtw89_phy_gain_band_be { +RTW89_BB_GAIN_BAND_2G_BE =0 , +RTW89_BB_GAIN_BAND_5G_L_BE =1 , +RTW89_BB_GAIN_BAND_5G_M_BE =2 , +RTW89_BB_GAIN_BAND_5G_H_BE =3 , +RTW89_BB_GAIN_BAND_6G_L0_BE =4 , +RTW89_BB_GAIN_BAND_6G_L1_BE =5 , +RTW89_BB_GAIN_BAND_6G_M0_BE =6 , +RTW89_BB_GAIN_BAND_6G_M1_BE =7 , +RTW89_BB_GAIN_BAND_6G_H0_BE =8 , +RTW89_BB_GAIN_BAND_6G_H1_BE =9 , +RTW89_BB_GAIN_BAND_6G_UH0_BE =10 , +RTW89_BB_GAIN_BAND_6G_UH1_BE =11 , + +RTW89_BB_GAIN_BAND_NR_BE , +}; + +enum rtw89_phy_bb_bw_be { +RTW89_BB_BW_20_40 =0 , +RTW89_BB_BW_80_160_320 =1 , + +RTW89_BB_BW_NR_BE , +}; + +enum rtw89_bw20_sc { +RTW89_BW20_SC_20M =1 , +RTW89_BW20_SC_40M =2 , +RTW89_BW20_SC_80M =4 , +RTW89_BW20_SC_160M =8 , +RTW89_BW20_SC_320M =16 , +}; + +enum rtw89_cmac_table_bw { +RTW89_CMAC_BW_20M =0 , +RTW89_CMAC_BW_40M =1 , +RTW89_CMAC_BW_80M =2 , +RTW89_CMAC_BW_160M =3 , +RTW89_CMAC_BW_320M =4 , + +RTW89_CMAC_BW_NR , +}; +enum rtw89_phy_bb_rxsc_num {RTW89_BB_RXSC_NUM_40 =9 ,/* SC: 0, 1~8 */ RTW89_BB_RXSC_NUM_80 =13 ,/* SC: 0, 1~8, 9~12 */
@@ -4627,6 +4669,27 @@ struct rtw89_phy_bb_gain_info { [RTW89_BB_RXSC_NUM_160 ]; }; +struct rtw89_phy_bb_gain_info_be { +s8 lna_gain[RTW89_BB_GAIN_BAND_NR_BE ][RTW89_BB_BW_NR_BE ][RF_PATH_MAX ] + [LNA_GAIN_NUM ]; +s8 tia_gain[RTW89_BB_GAIN_BAND_NR_BE ][RTW89_BB_BW_NR_BE ][RF_PATH_MAX ] + [TIA_GAIN_NUM ]; +s8 lna_gain_bypass[RTW89_BB_GAIN_BAND_NR_BE ][RTW89_BB_BW_NR_BE ] + [RF_PATH_MAX ][LNA_GAIN_NUM ]; +s8 lna_op1db[RTW89_BB_GAIN_BAND_NR_BE ][RTW89_BB_BW_NR_BE ] + [RF_PATH_MAX ][LNA_GAIN_NUM ]; +s8 tia_lna_op1db[RTW89_BB_GAIN_BAND_NR_BE ][RTW89_BB_BW_NR_BE ] + [RF_PATH_MAX ][LNA_GAIN_NUM +1 ]; +s8 rpl_ofst_20[RTW89_BB_GAIN_BAND_NR_BE ][RF_PATH_MAX ] + [RTW89_BW20_SC_20M ]; +s8 rpl_ofst_40[RTW89_BB_GAIN_BAND_NR_BE ][RF_PATH_MAX ] + [RTW89_BW20_SC_40M ]; +s8 rpl_ofst_80[RTW89_BB_GAIN_BAND_NR_BE ][RF_PATH_MAX ] + [RTW89_BW20_SC_80M ]; +s8 rpl_ofst_160[RTW89_BB_GAIN_BAND_NR_BE ][RF_PATH_MAX ] + [RTW89_BW20_SC_160M ]; +}; +struct rtw89_phy_efuse_gain {bool offset_valid;bool comp_valid;
@@ -4826,6 +4889,7 @@ struct rtw89_dev {struct rtw89_phy_ch_info ch_info;union {struct rtw89_phy_bb_gain_info ax; +struct rtw89_phy_bb_gain_info_be be; } bb_gain;struct rtw89_phy_efuse_gain efuse_gain;struct rtw89_phy_ul_tb_info ul_tb_info;
drivers/net/wireless/realtek/rtw89/phy.c +6 -5
@@ -1108,10 +1108,10 @@ rtw89_phy_cfg_bb_gain_op1db(struct rtw89_dev *rtwdev, } } -static void rtw89_phy_config_bb_gain (struct rtw89_dev *rtwdev, -const struct rtw89_reg2_def *reg, -enum rtw89_rf_path rf_path, -void *extra_data) +static void rtw89_phy_config_bb_gain_ax (struct rtw89_dev *rtwdev, +const struct rtw89_reg2_def *reg, +enum rtw89_rf_path rf_path, +void *extra_data) {const struct rtw89_chip_info *chip = rtwdev->chip;union rtw89_phy_bb_gain_arg arg = { .addr = reg->addr };
@@ -1425,7 +1425,7 @@ void rtw89_phy_init_bb_reg(struct rtw89_dev *rtwdev) bb_gain_table = elm_info->bb_gain ? elm_info->bb_gain : chip->bb_gain_table;if (bb_gain_table)rtw89_phy_init_reg (rtwdev, bb_gain_table, - rtw89_phy_config_bb_gain,NULL ); + chip->phy_def->config_bb_gain,NULL );rtw89_phy_bb_reset (rtwdev,RTW89_PHY_0 ); }
@@ -5476,6 +5476,7 @@ const struct rtw89_phy_gen_def rtw89_phy_gen_ax = { .ccx = &rtw89_ccx_regs_ax, .physts = &rtw89_physts_regs_ax, .cfo = &rtw89_cfo_regs_ax, + .config_bb_gain = rtw89_phy_config_bb_gain_ax, .set_txpwr_byrate = rtw89_phy_set_txpwr_byrate_ax, .set_txpwr_offset = rtw89_phy_set_txpwr_offset_ax,
drivers/net/wireless/realtek/rtw89/phy.h +36 -0
@@ -509,6 +509,10 @@ struct rtw89_phy_gen_def {const struct rtw89_ccx_regs *ccx;const struct rtw89_physts_regs *physts;const struct rtw89_cfo_regs *cfo; +void (*config_bb_gain)(struct rtw89_dev *rtwdev, +const struct rtw89_reg2_def *reg, +enum rtw89_rf_path rf_path, +void *extra_data); void (*set_txpwr_byrate)(struct rtw89_dev *rtwdev, const struct rtw89_chan *chan,
@@ -664,6 +668,38 @@ enum rtw89_phy_bb_gain_band rtw89_subband_to_bb_gain_band(enum rtw89_subband sub } } +static inline +enum rtw89_phy_gain_band_be rtw89_subband_to_gain_band_be (enum rtw89_subband subband) +{ +switch (subband) { +default : +case RTW89_CH_2G : +return RTW89_BB_GAIN_BAND_2G_BE ; +case RTW89_CH_5G_BAND_1 : +return RTW89_BB_GAIN_BAND_5G_L_BE ; +case RTW89_CH_5G_BAND_3 : +return RTW89_BB_GAIN_BAND_5G_M_BE ; +case RTW89_CH_5G_BAND_4 : +return RTW89_BB_GAIN_BAND_5G_H_BE ; +case RTW89_CH_6G_BAND_IDX0 : +return RTW89_BB_GAIN_BAND_6G_L0_BE ; +case RTW89_CH_6G_BAND_IDX1 : +return RTW89_BB_GAIN_BAND_6G_L1_BE ; +case RTW89_CH_6G_BAND_IDX2 : +return RTW89_BB_GAIN_BAND_6G_M0_BE ; +case RTW89_CH_6G_BAND_IDX3 : +return RTW89_BB_GAIN_BAND_6G_M1_BE ; +case RTW89_CH_6G_BAND_IDX4 : +return RTW89_BB_GAIN_BAND_6G_H0_BE ; +case RTW89_CH_6G_BAND_IDX5 : +return RTW89_BB_GAIN_BAND_6G_H1_BE ; +case RTW89_CH_6G_BAND_IDX6 : +return RTW89_BB_GAIN_BAND_6G_UH0_BE ; +case RTW89_CH_6G_BAND_IDX7 : +return RTW89_BB_GAIN_BAND_6G_UH1_BE ; + } +} +enum rtw89_rfk_flag {RTW89_RFK_F_WRF =0 ,RTW89_RFK_F_WM =1 ,
drivers/net/wireless/realtek/rtw89/phy_be.c +175 -0
187 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/8 wifi: rtw89: 8922a: set RX gain along with set_channel operation
In reply to Ping-Ke ShihFrom: Chung-Hsuan Hung <[email protected]>
Set values of LNA, TIA and RPL gain compensation read from firmware file when channel is changed.
--- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 184 ++++++++++++++++++ 1 file changed, 184 insertions(+)
drivers/net/wireless/realtek/rtw89/rtw8922a.c +184 -0
@@ -600,6 +600,189 @@ static int rtw8922a_read_phycap(struct rtw89_dev *rtwdev, u8 *phycap_map)return 0 ; } +struct rtw8922a_bb_gain { +u32 gain_g[BB_PATH_NUM_8922A ]; +u32 gain_a[BB_PATH_NUM_8922A ]; +u32 gain_g_mask; +u32 gain_a_mask; +}; + +static const struct rtw89_reg_def rpl_comp_bw160[RTW89_BW20_SC_160M ] = { + { .addr =0x41E8 , .mask =0xFF00 }, + { .addr =0x41E8 , .mask =0xFF0000 }, + { .addr =0x41E8 , .mask =0xFF000000 }, + { .addr =0x41EC , .mask =0xFF }, + { .addr =0x41EC , .mask =0xFF00 }, + { .addr =0x41EC , .mask =0xFF0000 }, + { .addr =0x41EC , .mask =0xFF000000 }, + { .addr =0x41F0 , .mask =0xFF } +}; + +static const struct rtw89_reg_def rpl_comp_bw80[RTW89_BW20_SC_80M ] = { + { .addr =0x41F4 , .mask =0xFF }, + { .addr =0x41F4 , .mask =0xFF00 }, + { .addr =0x41F4 , .mask =0xFF0000 }, + { .addr =0x41F4 , .mask =0xFF000000 } +}; + +static const struct rtw89_reg_def rpl_comp_bw40[RTW89_BW20_SC_40M ] = { + { .addr =0x41F0 , .mask =0xFF0000 }, + { .addr =0x41F0 , .mask =0xFF000000 } +}; + +static const struct rtw89_reg_def rpl_comp_bw20[RTW89_BW20_SC_20M ] = { + { .addr =0x41F0 , .mask =0xFF00 } +}; + +static const struct rtw8922a_bb_gain bb_gain_lna[LNA_GAIN_NUM ] = { + { .gain_g = {0x409c ,0x449c }, .gain_a = {0x406C ,0x446C }, + .gain_g_mask =0xFF00 , .gain_a_mask =0xFF }, + { .gain_g = {0x409c ,0x449c }, .gain_a = {0x406C ,0x446C }, + .gain_g_mask =0xFF000000 , .gain_a_mask =0xFF0000 }, + { .gain_g = {0x40a0 ,0x44a0 }, .gain_a = {0x4070 ,0x4470 }, + .gain_g_mask =0xFF00 , .gain_a_mask =0xFF }, + { .gain_g = {0x40a0 ,0x44a0 }, .gain_a = {0x4070 ,0x4470 }, + .gain_g_mask =0xFF000000 , .gain_a_mask =0xFF0000 }, + { .gain_g = {0x40a4 ,0x44a4 }, .gain_a = {0x4074 ,0x4474 }, + .gain_g_mask =0xFF00 , .gain_a_mask =0xFF }, + { .gain_g = {0x40a4 ,0x44a4 }, .gain_a = {0x4074 ,0x4474 }, + .gain_g_mask =0xFF000000 , .gain_a_mask =0xFF0000 }, + { .gain_g = {0x40a8 ,0x44a8 }, .gain_a = {0x4078 ,0x4478 }, + .gain_g_mask =0xFF00 , .gain_a_mask =0xFF }, +}; + +static const struct rtw8922a_bb_gain bb_gain_tia[TIA_GAIN_NUM ] = { + { .gain_g = {0x4054 ,0x4454 }, .gain_a = {0x4054 ,0x4454 }, + .gain_g_mask =0x7FC0000 , .gain_a_mask =0x1FF }, + { .gain_g = {0x4058 ,0x4458 }, .gain_a = {0x4054 ,0x4454 }, + .gain_g_mask =0x1FF , .gain_a_mask =0x3FE00 }, +}; + +struct rtw8922a_bb_gain_bypass { +u32 gain_g[BB_PATH_NUM_8922A ]; +u32 gain_a[BB_PATH_NUM_8922A ]; +u32 gain_mask_g; +u32 gain_mask_a; +}; + +static void rtw8922a_set_rpl_gain (struct rtw89_dev *rtwdev, +const struct rtw89_chan *chan, +enum rtw89_rf_path path, +enum rtw89_phy_idx phy_idx) +{ +const struct rtw89_phy_bb_gain_info_be *gain = &rtwdev->bb_gain.be; +u8 gain_band =rtw89_subband_to_gain_band_be (chan->subband_type); +u32 reg_path_ofst =0 ; +u32 mask; +s32 val; +u32 reg; +int i; + +if (path ==RF_PATH_B ) + reg_path_ofst =0x400 ; + +for (i =0 ; i <RTW89_BW20_SC_160M ; i++) { + reg = rpl_comp_bw160[i].addr | reg_path_ofst; + mask = rpl_comp_bw160[i].mask; + val = gain->rpl_ofst_160[gain_band][path][i]; +rtw89_phy_write32_idx (rtwdev, reg, mask, val, phy_idx); + } + +for (i =0 ; i <RTW89_BW20_SC_80M ; i++) { + reg = rpl_comp_bw80[i].addr | reg_path_ofst; + mask = rpl_comp_bw80[i].mask; + val = gain->rpl_ofst_80[gain_band][path][i]; +rtw89_phy_write32_idx (rtwdev, reg, mask, val, phy_idx); + } + +for (i =0 ; i <RTW89_BW20_SC_40M ; i++) { + reg = rpl_comp_bw40[i].addr | reg_path_ofst; + mask = rpl_comp_bw40[i].mask; + val = gain->rpl_ofst_40[gain_band][path][i]; +rtw89_phy_write32_idx (rtwdev, reg, mask, val, phy_idx); + } + +for (i =0 ; i <RTW89_BW20_SC_20M ; i++) { + reg = rpl_comp_bw20[i].addr | reg_path_ofst; + mask = rpl_comp_bw20[i].mask; + val = gain->rpl_ofst_20[gain_band][path][i]; +rtw89_phy_write32_idx (rtwdev, reg, mask, val, phy_idx); + } +} + +static void rtw8922a_set_lna_tia_gain (struct rtw89_dev *rtwdev, +const struct rtw89_chan *chan, +enum rtw89_rf_path path, +enum rtw89_phy_idx phy_idx) +{ +const struct rtw89_phy_bb_gain_info_be *gain = &rtwdev->bb_gain.be; +u8 gain_band =rtw89_subband_to_gain_band_be (chan->subband_type); +enum rtw89_phy_bb_bw_be bw_type; +s32 val; +u32 reg; +u32 mask; +int i; + + bw_type = chan->band_width <=RTW89_CHANNEL_WIDTH_40 ? +RTW89_BB_BW_20_40 :RTW89_BB_BW_80_160_320 ; + +for (i =0 ; i <LNA_GAIN_NUM ; i++) { +if (chan->band_type ==RTW89_BAND_2G ) { + reg = bb_gain_lna[i].gain_g[path]; + mask = bb_gain_lna[i].gain_g_mask; + }else { + reg = bb_gain_lna[i].gain_a[path]; + mask = bb_gain_lna[i].gain_a_mask; + } + val = gain->lna_gain[gain_band][bw_type][path][i]; +rtw89_phy_write32_idx (rtwdev, reg, mask, val, phy_idx); + } + +for (i =0 ; i <TIA_GAIN_NUM ; i++) { +if (chan->band_type ==RTW89_BAND_2G ) { + reg = bb_gain_tia[i].gain_g[path]; + mask = bb_gain_tia[i].gain_g_mask; + }else { + reg = bb_gain_tia[i].gain_a[path]; + mask = bb_gain_tia[i].gain_a_mask; + } + val = gain->tia_gain[gain_band][bw_type][path][i]; +rtw89_phy_write32_idx (rtwdev, reg, mask, val, phy_idx); + } +} + +static void rtw8922a_set_gain (struct rtw89_dev *rtwdev, +const struct rtw89_chan *chan, +enum rtw89_rf_path path, +enum rtw89_phy_idx phy_idx) +{ +rtw8922a_set_lna_tia_gain (rtwdev, chan, path, phy_idx); +rtw8922a_set_rpl_gain (rtwdev, chan, path, phy_idx); +} + +static void rtw8922a_ctrl_ch (struct rtw89_dev *rtwdev, +const struct rtw89_chan *chan, +enum rtw89_phy_idx phy_idx) +{ +rtw8922a_set_gain (rtwdev, chan,RF_PATH_A , phy_idx); +rtw8922a_set_gain (rtwdev, chan,RF_PATH_B , phy_idx); +} + +static void rtw8922a_set_channel_bb (struct rtw89_dev *rtwdev, +const struct rtw89_chan *chan, +enum rtw89_phy_idx phy_idx) +{ +rtw8922a_ctrl_ch (rtwdev, chan, phy_idx); +} + +static void rtw8922a_set_channel (struct rtw89_dev *rtwdev, +const struct rtw89_chan *chan, +enum rtw89_mac_idx mac_idx, +enum rtw89_phy_idx phy_idx) +{ +rtw8922a_set_channel_bb (rtwdev, chan, phy_idx); +} +#ifdef CONFIG_PM static const struct wiphy_wowlan_support rtw_wowlan_stub_8922a = { .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
@@ -610,6 +793,7 @@ static const struct wiphy_wowlan_support rtw_wowlan_stub_8922a = {#endif static const struct rtw89_chip_ops rtw8922a_chip_ops = { + .set_channel = rtw8922a_set_channel, .read_efuse = rtw8922a_read_efuse, .read_phycap = rtw8922a_read_phycap, .pwr_on_func = rtw8922a_pwr_on_func,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/8 wifi: rtw89: 8922a: update the register used in DIG and the DIG flow
In reply to Ping-Ke ShihFrom: Cheng-Chieh Hsieh <[email protected]>
DIG standing for dynamic initial gain that is used to adjust RX coverage, and PD lower threshold is packet detection power level by received signal strength to avoid false detection of the WiFi packet.
Because of the hardware is different between WiFi 7 and 6 ICs, we adjust flow and add register definition for 8922A.
--- drivers/net/wireless/realtek/rtw89/phy.c | 6 ++++- drivers/net/wireless/realtek/rtw89/reg.h | 4 +++ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 25 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/phy.c +5 -1
@@ -4551,6 +4551,9 @@ static void rtw89_phy_dig_set_rxb_idx(struct rtw89_dev *rtwdev, u8 rxb_idx)static void rtw89_phy_dig_set_igi_cr (struct rtw89_dev *rtwdev,const struct rtw89_agc_gaincode_set set) { +if (!rtwdev->hal.support_igi) +return ; +rtw89_phy_dig_set_lna_idx (rtwdev, set.lna_idx);rtw89_phy_dig_set_tia_idx (rtwdev, set.tia_idx);rtw89_phy_dig_set_rxb_idx (rtwdev, set.rxb_idx);
@@ -4606,7 +4609,8 @@ static void rtw89_phy_dig_dyn_pd_th(struct rtw89_dev *rtwdev, u8 rssi,s8 cck_cca_th;u32 pd_val =0 ; - under_region +=PD_TH_SB_FLTR_CMP_VAL ; +if (rtwdev->chip->chip_gen ==RTW89_CHIP_AX ) + under_region +=PD_TH_SB_FLTR_CMP_VAL ;switch (cbw) {case RTW89_CHANNEL_WIDTH_40 :
drivers/net/wireless/realtek/rtw89/reg.h +4 -0
@@ -7910,10 +7910,12 @@#define R_PATH0_P20_FOLLOW_BY_PAGCUGC 0x46A0#define R_PATH0_P20_FOLLOW_BY_PAGCUGC_V1 0x4C24#define R_PATH0_P20_FOLLOW_BY_PAGCUGC_V2 0x46E8 +#define R_PATH0_P20_FOLLOW_BY_PAGCUGC_V3 0x41C8#define B_PATH0_P20_FOLLOW_BY_PAGCUGC_EN_MSK BIT(5)#define R_PATH0_S20_FOLLOW_BY_PAGCUGC 0x46A4#define R_PATH0_S20_FOLLOW_BY_PAGCUGC_V1 0x4C28#define R_PATH0_S20_FOLLOW_BY_PAGCUGC_V2 0x46EC +#define R_PATH0_S20_FOLLOW_BY_PAGCUGC_V3 0x41CC#define B_PATH0_S20_FOLLOW_BY_PAGCUGC_EN_MSK BIT(5)#define R_PATH0_RXB_INIT_V1 0x46A8#define B_PATH0_RXB_INIT_IDX_MSK_V1 GENMASK(14, 10)
@@ -7958,10 +7960,12 @@#define R_PATH1_P20_FOLLOW_BY_PAGCUGC 0x4774#define R_PATH1_P20_FOLLOW_BY_PAGCUGC_V1 0x4CE8#define R_PATH1_P20_FOLLOW_BY_PAGCUGC_V2 0x47A8 +#define R_PATH1_P20_FOLLOW_BY_PAGCUGC_V3 0x45C8#define B_PATH1_P20_FOLLOW_BY_PAGCUGC_EN_MSK BIT(5)#define R_PATH1_S20_FOLLOW_BY_PAGCUGC 0x4778#define R_PATH1_S20_FOLLOW_BY_PAGCUGC_V1 0x4CEC#define R_PATH1_S20_FOLLOW_BY_PAGCUGC_V2 0x47AC +#define R_PATH1_S20_FOLLOW_BY_PAGCUGC_V3 0x45CC#define B_PATH1_S20_FOLLOW_BY_PAGCUGC_EN_MSK BIT(5)#define R_PATH1_G_TIA0_LNA6_OP1DB_V1 0x4778#define B_PATH1_G_TIA0_LNA6_OP1DB_V1 GENMASK(7, 0)
drivers/net/wireless/realtek/rtw89/rtw8922a.c +25 -0
@@ -119,6 +119,30 @@ static const struct rtw89_imr_table rtw8922a_imr_cmac_table = { .n_regs = ARRAY_SIZE(rtw8922a_imr_cmac_regs), }; +static const struct rtw89_dig_regs rtw8922a_dig_regs = { + .seg0_pd_reg =R_SEG0R_PD_V2 , + .pd_lower_bound_mask =B_SEG0R_PD_LOWER_BOUND_MSK , + .pd_spatial_reuse_en =B_SEG0R_PD_SPATIAL_REUSE_EN_MSK_V1 , + .bmode_pd_reg =R_BMODE_PDTH_EN_V2 , + .bmode_cca_rssi_limit_en =B_BMODE_PDTH_LIMIT_EN_MSK_V1 , + .bmode_pd_lower_bound_reg =R_BMODE_PDTH_V2 , + .bmode_rssi_nocca_low_th_mask =B_BMODE_PDTH_LOWER_BOUND_MSK_V1 , + .p0_lna_init = {R_PATH0_LNA_INIT_V1 ,B_PATH0_LNA_INIT_IDX_MSK }, + .p1_lna_init = {R_PATH1_LNA_INIT_V1 ,B_PATH1_LNA_INIT_IDX_MSK }, + .p0_tia_init = {R_PATH0_TIA_INIT_V1 ,B_PATH0_TIA_INIT_IDX_MSK_V1 }, + .p1_tia_init = {R_PATH1_TIA_INIT_V1 ,B_PATH1_TIA_INIT_IDX_MSK_V1 }, + .p0_rxb_init = {R_PATH0_RXB_INIT_V1 ,B_PATH0_RXB_INIT_IDX_MSK_V1 }, + .p1_rxb_init = {R_PATH1_RXB_INIT_V1 ,B_PATH1_RXB_INIT_IDX_MSK_V1 }, + .p0_p20_pagcugc_en = {R_PATH0_P20_FOLLOW_BY_PAGCUGC_V3 , +B_PATH0_P20_FOLLOW_BY_PAGCUGC_EN_MSK }, + .p0_s20_pagcugc_en = {R_PATH0_S20_FOLLOW_BY_PAGCUGC_V3 , +B_PATH0_S20_FOLLOW_BY_PAGCUGC_EN_MSK }, + .p1_p20_pagcugc_en = {R_PATH1_P20_FOLLOW_BY_PAGCUGC_V3 , +B_PATH1_P20_FOLLOW_BY_PAGCUGC_EN_MSK }, + .p1_s20_pagcugc_en = {R_PATH1_S20_FOLLOW_BY_PAGCUGC_V3 , +B_PATH1_S20_FOLLOW_BY_PAGCUGC_EN_MSK }, +}; +static const struct rtw89_efuse_block_cfg rtw8922a_efuse_blocks[] = { [RTW89_EFUSE_BLOCK_SYS ] = {.offset =0x00000 , .size =0x310 }, [RTW89_EFUSE_BLOCK_RF ] = {.offset =0x10000 , .size =0x240 },
@@ -834,6 +858,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .txpwr_factor_rf = 2, .txpwr_factor_mac = 1, .dig_table = NULL, + .dig_regs = &rtw8922a_dig_regs, .tssi_dbw_table = NULL, .support_chanctx_num = 1, .support_bands = BIT(NL80211_BAND_2GHZ) |
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/8 wifi: rtw89: phy: ignore special data from BB parameter file
In reply to Ping-Ke ShihBB parameter file is a list of tuple {addr, val} with conditional hardware version. However, tuples within a condition can't be empty, so insert a special dummy tuple for this case. Then, ignore this tuple when writing.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -32,6 +32,7 @@ extern const struct ieee80211_ops rtw89_ops;#define MASKDWORD 0xffffffff#define RFREG_MASK 0xfffff#define INV_RF_DATA 0xffffffff +#define BYPASS_CR_DATA 0xbabecafe#define RTW89_TRACK_WORK_PERIOD round_jiffies_relative(HZ * 2)#define RTW89_FORBID_BA_TIMER round_jiffies_relative(HZ * 4)
drivers/net/wireless/realtek/rtw89/phy.c +2 -0
@@ -905,6 +905,8 @@ static void rtw89_phy_config_bb_reg(struct rtw89_dev *rtwdev,udelay (5 ); else if (reg->addr == 0xf9) udelay(1); + else if (reg->data == BYPASS_CR_DATA) + rtw89_debug(rtwdev, RTW89_DBG_PHY_TRACK, "Bypass CR 0x%x\n", reg->addr); else rtw89_phy_write32(rtwdev, reg->addr, reg->data); }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/8 wifi: rtw89: 8922a: add NCTL pre-settings for WiFi 7 chips
In reply to Ping-Ke ShihNCTL standing for nano-controller is used to assist RF calibration. Basically, we write settings from a table, but format of the table can't describe register mask and additional conditions, so add a function to set this kind of settings.
--- drivers/net/wireless/realtek/rtw89/phy.c | 14 +++++++++++--- drivers/net/wireless/realtek/rtw89/phy.h | 8 ++++++++ drivers/net/wireless/realtek/rtw89/phy_be.c | 19 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 17 +++++++++++++++++ 4 files changed, 55 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.c +11 -3
@@ -1469,11 +1469,9 @@ void rtw89_phy_init_rf_reg(struct rtw89_dev *rtwdev, bool noio)kfree (rf_reg_info); } -static void rtw89_phy_init_rf_nctl (struct rtw89_dev *rtwdev) +static void rtw89_phy_preinit_rf_nctl_ax (struct rtw89_dev *rtwdev) { -struct rtw89_fw_elm_info *elm_info = &rtwdev->fw.elm_info;const struct rtw89_chip_info *chip = rtwdev->chip; -const struct rtw89_phy_table *nctl_table;u32 val;int ret;
@@ -1493,6 +1491,15 @@ static void rtw89_phy_init_rf_nctl(struct rtw89_dev *rtwdev) 1000, false, rtwdev);if (ret)rtw89_err (rtwdev,"failed to poll nctl block\n" ); +} + +static void rtw89_phy_init_rf_nctl (struct rtw89_dev *rtwdev) +{ +struct rtw89_fw_elm_info *elm_info = &rtwdev->fw.elm_info; +const struct rtw89_chip_info *chip = rtwdev->chip; +const struct rtw89_phy_table *nctl_table; + +rtw89_phy_preinit_rf_nctl (rtwdev); nctl_table = elm_info->rf_nctl ? elm_info->rf_nctl : chip->nctl_table;rtw89_phy_init_reg (rtwdev, nctl_table, rtw89_phy_config_bb_reg,NULL );
@@ -5483,6 +5490,7 @@ const struct rtw89_phy_gen_def rtw89_phy_gen_ax = { .physts = &rtw89_physts_regs_ax, .cfo = &rtw89_cfo_regs_ax, .config_bb_gain = rtw89_phy_config_bb_gain_ax, + .preinit_rf_nctl = rtw89_phy_preinit_rf_nctl_ax, .set_txpwr_byrate = rtw89_phy_set_txpwr_byrate_ax, .set_txpwr_offset = rtw89_phy_set_txpwr_offset_ax,
drivers/net/wireless/realtek/rtw89/phy.h +8 -0
@@ -513,6 +513,7 @@ struct rtw89_phy_gen_def {const struct rtw89_reg2_def *reg, enum rtw89_rf_path rf_path, void *extra_data); +void (*preinit_rf_nctl)(struct rtw89_dev *rtwdev); void (*set_txpwr_byrate)(struct rtw89_dev *rtwdev, const struct rtw89_chan *chan,
@@ -795,6 +796,13 @@ s8 rtw89_phy_read_txpwr_limit(struct rtw89_dev *rtwdev, u8 band,s8 rtw89_phy_read_txpwr_limit_ru (struct rtw89_dev *rtwdev,u8 band,u8 ru,u8 ntx,u8 ch); +static inline void rtw89_phy_preinit_rf_nctl (struct rtw89_dev *rtwdev) +{ +const struct rtw89_phy_gen_def *phy = rtwdev->chip->phy_def; + + phy->preinit_rf_nctl (rtwdev); +} + static inline void rtw89_phy_set_txpwr_byrate(struct rtw89_dev *rtwdev, const struct rtw89_chan *chan,
drivers/net/wireless/realtek/rtw89/phy_be.c +19 -0
@@ -252,6 +252,24 @@ static void rtw89_phy_config_bb_gain_be(struct rtw89_dev *rtwdev, } } +static void rtw89_phy_preinit_rf_nctl_be (struct rtw89_dev *rtwdev) +{ +rtw89_phy_write32_mask (rtwdev,R_GOTX_IQKDPK_C0 ,B_GOTX_IQKDPK ,0x3 ); +rtw89_phy_write32_mask (rtwdev,R_GOTX_IQKDPK_C1 ,B_GOTX_IQKDPK ,0x3 ); +rtw89_phy_write32_mask (rtwdev,R_IQKDPK_HC ,B_IQKDPK_HC ,0x1 ); +rtw89_phy_write32_mask (rtwdev,R_CLK_GCK ,B_CLK_GCK ,0x00fffff ); +rtw89_phy_write32_mask (rtwdev,R_IOQ_IQK_DPK ,B_IOQ_IQK_DPK_CLKEN ,0x3 ); +rtw89_phy_write32_mask (rtwdev,R_IQK_DPK_RST ,B_IQK_DPK_RST ,0x1 ); +rtw89_phy_write32_mask (rtwdev,R_IQK_DPK_PRST ,B_IQK_DPK_PRST ,0x1 ); +rtw89_phy_write32_mask (rtwdev,R_IQK_DPK_PRST_C1 ,B_IQK_DPK_PRST ,0x1 ); +rtw89_phy_write32_mask (rtwdev,R_TXRFC ,B_TXRFC_RST ,0x1 ); + +if (rtwdev->dbcc_en) { +rtw89_phy_write32_mask (rtwdev,R_IQK_DPK_RST_C1 ,B_IQK_DPK_RST ,0x1 ); +rtw89_phy_write32_mask (rtwdev,R_TXRFC_C1 ,B_TXRFC_RST ,0x1 ); + } +} +struct rtw89_byr_spec_ent_be {struct rtw89_rate_desc init;u8 num_of_idx;
@@ -819,6 +837,7 @@ const struct rtw89_phy_gen_def rtw89_phy_gen_be = { .physts = &rtw89_physts_regs_be, .cfo = &rtw89_cfo_regs_be, .config_bb_gain = rtw89_phy_config_bb_gain_be, + .preinit_rf_nctl = rtw89_phy_preinit_rf_nctl_be, .set_txpwr_byrate = rtw89_phy_set_txpwr_byrate_be, .set_txpwr_offset = rtw89_phy_set_txpwr_offset_be,
drivers/net/wireless/realtek/rtw89/reg.h +17 -0
@@ -7588,13 +7588,20 @@#define R_PD_CTRL 0x0C3C#define B_PD_HIT_DIS BIT(9)#define R_IOQ_IQK_DPK 0x0C60 +#define B_IOQ_IQK_DPK_CLKEN GENMASK(1, 0)#define B_IOQ_IQK_DPK_EN BIT(1)#define R_GNT_BT_WGT_EN 0x0C6C#define B_GNT_BT_WGT_EN BIT(21) +#define R_IQK_DPK_RST 0x0C6C +#define R_IQK_DPK_RST_C1 0x1C6C +#define B_IQK_DPK_RST BIT(0)#define R_TX_COLLISION_T2R_ST 0x0C70#define B_TX_COLLISION_T2R_ST_M GENMASK(25, 20)#define R_TXGATING 0x0C74#define B_TXGATING_EN BIT(4) +#define R_TXRFC 0x0C7C +#define R_TXRFC_C1 0x1C7C +#define B_TXRFC_RST GENMASK(23, 21)#define R_PD_ARBITER_OFF 0x0C80#define B_PD_ARBITER_OFF BIT(31)#define R_SNDCCA_A1 0x0C9C
@@ -7624,6 +7631,8 @@#define R_CTLTOP 0x1008#define B_CTLTOP_ON BIT(23)#define B_CTLTOP_VAL GENMASK(15, 12) +#define R_CLK_GCK 0x1008 +#define B_CLK_GCK GENMASK(24, 0)#define R_EDCCA_RPT_SEL_BE 0x10CC#define R_S0_HW_SI_DIS 0x1200#define B_S0_HW_SI_DIS_W_R_TRIG GENMASK(30, 28)
@@ -7771,6 +7780,8 @@#define B_P80_AT_HIGH_FREQ_RU_ALLOC_PHY0 BIT(13)#define R_DBCC_80P80_SEL_EVM_RPT2 0x2A10#define B_DBCC_80P80_SEL_EVM_RPT2_EN BIT(0) +#define R_IQKDPK_HC 0x2AB8 +#define B_IQKDPK_HC BIT(28)#define R_P1_EN_SOUND_WO_NDP 0x2D7C#define B_P1_EN_SOUND_WO_NDP BIT(1)#define R_EDCCA_RPT_A_BE 0x2E38
@@ -8630,6 +8641,12 @@#define B_DACKN0_V GENMASK(21, 14)#define R_DACKN1_CTL 0xC224#define B_DACKN1_V GENMASK(21, 14) +#define R_GOTX_IQKDPK_C0 0xE464 +#define R_GOTX_IQKDPK_C1 0xE564 +#define B_GOTX_IQKDPK GENMASK(28, 27) +#define R_IQK_DPK_PRST 0xE4AC +#define R_IQK_DPK_PRST_C1 0xE5AC +#define B_IQK_DPK_PRST BIT(27)/* WiFi CPU local domain */ #define R_AX_WDT_CTRL 0x0040
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/8 wifi: rtw89: phy: add BB wrapper of TX power for WiFi 7 chips
In reply to Ping-Ke ShihTX power is controlled by BB layer basically, but it should interact with MAC layer, so these registers are put on MAC register domain and called BB wrapper, which contains TX power for each MAC ID, OFDMA RU power, and consideration of power type table.
--- drivers/net/wireless/realtek/rtw89/phy.c | 2 + drivers/net/wireless/realtek/rtw89/phy.h | 9 ++ drivers/net/wireless/realtek/rtw89/phy_be.c | 106 ++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 47 +++++++++ 4 files changed, 164 insertions(+)
drivers/net/wireless/realtek/rtw89/phy.c +2 -0
@@ -4966,6 +4966,7 @@ void rtw89_phy_dm_init(struct rtw89_dev *rtwdev)rtw89_physts_parsing_init (rtwdev);rtw89_phy_dig_init (rtwdev);rtw89_phy_cfo_init (rtwdev); +rtw89_phy_bb_wrap_init (rtwdev);rtw89_phy_edcca_init (rtwdev);rtw89_phy_ul_tb_info_init (rtwdev);rtw89_phy_antdiv_init (rtwdev);
@@ -5491,6 +5492,7 @@ const struct rtw89_phy_gen_def rtw89_phy_gen_ax = { .cfo = &rtw89_cfo_regs_ax, .config_bb_gain = rtw89_phy_config_bb_gain_ax, .preinit_rf_nctl = rtw89_phy_preinit_rf_nctl_ax, + .bb_wrap_init = NULL, .set_txpwr_byrate = rtw89_phy_set_txpwr_byrate_ax, .set_txpwr_offset = rtw89_phy_set_txpwr_offset_ax,
drivers/net/wireless/realtek/rtw89/phy.h +9 -0
@@ -514,6 +514,7 @@ struct rtw89_phy_gen_def {enum rtw89_rf_path rf_path, void *extra_data);void (*preinit_rf_nctl)(struct rtw89_dev *rtwdev); +void (*bb_wrap_init)(struct rtw89_dev *rtwdev); void (*set_txpwr_byrate)(struct rtw89_dev *rtwdev, const struct rtw89_chan *chan,
@@ -803,6 +804,14 @@ static inline void rtw89_phy_preinit_rf_nctl(struct rtw89_dev *rtwdev) phy->preinit_rf_nctl (rtwdev); } +static inline void rtw89_phy_bb_wrap_init (struct rtw89_dev *rtwdev) +{ +const struct rtw89_phy_gen_def *phy = rtwdev->chip->phy_def; + +if (phy->bb_wrap_init) + phy->bb_wrap_init (rtwdev); +} + static inline void rtw89_phy_set_txpwr_byrate(struct rtw89_dev *rtwdev, const struct rtw89_chan *chan,
drivers/net/wireless/realtek/rtw89/phy_be.c +106 -0
118 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/reg.h +47 -0
65 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/8 wifi: rtw89: phy: set channel_info for WiFi 7 chips
In reply to Ping-Ke ShihThe channel_info is hardware settings to reflect operational status, such as scale factor, report unit, buffer matrix size, RU size and so on. Then, we can get desired reports to do further tuning.
--- drivers/net/wireless/realtek/rtw89/phy.c | 2 ++ drivers/net/wireless/realtek/rtw89/phy.h | 9 +++++++++ drivers/net/wireless/realtek/rtw89/phy_be.c | 12 ++++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 11 +++++++++++ 4 files changed, 34 insertions(+)
drivers/net/wireless/realtek/rtw89/phy.c +2 -0
@@ -4968,6 +4968,7 @@ void rtw89_phy_dm_init(struct rtw89_dev *rtwdev)rtw89_phy_cfo_init (rtwdev);rtw89_phy_bb_wrap_init (rtwdev);rtw89_phy_edcca_init (rtwdev); +rtw89_phy_ch_info_init (rtwdev);rtw89_phy_ul_tb_info_init (rtwdev);rtw89_phy_antdiv_init (rtwdev);rtw89_chip_rfe_gpio (rtwdev);
@@ -5493,6 +5494,7 @@ const struct rtw89_phy_gen_def rtw89_phy_gen_ax = { .config_bb_gain = rtw89_phy_config_bb_gain_ax, .preinit_rf_nctl = rtw89_phy_preinit_rf_nctl_ax, .bb_wrap_init = NULL, + .ch_info_init = NULL, .set_txpwr_byrate = rtw89_phy_set_txpwr_byrate_ax, .set_txpwr_offset = rtw89_phy_set_txpwr_offset_ax,
drivers/net/wireless/realtek/rtw89/phy.h +9 -0
@@ -515,6 +515,7 @@ struct rtw89_phy_gen_def { void *extra_data);void (*preinit_rf_nctl)(struct rtw89_dev *rtwdev);void (*bb_wrap_init)(struct rtw89_dev *rtwdev); +void (*ch_info_init)(struct rtw89_dev *rtwdev); void (*set_txpwr_byrate)(struct rtw89_dev *rtwdev, const struct rtw89_chan *chan,
@@ -812,6 +813,14 @@ static inline void rtw89_phy_bb_wrap_init(struct rtw89_dev *rtwdev) phy->bb_wrap_init (rtwdev); } +static inline void rtw89_phy_ch_info_init (struct rtw89_dev *rtwdev) +{ +const struct rtw89_phy_gen_def *phy = rtwdev->chip->phy_def; + +if (phy->ch_info_init) + phy->ch_info_init (rtwdev); +} + static inline void rtw89_phy_set_txpwr_byrate(struct rtw89_dev *rtwdev, const struct rtw89_chan *chan,
drivers/net/wireless/realtek/rtw89/phy_be.c +12 -0
@@ -375,6 +375,17 @@ static void rtw89_phy_bb_wrap_init_be(struct rtw89_dev *rtwdev)rtw89_phy_bb_wrap_tpu_set_all (rtwdev, mac_idx); } +static void rtw89_phy_ch_info_init_be (struct rtw89_dev *rtwdev) +{ +rtw89_phy_write32_mask (rtwdev,R_CHINFO_SEG ,B_CHINFO_SEG_LEN ,0x0 ); +rtw89_phy_write32_mask (rtwdev,R_CHINFO_SEG ,B_CHINFO_SEG ,0xf ); +rtw89_phy_write32_mask (rtwdev,R_CHINFO_DATA ,B_CHINFO_DATA_BITMAP ,0x1 ); +rtw89_phy_set_phy_regs (rtwdev,R_CHINFO_ELM_SRC ,B_CHINFO_ELM_BITMAP ,0x40303 ); +rtw89_phy_set_phy_regs (rtwdev,R_CHINFO_ELM_SRC ,B_CHINFO_SRC ,0x0 ); +rtw89_phy_set_phy_regs (rtwdev,R_CHINFO_TYPE_SCAL ,B_CHINFO_TYPE ,0x3 ); +rtw89_phy_set_phy_regs (rtwdev,R_CHINFO_TYPE_SCAL ,B_CHINFO_SCAL ,0x0 ); +} +struct rtw89_byr_spec_ent_be {struct rtw89_rate_desc init;u8 num_of_idx;
@@ -944,6 +955,7 @@ const struct rtw89_phy_gen_def rtw89_phy_gen_be = { .config_bb_gain = rtw89_phy_config_bb_gain_be, .preinit_rf_nctl = rtw89_phy_preinit_rf_nctl_be, .bb_wrap_init = rtw89_phy_bb_wrap_init_be, + .ch_info_init = rtw89_phy_ch_info_init_be, .set_txpwr_byrate = rtw89_phy_set_txpwr_byrate_be, .set_txpwr_offset = rtw89_phy_set_txpwr_offset_be,
drivers/net/wireless/realtek/rtw89/reg.h +11 -0
@@ -7512,9 +7512,14 @@#define B_UPD_P0_EN BIT(31)#define R_SPOOF_CG 0x00B4#define B_SPOOF_CG_EN BIT(17) +#define R_CHINFO_SEG 0x00B4 +#define B_CHINFO_SEG_LEN GENMASK(2, 0) +#define B_CHINFO_SEG GENMASK(16, 7)#define R_DFS_FFT_CG 0x00B8#define B_DFS_CG_EN BIT(1)#define B_DFS_FFT_EN BIT(0) +#define R_CHINFO_DATA 0x00C0 +#define B_CHINFO_DATA_BITMAP GENMASK(22, 0)#define R_ANAPAR_PW15 0x030C#define B_ANAPAR_PW15 GENMASK(31, 24)#define B_ANAPAR_PW15_H GENMASK(27, 24)
@@ -8154,6 +8159,12 @@#define B_PATH1_5MDET_SB2 BIT(8)#define B_PATH1_5MDET_SB0 BIT(6)#define B_PATH1_5MDET_TH GENMASK(5, 0) +#define R_CHINFO_ELM_SRC 0x4D84 +#define B_CHINFO_ELM_BITMAP GENMASK(22, 0) +#define B_CHINFO_SRC GENMASK(31, 30) +#define R_CHINFO_TYPE_SCAL 0x4D88 +#define B_CHINFO_TYPE GENMASK(2, 1) +#define B_CHINFO_SCAL BIT(8)#define R_RPL_BIAS_COMP 0x4DF0#define B_RPL_BIAS_COMP_MASK GENMASK(7, 0)#define R_RPL_PATHAB 0x4E0C
Signature · 1 line
2.25.1