scsi: qla2xxx: Save frame payload size from ICB

Save frame payload size from init control block.  This field/data is used
to register with switch database.  This allows the init control block temp
buf to be reused.

[mkp: remove unused variable]

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.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 0fc563572fadcefe45d9942360c6a662ec4bb506..d1ff1b8f1ae5a1ec52d1641621ad616883de8861 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -3848,6 +3848,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 5139a3577bb344e2e80df91c69e74ff422c7304d..cf70c59c252311c1a3894bf67600fb0befea0dac 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1954,7 +1954,6 @@ qla2x00_fdmiv2_rhba(scsi_qla_host_t *vha)
        void *entries;
        struct ct_fdmiv2_hba_attr *eiter;
        struct qla_hw_data *ha = vha->hw;
-       struct init_cb_24xx *icb24 = (struct init_cb_24xx *)ha->init_cb;
        struct new_utsname *p_sysid = NULL;
 
        /* Issue RHBA */
@@ -2134,9 +2133,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 c3c7aa1cb86e2d030eb24d6fd49f0e1355cc3d96..471322c29db684caf1518bedb0b84ccf31bc48f1 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -4418,7 +4418,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);
@@ -6893,7 +6893,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.
         */
@@ -7949,7 +7949,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.
         */