scsi: qla2xxx: Show OS name and version in FDMI-1

To be consistent with other OS drivers, register OS name and version in
FDMI-1 fabric registration.

Link: https://lore.kernel.org/r/20210810043720.1137-6-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_def.h b/drivers/scsi/qla2xxx/qla_def.h
index af0e8be0eb9ba13778389a4a8f5b605e0f38f6b8..c081bf1c7578e63a9cd5fcb89f6affbe291dfddc 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2790,7 +2790,7 @@ static const char * const port_dstate_str[] = {
 /*
  * FDMI HBA attribute types.
  */
-#define FDMI1_HBA_ATTR_COUNT                   9
+#define FDMI1_HBA_ATTR_COUNT                   10
 #define FDMI2_HBA_ATTR_COUNT                   17
 
 #define FDMI_HBA_NODE_NAME                     0x1

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index b16b7d16be126d390153172adc9c01f49cc7c35c..11401cfc35a13c01982f53e1ae1b045e394e4558 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1730,8 +1730,6 @@ qla2x00_hba_attributes(scsi_qla_host_t *vha, void *entries,
        size += alen;
        ql_dbg(ql_dbg_disc, vha, 0x20a8,
            "FIRMWARE VERSION = %s.\n", eiter->a.fw_version);
-       if (callopt == CALLOPT_FDMI1)
-               goto done;
        /* OS Name and Version */
        eiter = entries + size;
        eiter->type = cpu_to_be16(FDMI_HBA_OS_NAME_AND_VERSION);
@@ -1754,6 +1752,8 @@ qla2x00_hba_attributes(scsi_qla_host_t *vha, void *entries,
        size += alen;
        ql_dbg(ql_dbg_disc, vha, 0x20a9,
            "OS VERSION = %s.\n", eiter->a.os_version);
+       if (callopt == CALLOPT_FDMI1)
+               goto done;
        /* MAX CT Payload Length */
        eiter = entries + size;
        eiter->type = cpu_to_be16(FDMI_HBA_MAXIMUM_CT_PAYLOAD_LENGTH);

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 4db7e433bb38985fca03719b6e5481832bbd7753..222bcd80c255335bea04b929052f098fce4cef07 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -7990,7 +7990,7 @@ qla2x00_module_init(void)
        BUILD_BUG_ON(sizeof(struct cmd_type_7_fx00) != 64);
        BUILD_BUG_ON(sizeof(struct cmd_type_crc_2) != 64);
        BUILD_BUG_ON(sizeof(struct ct_entry_24xx) != 64);
-       BUILD_BUG_ON(sizeof(struct ct_fdmi1_hba_attributes) != 2344);
+       BUILD_BUG_ON(sizeof(struct ct_fdmi1_hba_attributes) != 2604);
        BUILD_BUG_ON(sizeof(struct ct_fdmi2_hba_attributes) != 4424);
        BUILD_BUG_ON(sizeof(struct ct_fdmi2_port_attributes) != 4164);
        BUILD_BUG_ON(sizeof(struct ct_fdmi_hba_attr) != 260);