[SCSI] qla2xxx: Pass in optional extended-initialization control block.

Recent ISPs use this data to configure FCF information.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 41ff7d69bd64..dad624e11717 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2203,9 +2203,19 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
         } else
                 ha->npiv_info = NULL;
 
+        /* Get consistent memory allocated for EX-INIT-CB. */
+        if (IS_QLA81XX(ha)) {
+                ha->ex_init_cb = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL,
+                    &ha->ex_init_cb_dma);
+                if (!ha->ex_init_cb)
+                        goto fail_ex_init_cb;
+        }
+
         INIT_LIST_HEAD(&ha->vp_list);
         return 1;
 
+fail_ex_init_cb:
+        kfree(ha->npiv_info);
 fail_npiv_info:
         dma_free_coherent(&ha->pdev->dev, ((*rsp)->length + 1) *
                 sizeof(response_t), (*rsp)->ring, (*rsp)->dma);
@@ -2291,15 +2301,16 @@ qla2x00_mem_free(struct qla_hw_data *ha)
         if (ha->ms_iocb)
                 dma_pool_free(ha->s_dma_pool, ha->ms_iocb, ha->ms_iocb_dma);
 
+        if (ha->ex_init_cb)
+                dma_pool_free(ha->s_dma_pool, ha->ex_init_cb, ha->ex_init_cb_dma);
+
         if (ha->s_dma_pool)
                 dma_pool_destroy(ha->s_dma_pool);
 
-
         if (ha->gid_list)
                 dma_free_coherent(&ha->pdev->dev, GID_LIST_SIZE, ha->gid_list,
                 ha->gid_list_dma);
 
-
         if (ha->init_cb)
                 dma_free_coherent(&ha->pdev->dev, ha->init_cb_size,
                 ha->init_cb, ha->init_cb_dma);
@@ -2318,6 +2329,8 @@ qla2x00_mem_free(struct qla_hw_data *ha)
         ha->ms_iocb_dma = 0;
         ha->init_cb = NULL;
         ha->init_cb_dma = 0;
+        ha->ex_init_cb = NULL;
+        ha->ex_init_cb_dma = 0;
 
         ha->s_dma_pool = NULL;