qla2xxx: synchronize rport dev_loss_tmo setting
Subsystems (2)
PATCH v2 1/1 qla2xxx: synchronize rport dev_loss_tmo setting
From: Hannes Reinecke <[email protected]>
Currently, the dev_loss_tmo setting is only ever used for SCSI devices. This patch reshuffles initialisation such that the SCSI remote ports are registered before the NVMe ones, allowing the dev_loss_tmo setting to be synchronized between SCSI and NVMe.
---
This patch got some more testing by one of our partners. So far, no regression identified.
changes v2:
- fixed build failure for !NVME_FC reported by lkp
drivers/scsi/qla2xxx/qla_attr.c | 6 ++++++ drivers/scsi/qla2xxx/qla_init.c | 10 +++------- drivers/scsi/qla2xxx/qla_nvme.c | 5 ++++- 3 files changed, 13 insertions(+), 8 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +6 -0
@@ -2648,7 +2648,13 @@ qla2x00_get_starget_port_id(struct scsi_target *starget)static inline void qla2x00_set_rport_loss_tmo (struct fc_rport *rport,uint32_t timeout) { +fc_port_t *fcport = *(fc_port_t **)rport->dd_data; + rport->dev_loss_tmo = timeout ? timeout :1 ; + +if (IS_ENABLED (CONFIG_NVME_FC ) && fcport->nvme_remote_port) +nvme_fc_set_remoteport_devloss (fcport->nvme_remote_port, + rport->dev_loss_tmo); } static void
drivers/scsi/qla2xxx/qla_init.c +3 -7
@@ -5631,13 +5631,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)qla2x00_dfs_create_rport (vha, fcport); -if (NVME_TARGET (vha->hw, fcport)) { -qla_nvme_register_remote (vha, fcport); -qla2x00_set_fcport_disc_state (fcport,DSC_LOGIN_COMPLETE ); -qla2x00_set_fcport_state (fcport,FCS_ONLINE ); -return ; - } -qla24xx_update_fcport_fcp_prio (vha, fcport);switch (vha->host->active_mode) {
@@ -5659,6 +5652,9 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)break ; } +if (NVME_TARGET (vha->hw, fcport)) +qla_nvme_register_remote (vha, fcport); +qla2x00_set_fcport_state (fcport,FCS_ONLINE );if (IS_IIDMA_CAPABLE (vha->hw) && vha->hw->flags.gpsc_supported) {
drivers/scsi/qla2xxx/qla_nvme.c +0 -0
@@ -41,7 +41,7 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)
req.port_name = wwn_to_u64(fcport->port_name);
req.node_name = wwn_to_u64(fcport->node_name);
req.port_role = 0;
- req.dev_loss_tmo = 0;
+ req.dev_loss_tmo = fcport->dev_loss_tmo;
if (fcport->nvme_prli_service_param & NVME_PRLI_SP_INITIATOR)
req.port_role = FC_PORT_ROLE_NVME_INITIATOR;
@@ -68,6 +68,9 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)
return ret;
}
+ nvme_fc_set_remoteport_devloss(fcport->nvme_remote_port,
+ fcport->dev_loss_tmo);
+
if (fcport->nvme_prli_service_param & NVME_PRLI_SP_SLER)
ql_log(ql_log_info, vha, 0x212a,
"PortID:%06x Supports SLER\n", req.port_id);
Signature · 1 line
2.29.2