wifi: rtw89: update fw crash simulation and settings of MAC and PCI
Ping-Ke Shih
maintainercover wifi: rtw89: update fw crash simulation and settings of MAC and PCI
Update to simulate firmware crash via debugfs to ensure we can recovery connection in field by first two patches. The later four patches are to set proper settings to MAC and PCI.
Chih-Kang Chang (1):
wifi: rtw89: wow: disable interrupt before swapping FW for 8922D
Dian-Syuan Yang (1):
wifi: rtw89: pci: restore LDO setting after device resume
Ping-Ke Shih (2):
wifi: rtw89: mac: set MU group membership and position to registers
wifi: rtw89: pci: warn if SPS OCP happens for RTL8922DE
Zong-Zhe Yang (2):
wifi: rtw89: debug: rename mac/ctrl error to L0/L1 error
wifi: rtw89: debug: tweak Wi-Fi 7 SER L0/L1 simulation methods
drivers/net/wireless/realtek/rtw89/debug.c | 89 ++++++++++++++++----- drivers/net/wireless/realtek/rtw89/mac.c | 21 +++-- drivers/net/wireless/realtek/rtw89/mac.h | 6 ++ drivers/net/wireless/realtek/rtw89/mac_be.c | 7 ++ drivers/net/wireless/realtek/rtw89/pci.c | 11 ++- drivers/net/wireless/realtek/rtw89/pci.h | 1 + drivers/net/wireless/realtek/rtw89/pci_be.c | 2 + drivers/net/wireless/realtek/rtw89/reg.h | 17 ++++ drivers/net/wireless/realtek/rtw89/wow.c | 6 +- 9 files changed, 128 insertions(+), 32 deletions(-)
base-commit: 8da7e88682d58a7c2e2c2101e49d3c9c9ac481b0
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/6 wifi: rtw89: debug: rename mac/ctrl error to L0/L1 error
From: Zong-Zhe Yang <[email protected]>
Sync Realtek terms on SER (system error recovery) simulation.
No logic is changed.
--- drivers/net/wireless/realtek/rtw89/debug.c | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/net/wireless/realtek/rtw89/debug.c +16 -16
@@ -3538,7 +3538,7 @@ rtw89_debug_priv_early_h2c_set(struct rtw89_dev *rtwdev,return count; } -static int rtw89_dbg_trigger_ctrl_error_by_halt_h2c (struct rtw89_dev *rtwdev) +static int rtw89_dbg_trigger_l1_error_by_halt_h2c (struct rtw89_dev *rtwdev) {if (!test_bit (RTW89_FLAG_FW_RDY , rtwdev->flags))return -EBUSY ;
@@ -3546,7 +3546,7 @@ static int rtw89_dbg_trigger_ctrl_error_by_halt_h2c(struct rtw89_dev *rtwdev)return rtw89_mac_set_err_status (rtwdev,MAC_AX_ERR_L1_RESET_FORCE ); } -static int rtw89_dbg_trigger_ctrl_error (struct rtw89_dev *rtwdev) +static int rtw89_dbg_trigger_l1_error (struct rtw89_dev *rtwdev) {const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;struct rtw89_cpuio_ctrl ctrl_para = {0 };
@@ -3554,7 +3554,7 @@ static int rtw89_dbg_trigger_ctrl_error(struct rtw89_dev *rtwdev)int ret;if (RTW89_CHK_FW_FEATURE (SIM_SER_L0L1_BY_HALT_H2C , &rtwdev->fw)) -return rtw89_dbg_trigger_ctrl_error_by_halt_h2c (rtwdev); +return rtw89_dbg_trigger_l1_error_by_halt_h2c (rtwdev);rtw89_leave_ps_mode (rtwdev);
@@ -3576,7 +3576,7 @@ static int rtw89_dbg_trigger_ctrl_error(struct rtw89_dev *rtwdev)return 0 ; } -static int rtw89_dbg_trigger_mac_error_ax (struct rtw89_dev *rtwdev) +static int rtw89_dbg_trigger_l0_error_ax (struct rtw89_dev *rtwdev) {u16 val16;u8 val8;
@@ -3598,7 +3598,7 @@ static int rtw89_dbg_trigger_mac_error_ax(struct rtw89_dev *rtwdev)return 0 ; } -static int rtw89_dbg_trigger_mac_error_be (struct rtw89_dev *rtwdev) +static int rtw89_dbg_trigger_l0_error_be (struct rtw89_dev *rtwdev) {int ret;
@@ -3612,7 +3612,7 @@ static int rtw89_dbg_trigger_mac_error_be(struct rtw89_dev *rtwdev)return 0 ; } -static int rtw89_dbg_trigger_mac_error_by_halt_h2c (struct rtw89_dev *rtwdev) +static int rtw89_dbg_trigger_l0_error_by_halt_h2c (struct rtw89_dev *rtwdev) {if (!test_bit (RTW89_FLAG_FW_RDY , rtwdev->flags))return -EBUSY ;
@@ -3620,20 +3620,20 @@ static int rtw89_dbg_trigger_mac_error_by_halt_h2c(struct rtw89_dev *rtwdev)return rtw89_mac_set_err_status (rtwdev,MAC_AX_ERR_L0_RESET_FORCE ); } -static int rtw89_dbg_trigger_mac_error (struct rtw89_dev *rtwdev) +static int rtw89_dbg_trigger_l0_error (struct rtw89_dev *rtwdev) {const struct rtw89_chip_info *chip = rtwdev->chip;if (RTW89_CHK_FW_FEATURE (SIM_SER_L0L1_BY_HALT_H2C , &rtwdev->fw)) -return rtw89_dbg_trigger_mac_error_by_halt_h2c (rtwdev); +return rtw89_dbg_trigger_l0_error_by_halt_h2c (rtwdev);rtw89_leave_ps_mode (rtwdev);switch (chip->chip_gen) {case RTW89_CHIP_AX : -return rtw89_dbg_trigger_mac_error_ax (rtwdev); +return rtw89_dbg_trigger_l0_error_ax (rtwdev);case RTW89_CHIP_BE : -return rtw89_dbg_trigger_mac_error_be (rtwdev); +return rtw89_dbg_trigger_l0_error_be (rtwdev);default :return -EOPNOTSUPP ; }
@@ -3653,8 +3653,8 @@ rtw89_debug_priv_fw_crash_get(struct rtw89_dev *rtwdev,enum rtw89_dbg_crash_simulation_type {RTW89_DBG_SIM_CPU_EXCEPTION =1 , -RTW89_DBG_SIM_CTRL_ERROR =2 , -RTW89_DBG_SIM_MAC_ERROR =3 , +RTW89_DBG_SIM_L1_ERROR =2 , +RTW89_DBG_SIM_L0_ERROR =3 , }; static ssize_t
@@ -3679,11 +3679,11 @@ rtw89_debug_priv_fw_crash_set(struct rtw89_dev *rtwdev,return -EOPNOTSUPP ; sim = rtw89_fw_h2c_trigger_cpu_exception;break ; -case RTW89_DBG_SIM_CTRL_ERROR : - sim = rtw89_dbg_trigger_ctrl_error; +case RTW89_DBG_SIM_L1_ERROR : + sim = rtw89_dbg_trigger_l1_error;break ; -case RTW89_DBG_SIM_MAC_ERROR : - sim = rtw89_dbg_trigger_mac_error; +case RTW89_DBG_SIM_L0_ERROR : + sim = rtw89_dbg_trigger_l0_error;/* Driver SER flow won't get involved; only FW will. */ announce = false;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 1/6] wifi: rtw89: debug: rename mac/ctrl error to L0/L1 error
Quoted 8 lines · Ping-Ke Shih
From: Zong-Zhe Yang <[email protected]>
Sync Realtek terms on SER (system error recovery) simulation.
No logic is changed.
Signed-off-by Zong-Zhe Yang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
6 patch(es) applied to rtw-next branch of rtw.git, thanks.
9e1e967b4dbe wifi: rtw89: debug: rename mac/ctrl error to L0/L1 error 6792fcf6a691 wifi: rtw89: debug: tweak Wi-Fi 7 SER L0/L1 simulation methods 734bb61782d4 wifi: rtw89: wow: disable interrupt before swapping FW for 8922D 2258f2770e19 wifi: rtw89: mac: set MU group membership and position to registers af1e82232b98 wifi: rtw89: pci: restore LDO setting after device resume 4c1552473acf wifi: rtw89: pci: warn if SPS OCP happens for RTL8922DE
Ping-Ke Shih
maintainerPATCH 2/6 wifi: rtw89: debug: tweak Wi-Fi 7 SER L0/L1 simulation methods
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
SER (system error recovery) L0/L1 simulation has two kinds of methods. How to choose them depends on FW features. But, Wi-Fi 7 misused them.
--- drivers/net/wireless/realtek/rtw89/debug.c | 69 ++++++++++++++++++---- drivers/net/wireless/realtek/rtw89/reg.h | 4 ++ 2 files changed, 62 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw89/debug.c +58 -11
@@ -3538,7 +3538,7 @@ rtw89_debug_priv_early_h2c_set(struct rtw89_dev *rtwdev,return count; } -static int rtw89_dbg_trigger_l1_error_by_halt_h2c (struct rtw89_dev *rtwdev) +static int rtw89_dbg_trigger_l1_error_by_halt_h2c_ax (struct rtw89_dev *rtwdev) {if (!test_bit (RTW89_FLAG_FW_RDY , rtwdev->flags))return -EBUSY ;
@@ -3546,6 +3546,31 @@ static int rtw89_dbg_trigger_l1_error_by_halt_h2c(struct rtw89_dev *rtwdev)return rtw89_mac_set_err_status (rtwdev,MAC_AX_ERR_L1_RESET_FORCE ); } +static int rtw89_dbg_trigger_l1_error_by_halt_h2c_be (struct rtw89_dev *rtwdev) +{ +if (!test_bit (RTW89_FLAG_FW_RDY , rtwdev->flags)) +return -EBUSY ; + +rtw89_write32_set (rtwdev,R_BE_FW_TRIGGER_IDCT_ISR , +B_BE_DMAC_FW_TRIG_IDCT |B_BE_DMAC_FW_ERR_IDCT_IMR ); + +return 0 ; +} + +static int rtw89_dbg_trigger_l1_error_by_halt_h2c (struct rtw89_dev *rtwdev) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +switch (chip->chip_gen) { +case RTW89_CHIP_AX : +return rtw89_dbg_trigger_l1_error_by_halt_h2c_ax (rtwdev); +case RTW89_CHIP_BE : +return rtw89_dbg_trigger_l1_error_by_halt_h2c_be (rtwdev); +default : +return -EOPNOTSUPP ; + } +} +static int rtw89_dbg_trigger_l1_error (struct rtw89_dev *rtwdev) {const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;
@@ -3600,19 +3625,22 @@ static int rtw89_dbg_trigger_l0_error_ax(struct rtw89_dev *rtwdev)static int rtw89_dbg_trigger_l0_error_be (struct rtw89_dev *rtwdev) { +u8 val8;int ret; ret =rtw89_mac_check_mac_en (rtwdev,RTW89_MAC_0 ,RTW89_CMAC_SEL );if (ret)return ret; -rtw89_write32_set (rtwdev,R_BE_CMAC_FW_TRIGGER_IDCT_ISR , -B_BE_CMAC_FW_TRIG_IDCT |B_BE_CMAC_FW_ERR_IDCT_IMR ); + val8 =rtw89_read8 (rtwdev,R_BE_CMAC_FUNC_EN ); +rtw89_write8 (rtwdev,R_BE_CMAC_FUNC_EN , val8 & ~B_BE_TMAC_EN ); +mdelay (1 ); +rtw89_write8 (rtwdev,R_BE_CMAC_FUNC_EN , val8);return 0 ; } -static int rtw89_dbg_trigger_l0_error_by_halt_h2c (struct rtw89_dev *rtwdev) +static int rtw89_dbg_trigger_l0_error_by_halt_h2c_ax (struct rtw89_dev *rtwdev) {if (!test_bit (RTW89_FLAG_FW_RDY , rtwdev->flags))return -EBUSY ;
@@ -3620,23 +3648,42 @@ static int rtw89_dbg_trigger_l0_error_by_halt_h2c(struct rtw89_dev *rtwdev)return rtw89_mac_set_err_status (rtwdev,MAC_AX_ERR_L0_RESET_FORCE ); } -static int rtw89_dbg_trigger_l0_error (struct rtw89_dev *rtwdev) +static int rtw89_dbg_trigger_l0_error_by_halt_h2c_be (struct rtw89_dev *rtwdev) { -const struct rtw89_chip_info *chip = rtwdev->chip; +if (!test_bit (RTW89_FLAG_FW_RDY , rtwdev->flags)) +return -EBUSY ; -if (RTW89_CHK_FW_FEATURE (SIM_SER_L0L1_BY_HALT_H2C , &rtwdev->fw)) -return rtw89_dbg_trigger_l0_error_by_halt_h2c (rtwdev); +rtw89_write32_set (rtwdev,R_BE_CMAC_FW_TRIGGER_IDCT_ISR , +B_BE_CMAC_FW_TRIG_IDCT |B_BE_CMAC_FW_ERR_IDCT_IMR ); -rtw89_leave_ps_mode (rtwdev); +return 0 ; +} + +static int rtw89_dbg_trigger_l0_error (struct rtw89_dev *rtwdev) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; +int (*sim_l0_by_halt_h2c)(struct rtw89_dev *rtwdev); +int (*sim_l0)(struct rtw89_dev *rtwdev);switch (chip->chip_gen) {case RTW89_CHIP_AX : -return rtw89_dbg_trigger_l0_error_ax (rtwdev); + sim_l0_by_halt_h2c = rtw89_dbg_trigger_l0_error_by_halt_h2c_ax; + sim_l0 = rtw89_dbg_trigger_l0_error_ax; +break ;case RTW89_CHIP_BE : -return rtw89_dbg_trigger_l0_error_be (rtwdev); + sim_l0_by_halt_h2c = rtw89_dbg_trigger_l0_error_by_halt_h2c_be; + sim_l0 = rtw89_dbg_trigger_l0_error_be; +break ;default :return -EOPNOTSUPP ; } + +if (RTW89_CHK_FW_FEATURE (SIM_SER_L0L1_BY_HALT_H2C , &rtwdev->fw)) +return sim_l0_by_halt_h2c (rtwdev); + +rtw89_leave_ps_mode (rtwdev); + +return sim_l0 (rtwdev); } static ssize_t
drivers/net/wireless/realtek/rtw89/reg.h +4 -0
@@ -4960,6 +4960,10 @@#define R_BE_SER_L1_DBG_CNT_7 0x845C#define B_BE_SER_L1_DBG_2_MASK GENMASK(31, 0) +#define R_BE_FW_TRIGGER_IDCT_ISR 0x8508 +#define B_BE_DMAC_FW_ERR_IDCT_IMR BIT(31) +#define B_BE_DMAC_FW_TRIG_IDCT BIT(0) +#define R_BE_DMAC_ERR_IMR 0x8520#define B_BE_DMAC_NOTX_ERR_INT_EN BIT(21)#define B_BE_DMAC_NORX_ERR_INT_EN BIT(20)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/6 wifi: rtw89: wow: disable interrupt before swapping FW for 8922D
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
Except for the 8852A, 8852B, 8851B, 8852BT, all subsequent chips use HAXIDMA. Therefore, interrupts need to be disabled before swapping firmware to avoid unexpected SER.
--- drivers/net/wireless/realtek/rtw89/wow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/wow.c +3 -3
@@ -1267,15 +1267,15 @@ static int rtw89_wow_swap_fw(struct rtw89_dev *rtwdev, bool wow)enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;const struct rtw89_chip_info *chip = rtwdev->chip;bool include_bb = !!chip->bbmcu_nr; -bool disable_intr_for_dlfw = false; +bool disable_intr_for_dlfw = true;struct ieee80211_sta *wow_sta;struct rtw89_sta_link *rtwsta_link =NULL ;struct rtw89_sta *rtwsta;bool is_conn = true;int ret; -if (chip_id ==RTL8852C || chip_id ==RTL8922A ) - disable_intr_for_dlfw = true; +if (chip->chip_gen ==RTW89_CHIP_AX && chip_id !=RTL8852C ) + disable_intr_for_dlfw = false; wow_sta =ieee80211_find_sta (wow_vif, wow_vif->cfg.ap_addr);if (wow_sta) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/6 wifi: rtw89: mac: set MU group membership and position to registers
In reply to Ping-Ke ShihThe WiFi 7 chips use different registers to configure MU group for beamforming. Define specific registers and refactor the common flow.
--- drivers/net/wireless/realtek/rtw89/mac.c | 21 +++++++++++++++------ drivers/net/wireless/realtek/rtw89/mac.h | 6 ++++++ drivers/net/wireless/realtek/rtw89/mac_be.c | 7 +++++++ drivers/net/wireless/realtek/rtw89/reg.h | 13 +++++++++++++ 4 files changed, 41 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +15 -6
@@ -4374,6 +4374,12 @@ static const struct rtw89_port_reg rtw89_port_base_ax = { R_AX_PORT_HGQ_WINDOW_CFG + 3}, }; +static const struct rtw89_mac_mu_gid_addr rtw89_mac_mu_gid_addr_ax = { + .position_en = {R_AX_GID_POSITION_EN0 ,R_AX_GID_POSITION_EN1 }, + .position = {R_AX_GID_POSITION0 ,R_AX_GID_POSITION1 , +R_AX_GID_POSITION2 ,R_AX_GID_POSITION3 }, +}; +static void rtw89_mac_check_packet_ctrl (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,u8 type) {
@@ -6770,6 +6776,8 @@ void rtw89_mac_bf_disassoc(struct rtw89_dev *rtwdev,void rtw89_mac_bf_set_gid_table (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif,struct ieee80211_bss_conf *conf) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; +const struct rtw89_mac_mu_gid_addr *addr = mac->mu_gid;struct rtw89_vif *rtwvif =vif_to_rtwvif (vif);struct rtw89_vif_link *rtwvif_link;u8 mac_idx;
@@ -6789,20 +6797,20 @@ void rtw89_mac_bf_set_gid_table(struct rtw89_dev *rtwdev, struct ieee80211_vif * p = (__le32 *)conf->mu_group.membership;rtw89_write32 (rtwdev, -rtw89_mac_reg_by_idx (rtwdev,R_AX_GID_POSITION_EN0 , mac_idx), +rtw89_mac_reg_by_idx (rtwdev, addr->position_en[0 ], mac_idx),le32_to_cpu (p[0 ]));rtw89_write32 (rtwdev, -rtw89_mac_reg_by_idx (rtwdev,R_AX_GID_POSITION_EN1 , mac_idx), +rtw89_mac_reg_by_idx (rtwdev, addr->position_en[1 ], mac_idx),le32_to_cpu (p[1 ])); p = (__le32 *)conf->mu_group.position; -rtw89_write32 (rtwdev,rtw89_mac_reg_by_idx (rtwdev,R_AX_GID_POSITION0 , mac_idx), +rtw89_write32 (rtwdev,rtw89_mac_reg_by_idx (rtwdev, addr->position[0 ], mac_idx),le32_to_cpu (p[0 ])); -rtw89_write32 (rtwdev,rtw89_mac_reg_by_idx (rtwdev,R_AX_GID_POSITION1 , mac_idx), +rtw89_write32 (rtwdev,rtw89_mac_reg_by_idx (rtwdev, addr->position[1 ], mac_idx),le32_to_cpu (p[1 ])); -rtw89_write32 (rtwdev,rtw89_mac_reg_by_idx (rtwdev,R_AX_GID_POSITION2 , mac_idx), +rtw89_write32 (rtwdev,rtw89_mac_reg_by_idx (rtwdev, addr->position[2 ], mac_idx),le32_to_cpu (p[2 ])); -rtw89_write32 (rtwdev,rtw89_mac_reg_by_idx (rtwdev,R_AX_GID_POSITION3 , mac_idx), +rtw89_write32 (rtwdev,rtw89_mac_reg_by_idx (rtwdev, addr->position[3 ], mac_idx),le32_to_cpu (p[3 ])); }
@@ -7282,6 +7290,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .port_base = &rtw89_port_base_ax, .agg_len_ht = R_AX_AGG_LEN_HT_0, .ps_status = R_AX_PPWRBIT_SETTING, + .mu_gid = &rtw89_mac_mu_gid_addr_ax, .muedca_ctrl = { .addr = R_AX_MUEDCA_EN,
drivers/net/wireless/realtek/rtw89/mac.h +6 -0
@@ -1015,6 +1015,11 @@ struct rtw89_mac_size_set {extern const struct rtw89_mac_size_set rtw89_mac_size; +struct rtw89_mac_mu_gid_addr { +u32 position_en[2 ]; +u32 position[4 ]; +}; +struct rtw89_mac_gen_def {u32 band1_offset;u32 filter_model_addr;
@@ -1025,6 +1030,7 @@ struct rtw89_mac_gen_def {const struct rtw89_port_reg *port_base;u32 agg_len_ht;u32 ps_status; +const struct rtw89_mac_mu_gid_addr *mu_gid;struct rtw89_reg_def muedca_ctrl;struct rtw89_reg_def bfee_ctrl;
drivers/net/wireless/realtek/rtw89/mac_be.c +7 -0
@@ -62,6 +62,12 @@ static const struct rtw89_port_reg rtw89_port_base_be = { R_BE_PORT_HGQ_WINDOW_CFG + 3}, }; +static const struct rtw89_mac_mu_gid_addr rtw89_mac_mu_gid_addr_be = { + .position_en = {R_BE_GID_POSITION_EN0 ,R_BE_GID_POSITION_EN1 }, + .position = {R_BE_GID_POSITION0 ,R_BE_GID_POSITION1 , +R_BE_GID_POSITION2 ,R_BE_GID_POSITION3 }, +}; +static int rtw89_mac_check_mac_en_be (struct rtw89_dev *rtwdev,u8 mac_idx,enum rtw89_mac_hwmod_sel sel) {
@@ -3170,6 +3176,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .port_base = &rtw89_port_base_be, .agg_len_ht = R_BE_AGG_LEN_HT_0, .ps_status = R_BE_WMTX_POWER_BE_BIT_CTL, + .mu_gid = &rtw89_mac_mu_gid_addr_be, .muedca_ctrl = { .addr = R_BE_MUEDCA_EN,
drivers/net/wireless/realtek/rtw89/reg.h +13 -0
@@ -6501,6 +6501,19 @@#define BE_WMAC_RFMOD_160M 3#define BE_WMAC_RFMOD_320M 4 +#define R_BE_GID_POSITION0 0x10070 +#define R_BE_GID_POSITION0_C1 0x14070 +#define R_BE_GID_POSITION1 0x10074 +#define R_BE_GID_POSITION1_C1 0x14074 +#define R_BE_GID_POSITION2 0x10078 +#define R_BE_GID_POSITION2_C1 0x14078 +#define R_BE_GID_POSITION3 0x1007C +#define R_BE_GID_POSITION3_C1 0x1407C +#define R_BE_GID_POSITION_EN0 0x10080 +#define R_BE_GID_POSITION_EN0_C1 0x14080 +#define R_BE_GID_POSITION_EN1 0x10084 +#define R_BE_GID_POSITION_EN1_C1 0x14084 +#define R_BE_TX_SUB_BAND_VALUE 0x10088#define R_BE_TX_SUB_BAND_VALUE_C1 0x14088#define B_BE_PRI20_BITMAP_MASK GENMASK(31, 16)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/6 wifi: rtw89: pci: restore LDO setting after device resume
In reply to Ping-Ke ShihFrom: Dian-Syuan Yang <[email protected]>
The LDO (Low Dropout Regulator) setting is missing after suspend/resume in some platforms, and it will cause card loss. Therefore, reconfigure this setting to avoid it.
--- drivers/net/wireless/realtek/rtw89/pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtw89/pci.c +1 -0
@@ -4603,6 +4603,7 @@ static int __maybe_unused rtw89_pci_resume(struct device *dev)rtw89_write32_clr (rtwdev,R_AX_PCIE_PS_CTRL_V1 ,B_AX_SEL_REQ_ENTR_L1 ); } +rtw89_pci_hci_ldo (rtwdev);rtw89_pci_l2_hci_ldo (rtwdev);rtw89_pci_basic_cfg (rtwdev, true);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/6 wifi: rtw89: pci: warn if SPS OCP happens for RTL8922DE
In reply to Ping-Ke ShihSPS OCP (over current protection) is a mechanism to cut off power to protect hardware. When this happens, raise an interrupt to signal driver, which prints out a message to note hardware status.
--- drivers/net/wireless/realtek/rtw89/pci.c | 10 ++++++++-- drivers/net/wireless/realtek/rtw89/pci.h | 1 + drivers/net/wireless/realtek/rtw89/pci_be.c | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +8 -2
@@ -968,6 +968,9 @@ static irqreturn_t rtw89_pci_interrupt_threadfn(int irq, void *dev)if (unlikely (isrs.halt_c2h_isrs & isr_def->isr_wdt_timeout))rtw89_ser_notify (rtwdev,MAC_AX_ERR_L2_ERR_WDT_TIMEOUT_INT ); +if (unlikely (isrs.halt_c2h_isrs & isr_def->isr_sps_ocp)) +rtw89_warn (rtwdev,"SPS OCP alarm 0x%x\n" , isrs.halt_c2h_isrs); +if (unlikely (rtwpci->under_recovery)) goto enable_intr;
@@ -4003,7 +4006,8 @@ static void rtw89_pci_recovery_intr_mask_v3(struct rtw89_dev *rtwdev)struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; rtwpci->ind_intrs =B_BE_HS0_IND_INT_EN0 ; - rtwpci->halt_c2h_intrs =B_BE_HALT_C2H_INT_EN |B_BE_WDT_TIMEOUT_INT_EN ; + rtwpci->halt_c2h_intrs =B_BE_HALT_C2H_INT_EN |B_BE_WDT_TIMEOUT_INT_EN | +B_BE_SPSANA_OCP_INT_EN |B_BE_SPS_OCP_INT_EN ; rtwpci->intrs[0 ] =0 ; rtwpci->intrs[1 ] =0 ; }
@@ -4013,7 +4017,8 @@ static void rtw89_pci_default_intr_mask_v3(struct rtw89_dev *rtwdev)struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; rtwpci->ind_intrs =B_BE_HS0_IND_INT_EN0 ; - rtwpci->halt_c2h_intrs =B_BE_HALT_C2H_INT_EN |B_BE_WDT_TIMEOUT_INT_EN ; + rtwpci->halt_c2h_intrs =B_BE_HALT_C2H_INT_EN |B_BE_WDT_TIMEOUT_INT_EN | +B_BE_SPSANA_OCP_INT_EN |B_BE_SPS_OCP_INT_EN ; rtwpci->intrs[0 ] =0 ; rtwpci->intrs[1 ] =B_BE_PCIE_RDU_CH1_IMR | B_BE_PCIE_RDU_CH0_IMR |
@@ -4655,6 +4660,7 @@ const struct rtw89_pci_isr_def rtw89_pci_isr_ax = { .isr_rdu = B_AX_RDU_INT, .isr_halt_c2h = B_AX_HALT_C2H_INT_EN, .isr_wdt_timeout = B_AX_WDT_TIMEOUT_INT_EN, + .isr_sps_ocp = 0, .isr_clear_rpq = {R_AX_PCIE_HISR00, B_AX_RPQDMA_INT | B_AX_RPQBD_FULL_INT}, .isr_clear_rxq = {R_AX_PCIE_HISR00, B_AX_RXP1DMA_INT | B_AX_RXDMA_INT | B_AX_RDU_INT},
drivers/net/wireless/realtek/rtw89/pci.h +1 -0
@@ -1331,6 +1331,7 @@ struct rtw89_pci_isr_def {u32 isr_rdu;u32 isr_halt_c2h;u32 isr_wdt_timeout; +u32 isr_sps_ocp;struct rtw89_reg2_def isr_clear_rpq;struct rtw89_reg2_def isr_clear_rxq; };
drivers/net/wireless/realtek/rtw89/pci_be.c +2 -0
@@ -763,6 +763,7 @@ const struct rtw89_pci_isr_def rtw89_pci_isr_be = { .isr_rdu = B_BE_RDU_CH1_INT_V1 | B_BE_RDU_CH0_INT_V1, .isr_halt_c2h = B_BE_HALT_C2H_INT, .isr_wdt_timeout = B_BE_WDT_TIMEOUT_INT, + .isr_sps_ocp = 0, .isr_clear_rpq = {R_BE_PCIE_DMA_ISR, B_BE_PCIE_RX_RPQ0_ISR_V1}, .isr_clear_rxq = {R_BE_PCIE_DMA_ISR, B_BE_PCIE_RX_RX0P2_ISR_V1}, };
@@ -772,6 +773,7 @@ const struct rtw89_pci_isr_def rtw89_pci_isr_be_v1 = { .isr_rdu = B_BE_PCIE_RDU_CH1_INT | B_BE_PCIE_RDU_CH0_INT, .isr_halt_c2h = B_BE_HALT_C2H_INT, .isr_wdt_timeout = B_BE_WDT_TIMEOUT_INT, + .isr_sps_ocp = B_BE_SPS_OCP_INT | B_BE_SPSANA_OCP_INT, .isr_clear_rpq = {R_BE_PCIE_DMA_ISR, B_BE_PCIE_RX_RPQ0_ISR_V1}, .isr_clear_rxq = {R_BE_PCIE_DMA_ISR, B_BE_PCIE_RX_RX0P2_ISR_V1}, };
Signature · 1 line
2.25.1