wifi: rtw89: reset AFEDIG register in power off sequence
Ping-Ke Shih
maintainerPATCH 1/2 wifi: rtw89: reset AFEDIG register in power off sequence
From: Chin-Yen Lee <[email protected]>
Some Wi-Fi chips meet card lost issue due to unstable hardware signal of GPIO pins during power off. Reset AFEDIG register before BB reset in power off sequence could avoid unstable signal and fix the issue.
--- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 ++ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 ++ 3 files changed, 5 insertions(+)
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2320,6 +2320,7 @@ static int rtw8851b_mac_disable_bb_rf(struct rtw89_dev *rtwdev)u8 wl_rfc_s1;int ret; +rtw89_write32_clr (rtwdev,R_AX_WLRF_CTRL ,B_AX_AFC_AFEDIG );rtw89_write8_clr (rtwdev,R_AX_SYS_FUNC_EN ,B_AX_FEN_BBRSTB |B_AX_FEN_BB_GLB_RSTN );
drivers/net/wireless/realtek/rtw89/rtw8852b.c +2 -0
@@ -550,6 +550,7 @@ static int rtw8852b_pwr_off_func(struct rtw89_dev *rtwdev)return ret;rtw89_write32_set (rtwdev,R_AX_SYS_PW_CTRL ,B_AX_EN_WLON ); +rtw89_write32_clr (rtwdev,R_AX_WLRF_CTRL ,B_AX_AFC_AFEDIG );rtw89_write8_clr (rtwdev,R_AX_SYS_FUNC_EN ,B_AX_FEN_BB_GLB_RSTN |B_AX_FEN_BBRSTB );rtw89_write32_clr (rtwdev,R_AX_SYS_ADIE_PAD_PWR_CTRL ,B_AX_SYM_PADPDN_WL_RFC_1P3 );
@@ -2469,6 +2470,7 @@ static int rtw8852b_mac_disable_bb_rf(struct rtw89_dev *rtwdev)u8 wl_rfc_s1;int ret; +rtw89_write32_clr (rtwdev,R_AX_WLRF_CTRL ,B_AX_AFC_AFEDIG );rtw89_write8_clr (rtwdev,R_AX_SYS_FUNC_EN ,B_AX_FEN_BBRSTB |B_AX_FEN_BB_GLB_RSTN );
drivers/net/wireless/realtek/rtw89/rtw8852c.c +2 -0
@@ -338,6 +338,7 @@ static int rtw8852c_pwr_off_func(struct rtw89_dev *rtwdev)return ret;rtw89_write32_set (rtwdev,R_AX_SYS_PW_CTRL ,B_AX_EN_WLON ); +rtw89_write32_clr (rtwdev,R_AX_WLRF_CTRL ,B_AX_AFC_AFEDIG );rtw89_write8_clr (rtwdev,R_AX_SYS_FUNC_EN ,B_AX_FEN_BB_GLB_RSTN |B_AX_FEN_BBRSTB );rtw89_write32_clr (rtwdev,R_AX_SYS_ISO_CTRL_EXTEND ,B_AX_R_SYM_FEN_WLBBGLB_1 |B_AX_R_SYM_FEN_WLBBFUN_1 );
@@ -2816,6 +2817,7 @@ static int rtw8852c_mac_enable_bb_rf(struct rtw89_dev *rtwdev)static int rtw8852c_mac_disable_bb_rf (struct rtw89_dev *rtwdev) { +rtw89_write32_clr (rtwdev,R_AX_WLRF_CTRL ,B_AX_AFC_AFEDIG );rtw89_write8_clr (rtwdev,R_AX_SYS_FUNC_EN ,B_AX_FEN_BBRSTB |B_AX_FEN_BB_GLB_RSTN );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 2/2 wifi: rtw89: 8852c: refine power sequence to imporve power consumption
From: Chia-Yuan Li <[email protected]>
Power sequence is a flow to enable/disable WiFi card with hardware parameters. Adjust power and clock parameters according to results of internal simulation and verification, so apply them to have better power consumption.
--- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8852c.c +8 -2
@@ -203,6 +203,9 @@ static int rtw8852c_pwr_on_func(struct rtw89_dev *rtwdev)rtw89_write32_clr (rtwdev,R_AX_SYS_PW_CTRL ,B_AX_APDM_HPDN );rtw89_write32_clr (rtwdev,R_AX_SYS_PW_CTRL ,B_AX_APFM_SWLPS ); +rtw89_write32_mask (rtwdev,R_AX_SPS_DIG_ON_CTRL0 , +B_AX_OCP_L1_MASK ,0x7 ); + ret =read_poll_timeout (rtw89_read32, val32, val32 &B_AX_RDY_SYSPWR ,1000 ,20000 , false, rtwdev,R_AX_SYS_PW_CTRL );if (ret)
@@ -266,7 +269,7 @@ static int rtw8852c_pwr_on_func(struct rtw89_dev *rtwdev) ret =rtw89_mac_write_xtal_si (rtwdev,XTAL_SI_ANAPAR_WL ,0 ,XTAL_SI_SRAM2RFC );if (ret)return ret; - ret =rtw89_mac_write_xtal_si (rtwdev,XTAL_SI_XTAL_XMD_2 ,0 ,XTAL_SI_LDO_LPS ); + ret =rtw89_mac_write_xtal_si (rtwdev,XTAL_SI_XTAL_XMD_2 ,0x10 ,XTAL_SI_LDO_LPS );if (ret)return ret; ret =rtw89_mac_write_xtal_si (rtwdev,XTAL_SI_XTAL_XMD_4 ,0 ,XTAL_SI_LPS_CAP );
@@ -361,8 +364,11 @@ static int rtw8852c_pwr_off_func(struct rtw89_dev *rtwdev)if (ret)return ret; -rtw89_write32 (rtwdev,R_AX_WLLPS_CTRL ,0x0001A0B0 ); +rtw89_write32 (rtwdev,R_AX_WLLPS_CTRL ,SW_LPS_OPTION );rtw89_write32_set (rtwdev,R_AX_SYS_PW_CTRL ,B_AX_XTAL_OFF_A_DIE ); +rtw89_write32_set (rtwdev,R_AX_SYS_SWR_CTRL1 ,B_AX_SYM_CTRL_SPS_PWMFREQ ); +rtw89_write32_mask (rtwdev,R_AX_SPS_DIG_ON_CTRL0 , +B_AX_REG_ZCDC_H_MASK ,0x3 );rtw89_write32_set (rtwdev,R_AX_SYS_PW_CTRL ,B_AX_APFM_SWLPS );return 0 ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerQuoted 8 lines · Ping-Ke Shih
From: Chin-Yen Lee <[email protected]>
Some Wi-Fi chips meet card lost issue due to unstable hardware signal of GPIO pins during power off. Reset AFEDIG register before BB reset in power off sequence could avoid unstable signal and fix the issue.
Signed-off-by Chin-Yen Lee <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
2 patch(es) applied to rtw-next branch of rtw.git, thanks.
535c045da60f wifi: rtw89: reset AFEDIG register in power off sequence 4e5957101d42 wifi: rtw89: 8852c: refine power sequence to imporve power consumption