Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 032a13c7 authored by Sritej Velaga's avatar Sritej Velaga Committed by David S. Miller
Browse files

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: default avatarSritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: default avatarAnirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d46512c

drivers/net/qlcnic/qlcnic.h

+1 −0
Original line number Diff line number Diff line
@@ -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))

drivers/net/qlcnic/qlcnic_init.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/qlcnic/qlcnic_main.c

+5 −0
Original line number Diff line number Diff line
@@ -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 @@ qlcnic_fwinit_work(struct work_struct *work) 
		    (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 @@ qlcnic_attach_work(struct work_struct *work) 
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)