scsi: lpfc: Move scsi_host_template outside dynamically allocated/freed phba

[linux-2.6-block.git] / drivers / scsi / lpfc / lpfc_init.c

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 460295b7c9fe8878a11f9cd78d10f4eb12e13970..0a4a82f5df5cefe421ea4912dff50ca1d7bee8ef 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -4614,6 +4614,17 @@ lpfc_get_wwpn(struct lpfc_hba *phba)
                return rol64(wwn, 32);
 }
 
+static unsigned short lpfc_get_sg_tablesize(struct lpfc_hba *phba)
+{
+       if (phba->sli_rev == LPFC_SLI_REV4)
+               if (phba->cfg_xpsgl && !phba->nvmet_support)
+                       return LPFC_MAX_SG_TABLESIZE;
+               else
+                       return phba->cfg_scsi_seg_cnt;
+       else
+               return phba->cfg_sg_seg_cnt;
+}
+
 /**
  * lpfc_vmid_res_alloc - Allocates resources for VMID
  * @phba: pointer to lpfc hba data structure.
@@ -4716,42 +4727,26 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
 
        /* Seed template for SCSI host registration */
        if (dev == &phba->pcidev->dev) {
-               template = &phba->port_template;
-
                if (phba->cfg_enable_fc4_type & LPFC_ENABLE_FCP) {
                        /* Seed physical port template */
-                       memcpy(template, &lpfc_template, sizeof(*template));
+                       template = &lpfc_template;
 
                        if (use_no_reset_hba)
                                /* template is for a no reset SCSI Host */
                                template->eh_host_reset_handler = NULL;
 
-                       /* Template for all vports this physical port creates */
-                       memcpy(&phba->vport_template, &lpfc_template,
-                              sizeof(*template));
-                       phba->vport_template.shost_groups = lpfc_vport_groups;
-                       phba->vport_template.eh_bus_reset_handler = NULL;
-                       phba->vport_template.eh_host_reset_handler = NULL;
-                       phba->vport_template.vendor_id = 0;
-
-                       /* Initialize the host templates with updated value */
-                       if (phba->sli_rev == LPFC_SLI_REV4) {
-                               template->sg_tablesize = phba->cfg_scsi_seg_cnt;
-                               phba->vport_template.sg_tablesize =
-                                       phba->cfg_scsi_seg_cnt;
-                       } else {
-                               template->sg_tablesize = phba->cfg_sg_seg_cnt;
-                               phba->vport_template.sg_tablesize =
-                                       phba->cfg_sg_seg_cnt;
-                       }
-
+                       /* Seed updated value of sg_tablesize */
+                       template->sg_tablesize = lpfc_get_sg_tablesize(phba);
                } else {
                        /* NVMET is for physical port only */
-                       memcpy(template, &lpfc_template_nvme,
-                              sizeof(*template));
+                       template = &lpfc_template_nvme;
                }
        } else {
-               template = &phba->vport_template;
+               /* Seed vport template */
+               template = &lpfc_vport_template;
+
+               /* Seed updated value of sg_tablesize */
+               template->sg_tablesize = lpfc_get_sg_tablesize(phba);
        }
 
        shost = scsi_host_alloc(template, sizeof(struct lpfc_vport));
@@ -4784,11 +4779,6 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
 
                shost->dma_boundary =
                        phba->sli4_hba.pc_sli4_params.sge_supp_len-1;
-
-               if (phba->cfg_xpsgl && !phba->nvmet_support)
-                       shost->sg_tablesize = LPFC_MAX_SG_TABLESIZE;
-               else
-                       shost->sg_tablesize = phba->cfg_scsi_seg_cnt;
        } else
                /* SLI-3 has a limited number of hardware queues (3),
                 * thus there is only one for FCP processing.