scsi: qla2xxx: Fix session state stuck in Get Port DB

[ Upstream commit 8fde6977ac478c00eeb2beccfdd4a6ad44219f6c ]

This patch sets discovery state back to GNL (Get Name List) when session is
stuck at GPDB (Get Port DataBase). This will allow state machine to retry
login and move session state ahead in discovery.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index ec550ee0108e6543244a2766c89d5d73b42c29ad..75d34def236155935a9b1d2eca62a670a7f6beb8 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1074,9 +1074,12 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)
        case PDS_PLOGI_COMPLETE:
        case PDS_PRLI_PENDING:
        case PDS_PRLI2_PENDING:
-               ql_dbg(ql_dbg_disc, vha, 0x20d5, "%s %d %8phC relogin needed\n",
-                   __func__, __LINE__, fcport->port_name);
-               set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
+               /* Set discovery state back to GNL to Relogin attempt */
+               if (qla_dual_mode_enabled(vha) ||
+                   qla_ini_mode_enabled(vha)) {
+                       fcport->disc_state = DSC_GNL;
+                       set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
+               }
                return;
        case PDS_LOGO_PENDING:
        case PDS_PORT_UNAVAILABLE: