diff mbox series

[14/18] qla2xxx: Serialize fc_port alloc in N2N

Message ID 20200226224022.24518-15-hmadhani@marvell.com (mailing list archive)
State Accepted
Headers show
Series qla2xxx: fixes for the driver | expand

Commit Message

Himanshu Madhani Feb. 26, 2020, 10:40 p.m. UTC 
From: Quinn Tran <qutran@marvell.com>

For N2N, fc_port struct is created during report id acquistion.
At later time, the loop resync (fabric, n2n, loop) would trigger
the rest of the login using the created fc_port struct.  The loop
resync logic can trigger another fc_port allocation if the 1st
allocation was not able to execute.  This patch prevents the 2nd
allocation trigger.

Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
---
 drivers/scsi/qla2xxx/qla_init.c | 1 +
 drivers/scsi/qla2xxx/qla_os.c   | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 453b47006a59..3815f5321b3b 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5148,6 +5148,7 @@  qla2x00_configure_local_loop(scsi_qla_host_t *vha)
 			set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
 			set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
 		}
+		return QLA_FUNCTION_FAILED;
 	}
 
 	found_devs = 0;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index ede4529c4718..80c5c7b16150 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -5202,9 +5202,8 @@  void qla24xx_create_new_sess(struct scsi_qla_host *vha, struct qla_work_evt *e)
 					fcport->n2n_flag = 1;
 				}
 				fcport->fw_login_state = 0;
-				/*
-				 * wait link init done before sending login
-				 */
+
+				schedule_delayed_work(&vha->scan.scan_work, 5);
 			} else {
 				qla24xx_fcport_handle_login(vha, fcport);
 			}