From f9593505f804525ad95ef634070752f76fc9b943 Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Mon, 17 Aug 2020 17:22:10 -0700 Subject: [PATCH] cnss2: Use correct timer for forcing FW assert When force FW assert, it should use RDDM timer instead of FW boot timer since it expects FW entering RDDM mode. Change-Id: Ic8498b0f3c23dc494267571da7f627eace9f91bd Signed-off-by: Yue Ma --- drivers/net/wireless/cnss2/pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/cnss2/pci.c b/drivers/net/wireless/cnss2/pci.c index 1257b3ffe0ec..ead09d210299 100644 --- a/drivers/net/wireless/cnss2/pci.c +++ b/drivers/net/wireless/cnss2/pci.c @@ -45,7 +45,6 @@ #define WAKE_MSI_NAME "WAKE" -#define FW_ASSERT_TIMEOUT 5000 #define DEV_RDDM_TIMEOUT 5000 #ifdef CONFIG_CNSS_EMULATION @@ -3943,8 +3942,8 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv) } if (!test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state)) { - mod_timer(&plat_priv->fw_boot_timer, - jiffies + msecs_to_jiffies(FW_ASSERT_TIMEOUT)); + mod_timer(&pci_priv->dev_rddm_timer, + jiffies + msecs_to_jiffies(DEV_RDDM_TIMEOUT)); } return 0;