wifi: rtw89: 8852b: add RF calibration part 2 and enable 8852BE
Ping-Ke Shih
maintainercover wifi: rtw89: 8852b: add RF calibration part 2 and enable 8852BE
After this patchset, 8852BE is ready, so add 8852BE to Kconfig and Makefile. With firmware v0.27.32.0, STA, AP and monitor can work well.
This patchset depdens on "wifi: rtw89: 8852b: add RF calibration part 1"
Ping-Ke Shih (4):
wifi: rtw89: 8852b: rfk: add DPK
wifi: rtw89: 8852b: add chip_ops related to RF calibration
wifi: rtw89: phy: add dummy C2H handler to avoid warning message
wifi: rtw89: 8852b: add 8852be to Makefile and Kconfig
drivers/net/wireless/realtek/rtw89/Kconfig | 14 + drivers/net/wireless/realtek/rtw89/Makefile | 9 + drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 4 + drivers/net/wireless/realtek/rtw89/phy.h | 9 + drivers/net/wireless/realtek/rtw89/reg.h | 17 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 42 + .../net/wireless/realtek/rtw89/rtw8852b_rfk.c | 1148 +++++++++++++++++ .../net/wireless/realtek/rtw89/rtw8852b_rfk.h | 3 + 9 files changed, 1247 insertions(+)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/4 wifi: rtw89: 8852b: rfk: add DPK
DPK is short for digital pre-distortion calibration. It can adjusts digital waveform according to PA linear characteristics dynamically to enhance TX EVM.
Do this calibration when we are going to run on AP channel. To prevent power offset out of boundary, it monitors thermal and set proper boundary to register.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/reg.h | 17 + .../net/wireless/realtek/rtw89/rtw8852b_rfk.c | 1148 +++++++++++++++++ .../net/wireless/realtek/rtw89/rtw8852b_rfk.h | 3 + 4 files changed, 1169 insertions(+)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -3049,6 +3049,7 @@ struct rtw89_dpk_bkup_para {struct rtw89_dpk_info {bool is_dpk_enable;bool is_dpk_reload_en; +u8 dpk_gs[RTW89_PHY_MAX ];u16 dc_i[RTW89_DPK_RF_PATH ][RTW89_DPK_BKUP_NUM ];u16 dc_q[RTW89_DPK_RF_PATH ][RTW89_DPK_BKUP_NUM ];u8 corr_val[RTW89_DPK_RF_PATH ][RTW89_DPK_BKUP_NUM ];
drivers/net/wireless/realtek/rtw89/reg.h +17 -0
@@ -3298,6 +3298,7 @@#define RR_MOD_RGM GENMASK(13, 4)#define RR_MOD_V_DOWN 0x0#define RR_MOD_V_STANDBY 0x1 +#define RR_TXAGC 0x10001#define RR_MOD_V_TX 0x2#define RR_MOD_V_RX 0x3#define RR_MOD_V_TXIQK 0x4
@@ -3431,6 +3432,7 @@#define RR_RXBB_VOBUF GENMASK(15, 12)#define RR_RXBB_C2G GENMASK(16, 10)#define RR_RXBB_C1G GENMASK(9, 8) +#define RR_RXBB_FATT GENMASK(7, 0)#define RR_RXBB_ATTR GENMASK(7, 4)#define RR_RXBB_ATTC GENMASK(2, 0)#define RR_RXG 0x84
@@ -3441,7 +3443,9 @@#define RR_RXAE_IQKMOD GENMASK(3, 0)#define RR_RXA 0x8a#define RR_RXA_DPK GENMASK(9, 8) +#define RR_RXA_LNA 0x8b#define RR_RXA2 0x8c +#define RR_RAA2_SWATT GENMASK(15, 9)#define RR_RXA2_C1 GENMASK(12, 10)#define RR_RXA2_C2 GENMASK(9, 3)#define RR_RXA2_CC2 GENMASK(8, 7)
@@ -3476,6 +3480,7 @@#define RR_IQGEN_BIAS GENMASK(11, 8)#define RR_TXIQK 0x98#define RR_TXIQK_ATT2 GENMASK(15, 12) +#define RR_TXIQK_ATT1 GENMASK(6, 0)#define RR_TIA 0x9e#define RR_TIA_N6 BIT(8)#define RR_MIXER 0x9f
@@ -3851,6 +3856,9 @@#define B_TXSHAPE_TRIANGULAR_CFG GENMASK(25, 24)#define R_BANDEDGE 0x4498#define B_BANDEDGE_EN BIT(30) +#define R_DPD_BF 0x44a0 +#define B_DPD_BF_OFDM GENMASK(16, 12) +#define B_DPD_BF_SCA GENMASK(6, 0)#define R_TXPATH_SEL 0x458C#define B_TXPATH_SEL_MSK GENMASK(31, 28)#define R_TXPWR 0x4594
@@ -4297,6 +4305,7 @@#define B_KPATH_CFG_ED GENMASK(21, 20)#define R_KIP_RPT1 0x80D4#define B_KIP_RPT1_SEL GENMASK(21, 16) +#define B_KIP_RPT1_SEL_V1 GENMASK(19, 16)#define R_SRAM_IQRX 0x80D8#define R_GAPK 0x80E0#define B_GAPK_ADR BIT(0)
@@ -4318,6 +4327,7 @@#define B_PRT_COM_GL GENMASK(7, 4)#define B_PRT_COM_CORI GENMASK(7, 0)#define B_PRT_COM_RXBB GENMASK(5, 0) +#define B_PRT_COM_RXBB_V1 GENMASK(4, 0)#define B_PRT_COM_DONE BIT(0)#define R_COEF_SEL 0x8104#define B_COEF_SEL_IQC BIT(0)
@@ -4356,13 +4366,18 @@#define B_DPD_LBK BIT(7)#define R_DPD_CH0 0x81AC#define R_DPD_BND 0x81B4 +#define B_DPD_BND_1 GENMASK(24, 16) +#define B_DPD_BND_0 GENMASK(8, 0)#define R_DPD_CH0A 0x81BC#define B_DPD_MEN GENMASK(31, 28)#define B_DPD_ORDER GENMASK(26, 24) +#define B_DPD_ORDER_V1 GENMASK(26, 25) +#define B_DPD_CFG GENMASK(22, 0)#define B_DPD_SEL GENMASK(13, 8)#define R_TXAGC_RFK 0x81C4#define B_TXAGC_RFK_CH0 GENMASK(5, 0)#define R_DPD_COM 0x81C8 +#define B_DPD_COM_OF BIT(15)#define R_KIP_IQP 0x81CC#define B_KIP_IQP_SW GENMASK(13, 12)#define B_KIP_IQP_IQSW GENMASK(5, 0)
@@ -4462,6 +4477,7 @@#define R_P0_CFCH_BW0 0xC0D4#define B_P0_CFCH_BW0 GENMASK(27, 26)#define R_P0_CFCH_BW1 0xC0D8 +#define B_P0_CFCH_EX BIT(13)#define B_P0_CFCH_BW1 GENMASK(8, 5)#define R_ADDCK0D 0xC0F0#define B_ADDCK0D_VAL2 GENMASK(31, 26)
@@ -4511,6 +4527,7 @@#define R_PATH0_BW_SEL_V1 0xC0D8#define B_PATH0_BW_SEL_MSK_V1 GENMASK(8, 5)#define R_PATH1_BW_SEL_V1 0xC1D8 +#define B_PATH1_BW_SEL_EX BIT(13)#define B_PATH1_BW_SEL_MSK_V1 GENMASK(8, 5)#define R_ADDCK1D 0xC1F0#define B_ADDCK1D_VAL2 GENMASK(31, 26)
drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c +1148 -0
1,181 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h +3 -0
@@ -11,6 +11,9 @@ void rtw8852b_rck(struct rtw89_dev *rtwdev);void rtw8852b_dack (struct rtw89_dev *rtwdev);void rtw8852b_iqk (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx);void rtw8852b_rx_dck (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx); +void rtw8852b_dpk_init (struct rtw89_dev *rtwdev); +void rtw8852b_dpk (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy); +void rtw8852b_dpk_track (struct rtw89_dev *rtwdev);void rtw8852b_tssi (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy,bool hwtx_en);void rtw8852b_tssi_scan (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy); void rtw8852b_wifi_scan_notify(struct rtw89_dev *rtwdev, bool scan_start,
Signature · 1 line
2.25.1
Re: [PATCH 1/4] wifi: rtw89: 8852b: rfk: add DPK
Quoted 9 lines · Ping-Ke Shih
DPK is short for digital pre-distortion calibration. It can adjusts digital waveform according to PA linear characteristics dynamically to enhance TX EVM.
Do this calibration when we are going to run on AP channel. To prevent power offset out of boundary, it monitors thermal and set proper boundary to register.
Signed-off-by Ping-Ke Shih <[email protected]>
4 patches applied to wireless-next.git, thanks.
5b8471ace5b1 wifi: rtw89: 8852b: rfk: add DPKef8acbcac681 wifi: rtw89: 8852b: add chip_ops related to RF calibration 3b66519b023b wifi: rtw89: phy: add dummy C2H handler to avoid warning message b5db4ef38e21 wifi: rtw89: 8852b: add 8852be to Makefile and Kconfig
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/4 wifi: rtw89: 8852b: add chip_ops related to RF calibration
In reply to Ping-Ke ShihSince RF calibrations are added, add chip_ops to call them. These chip_ops include initial, full calibration, configuration when switching band and scanning, and track work in period of 2 seconds.
--- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+)
drivers/net/wireless/realtek/rtw89/rtw8852b.c +42 -0
@@ -1513,6 +1513,43 @@ static void rtw8852b_set_channel_help(struct rtw89_dev *rtwdev, bool enter, } } +static void rtw8852b_rfk_init (struct rtw89_dev *rtwdev) +{ + rtwdev->is_tssi_mode[RF_PATH_A ] = false; + rtwdev->is_tssi_mode[RF_PATH_B ] = false; + +rtw8852b_dpk_init (rtwdev); +rtw8852b_rck (rtwdev); +rtw8852b_dack (rtwdev); +rtw8852b_rx_dck (rtwdev,RTW89_PHY_0 ); +} + +static void rtw8852b_rfk_channel (struct rtw89_dev *rtwdev) +{ +enum rtw89_phy_idx phy_idx =RTW89_PHY_0 ; + +rtw8852b_rx_dck (rtwdev, phy_idx); +rtw8852b_iqk (rtwdev, phy_idx); +rtw8852b_tssi (rtwdev, phy_idx, true); +rtw8852b_dpk (rtwdev, phy_idx); +} + +static void rtw8852b_rfk_band_changed (struct rtw89_dev *rtwdev, +enum rtw89_phy_idx phy_idx) +{ +rtw8852b_tssi_scan (rtwdev, phy_idx); +} + +static void rtw8852b_rfk_scan (struct rtw89_dev *rtwdev,bool start) +{ +rtw8852b_wifi_scan_notify (rtwdev, start,RTW89_PHY_0 ); +} + +static void rtw8852b_rfk_track (struct rtw89_dev *rtwdev) +{ +rtw8852b_dpk_track (rtwdev); +} +static u32 rtw8852b_bb_cal_txpwr_ref (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx,s16 ref) {
@@ -2346,6 +2383,11 @@ static const struct rtw89_chip_ops rtw8852b_chip_ops = { .read_efuse = rtw8852b_read_efuse, .read_phycap = rtw8852b_read_phycap, .fem_setup = NULL, + .rfk_init = rtw8852b_rfk_init, + .rfk_channel = rtw8852b_rfk_channel, + .rfk_band_changed = rtw8852b_rfk_band_changed, + .rfk_scan = rtw8852b_rfk_scan, + .rfk_track = rtw8852b_rfk_track, .power_trim = rtw8852b_power_trim, .set_txpwr = rtw8852b_set_txpwr, .set_txpwr_ctrl = rtw8852b_set_txpwr_ctrl,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/4 wifi: rtw89: phy: add dummy C2H handler to avoid warning message
In reply to Ping-Ke ShihThe C2H class 2 function 3 is to report retry count of low rate, but driver doesn't implement yet, so add a dummy case to avoid message:
rtw89_8852be 0000:03:00.0: c2h class 2 not support
--- drivers/net/wireless/realtek/rtw89/phy.c | 4 ++++ drivers/net/wireless/realtek/rtw89/phy.h | 9 +++++++++ 2 files changed, 13 insertions(+)
drivers/net/wireless/realtek/rtw89/phy.c +4 -0
@@ -2276,6 +2276,10 @@ void rtw89_phy_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,if (func <RTW89_PHY_C2H_FUNC_RA_MAX ) handler = rtw89_phy_c2h_ra_handler[func];break ; +case RTW89_PHY_C2H_CLASS_DM : +if (func ==RTW89_PHY_C2H_DM_FUNC_LOWRT_RTY ) +return ; + fallthrough;default :rtw89_info (rtwdev,"c2h class %d not support\n" , class);return ;
drivers/net/wireless/realtek/rtw89/phy.h +9 -0
@@ -114,6 +114,15 @@ enum rtw89_phy_c2h_ra_func { RTW89_PHY_C2H_FUNC_RA_MAX, }; +enum rtw89_phy_c2h_dm_func { +RTW89_PHY_C2H_DM_FUNC_FW_TEST , +RTW89_PHY_C2H_DM_FUNC_FW_TRIG_TX_RPT , +RTW89_PHY_C2H_DM_FUNC_SIGB , +RTW89_PHY_C2H_DM_FUNC_LOWRT_RTY , +RTW89_PHY_C2H_DM_FUNC_MCC_DIG , +RTW89_PHY_C2H_DM_FUNC_NUM , +}; +enum rtw89_phy_c2h_class {RTW89_PHY_C2H_CLASS_RUA ,RTW89_PHY_C2H_CLASS_RA ,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/4 wifi: rtw89: 8852b: add 8852be to Makefile and Kconfig
In reply to Ping-Ke ShihNow, basic materials for 8852be are ready, so add 8852be to Kconfig and Makefile. Current version can support STA, AP and monitor modes.
We still fine tune some features, such as BT coexistence, performance, and power consumption.
--- drivers/net/wireless/realtek/rtw89/Kconfig | 14 ++++++++++++++ drivers/net/wireless/realtek/rtw89/Makefile | 9 +++++++++ 2 files changed, 23 insertions(+)
drivers/net/wireless/realtek/rtw89/Kconfig +14 -0
@@ -19,6 +19,9 @@ config RTW89_PCI config RTW89_8852A tristate +config RTW89_8852B + tristate + config RTW89_8852C tristate
@@ -33,6 +36,17 @@ config RTW89_8852AE 802.11ax PCIe wireless network (Wi-Fi 6) adapter +config RTW89_8852BE + tristate "Realtek 8852BE PCI wireless network (Wi-Fi 6) adapter" + depends on PCI + select RTW89_CORE + select RTW89_PCI + select RTW89_8852B + help + Select this option will enable support for 8852BE chipset + + 802.11ax PCIe wireless network (Wi-Fi 6) adapter + config RTW89_8852CE tristate "Realtek 8852CE PCI wireless network (Wi-Fi 6E) adapter" depends on PCI
drivers/net/wireless/realtek/rtw89/Makefile +9 -0
@@ -24,6 +24,15 @@ rtw89_8852a-objs := rtw8852a.o \ obj-$(CONFIG_RTW89_8852AE) += rtw89_8852ae.o rtw89_8852ae-objs := rtw8852ae.o +obj-$(CONFIG_RTW89_8852B) += rtw89_8852b.o +rtw89_8852b-objs := rtw8852b.o \ + rtw8852b_table.o \ + rtw8852b_rfk.o \ + rtw8852b_rfk_table.o + +obj-$(CONFIG_RTW89_8852BE) += rtw89_8852be.o +rtw89_8852be-objs := rtw8852be.o + obj-$(CONFIG_RTW89_8852C) += rtw89_8852c.o rtw89_8852c-objs := rtw8852c.o \ rtw8852c_table.o \
Signature · 1 line
2.25.1
Quoted 2 lines · Ping-Ke Shih
After this patchset, 8852BE is ready, so add 8852BE to
KconfigandMakefile. With firmware v0.27.32.0, STA, AP and monitor can work well.
Awesome! From my point of view adding 8852BE support went really smoothly, thanks for that. Very much appreciated.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerQuoted 8 lines · Kalle Valo
Quoted 2 lines · Ping-Ke Shih
After this patchset, 8852BE is ready, so add 8852BE to
KconfigandMakefile. With firmware v0.27.32.0, STA, AP and monitor can work well.Awesome! From my point of view adding 8852BE support went really smoothly, thanks for that. Very much appreciated.
Super thanks for spending your time to review this driver, and also thanks for your support, advice and teaching during review process. :-)
Ping-Ke
Quoted 7 lines · Kalle Valo
Quoted 2 lines · Ping-Ke Shih
After this patchset, 8852BE is ready, so add 8852BE to
KconfigandMakefile. With firmware v0.27.32.0, STA, AP and monitor can work well.Awesome! From my point of view adding 8852BE support went really smoothly, thanks for that. Very much appreciated.
I agree. I have been testing the wireless-next code for about a week with no drops and with a code change in today's patches, very little has been logged.
After applying today's updates, my RTW8852BE gets a little over 700 Mbps up and down when using a local speedtest server and a D-Link AX1500 router in the 5G band.
Kudos to the Realtek group.
Larry