| From 84aae3332376fdc8d56c6c873c87d31deba0d7ef Mon Sep 17 00:00:00 2001 |
| From: Roman Bolshakov <r.bolshakov@yadro.com> |
| Date: Mon, 25 Nov 2019 19:56:54 +0300 |
| Subject: [PATCH] scsi: qla2xxx: Change discovery state before PLOGI |
| |
| commit 58e39a2ce4be08162c0368030cdc405f7fd849aa upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c |
| index b07833b5d3b3..9091d37ffd95 100644 |
| --- a/drivers/scsi/qla2xxx/qla_init.c |
| +++ b/drivers/scsi/qla2xxx/qla_init.c |
| @@ -513,6 +513,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); |
| } |
| |
| -- |
| 2.7.4 |
| |
