scsi: qla2xxx: Add H:C:T info in the log message for fc ports

The host:channel:scsi_target_id information is helpful in matching an FC
port with a SCSI device, so add it. For initiator FC ports, a -1 would be
displayed for "target" part.

Link: https://lore.kernel.org/r/20210329085229.4367-3-njavali@marvell.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Arun Easi <aeasi@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index f01f07116bd3ec777db203c7b3021e1b7d567d2f..af237c485389a297174362ddc3fb45585a8eff5e 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5512,13 +5512,14 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
        if (fcport->port_type & FCT_NVME_DISCOVERY)
                rport_ids.roles |= FC_PORT_ROLE_NVME_DISCOVERY;
 
+       fc_remote_port_rolechg(rport, rport_ids.roles);
+
        ql_dbg(ql_dbg_disc, vha, 0x20ee,
-           "%s %8phN. rport %p is %s mode\n",
-           __func__, fcport->port_name, rport,
+           "%s: %8phN. rport %ld:0:%d (%p) is %s mode\n",
+           __func__, fcport->port_name, vha->host_no,
+           rport->scsi_target_id, rport,
            (fcport->port_type == FCT_TARGET) ? "tgt" :
            ((fcport->port_type & FCT_NVME) ? "nvme" : "ini"));
-
-       fc_remote_port_rolechg(rport, rport_ids.roles);
 }
 
 /*