Commit 89f3ac7e authored Nov 25, 2019 by Roman Bolshakov Committed by Greg Kroah-Hartman Dec 17, 2019

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: 8777e431 ("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>

parent a40982c7

drivers/scsi/qla2xxx/qla_init.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -433,6 +433,7 @@ int qla_post_els_plogi_work(struct scsi_qla_host vha, fc_port_t fcport)

	e->u.fcport.fcport = fcport;		e->u.fcport.fcport = fcport;
	fcport->flags \|= FCF_ASYNC_ACTIVE;		fcport->flags \|= FCF_ASYNC_ACTIVE;
			fcport->disc_state = DSC_LOGIN_PEND;
	return qla2x00_post_work(vha, e);		return qla2x00_post_work(vha, e);
	}		}