Skip to content

Commit f3f1938

Browse files
Quinn Tranmartinkpetersen
authored andcommitted
scsi: qla2xxx: Fix N2N link up fail
During link up/bounce, qla driver would do command flush as part of cleanup. In this case, the flush can intefere with FW state. This patch allows FW to be in control of link up. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Quinn Tran <[email protected]> Signed-off-by: Himanshu Madhani <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 7f2a398 commit f3f1938

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/scsi/qla2xxx/qla_mbx.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3897,6 +3897,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
38973897
fcport->dm_login_expire = jiffies + 2*HZ;
38983898
fcport->scan_state = QLA_FCPORT_FOUND;
38993899
fcport->n2n_flag = 1;
3900+
fcport->keep_nport_handle = 1;
39003901
if (vha->flags.nvme_enabled)
39013902
fcport->fc4f_nvme = 1;
39023903

@@ -4042,6 +4043,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
40424043
fcport->login_retry = vha->hw->login_retry_count;
40434044
fcport->plogi_nack_done_deadline = jiffies + HZ;
40444045
fcport->scan_state = QLA_FCPORT_FOUND;
4046+
fcport->keep_nport_handle = 1;
40454047
fcport->n2n_flag = 1;
40464048
fcport->d_id.b.domain =
40474049
rptid_entry->u.f2.remote_nport_id[2];

drivers/scsi/qla2xxx/qla_os.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5135,11 +5135,9 @@ void qla24xx_create_new_sess(struct scsi_qla_host *vha, struct qla_work_evt *e)
51355135
if (dfcp)
51365136
qlt_schedule_sess_for_deletion(tfcp);
51375137

5138-
5139-
if (N2N_TOPO(vha->hw))
5140-
fcport->flags &= ~FCF_FABRIC_DEVICE;
5141-
51425138
if (N2N_TOPO(vha->hw)) {
5139+
fcport->flags &= ~FCF_FABRIC_DEVICE;
5140+
fcport->keep_nport_handle = 1;
51435141
if (vha->flags.nvme_enabled) {
51445142
fcport->fc4f_nvme = 1;
51455143
fcport->n2n_flag = 1;

0 commit comments

Comments
 (0)