wlcore: do not send stop fwlog cmd if fw is hanged

If the driver received a watchdog interrupt then the
assumption is that the fw is hanged. Avoid sending
the stop fwlog command in case of a watchdog recovey
to avoid waiting for the 2 seconds timeout of the command.

Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 7c4f78136bb193750f230683a36bc9cc5289c692..54da16501e42e04735d498bd2e2b57c464535f24 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -544,6 +544,7 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                if (unlikely(intr & WL1271_ACX_INTR_WATCHDOG)) {
                        wl1271_error("watchdog interrupt received! "
                                     "starting recovery.");
+                       wl->watchdog_recovery = true;
                        wl12xx_queue_recovery_work(wl);
 
                        /* restarting the chip. ignore any other interrupt. */
@@ -782,10 +783,12 @@ static void wl12xx_read_fwlog_panic(struct wl1271 *wl)
 
        /*
         * Make sure the chip is awake and the logger isn't active.
-        * This might fail if the firmware hanged.
+        * Do not send a stop fwlog command if the fw is hanged.
         */
-       if (!wl1271_ps_elp_wakeup(wl))
+       if (!wl1271_ps_elp_wakeup(wl) && !wl->watchdog_recovery)
                wl12xx_cmd_stop_fwlog(wl);
+       else
+               goto out;
 
        /* Read the first memory block address */
        wl12xx_fw_status(wl, wl->fw_status_1, wl->fw_status_2);
@@ -879,6 +882,7 @@ static void wl1271_recovery_work(struct work_struct *work)
                vif = wl12xx_wlvif_to_vif(wlvif);
                __wl1271_op_remove_interface(wl, vif, false);
        }
+        wl->watchdog_recovery = false;
        mutex_unlock(&wl->mutex);
        wl1271_op_stop(wl->hw);
 
@@ -893,6 +897,7 @@ static void wl1271_recovery_work(struct work_struct *work)
        wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART);
        return;
 out_unlock:
+        wl->watchdog_recovery = false;
        mutex_unlock(&wl->mutex);
 }
 

diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index 4ca968fac0eb5a42dfc06b9dbea7467725a41705..e63450072f4dac9d323974c635afd039e8d7395b 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -252,6 +252,7 @@ struct wl1271 {
 
        /* Hardware recovery work */
        struct work_struct recovery_work;
+       bool watchdog_recovery;
 
        /* Pointer that holds DMA-friendly block for the mailbox */
        struct event_mailbox *mbox;