qlcnic: Fix delay in reset path

Driver should not check for heart beat anymore when FW is hung, rather it
should restart the FW.

Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 4200ef81ca8e..5f0141be8ca9 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -911,6 +911,7 @@ struct qlcnic_ipaddr {
 #define QLCNIC_PROMISC_DISABLED         0x800
 #define QLCNIC_NEED_FLR                 0x1000
 #define QLCNIC_FW_RESET_OWNER           0x2000
+#define QLCNIC_FW_HANG                  0x4000
 #define QLCNIC_IS_MSI_FAMILY(adapter) \
         ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))
 
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c
index ee8a3982395e..3b6741e4754d 100644
--- a/drivers/net/qlcnic/qlcnic_init.c
+++ b/drivers/net/qlcnic/qlcnic_init.c
@@ -1056,7 +1056,8 @@ qlcnic_check_fw_hearbeat(struct qlcnic_adapter *adapter)
 int
 qlcnic_need_fw_reset(struct qlcnic_adapter *adapter)
 {
-        if (qlcnic_check_fw_hearbeat(adapter)) {
+        if ((adapter->flags & QLCNIC_FW_HANG) ||
+                        qlcnic_check_fw_hearbeat(adapter)) {
                 qlcnic_rom_lock_recovery(adapter);
                 return 1;
         }
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 5ca1b562443c..248ebbd43279 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -2682,6 +2682,7 @@ qlcnic_clr_all_drv_state(struct qlcnic_adapter *adapter, u8 failed)
         qlcnic_api_unlock(adapter);
 err:
         adapter->fw_fail_cnt = 0;
+        adapter->flags &= ~QLCNIC_FW_HANG;
         clear_bit(__QLCNIC_START_FW, &adapter->state);
         clear_bit(__QLCNIC_RESETTING, &adapter->state);
 }
@@ -2859,6 +2860,7 @@ skip_ack_check:
                     (adapter->flags & QLCNIC_FW_RESET_OWNER)) {
                         QLCDB(adapter, DRV, "Take FW dump\n");
                         qlcnic_dump_fw(adapter);
+                        adapter->flags |= QLCNIC_FW_HANG;
                 }
                 rtnl_unlock();
 
@@ -3046,6 +3048,7 @@ attach:
 done:
         netif_device_attach(netdev);
         adapter->fw_fail_cnt = 0;
+        adapter->flags &= ~QLCNIC_FW_HANG;
         clear_bit(__QLCNIC_RESETTING, &adapter->state);
 
         if (!qlcnic_clr_drv_state(adapter))
@@ -3090,6 +3093,8 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
         if (++adapter->fw_fail_cnt < FW_FAIL_THRESH)
                 return 0;
 
+        adapter->flags |= QLCNIC_FW_HANG;
+
         qlcnic_dev_request_reset(adapter);
 
         if (auto_fw_reset)