From dcf8badf559d7d5fc68db5a1baff92fceb3e2bf6 Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Wed, 5 Feb 2020 12:28:39 -0800 Subject: [PATCH] cnss2: Extend idle restart timeout WLAN driver has its own watchdog timer for idle restart, so extend idle restart timeout in platform driver to avoid timing out before WLAN driver. Change-Id: I4bab19fce7b30c59e9ecc0f0a8923a3693fdec12 Signed-off-by: Yue Ma --- drivers/net/wireless/cnss2/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/cnss2/main.c b/drivers/net/wireless/cnss2/main.c index 05a0f923ad22..2b43c4c670b6 100644 --- a/drivers/net/wireless/cnss2/main.c +++ b/drivers/net/wireless/cnss2/main.c @@ -32,6 +32,7 @@ #define FW_ASSERT_TIMEOUT 5000 #define CNSS_EVENT_PENDING 2989 #define COLD_BOOT_CAL_SHUTDOWN_DELAY_MS 50 +#define WLAN_WD_TIMEOUT_MS 60000 #define CNSS_QUIRKS_DEFAULT BIT(DISABLE_IO_COHERENCY) #ifdef CONFIG_CNSS_EMULATION @@ -649,7 +650,8 @@ int cnss_idle_restart(struct device *dev) timeout = cnss_get_boot_timeout(dev); ret = wait_for_completion_timeout(&plat_priv->power_up_complete, - msecs_to_jiffies(timeout) << 2); + msecs_to_jiffies((timeout << 1) + + WLAN_WD_TIMEOUT_MS)); if (!ret) { cnss_pr_err("Timeout waiting for idle restart to complete\n"); ret = -ETIMEDOUT;