[PATCH 14/16] qla2xxx: Save frame payload size from ICB

[Himanshu Madhani]

From: Quinn Tran <quinn.t...@cavium.com>

Save frame payload size from init control block.  This
field/data is used to register with switch data base.
This allow the init control block temp buf to be reuse

Signed-off-by: Quinn Tran <quinn.t...@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madh...@cavium.com>
---
 drivers/scsi/qla2xxx/qla_def.h  | 1 +
 drivers/scsi/qla2xxx/qla_gs.c   | 4 +---
 drivers/scsi/qla2xxx/qla_init.c | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index c93e318e8d86..0db81e17c063 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -3850,6 +3850,7 @@ struct qla_hw_data {
        atomic_t        num_pend_mbx_stage1;
        atomic_t        num_pend_mbx_stage2;
        atomic_t        num_pend_mbx_stage3;
+       uint16_t        frame_payload_size;
 
        uint32_t        login_retry_count;
        /* SNS command interfaces. */
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 74a7f372e3a7..9784cfaf14ab 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -2142,9 +2142,7 @@ qla2x00_fdmiv2_rhba(scsi_qla_host_t *vha)
        /* MAX CT Payload Length */
        eiter = entries + size;
        eiter->type = cpu_to_be16(FDMI_HBA_MAXIMUM_CT_PAYLOAD_LENGTH);
-       eiter->a.max_ct_len = IS_FWI2_CAPABLE(ha) ?
-           le16_to_cpu(icb24->frame_payload_size) :
-           le16_to_cpu(ha->init_cb->frame_payload_size);
+       eiter->a.max_ct_len = cpu_to_be32(ha->frame_payload_size);
        eiter->a.max_ct_len = cpu_to_be32(eiter->a.max_ct_len);
        eiter->len = cpu_to_be16(4 + 4);
        size += 4 + 4;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 9b07610ae720..9c61d54dd9ad 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -4419,7 +4419,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
        cnt = (uint8_t *)icb->reserved_3 - (uint8_t *)icb->add_firmware_options;
        while (cnt--)
                *dptr1++ = *dptr2++;
-
+       ha->frame_payload_size = le16_to_cpu(icb->frame_payload_size);
        /* Use alternate WWN? */
        if (nv->host_p[1] & BIT_7) {
                memcpy(icb->node_name, nv->alternate_node_name, WWN_SIZE);
@@ -6890,7 +6890,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
            (uint8_t *)&icb->interrupt_delay_timer;
        while (cnt--)
                *dptr1++ = *dptr2++;
-
+       ha->frame_payload_size = le16_to_cpu(icb->frame_payload_size);
        /*
         * Setup driver NVRAM options.
         */
@@ -7946,7 +7946,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
 
        /* Use extended-initialization control block. */
        memcpy(ha->ex_init_cb, &nv->ex_version, sizeof(*ha->ex_init_cb));
-
+       ha->frame_payload_size = le16_to_cpu(icb->frame_payload_size);
        /*
         * Setup driver NVRAM options.
         */
-- 
2.12.0