From: Arun Easi <aeasi@marvell.com>
Date: Wed, 2 Dec 2020 05:23:11 -0800
Subject: scsi: qla2xxx: Fix device loss on 4G and older HBAs
Patch-mainline: v5.11-rc1
Git-commit: abd9cae9bbae9f3a80dae82587b1f79161ad7836
References: bsc#1172538 bsc#1179142 bsc#1179810

Due to a bug in the older scan logic, when a once lost device re-appeared,
it was not discovered. Fix this by resetting login_retry counter upon
device discovery.

This is applicable only for 4G and older HBAs.

Link: https://lore.kernel.org/r/20201202132312.19966-15-njavali@marvell.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Arun Easi <aeasi@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Daniel Wagner <dwagner@suse.de>
---
 drivers/scsi/qla2xxx/qla_init.c |    3 +++
 1 file changed, 3 insertions(+)

--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5983,6 +5983,9 @@ qla2x00_find_all_fabric_devs(scsi_qla_ho
 				break;
 			}
 
+			if (fcport->login_retry == 0)
+				fcport->login_retry =
+					vha->hw->login_retry_count;
 			/*
 			 * If device was not a fabric device before.
 			 */