rtw89: add firmware reset and dump firmware memory and backtrace
Ping-Ke Shih
maintainercover rtw89: add firmware reset and dump firmware memory and backtrace
Add a debugfs entry to trigger firmware reset manually, and then SER (System Error Recovery) will catch the error and dump memory and backtrace before calling ieee80211_restart_hw().
During development of this feature, we found some issues related to SER, so fix them in this patchset as well.
Zong-Zhe Yang (8):
rtw89: ser: fix CAM leaks occurring in L2 reset
rtw89: mac: move table of mem base addr to common
rtw89: mac: correct decision on error status by scenario
rtw89: ser: control hci interrupts on/off by state
rtw89: ser: dump memory for fw payload engine while L2 reset
rtw89: ser: dump fw backtrace while L2 reset
rtw89: reconstruct fw feature
rtw89: support FW crash simulation
drivers/net/wireless/realtek/rtw89/cam.c | 14 +- drivers/net/wireless/realtek/rtw89/core.c | 5 +- drivers/net/wireless/realtek/rtw89/core.h | 38 ++- drivers/net/wireless/realtek/rtw89/debug.c | 70 +++-- drivers/net/wireless/realtek/rtw89/fw.c | 89 ++++++- drivers/net/wireless/realtek/rtw89/fw.h | 23 ++ drivers/net/wireless/realtek/rtw89/mac.c | 32 ++- drivers/net/wireless/realtek/rtw89/mac.h | 10 + drivers/net/wireless/realtek/rtw89/mac80211.c | 4 +- drivers/net/wireless/realtek/rtw89/pci.c | 29 +++ drivers/net/wireless/realtek/rtw89/pci.h | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/ser.c | 245 +++++++++++++++++- 14 files changed, 516 insertions(+), 47 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/8 rtw89: ser: fix CAM leaks occurring in L2 reset
From: Zong-Zhe Yang <[email protected]>
The CAM, meaning address CAM and bssid CAM here, will get leaks during SER (system error recover) L2 reset process and ieee80211_restart_hw() which is called by L2 reset process eventually.
The normal flow would be like
-> add interface (acquire 1)
-> enter ips (release 1)
-> leave ips (acquire 1)
-> connection (occupy 1) <(A) 1 leak after L2 reset if non-sec connection>
The ieee80211_restart_hw() flow (under connection) -> ieee80211 reconfig
-> add interface (acquire 1)
-> leave ips (acquire 1)
-> connection (occupy (A) + 2) <(B) 1 more leak>
Originally, CAM is released before HW restart only if connection is under security. Now, release CAM whatever connection it is to fix leak in (A). OTOH, check if CAM is already valid to avoid acquiring multiple times to fix (B).
Besides, if AP mode, release address CAM of all stations before HW restart.
--- drivers/net/wireless/realtek/rtw89/cam.c | 14 ++++++++++++-- drivers/net/wireless/realtek/rtw89/ser.c | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/cam.c +12 -2
@@ -421,10 +421,8 @@ static void rtw89_cam_reset_key_iter(struct ieee80211_hw *hw, void *data) {struct rtw89_dev *rtwdev = (struct rtw89_dev *)data; -struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv;rtw89_cam_sec_key_del (rtwdev, vif, sta, key, false); -rtw89_cam_deinit (rtwdev, rtwvif); } void rtw89_cam_deinit_addr_cam(struct rtw89_dev *rtwdev,
@@ -480,6 +478,12 @@ int rtw89_cam_init_addr_cam(struct rtw89_dev *rtwdev,int i;int ret; +if (unlikely (addr_cam->valid)) { +rtw89_debug (rtwdev,RTW89_DBG_FW , +"addr cam is already valid; skip init\n" ); +return 0 ; + } + ret =rtw89_cam_get_avail_addr_cam (rtwdev, &addr_cam_idx);if (ret) {rtw89_err (rtwdev,"failed to get available addr cam\n" );
@@ -531,6 +535,12 @@ static int rtw89_cam_init_bssid_cam(struct rtw89_dev *rtwdev,u8 bssid_cam_idx;int ret; +if (unlikely (bssid_cam->valid)) { +rtw89_debug (rtwdev,RTW89_DBG_FW , +"bssid cam is already valid; skip init\n" ); +return 0 ; + } + ret =rtw89_cam_get_avail_bssid_cam (rtwdev, &bssid_cam_idx);if (ret) {rtw89_err (rtwdev,"failed to get available bssid cam\n" );
drivers/net/wireless/realtek/rtw89/ser.c +21 -0
@@ -220,11 +220,32 @@ static void ser_reset_vif(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) rtwvif->trigger = false; } +static void ser_sta_deinit_addr_cam_iter (void *data,struct ieee80211_sta *sta) +{ +struct rtw89_dev *rtwdev = (struct rtw89_dev *)data; +struct rtw89_sta *rtwsta = (struct rtw89_sta *)sta->drv_priv; + +rtw89_cam_deinit_addr_cam (rtwdev, &rtwsta->addr_cam); +} + +static void ser_deinit_cam (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif) +{ +if (rtwvif->net_type ==RTW89_NET_TYPE_AP_MODE ) +ieee80211_iterate_stations_atomic (rtwdev->hw, + ser_sta_deinit_addr_cam_iter, + rtwdev); + +rtw89_cam_deinit (rtwdev, rtwvif); +} +static void ser_reset_mac_binding (struct rtw89_dev *rtwdev) {struct rtw89_vif *rtwvif;rtw89_cam_reset_keys (rtwdev); +rtw89_for_each_rtwvif (rtwdev, rtwvif) +ser_deinit_cam (rtwdev, rtwvif); +rtw89_core_release_all_bits_map (rtwdev->mac_id_map,RTW89_MAX_MAC_ID_NUM );rtw89_for_each_rtwvif (rtwdev, rtwvif)ser_reset_vif (rtwdev, rtwvif);
Signature · 1 line
2.25.1
Re: [PATCH 1/8] rtw89: ser: fix CAM leaks occurring in L2 reset
Quoted 23 lines · Ping-Ke Shih
From: Zong-Zhe Yang <[email protected]>
The CAM, meaning address CAM and bssid CAM here, will get leaks during SER (system error recover) L2 reset process and
ieee80211_restart_hw()which is called by L2 reset process eventually.The normal flow would be like
-> add interface (acquire 1)
-> enter ips (release 1)
-> leave ips (acquire 1)
-> connection (occupy 1) <(A) 1 leak after L2 reset if non-sec connection>The
ieee80211_restart_hw()flow (under connection) -> ieee80211 reconfig
-> add interface (acquire 1)
-> leave ips (acquire 1)
-> connection (occupy (A) + 2) <(B) 1 more leak>Originally, CAM is released before HW restart only if connection is under security. Now, release CAM whatever connection it is to fix leak in (A). OTOH, check if CAM is already valid to avoid acquiring multiple times to fix (B).
Quoted 4 lines
Besides, if AP mode, release address CAM of all stations before HW restart.
Signed-off-by Zong-Zhe Yang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
8 patches applied to wireless-next.git, thanks.
b169f877f001 rtw89: ser: fix CAM leaks occurring in L2 reset e1400b115cac rtw89: mac: move table of mem base addr to common 198b6cf70146 rtw89: mac: correct decision on error status by scenario 14f9f4790048 rtw89: ser: control hci interrupts on/off by state 9f8004bfed03 rtw89: ser: dump memory for fw payload engine while L2 reset f5e246846412 rtw89: ser: dump fw backtrace while L2 reset 11fe4ccda867 rtw89: reconstruct fw featureedb896297abe rtw89: support FW crash simulation
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 rtw89: mac: move table of mem base addr to common
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Previously, mac_mem_base_addr_table was declared in debug.c locally because it's only used via debugfs to dump mac memory. Now, we plan to refine SER (system error recover) flow which will also need to dump mac memory to somewhere as information for error which is catched. So, we move mac_mem_base_addr_table to mac.c rtw89_mac_mem_base_addrs earlier as common code.
(no logic is changed)
--- drivers/net/wireless/realtek/rtw89/debug.c | 22 +--------------------- drivers/net/wireless/realtek/rtw89/mac.c | 20 ++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/mac.h | 2 ++ 3 files changed, 23 insertions(+), 21 deletions(-)
drivers/net/wireless/realtek/rtw89/debug.c +1 -21
@@ -724,26 +724,6 @@ rtw89_debug_priv_mac_mem_dump_select(struct file *filp,return count; } -static const u32 mac_mem_base_addr_table[RTW89_MAC_MEM_MAX ] = { - [RTW89_MAC_MEM_AXIDMA ] =AXIDMA_BASE_ADDR , - [RTW89_MAC_MEM_SHARED_BUF ] =SHARED_BUF_BASE_ADDR , - [RTW89_MAC_MEM_DMAC_TBL ] =DMAC_TBL_BASE_ADDR , - [RTW89_MAC_MEM_SHCUT_MACHDR ] =SHCUT_MACHDR_BASE_ADDR , - [RTW89_MAC_MEM_STA_SCHED ] =STA_SCHED_BASE_ADDR , - [RTW89_MAC_MEM_RXPLD_FLTR_CAM ] =RXPLD_FLTR_CAM_BASE_ADDR , - [RTW89_MAC_MEM_SECURITY_CAM ] =SECURITY_CAM_BASE_ADDR , - [RTW89_MAC_MEM_WOW_CAM ] =WOW_CAM_BASE_ADDR , - [RTW89_MAC_MEM_CMAC_TBL ] =CMAC_TBL_BASE_ADDR , - [RTW89_MAC_MEM_ADDR_CAM ] =ADDR_CAM_BASE_ADDR , - [RTW89_MAC_MEM_BA_CAM ] =BA_CAM_BASE_ADDR , - [RTW89_MAC_MEM_BCN_IE_CAM0 ] =BCN_IE_CAM0_BASE_ADDR , - [RTW89_MAC_MEM_BCN_IE_CAM1 ] =BCN_IE_CAM1_BASE_ADDR , - [RTW89_MAC_MEM_TXD_FIFO_0 ] =TXD_FIFO_0_BASE_ADDR , - [RTW89_MAC_MEM_TXD_FIFO_1 ] =TXD_FIFO_1_BASE_ADDR , - [RTW89_MAC_MEM_TXDATA_FIFO_0 ] =TXDATA_FIFO_0_BASE_ADDR , - [RTW89_MAC_MEM_TXDATA_FIFO_1 ] =TXDATA_FIFO_1_BASE_ADDR , -}; -static void rtw89_debug_dump_mac_mem (struct seq_file *m,struct rtw89_dev *rtwdev,u8 sel,u32 start_addr,u32 len)
@@ -757,7 +737,7 @@ static void rtw89_debug_dump_mac_mem(struct seq_file *m, pages = len /MAC_MEM_DUMP_PAGE_SIZE +1 ; start_page = start_addr /MAC_MEM_DUMP_PAGE_SIZE ; residue = start_addr %MAC_MEM_DUMP_PAGE_SIZE ; - base_addr = mac_mem_base_addr_table[sel]; + base_addr = rtw89_mac_mem_base_addrs[sel]; base_addr += start_page *MAC_MEM_DUMP_PAGE_SIZE ;for (p =0 ; p < pages; p++) {
drivers/net/wireless/realtek/rtw89/mac.c +20 -0
@@ -10,6 +10,26 @@#include "reg.h" #include "util.h" +const u32 rtw89_mac_mem_base_addrs[RTW89_MAC_MEM_MAX ] = { + [RTW89_MAC_MEM_AXIDMA ] =AXIDMA_BASE_ADDR , + [RTW89_MAC_MEM_SHARED_BUF ] =SHARED_BUF_BASE_ADDR , + [RTW89_MAC_MEM_DMAC_TBL ] =DMAC_TBL_BASE_ADDR , + [RTW89_MAC_MEM_SHCUT_MACHDR ] =SHCUT_MACHDR_BASE_ADDR , + [RTW89_MAC_MEM_STA_SCHED ] =STA_SCHED_BASE_ADDR , + [RTW89_MAC_MEM_RXPLD_FLTR_CAM ] =RXPLD_FLTR_CAM_BASE_ADDR , + [RTW89_MAC_MEM_SECURITY_CAM ] =SECURITY_CAM_BASE_ADDR , + [RTW89_MAC_MEM_WOW_CAM ] =WOW_CAM_BASE_ADDR , + [RTW89_MAC_MEM_CMAC_TBL ] =CMAC_TBL_BASE_ADDR , + [RTW89_MAC_MEM_ADDR_CAM ] =ADDR_CAM_BASE_ADDR , + [RTW89_MAC_MEM_BA_CAM ] =BA_CAM_BASE_ADDR , + [RTW89_MAC_MEM_BCN_IE_CAM0 ] =BCN_IE_CAM0_BASE_ADDR , + [RTW89_MAC_MEM_BCN_IE_CAM1 ] =BCN_IE_CAM1_BASE_ADDR , + [RTW89_MAC_MEM_TXD_FIFO_0 ] =TXD_FIFO_0_BASE_ADDR , + [RTW89_MAC_MEM_TXD_FIFO_1 ] =TXD_FIFO_1_BASE_ADDR , + [RTW89_MAC_MEM_TXDATA_FIFO_0 ] =TXDATA_FIFO_0_BASE_ADDR , + [RTW89_MAC_MEM_TXDATA_FIFO_1 ] =TXDATA_FIFO_1_BASE_ADDR , +}; +int rtw89_mac_check_mac_en (struct rtw89_dev *rtwdev,u8 mac_idx,enum rtw89_mac_hwmod_sel sel) {
drivers/net/wireless/realtek/rtw89/mac.h +2 -0
@@ -273,6 +273,8 @@ enum rtw89_mac_mem_sel { RTW89_MAC_MEM_INVALID = RTW89_MAC_MEM_LAST, }; +extern const u32 rtw89_mac_mem_base_addrs[]; +enum rtw89_rpwm_req_pwr_state {RTW89_MAC_RPWM_REQ_PWR_STATE_ACTIVE =0 ,RTW89_MAC_RPWM_REQ_PWR_STATE_BAND0_RFON =1 ,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/8 rtw89: mac: correct decision on error status by scenario
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
The raw error code might combine error scenario and error status. But, the error scenario isn't parsed previously. It makes us mishandle cpu exception and assertion. Now, we correct the error status for them.
Besides, a few uses of error status are refined.
--- drivers/net/wireless/realtek/rtw89/mac.c | 12 ++++++++++-- drivers/net/wireless/realtek/rtw89/mac.h | 8 ++++++++ drivers/net/wireless/realtek/rtw89/ser.c | 6 ++++-- 3 files changed, 22 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +10 -2
@@ -257,7 +257,9 @@ static void rtw89_mac_dump_err_status(struct rtw89_dev *rtwdev,u32 dmac_err, cmac_err;if (err !=MAC_AX_ERR_L1_ERR_DMAC && - err !=MAC_AX_ERR_L0_PROMOTE_TO_L1 ) + err !=MAC_AX_ERR_L0_PROMOTE_TO_L1 && + err !=MAC_AX_ERR_L0_ERR_CMAC0 && + err !=MAC_AX_ERR_L0_ERR_CMAC1 )return ;rtw89_info (rtwdev,"--->\nerr=0x%x\n" , err);
@@ -458,7 +460,7 @@ static void rtw89_mac_dump_err_status(struct rtw89_dev *rtwdev,u32 rtw89_mac_get_err_status (struct rtw89_dev *rtwdev) { -u32 err; +u32 err, err_scnr;int ret; ret = read_poll_timeout(rtw89_read32, err, (err != 0), 1000, 100000,
@@ -471,6 +473,12 @@ u32 rtw89_mac_get_err_status(struct rtw89_dev *rtwdev) err =rtw89_read32 (rtwdev,R_AX_HALT_C2H );rtw89_write32 (rtwdev,R_AX_HALT_C2H_CTRL ,0 ); + err_scnr =RTW89_ERROR_SCENARIO (err); +if (err_scnr ==RTW89_WCPU_CPU_EXCEPTION ) + err =MAC_AX_ERR_CPU_EXCEPTION ; +else if (err_scnr ==RTW89_WCPU_ASSERTION ) + err =MAC_AX_ERR_ASSERTION ; +rtw89_fw_st_dbg_dump (rtwdev);rtw89_mac_dump_err_status (rtwdev, err);
drivers/net/wireless/realtek/rtw89/mac.h +8 -0
@@ -521,6 +521,13 @@ struct rtw89_mac_dle_dfi_qempty {u32 qempty; }; +enum rtw89_mac_error_scenario { +RTW89_WCPU_CPU_EXCEPTION =2 , +RTW89_WCPU_ASSERTION =3 , +}; + +#define RTW89_ERROR_SCENARIO (__err) ((__err) >> 28) +/* Define DBG and recovery enum */ enum mac_ax_err_info {/* Get error info */
@@ -659,6 +666,7 @@ enum mac_ax_err_info {MAC_AX_ERR_L2_ERR_APB_BBRF_TO_OTHERS =0x2370 ,MAC_AX_ERR_L2_RESET_DONE =0x2400 ,MAC_AX_ERR_CPU_EXCEPTION =0x3000 , +MAC_AX_ERR_ASSERTION =0x4000 ,MAC_AX_GET_ERR_MAX , MAC_AX_DUMP_SHAREBUFF_INDICATOR = 0x80000000,
drivers/net/wireless/realtek/rtw89/ser.c +4 -2
@@ -477,7 +477,7 @@ int rtw89_ser_notify(struct rtw89_dev *rtwdev, u32 err) {u8 event =SER_EV_NONE ; -rtw89_info (rtwdev,"ser event = 0x%04x\n" , err); +rtw89_info (rtwdev,"SER catches error: 0x%x\n" , err);switch (err) {case MAC_AX_ERR_L1_ERR_DMAC :
@@ -503,8 +503,10 @@ int rtw89_ser_notify(struct rtw89_dev *rtwdev, u32 err)break ; } -if (event ==SER_EV_NONE ) +if (event ==SER_EV_NONE ) { +rtw89_warn (rtwdev,"SER cannot recognize error: 0x%x\n" , err);return -EINVAL ; + }ser_send_msg (&rtwdev->ser, event);return 0 ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/8 rtw89: ser: control hci interrupts on/off by state
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
While SER (system error recover) is processing, it's supposed to mean something is under recovery. So, disable interrupts (excluding the one of halt which could be used during SER) to avoid unexpected behavior. And then, enable interrupts after SER is done.
--- drivers/net/wireless/realtek/rtw89/core.h | 19 +++++++++++++++ drivers/net/wireless/realtek/rtw89/pci.c | 29 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/pci.h | 1 + drivers/net/wireless/realtek/rtw89/ser.c | 4 ++++ 4 files changed, 53 insertions(+)
drivers/net/wireless/realtek/rtw89/core.h +19 -0
@@ -2025,6 +2025,13 @@ struct rtw89_hci_ops {int (*mac_lv1_rcvy)(struct rtw89_dev *rtwdev,enum rtw89_lv1_rcvy_step step);void (*dump_err_status)(struct rtw89_dev *rtwdev);int (*napi_poll)(struct napi_struct *napi,int budget); + +/* Deal with locks inside recovery_start and recovery_complete callbacks +* by hci instance, and handle things which need to consider under SER. +* e.g. turn on/off interrupts except for the one for halt notification. +*/ +void (*recovery_start)(struct rtw89_dev *rtwdev); +void (*recovery_complete)(struct rtw89_dev *rtwdev); };struct rtw89_hci_info {
@@ -3023,6 +3030,18 @@ static inline void rtw89_hci_flush_queues(struct rtw89_dev *rtwdev, u32 queues,return rtwdev->hci.ops->flush_queues (rtwdev, queues, drop); } +static inline void rtw89_hci_recovery_start (struct rtw89_dev *rtwdev) +{ +if (rtwdev->hci.ops->recovery_start) + rtwdev->hci.ops->recovery_start (rtwdev); +} + +static inline void rtw89_hci_recovery_complete (struct rtw89_dev *rtwdev) +{ +if (rtwdev->hci.ops->recovery_complete) + rtwdev->hci.ops->recovery_complete (rtwdev); +} +static inline u8 rtw89_read8 (struct rtw89_dev *rtwdev,u32 addr) {return rtwdev->hci.ops->read8 (rtwdev, addr);
drivers/net/wireless/realtek/rtw89/pci.c +29 -0
@@ -647,6 +647,29 @@ static void rtw89_pci_disable_intr(struct rtw89_dev *rtwdev,rtw89_write32 (rtwdev,R_AX_PCIE_HIMR10 ,0 ); } +static void rtw89_pci_ops_recovery_start (struct rtw89_dev *rtwdev) +{ +struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; +unsigned long flags; + +spin_lock_irqsave (&rtwpci->irq_lock, flags); + rtwpci->under_recovery = true; +rtw89_write32 (rtwdev,R_AX_PCIE_HIMR00 ,0 ); +rtw89_write32 (rtwdev,R_AX_PCIE_HIMR10 ,0 ); +spin_unlock_irqrestore (&rtwpci->irq_lock, flags); +} + +static void rtw89_pci_ops_recovery_complete (struct rtw89_dev *rtwdev) +{ +struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; +unsigned long flags; + +spin_lock_irqsave (&rtwpci->irq_lock, flags); + rtwpci->under_recovery = false; +rtw89_pci_enable_intr (rtwdev, rtwpci); +spin_unlock_irqrestore (&rtwpci->irq_lock, flags); +} +static irqreturn_t rtw89_pci_interrupt_threadfn (int irq,void *dev) {struct rtw89_dev *rtwdev = dev;
@@ -664,6 +687,9 @@ static irqreturn_t rtw89_pci_interrupt_threadfn(int irq, void *dev)if (unlikely (isrs.halt_c2h_isrs &B_AX_HALT_C2H_INT_EN ))rtw89_ser_notify (rtwdev,rtw89_mac_get_err_status (rtwdev)); +if (unlikely (rtwpci->under_recovery)) +return IRQ_HANDLED ; +if (likely (rtwpci->running)) {local_bh_disable ();napi_schedule (&rtwdev->napi);
@@ -2931,6 +2957,9 @@ static const struct rtw89_hci_ops rtw89_pci_ops = { .mac_lv1_rcvy = rtw89_pci_ops_mac_lv1_recovery, .dump_err_status = rtw89_pci_ops_dump_err_status, .napi_poll = rtw89_pci_napi_poll, + + .recovery_start = rtw89_pci_ops_recovery_start, + .recovery_complete = rtw89_pci_ops_recovery_complete, };int rtw89_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id)
drivers/net/wireless/realtek/rtw89/pci.h +1 -0
@@ -594,6 +594,7 @@ struct rtw89_pci {/* protect TRX resources (exclude RXQ) */ spinlock_t trx_lock;bool running; +bool under_recovery;struct rtw89_pci_tx_ring tx_rings[RTW89_TXCH_NUM ];struct rtw89_pci_rx_ring rx_rings[RTW89_RXCH_NUM ];struct sk_buff_head h2c_queue;
drivers/net/wireless/realtek/rtw89/ser.c +4 -0
@@ -302,8 +302,11 @@ static void hal_send_m4_event(struct rtw89_ser *ser)/* state handler */ static void ser_idle_st_hdl (struct rtw89_ser *ser,u8 evt) { + struct rtw89_dev *rtwdev = container_of(ser, struct rtw89_dev, ser); +switch (evt) {case SER_EV_STATE_IN : +rtw89_hci_recovery_complete (rtwdev);break ;case SER_EV_L1_RESET :ser_state_goto (ser,SER_RESET_TRX_ST );
@@ -312,6 +315,7 @@ static void ser_idle_st_hdl(struct rtw89_ser *ser, u8 evt)ser_state_goto (ser,SER_L2_RESET_ST );break ;case SER_EV_STATE_OUT : +rtw89_hci_recovery_start (rtwdev);default :break ; }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/8 rtw89: ser: dump memory for fw payload engine while L2 reset
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
When FW encounters exception or assertion, SER L2 reset process will start. It will dump some error information and re-download FW eventually. Since such errors are usually critical, we would like to keep more information about error to increase possibility of analysis and debugging FW. We first add FW payload engine (fw reserved playoad engine, fw_rsvd_ple) memory dump. FW will record things like CPU registers, backtrace entry, etc. in it for debugging.
Moreover, device core dump framework is used and wrapped to collect kinds of dumps during SER L2 reset process.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.h | 2 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/ser.c | 118 +++++++++++++++++- 4 files changed, 120 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -2267,6 +2267,7 @@ struct rtw89_chip_info {u32 fifo_size;u16 max_amsdu_limit;bool dis_2g_40m_ul_ofdma; +u32 rsvd_ple_ofst;const struct rtw89_hfc_param_ini *hfc_param_ini;const struct rtw89_dle_mem *dle_mem;u32 rf_base_addr[2 ];
drivers/net/wireless/realtek/rtw89/fw.h +2 -0
@@ -2194,6 +2194,8 @@ struct rtw89_fw_h2c_rf_reg_info {#define H2C_CL_OUTSRC_RF_REG_A 0x8#define H2C_CL_OUTSRC_RF_REG_B 0x9 +#define RTW89_FW_RSVD_PLE_SIZE 0x800 +int rtw89_fw_check_rdy (struct rtw89_dev *rtwdev);int rtw89_fw_recognize (struct rtw89_dev *rtwdev);int rtw89_fw_download (struct rtw89_dev *rtwdev,enum rtw89_fw_type type);
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2033,6 +2033,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .fifo_size = 458752, .max_amsdu_limit = 3500, .dis_2g_40m_ul_ofdma = true, + .rsvd_ple_ofst = 0x6f800, .hfc_param_ini = rtw8852a_hfc_param_ini_pcie, .dle_mem = rtw8852a_dle_mem_pcie, .rf_base_addr = {0xc000, 0xd000},
drivers/net/wireless/realtek/rtw89/ser.c +116 -2
146 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/8 rtw89: ser: dump fw backtrace while L2 reset
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Read FW backtrace entry through FW reserved payload engine, and then add FW backtrace dump during SER (system error recover) L2 reset process. It contains a list of RA (return address) and SP (stack pointer) which gives us a chance to trace back the call stack of FW.
Moreover, if core dump might have wrong content due to error during dumping, we won't invoke device core dump framework. For this case, rtw89_ser_cd_free() is added to free buffer by ourselves.
--- drivers/net/wireless/realtek/rtw89/fw.h | 9 +++ drivers/net/wireless/realtek/rtw89/ser.c | 97 +++++++++++++++++++++++- 2 files changed, 105 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/fw.h +9 -0
@@ -2196,6 +2196,15 @@ struct rtw89_fw_h2c_rf_reg_info {#define RTW89_FW_RSVD_PLE_SIZE 0x800 +#define RTW89_WCPU_BASE_ADDR 0xA0000000 + +#define RTW89_FW_BACKTRACE_INFO_SIZE 8 +#define RTW89_VALID_FW_BACKTRACE_SIZE (_size) \ + ((_size) % RTW89_FW_BACKTRACE_INFO_SIZE == 0) + +#define RTW89_FW_BACKTRACE_MAX_SIZE 512/* 8 * 64 (entries) */ +#define RTW89_FW_BACKTRACE_KEY 0xBACEBACE +int rtw89_fw_check_rdy (struct rtw89_dev *rtwdev);int rtw89_fw_recognize (struct rtw89_dev *rtwdev);int rtw89_fw_download (struct rtw89_dev *rtwdev,enum rtw89_fw_type type);
drivers/net/wireless/realtek/rtw89/ser.c +96 -1
141 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/8 rtw89: reconstruct fw feature
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
As the fw features gradually increase, it would be better that we have a set of methods to maintain fw features instead of using scattered bool variables.
We reconstruct the way fw recognize features, and introduce RTW89_CHK_FW_FEATURE() / RTW89_SET_FW_FEATURE() to check / set fw features for uses.
--- drivers/net/wireless/realtek/rtw89/core.c | 5 +- drivers/net/wireless/realtek/rtw89/core.h | 16 ++++-- drivers/net/wireless/realtek/rtw89/fw.c | 53 +++++++++++++++---- drivers/net/wireless/realtek/rtw89/mac80211.c | 4 +- drivers/net/wireless/realtek/rtw89/phy.c | 2 +- 5 files changed, 62 insertions(+), 18 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +3 -2
@@ -759,7 +759,7 @@ static void rtw89_core_tx_wake(struct rtw89_dev *rtwdev, struct rtw89_core_tx_request *tx_req) { -if (!rtwdev->fw.tx_wake) +if (!RTW89_CHK_FW_FEATURE (TX_WAKE , &rtwdev->fw))return ;if (!test_bit (RTW89_FLAG_LOW_POWER_MODE , rtwdev->flags))
@@ -1454,7 +1454,8 @@ static void rtw89_core_update_rx_status(struct rtw89_dev *rtwdev, rx_status->freq = hw->conf.chandef.chan->center_freq; rx_status->band = hw->conf.chandef.chan->band; -if (rtwdev->scanning && rtwdev->fw.scan_offload) { +if (rtwdev->scanning && +RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw)) { rx_status->freq =ieee80211_channel_to_frequency (hal->current_channel, hal->current_band_type);
drivers/net/wireless/realtek/rtw89/core.h +13 -3
@@ -2386,6 +2386,12 @@ enum rtw89_fw_type { RTW89_FW_WOWLAN = 3, }; +enum rtw89_fw_feature { +RTW89_FW_FEATURE_OLD_HT_RA_FORMAT , +RTW89_FW_FEATURE_SCAN_OFFLOAD , +RTW89_FW_FEATURE_TX_WAKE , +}; +struct rtw89_fw_suit {const u8 *data;u32 size;
@@ -2415,11 +2421,15 @@ struct rtw89_fw_info {struct rtw89_fw_suit normal;struct rtw89_fw_suit wowlan;bool fw_log_enable; -bool old_ht_ra_format; -bool scan_offload; -bool tx_wake; +u32 feature_map; }; +#define RTW89_CHK_FW_FEATURE (_feat, _fw) \ + (!!((_fw)->feature_map & BIT(RTW89_FW_FEATURE_ ## _feat))) + +#define RTW89_SET_FW_FEATURE (_fw_feature, _fw) \ + ((_fw)->feature_map |= BIT(_fw_feature)) +struct rtw89_cam_info { DECLARE_BITMAP(addr_cam_map, RTW89_MAX_ADDR_CAM_NUM); DECLARE_BITMAP(bssid_cam_map, RTW89_MAX_BSSID_CAM_NUM);
drivers/net/wireless/realtek/rtw89/fw.c +43 -10
65 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/mac80211.c +2 -2
@@ -725,7 +725,7 @@ static int rtw89_ops_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,struct rtw89_dev *rtwdev = hw->priv;int ret =0 ; -if (!rtwdev->fw.scan_offload) +if (!RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw))return 1 ;if (rtwdev->scanning)
@@ -748,7 +748,7 @@ static void rtw89_ops_cancel_hw_scan(struct ieee80211_hw *hw, {struct rtw89_dev *rtwdev = hw->priv; -if (!rtwdev->fw.scan_offload) +if (!RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD , &rtwdev->fw))return ;if (!rtwdev->scanning)
drivers/net/wireless/realtek/rtw89/phy.c +1 -1
@@ -1558,7 +1558,7 @@ static void rtw89_phy_c2h_ra_rpt_iter(void *data, struct ieee80211_sta *sta)break ;case RTW89_RA_RPT_MODE_HT : ra_report->txrate.flags |=RATE_INFO_FLAGS_MCS ; -if (rtwdev->fw.old_ht_ra_format) +if (RTW89_CHK_FW_FEATURE (OLD_HT_RA_FORMAT , &rtwdev->fw)) rate =RTW89_MK_HT_RATE (FIELD_GET (RTW89_RA_RATE_MASK_NSS , rate),FIELD_GET (RTW89_RA_RATE_MASK_MCS , rate));else
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/8 rtw89: support FW crash simulation
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Originally, there is already a mechanism, SER (system error recover), to deal with HW/FW recovery. After FW v0.13.36.0, FW supports a H2C (host to chip) command to make a CPU exception. Then, SER is supposed to catch this FW crash and do L2 reset. This feature is a simulation to verify if flow of recovering from FW crash works.
Usage of fw_crash debugfs is as the following.
$ echo 1 > fw_crash // trigger FW crash and wait SER handling $ cat fw_crash // return 0 if restart has been done
--- drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/debug.c | 48 ++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.c | 36 ++++++++++++++++ drivers/net/wireless/realtek/rtw89/fw.h | 12 ++++++ drivers/net/wireless/realtek/rtw89/ser.c | 1 + 5 files changed, 99 insertions(+)
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -2390,6 +2390,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_OLD_HT_RA_FORMAT ,RTW89_FW_FEATURE_SCAN_OFFLOAD ,RTW89_FW_FEATURE_TX_WAKE , + RTW89_FW_FEATURE_CRASH_TRIGGER, }; struct rtw89_fw_suit {
@@ -2492,6 +2493,7 @@ enum rtw89_flags {RTW89_FLAG_LEISURE_PS ,RTW89_FLAG_LOW_POWER_MODE ,RTW89_FLAG_INACTIVE_PS , +RTW89_FLAG_RESTART_TRIGGER , NUM_OF_RTW89_FLAGS, };
drivers/net/wireless/realtek/rtw89/debug.c +48 -0
66 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.c +36 -0
@@ -221,6 +221,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852A , le,0 ,13 ,29 ,0 ,OLD_HT_RA_FORMAT ),__CFG_FW_FEAT (RTL8852A , ge,0 ,13 ,35 ,0 ,SCAN_OFFLOAD ),__CFG_FW_FEAT (RTL8852A , ge,0 ,13 ,35 ,0 ,TX_WAKE ), + __CFG_FW_FEAT(RTL8852A, ge, 0, 13, 36, 0, CRASH_TRIGGER), };static void rtw89_fw_recognize_features (struct rtw89_dev *rtwdev)
@@ -2287,3 +2288,38 @@ void rtw89_store_op_chan(struct rtw89_dev *rtwdev) scan_info->op_bw = hal->current_band_width; scan_info->op_band = hal->current_band_type; } + +#define H2C_FW_CPU_EXCEPTION_LEN 4 +#define H2C_FW_CPU_EXCEPTION_TYPE_DEF 0x5566 +int rtw89_fw_h2c_trigger_cpu_exception (struct rtw89_dev *rtwdev) +{ +struct sk_buff *skb; + + skb =rtw89_fw_h2c_alloc_skb_with_hdr (H2C_FW_CPU_EXCEPTION_LEN ); +if (!skb) { +rtw89_err (rtwdev, +"failed to alloc skb for fw cpu exception\n" ); +return -ENOMEM ; + } + +skb_put (skb,H2C_FW_CPU_EXCEPTION_LEN ); +RTW89_SET_FWCMD_CPU_EXCEPTION_TYPE (skb->data, +H2C_FW_CPU_EXCEPTION_TYPE_DEF ); + +rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C , +H2C_CAT_TEST , +H2C_CL_FW_STATUS_TEST , +H2C_FUNC_CPU_EXCEPTION ,0 ,0 , +H2C_FW_CPU_EXCEPTION_LEN ); + +if (rtw89_h2c_tx (rtwdev, skb, false)) { +rtw89_err (rtwdev,"failed to send h2c\n" ); + goto fail; + } + +return 0 ; + +fail: +dev_kfree_skb_any (skb); +return -EBUSY ; +}
drivers/net/wireless/realtek/rtw89/fw.h +12 -0
@@ -1461,6 +1461,11 @@ static inline void SET_LPS_PARM_LASTRPWM(void *h2c, u32 val)le32p_replace_bits ((__le32 *)(h2c) +1 , val,GENMASK (15 ,8 )); } +static inline void RTW89_SET_FWCMD_CPU_EXCEPTION_TYPE (void *cmd,u32 val) +{ +le32p_replace_bits ((__le32 *)cmd, val,GENMASK (31 ,0 )); +} +enum rtw89_btc_btf_h2c_class {BTFC_SET =0x10 ,BTFC_GET =0x11 ,
@@ -2140,6 +2145,12 @@ struct rtw89_fw_h2c_rf_reg_info {#define FWCMD_TYPE_H2C 0 +#define H2C_CAT_TEST 0x0 + +/* CLASS 5 - FW STATUS TEST */ +#define H2C_CL_FW_STATUS_TEST 0x5 +#define H2C_FUNC_CPU_EXCEPTION 0x1 +#define H2C_CAT_MAC 0x1/* CLASS 0 - FW INFO */
@@ -2284,5 +2295,6 @@ void rtw89_hw_scan_status_report(struct rtw89_dev *rtwdev, struct sk_buff *skb);void rtw89_hw_scan_chan_switch (struct rtw89_dev *rtwdev,struct sk_buff *skb);void rtw89_hw_scan_abort (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif);void rtw89_store_op_chan (struct rtw89_dev *rtwdev); +int rtw89_fw_h2c_trigger_cpu_exception (struct rtw89_dev *rtwdev);#endif
drivers/net/wireless/realtek/rtw89/ser.c +1 -0
@@ -619,6 +619,7 @@ static void ser_l2_reset_st_hdl(struct rtw89_ser *ser, u8 evt) fallthrough;case SER_EV_L2_RECFG_DONE :ser_state_goto (ser,SER_IDLE_ST ); +clear_bit (RTW89_FLAG_RESTART_TRIGGER , rtwdev->flags);break ;case SER_EV_STATE_OUT :
Signature · 1 line
2.25.1