scsi: qla2xxx: Synchronize rport dev_loss_tmo setting

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.

Link: https://lore.kernel.org/r/20211214111139.52503-1-dwagner@suse.de
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 032efb294ee52f1c5274d636ea9e2da09591f603..db55737000ab55a498e75ef3b14d6a598e716260 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -2700,7 +2700,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 && fcport->nvme_remote_port)
+               nvme_fc_set_remoteport_devloss(fcport->nvme_remote_port,
+                                              rport->dev_loss_tmo);
 }
 
 static void

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 070b636802d041445d597776384d5a402c79c483..1fe4966fc2f68c1ed4a689b9f1ccf6242107fe3d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5828,13 +5828,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) {
@@ -5856,6 +5849,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) {

diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index 138ffdb5c92cdc3530749d6f2e940af4ebdf65ab..e22ec7cb65db58cd2107c68c77fbb8f0015b4ae1 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -43,7 +43,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;
@@ -70,6 +70,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);