scsi: qla2xxx: Fix login state machine stuck at GPDB

commit 414d9ff3f8039f85d23f619dcbbd1ba2628a1a67 upstream.

This patch returns discovery state machine back to Login Complete.

Fixes: 726b85487067d ("qla2xxx: Add framework for async fabric discovery")
Cc: <stable@vger.kernel.org> # 4.10+
Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.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 36379b8..6ac8ad9 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -864,6 +864,7 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)
        int rval = ea->rc;
        fc_port_t *fcport = ea->fcport;
        unsigned long flags;
+       u16 opt = ea->sp->u.iocb_cmd.u.mbx.out_mb[10];
 
        fcport->flags &= ~FCF_ASYNC_SENT;
 
@@ -894,7 +895,8 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)
        }
 
        spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
-       ea->fcport->login_gen++;
+       if (opt != PDO_FORCE_ADISC)
+               ea->fcport->login_gen++;
        ea->fcport->deleted = 0;
        ea->fcport->logout_on_delete = 1;
 
@@ -918,6 +920,13 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct event_arg *ea)
 
                        qla24xx_post_gpsc_work(vha, fcport);
                }
+       } else if (ea->fcport->login_succ) {
+               /*
+                * We have an existing session. A late RSCN delivery
+                * must have triggered the session to be re-validate.
+                * session is still valid.
+                */
+               fcport->disc_state = DSC_LOGIN_COMPLETE;
        }
        spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags);
 } /* gpdb event */