1 files changed, 136 insertions, 64 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 0f2a9f5d801c..05fa7796a559 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -18,7 +18,7 @@ qla2x00_sysfs_read_fw_dump(struct kobject *kobj,
                            struct bin_attribute *bin_attr,
                            char *buf, loff_t off, size_t count)
 {
-        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+        struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
         char *rbuf = (char *)ha->fw_dump;
 
@@ -39,7 +39,7 @@ qla2x00_sysfs_write_fw_dump(struct kobject *kobj,
                             struct bin_attribute *bin_attr,
                             char *buf, loff_t off, size_t count)
 {
-        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+        struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
         int reading;
 
@@ -89,7 +89,7 @@ qla2x00_sysfs_read_nvram(struct kobject *kobj,
                          struct bin_attribute *bin_attr,
                          char *buf, loff_t off, size_t count)
 {
-        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+        struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
         int             size = ha->nvram_size;
         char            *nvram_cache = ha->nvram;
@@ -112,7 +112,7 @@ qla2x00_sysfs_write_nvram(struct kobject *kobj,
                           struct bin_attribute *bin_attr,
                           char *buf, loff_t off, size_t count)
 {
-        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+        struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
         unsigned long   flags;
         uint16_t        cnt;
@@ -146,7 +146,7 @@ qla2x00_sysfs_write_nvram(struct kobject *kobj,
         /* Write NVRAM. */
         spin_lock_irqsave(&ha->hardware_lock, flags);
         ha->isp_ops->write_nvram(ha, (uint8_t *)buf, ha->nvram_base, count);
-        ha->isp_ops->read_nvram(ha, (uint8_t *)&ha->nvram, ha->nvram_base,
+        ha->isp_ops->read_nvram(ha, (uint8_t *)ha->nvram, ha->nvram_base,
             count);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
@@ -170,15 +170,15 @@ qla2x00_sysfs_read_optrom(struct kobject *kobj,
                           struct bin_attribute *bin_attr,
                           char *buf, loff_t off, size_t count)
 {
-        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+        struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
 
         if (ha->optrom_state != QLA_SREADING)
                 return 0;
-        if (off > ha->optrom_size)
+        if (off > ha->optrom_region_size)
                 return 0;
-        if (off + count > ha->optrom_size)
-                count = ha->optrom_size - off;
+        if (off + count > ha->optrom_region_size)
+                count = ha->optrom_region_size - off;
 
         memcpy(buf, &ha->optrom_buffer[off], count);
 
@@ -190,15 +190,15 @@ qla2x00_sysfs_write_optrom(struct kobject *kobj,
                            struct bin_attribute *bin_attr,
                            char *buf, loff_t off, size_t count)
 {
-        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+        struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
 
         if (ha->optrom_state != QLA_SWRITING)
                 return -EINVAL;
-        if (off > ha->optrom_size)
+        if (off > ha->optrom_region_size)
                 return -ERANGE;
-        if (off + count > ha->optrom_size)
-                count = ha->optrom_size - off;
+        if (off + count > ha->optrom_region_size)
+                count = ha->optrom_region_size - off;
 
         memcpy(&ha->optrom_buffer[off], buf, count);
 
@@ -220,14 +220,18 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,
                                struct bin_attribute *bin_attr,
                                char *buf, loff_t off, size_t count)
 {
-        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+        struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
-        int val;
+        uint32_t start = 0;
+        uint32_t size = ha->optrom_size;
+        int val, valid;
 
         if (off)
                 return 0;
 
-        if (sscanf(buf, "%d", &val) != 1)
+        if (sscanf(buf, "%d:%x:%x", &val, &start, &size) < 1)
+                return -EINVAL;
+        if (start > ha->optrom_size)
                 return -EINVAL;
 
         switch (val) {
@@ -237,6 +241,11 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,
                         break;
 
                 ha->optrom_state = QLA_SWAITING;
+
+                DEBUG2(qla_printk(KERN_INFO, ha,
+                    "Freeing flash region allocation -- 0x%x bytes.\n",
+                    ha->optrom_region_size));
+
                 vfree(ha->optrom_buffer);
                 ha->optrom_buffer = NULL;
                 break;
@@ -244,44 +253,107 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,
                 if (ha->optrom_state != QLA_SWAITING)
                         break;
 
+                if (start & 0xfff) {
+                        qla_printk(KERN_WARNING, ha,
+                            "Invalid start region 0x%x/0x%x.\n", start, size);
+                        return -EINVAL;
+                }
+
+                ha->optrom_region_start = start;
+                ha->optrom_region_size = start + size > ha->optrom_size ?
+                    ha->optrom_size - start : size;
+
                 ha->optrom_state = QLA_SREADING;
-                ha->optrom_buffer = (uint8_t *)vmalloc(ha->optrom_size);
+                ha->optrom_buffer = vmalloc(ha->optrom_region_size);
                 if (ha->optrom_buffer == NULL) {
                         qla_printk(KERN_WARNING, ha,
                             "Unable to allocate memory for optrom retrieval "
-                            "(%x).\n", ha->optrom_size);
+                            "(%x).\n", ha->optrom_region_size);
 
                         ha->optrom_state = QLA_SWAITING;
                         return count;
                 }
 
-                memset(ha->optrom_buffer, 0, ha->optrom_size);
-                ha->isp_ops->read_optrom(ha, ha->optrom_buffer, 0,
-                    ha->optrom_size);
+                DEBUG2(qla_printk(KERN_INFO, ha,
+                    "Reading flash region -- 0x%x/0x%x.\n",
+                    ha->optrom_region_start, ha->optrom_region_size));
+
+                memset(ha->optrom_buffer, 0, ha->optrom_region_size);
+                ha->isp_ops->read_optrom(ha, ha->optrom_buffer,
+                    ha->optrom_region_start, ha->optrom_region_size);
                 break;
         case 2:
                 if (ha->optrom_state != QLA_SWAITING)
                         break;
 
+                /*
+                 * We need to be more restrictive on which FLASH regions are
+                 * allowed to be updated via user-space.  Regions accessible
+                 * via this method include:
+                 *
+                 * ISP21xx/ISP22xx/ISP23xx type boards:
+                 *
+                 *      0x000000 -> 0x020000 -- Boot code.
+                 *
+                 * ISP2322/ISP24xx type boards:
+                 *
+                 *      0x000000 -> 0x07ffff -- Boot code.
+                 *      0x080000 -> 0x0fffff -- Firmware.
+                 *
+                 * ISP25xx type boards:
+                 *
+                 *      0x000000 -> 0x07ffff -- Boot code.
+                 *      0x080000 -> 0x0fffff -- Firmware.
+                 *      0x120000 -> 0x12ffff -- VPD and HBA parameters.
+                 */
+                valid = 0;
+                if (ha->optrom_size == OPTROM_SIZE_2300 && start == 0)
+                        valid = 1;
+                else if (start == (FA_BOOT_CODE_ADDR*4) ||
+                    start == (FA_RISC_CODE_ADDR*4))
+                        valid = 1;
+                else if (IS_QLA25XX(ha) && start == (FA_VPD_NVRAM_ADDR*4))
+                    valid = 1;
+                if (!valid) {
+                        qla_printk(KERN_WARNING, ha,
+                            "Invalid start region 0x%x/0x%x.\n", start, size);
+                        return -EINVAL;
+                }
+
+                ha->optrom_region_start = start;
+                ha->optrom_region_size = start + size > ha->optrom_size ?
+                    ha->optrom_size - start : size;
+
                 ha->optrom_state = QLA_SWRITING;
-                ha->optrom_buffer = (uint8_t *)vmalloc(ha->optrom_size);
+                ha->optrom_buffer = vmalloc(ha->optrom_region_size);
                 if (ha->optrom_buffer == NULL) {
                         qla_printk(KERN_WARNING, ha,
                             "Unable to allocate memory for optrom update "
-                            "(%x).\n", ha->optrom_size);
+                            "(%x).\n", ha->optrom_region_size);
 
                         ha->optrom_state = QLA_SWAITING;
                         return count;
                 }
-                memset(ha->optrom_buffer, 0, ha->optrom_size);
+
+                DEBUG2(qla_printk(KERN_INFO, ha,
+                    "Staging flash region write -- 0x%x/0x%x.\n",
+                    ha->optrom_region_start, ha->optrom_region_size));
+
+                memset(ha->optrom_buffer, 0, ha->optrom_region_size);
                 break;
         case 3:
                 if (ha->optrom_state != QLA_SWRITING)
                         break;
 
-                ha->isp_ops->write_optrom(ha, ha->optrom_buffer, 0,
-                    ha->optrom_size);
+                DEBUG2(qla_printk(KERN_INFO, ha,
+                    "Writing flash region -- 0x%x/0x%x.\n",
+                    ha->optrom_region_start, ha->optrom_region_size));
+
+                ha->isp_ops->write_optrom(ha, ha->optrom_buffer,
+                    ha->optrom_region_start, ha->optrom_region_size);
                 break;
+        default:
+                count = -EINVAL;
         }
         return count;
 }
@@ -300,7 +372,7 @@ qla2x00_sysfs_read_vpd(struct kobject *kobj,
                        struct bin_attribute *bin_attr,
                        char *buf, loff_t off, size_t count)
 {
-        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+        struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
         int           size = ha->vpd_size;
         char          *vpd_cache = ha->vpd;
@@ -323,7 +395,7 @@ qla2x00_sysfs_write_vpd(struct kobject *kobj,
                         struct bin_attribute *bin_attr,
                         char *buf, loff_t off, size_t count)
 {
-        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+        struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
         unsigned long flags;
 
@@ -354,7 +426,7 @@ qla2x00_sysfs_read_sfp(struct kobject *kobj,
                        struct bin_attribute *bin_attr,
                        char *buf, loff_t off, size_t count)
 {
-        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+        struct scsi_qla_host *ha = shost_priv(dev_to_shost(container_of(kobj,
             struct device, kobj)));
         uint16_t iter, addr, offset;
         int rval;
@@ -459,7 +531,7 @@ qla2x00_drvr_version_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_fw_version_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         char fw_str[30];
 
         return snprintf(buf, PAGE_SIZE, "%s\n",
@@ -469,7 +541,7 @@ qla2x00_fw_version_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_serial_num_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         uint32_t sn;
 
         sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;
@@ -480,14 +552,14 @@ qla2x00_serial_num_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_isp_name_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         return snprintf(buf, PAGE_SIZE, "ISP%04X\n", ha->pdev->device);
 }
 
 static ssize_t
 qla2x00_isp_id_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         return snprintf(buf, PAGE_SIZE, "%04x %04x %04x %04x\n",
             ha->product_id[0], ha->product_id[1], ha->product_id[2],
             ha->product_id[3]);
@@ -496,14 +568,14 @@ qla2x00_isp_id_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_model_name_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         return snprintf(buf, PAGE_SIZE, "%s\n", ha->model_number);
 }
 
 static ssize_t
 qla2x00_model_desc_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         return snprintf(buf, PAGE_SIZE, "%s\n",
             ha->model_desc ? ha->model_desc: "");
 }
@@ -511,7 +583,7 @@ qla2x00_model_desc_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_pci_info_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         char pci_info[30];
 
         return snprintf(buf, PAGE_SIZE, "%s\n",
@@ -521,7 +593,7 @@ qla2x00_pci_info_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_state_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         int len = 0;
 
         if (atomic_read(&ha->loop_state) == LOOP_DOWN ||
@@ -559,7 +631,7 @@ qla2x00_state_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_zio_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         int len = 0;
 
         switch (ha->zio_mode) {
@@ -576,7 +648,7 @@ qla2x00_zio_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_zio_store(struct class_device *cdev, const char *buf, size_t count)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         int val = 0;
         uint16_t zio_mode;
 
@@ -602,7 +674,7 @@ qla2x00_zio_store(struct class_device *cdev, const char *buf, size_t count)
 static ssize_t
 qla2x00_zio_timer_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
 
         return snprintf(buf, PAGE_SIZE, "%d us\n", ha->zio_timer * 100);
 }
@@ -611,7 +683,7 @@ static ssize_t
 qla2x00_zio_timer_store(struct class_device *cdev, const char *buf,
     size_t count)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         int val = 0;
         uint16_t zio_timer;
 
@@ -629,7 +701,7 @@ qla2x00_zio_timer_store(struct class_device *cdev, const char *buf,
 static ssize_t
 qla2x00_beacon_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         int len = 0;
 
         if (ha->beacon_blink_led)
@@ -643,7 +715,7 @@ static ssize_t
 qla2x00_beacon_store(struct class_device *cdev, const char *buf,
     size_t count)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
         int val = 0;
         int rval;
 
@@ -673,7 +745,7 @@ qla2x00_beacon_store(struct class_device *cdev, const char *buf,
 static ssize_t
 qla2x00_optrom_bios_version_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
 
         return snprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->bios_revision[1],
             ha->bios_revision[0]);
@@ -682,7 +754,7 @@ qla2x00_optrom_bios_version_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_optrom_efi_version_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
 
         return snprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->efi_revision[1],
             ha->efi_revision[0]);
@@ -691,7 +763,7 @@ qla2x00_optrom_efi_version_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_optrom_fcode_version_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
 
         return snprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->fcode_revision[1],
             ha->fcode_revision[0]);
@@ -700,7 +772,7 @@ qla2x00_optrom_fcode_version_show(struct class_device *cdev, char *buf)
 static ssize_t
 qla2x00_optrom_fw_version_show(struct class_device *cdev, char *buf)
 {
-        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));
 
         return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d %d\n",
             ha->fw_revision[0], ha->fw_revision[1], ha->fw_revision[2],
@@ -757,7 +829,7 @@ struct class_device_attribute *qla2x00_host_attrs[] = {
 static void
 qla2x00_get_host_port_id(struct Scsi_Host *shost)
 {
-        scsi_qla_host_t *ha = to_qla_host(shost);
+        scsi_qla_host_t *ha = shost_priv(shost);
 
         fc_host_port_id(shost) = ha->d_id.b.domain << 16 |
             ha->d_id.b.area << 8 | ha->d_id.b.al_pa;
@@ -766,7 +838,7 @@ qla2x00_get_host_port_id(struct Scsi_Host *shost)
 static void
 qla2x00_get_host_speed(struct Scsi_Host *shost)
 {
-        scsi_qla_host_t *ha = to_qla_host(shost);
+        scsi_qla_host_t *ha = shost_priv(shost);
         uint32_t speed = 0;
 
         switch (ha->link_data_rate) {
@@ -786,7 +858,7 @@ qla2x00_get_host_speed(struct Scsi_Host *shost)
 static void
 qla2x00_get_host_port_type(struct Scsi_Host *shost)
 {
-        scsi_qla_host_t *ha = to_qla_host(shost);
+        scsi_qla_host_t *ha = shost_priv(shost);
         uint32_t port_type = FC_PORTTYPE_UNKNOWN;
 
         switch (ha->current_topology) {
@@ -810,7 +882,7 @@ static void
 qla2x00_get_starget_node_name(struct scsi_target *starget)
 {
         struct Scsi_Host *host = dev_to_shost(starget->dev.parent);
-        scsi_qla_host_t *ha = to_qla_host(host);
+        scsi_qla_host_t *ha = shost_priv(host);
         fc_port_t *fcport;
         u64 node_name = 0;
 
@@ -828,7 +900,7 @@ static void
 qla2x00_get_starget_port_name(struct scsi_target *starget)
 {
         struct Scsi_Host *host = dev_to_shost(starget->dev.parent);
-        scsi_qla_host_t *ha = to_qla_host(host);
+        scsi_qla_host_t *ha = shost_priv(host);
         fc_port_t *fcport;
         u64 port_name = 0;
 
@@ -846,7 +918,7 @@ static void
 qla2x00_get_starget_port_id(struct scsi_target *starget)
 {
         struct Scsi_Host *host = dev_to_shost(starget->dev.parent);
-        scsi_qla_host_t *ha = to_qla_host(host);
+        scsi_qla_host_t *ha = shost_priv(host);
         fc_port_t *fcport;
         uint32_t port_id = ~0U;
 
@@ -865,7 +937,7 @@ static void
 qla2x00_get_rport_loss_tmo(struct fc_rport *rport)
 {
         struct Scsi_Host *host = rport_to_shost(rport);
-        scsi_qla_host_t *ha = to_qla_host(host);
+        scsi_qla_host_t *ha = shost_priv(host);
 
         rport->dev_loss_tmo = ha->port_down_retry_count + 5;
 }
@@ -874,7 +946,7 @@ static void
 qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
 {
         struct Scsi_Host *host = rport_to_shost(rport);
-        scsi_qla_host_t *ha = to_qla_host(host);
+        scsi_qla_host_t *ha = shost_priv(host);
 
         if (timeout)
                 ha->port_down_retry_count = timeout;
@@ -887,7 +959,7 @@ qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
 static int
 qla2x00_issue_lip(struct Scsi_Host *shost)
 {
-        scsi_qla_host_t *ha = to_qla_host(shost);
+        scsi_qla_host_t *ha = shost_priv(shost);
 
         set_bit(LOOP_RESET_NEEDED, &ha->dpc_flags);
         return 0;
@@ -896,7 +968,7 @@ qla2x00_issue_lip(struct Scsi_Host *shost)
 static struct fc_host_statistics *
 qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
 {
-        scsi_qla_host_t *ha = to_qla_host(shost);
+        scsi_qla_host_t *ha = shost_priv(shost);
         int rval;
         uint16_t mb_stat[1];
         link_stat_t stat_buf;
@@ -934,7 +1006,7 @@ done:
 static void
 qla2x00_get_host_symbolic_name(struct Scsi_Host *shost)
 {
-        scsi_qla_host_t *ha = to_qla_host(shost);
+        scsi_qla_host_t *ha = shost_priv(shost);
 
         qla2x00_get_sym_node_name(ha, fc_host_symbolic_name(shost));
 }
@@ -942,7 +1014,7 @@ qla2x00_get_host_symbolic_name(struct Scsi_Host *shost)
 static void
 qla2x00_set_host_system_hostname(struct Scsi_Host *shost)
 {
-        scsi_qla_host_t *ha = to_qla_host(shost);
+        scsi_qla_host_t *ha = shost_priv(shost);
 
         set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);
 }
@@ -950,7 +1022,7 @@ qla2x00_set_host_system_hostname(struct Scsi_Host *shost)
 static void
 qla2x00_get_host_fabric_name(struct Scsi_Host *shost)
 {
-        scsi_qla_host_t *ha = to_qla_host(shost);
+        scsi_qla_host_t *ha = shost_priv(shost);
         u64 node_name;
 
         if (ha->device_flags & SWITCH_FOUND)
@@ -964,7 +1036,7 @@ qla2x00_get_host_fabric_name(struct Scsi_Host *shost)
 static void
 qla2x00_get_host_port_state(struct Scsi_Host *shost)
 {
-        scsi_qla_host_t *ha = to_qla_host(shost);
+        scsi_qla_host_t *ha = shost_priv(shost);
 
         if (!ha->flags.online)
                 fc_host_port_state(shost) = FC_PORTSTATE_OFFLINE;
@@ -978,7 +1050,7 @@ static int
 qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
 {
         int     ret = 0;
-        scsi_qla_host_t *ha = (scsi_qla_host_t *) fc_vport->shost->hostdata;
+        scsi_qla_host_t *ha = shost_priv(fc_vport->shost);
         scsi_qla_host_t *vha;
 
         ret = qla24xx_vport_create_req_sanity_check(fc_vport);
@@ -1047,7 +1119,7 @@ vport_create_failed_2:
 int
 qla24xx_vport_delete(struct fc_vport *fc_vport)
 {
-        scsi_qla_host_t *ha = (scsi_qla_host_t *) fc_vport->shost->hostdata;
+        scsi_qla_host_t *ha = shost_priv(fc_vport->shost);
         scsi_qla_host_t *vha = fc_vport->dd_data;
 
         qla24xx_disable_vp(vha);
@@ -1178,6 +1250,6 @@ qla2x00_init_host_attr(scsi_qla_host_t *ha)
         fc_host_node_name(ha->host) = wwn_to_u64(ha->node_name);
         fc_host_port_name(ha->host) = wwn_to_u64(ha->port_name);
         fc_host_supported_classes(ha->host) = FC_COS_CLASS3;
-        fc_host_max_npiv_vports(ha->host) = MAX_NUM_VPORT_FABRIC;
+        fc_host_max_npiv_vports(ha->host) = ha->max_npiv_vports;;
         fc_host_npiv_vports_inuse(ha->host) = ha->cur_vport_count;
 }