diff options
| author | Roman Bolshakov <r.bolshakov@yadro.com> | 2019-11-25 19:56:54 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-17 20:08:37 +0100 |
| commit | 11c3ef9073a06f849e4ed87db6995107157ae0ed (patch) | |
| tree | 250228ce16445d96996a62d5a04a2329fdbb22ee | |
| parent | 51952b3c0340bd101c9076fde1cd276e26510ebd (diff) | |
| download | linux-stable-11c3ef9073a06f849e4ed87db6995107157ae0ed.tar.gz linux-stable-11c3ef9073a06f849e4ed87db6995107157ae0ed.tar.bz2 linux-stable-11c3ef9073a06f849e4ed87db6995107157ae0ed.zip | |
scsi: qla2xxx: Change discovery state before PLOGI
[ Upstream commit 58e39a2ce4be08162c0368030cdc405f7fd849aa ]
When a port sends PLOGI, discovery state should be changed to login
pending, otherwise RELOGIN_NEEDED bit is set in
qla24xx_handle_plogi_done_event(). RELOGIN_NEEDED triggers another PLOGI,
and it never goes out of the loop until login timer expires.
Fixes: 8777e4314d397 ("scsi: qla2xxx: Migrate NVME N2N handling into state machine")
Fixes: 8b5292bcfcacf ("scsi: qla2xxx: Fix Relogin to prevent modifying scan_state flag")
Cc: Quinn Tran <qutran@marvell.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20191125165702.1013-6-r.bolshakov@yadro.com
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index b84afef37f70..646fe7fe91b2 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -542,6 +542,7 @@ static int qla_post_els_plogi_work(struct scsi_qla_host *vha, fc_port_t *fcport) e->u.fcport.fcport = fcport; fcport->flags |= FCF_ASYNC_ACTIVE; + fcport->disc_state = DSC_LOGIN_PEND; return qla2x00_post_work(vha, e); } |