rtw88: refine fw_crash debugfs to show non-zero while triggering

The usage of fw_crash debugfs is to write 1 to it to trigger fw crash
simulation and to read from it to check the state. When zero is read,
it is supposed to mean fw crash/restart process is done. Then, some
test plans can be designed for crash/restart.
e.g.
step 1. trigger fw crash simulation
step 2. poll the state until zero is read
step 3. check connection by ping test

However, in certain connection cases, triggering fw crash simulation
will take a while. If the state is queried too early before restart
begins processing, it may mistakenly think restart process has been
done. If some tests are started at this time, something unexpected
might happen due to the follow-up restart process.

To avoid that, let fw_crash also show non-zero when a simulation
is still triggering.

Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211001082301.4805-1-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/debug.c b/drivers/net/wireless/realtek/rtw88/debug.c
index babf7fb..682b235 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/debug.c
+++ b/drivers/net/wireless/realtek/rtw88/debug.c
@@ -886,6 +886,7 @@ static ssize_t rtw_debugfs_set_fw_crash(struct file *filp,
 
        mutex_lock(&rtwdev->mutex);
        rtw_leave_lps_deep(rtwdev);
+       set_bit(RTW_FLAG_RESTART_TRIGGERING, rtwdev->flags);
        rtw_write8(rtwdev, REG_HRCV_MSG, 1);
        mutex_unlock(&rtwdev->mutex);
 
@@ -897,7 +898,9 @@ static int rtw_debugfs_get_fw_crash(struct seq_file *m, void *v)
        struct rtw_debugfs_priv *debugfs_priv = m->private;
        struct rtw_dev *rtwdev = debugfs_priv->rtwdev;
 
-       seq_printf(m, "%d\n", test_bit(RTW_FLAG_RESTARTING, rtwdev->flags));
+       seq_printf(m, "%d\n",
+                  test_bit(RTW_FLAG_RESTART_TRIGGERING, rtwdev->flags) ||
+                  test_bit(RTW_FLAG_RESTARTING, rtwdev->flags));
        return 0;
 }
 

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index cee2aca..a0d4d6e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -564,6 +564,7 @@ static void __fw_recovery_work(struct rtw_dev *rtwdev)
        int ret = 0;
 
        set_bit(RTW_FLAG_RESTARTING, rtwdev->flags);
+       clear_bit(RTW_FLAG_RESTART_TRIGGERING, rtwdev->flags);
 
        ret = rtw_fwcd_prep(rtwdev);
        if (ret)

diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 7233163..bbdd535 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -363,6 +363,7 @@ enum rtw_flags {
        RTW_FLAG_BUSY_TRAFFIC,
        RTW_FLAG_WOWLAN,
        RTW_FLAG_RESTARTING,
+       RTW_FLAG_RESTART_TRIGGERING,
 
        NUM_OF_RTW_FLAGS,
 };