Re: [PATCH v2 08/22] qla2xxx: Fix login state machine stuck at GPDB

2017-11-30 Thread Hannes Reinecke
On 11/30/2017 04:40 AM, Himanshu Madhani wrote:
> From: Quinn Tran 
> 
> This patch returns discovery state machine back to
> Login Complete.
> 
> Fixes: 726b85487067d ("qla2xxx: Add framework for async fabric discovery")
> Cc:  # 4.10+
> Signed-off-by: Quinn Tran 
> Signed-off-by: Himanshu Madhani 
> ---
>  drivers/scsi/qla2xxx/qla_init.c | 11 ++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
Reviewed-by: Hannes Reinecke 

Cheers,

Hannes
-- 
Dr. Hannes ReineckeTeamlead Storage & Networking
h...@suse.de   +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)


[PATCH v2 08/22] qla2xxx: Fix login state machine stuck at GPDB

2017-11-29 Thread Himanshu Madhani
From: Quinn Tran 

This patch returns discovery state machine back to
Login Complete.

Fixes: 726b85487067d ("qla2xxx: Add framework for async fabric discovery")
Cc:  # 4.10+
Signed-off-by: Quinn Tran 
Signed-off-by: Himanshu Madhani 
---
 drivers/scsi/qla2xxx/qla_init.c | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index be4c67b465b8..2f246996d3e2 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -863,6 +863,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;
 
@@ -893,7 +894,8 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, struct 
event_arg *ea)
}
 
spin_lock_irqsave(>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;
 
@@ -917,6 +919,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(>hw->tgt.sess_lock, flags);
 } /* gpdb event */
-- 
2.12.0