Commit 8ad4be3d authored by Arun Easi's avatar Arun Easi Committed by Martin K. Petersen

scsi: qla2xxx: Fix device reconnect in loop topology

A device logout in loop topology initiates a device connection teardown
which loses the FW device handle. In loop topo, the device handle is not
regrabbed leading to device login failures and eventually to loss of the
device. Fix this by taking the main login path that does it.

Link: https://lore.kernel.org/r/20220110050218.3958-11-njavali@marvell.com
Cc: stable@vger.kernel.org
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarArun Easi <aeasi@marvell.com>
Signed-off-by: default avatarNilesh Javali <njavali@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 65120de2
...@@ -974,6 +974,9 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, ...@@ -974,6 +974,9 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,
set_bit(RELOGIN_NEEDED, &vha->dpc_flags); set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
} }
break; break;
case ISP_CFG_NL:
qla24xx_fcport_handle_login(vha, fcport);
break;
default: default:
break; break;
} }
...@@ -1563,6 +1566,11 @@ static void qla_chk_n2n_b4_login(struct scsi_qla_host *vha, fc_port_t *fcport) ...@@ -1563,6 +1566,11 @@ static void qla_chk_n2n_b4_login(struct scsi_qla_host *vha, fc_port_t *fcport)
u8 login = 0; u8 login = 0;
int rc; int rc;
ql_dbg(ql_dbg_disc, vha, 0x307b,
"%s %8phC DS %d LS %d lid %d retries=%d\n",
__func__, fcport->port_name, fcport->disc_state,
fcport->fw_login_state, fcport->loop_id, fcport->login_retry);
if (qla_tgt_mode_enabled(vha)) if (qla_tgt_mode_enabled(vha))
return; return;
...@@ -5604,6 +5612,13 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) ...@@ -5604,6 +5612,13 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
memcpy(fcport->node_name, new_fcport->node_name, memcpy(fcport->node_name, new_fcport->node_name,
WWN_SIZE); WWN_SIZE);
fcport->scan_state = QLA_FCPORT_FOUND; fcport->scan_state = QLA_FCPORT_FOUND;
if (fcport->login_retry == 0) {
fcport->login_retry = vha->hw->login_retry_count;
ql_dbg(ql_dbg_disc, vha, 0x2135,
"Port login retry %8phN, lid 0x%04x retry cnt=%d.\n",
fcport->port_name, fcport->loop_id,
fcport->login_retry);
}
found++; found++;
break; break;
} }
......
...@@ -5540,6 +5540,11 @@ void qla2x00_relogin(struct scsi_qla_host *vha) ...@@ -5540,6 +5540,11 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
memset(&ea, 0, sizeof(ea)); memset(&ea, 0, sizeof(ea));
ea.fcport = fcport; ea.fcport = fcport;
qla24xx_handle_relogin_event(vha, &ea); qla24xx_handle_relogin_event(vha, &ea);
} else if (vha->hw->current_topology ==
ISP_CFG_NL &&
IS_QLA2XXX_MIDTYPE(vha->hw)) {
(void)qla24xx_fcport_handle_login(vha,
fcport);
} else if (vha->hw->current_topology == } else if (vha->hw->current_topology ==
ISP_CFG_NL) { ISP_CFG_NL) {
fcport->login_retry--; fcport->login_retry--;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment