1 files changed, 43 insertions, 43 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 9bc1f153f7ea..659a5d63467d 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -63,23 +63,29 @@ qla2x00_sysfs_write_fw_dump(struct kobject *kobj, char *buf, loff_t off,
                             ha->host_no);
 
                         vfree(ha->fw_dump_buffer);
-                        free_pages((unsigned long)ha->fw_dump,
-                            ha->fw_dump_order);
+                        if (!IS_QLA24XX(ha) && !IS_QLA25XX(ha))
+                                free_pages((unsigned long)ha->fw_dump,
+                                    ha->fw_dump_order);
 
                         ha->fw_dump_reading = 0;
                         ha->fw_dump_buffer = NULL;
                         ha->fw_dump = NULL;
+                        ha->fw_dumped = 0;
                 }
                 break;
         case 1:
-                if (ha->fw_dump != NULL && !ha->fw_dump_reading) {
+                if ((ha->fw_dump || ha->fw_dumped) && !ha->fw_dump_reading) {
                         ha->fw_dump_reading = 1;
 
-                        dump_size = FW_DUMP_SIZE_1M;
-                        if (ha->fw_memory_size < 0x20000) 
-                                dump_size = FW_DUMP_SIZE_128K;
-                        else if (ha->fw_memory_size < 0x80000) 
-                                dump_size = FW_DUMP_SIZE_512K;
+                        if (IS_QLA24XX(ha) || IS_QLA25XX(ha))
+                                dump_size = FW_DUMP_SIZE_24XX;
+                        else {
+                                dump_size = FW_DUMP_SIZE_1M;
+                                if (ha->fw_memory_size < 0x20000)
+                                        dump_size = FW_DUMP_SIZE_128K;
+                                else if (ha->fw_memory_size < 0x80000)
+                                        dump_size = FW_DUMP_SIZE_512K;
+                        }
                         ha->fw_dump_buffer = (char *)vmalloc(dump_size);
                         if (ha->fw_dump_buffer == NULL) {
                                 qla_printk(KERN_WARNING, ha,
@@ -93,10 +99,7 @@ qla2x00_sysfs_write_fw_dump(struct kobject *kobj, char *buf, loff_t off,
                             "Firmware dump ready for read on (%ld).\n",
                             ha->host_no);
                         memset(ha->fw_dump_buffer, 0, dump_size);
-                        if (IS_QLA2100(ha) || IS_QLA2200(ha))
-                                qla2100_ascii_fw_dump(ha);
-                        else
-                                qla2300_ascii_fw_dump(ha);
+                        ha->isp_ops.ascii_fw_dump(ha);
                         ha->fw_dump_buffer_len = strlen(ha->fw_dump_buffer);
                 }
                 break;
@@ -121,23 +124,15 @@ qla2x00_sysfs_read_nvram(struct kobject *kobj, char *buf, loff_t off,
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
-        uint16_t        *witer;
         unsigned long   flags;
-        uint16_t        cnt;
 
-        if (!capable(CAP_SYS_ADMIN) || off != 0 || count != sizeof(nvram_t))
+        if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->nvram_size)
                 return 0;
 
         /* Read NVRAM. */
         spin_lock_irqsave(&ha->hardware_lock, flags);
-        qla2x00_lock_nvram_access(ha);
-        witer = (uint16_t *)buf;
-        for (cnt = 0; cnt < count / 2; cnt++) {
-                *witer = cpu_to_le16(qla2x00_get_nvram_word(ha,
-                    cnt+ha->nvram_base));
-                witer++;
-        }
-        qla2x00_unlock_nvram_access(ha);
+        ha->isp_ops.read_nvram(ha, (uint8_t *)buf, ha->nvram_base,
+            ha->nvram_size);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         return (count);
@@ -149,34 +144,38 @@ qla2x00_sysfs_write_nvram(struct kobject *kobj, char *buf, loff_t off,
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
-        uint8_t         *iter;
-        uint16_t        *witer;
         unsigned long   flags;
         uint16_t        cnt;
-        uint8_t         chksum;
 
-        if (!capable(CAP_SYS_ADMIN) || off != 0 || count != sizeof(nvram_t))
+        if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->nvram_size)
                 return 0;
 
         /* Checksum NVRAM. */
-        iter = (uint8_t *)buf;
-        chksum = 0;
-        for (cnt = 0; cnt < count - 1; cnt++)
-                chksum += *iter++;
-        chksum = ~chksum + 1;
-        *iter = chksum;
+        if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
+                uint32_t *iter;
+                uint32_t chksum;
+
+                iter = (uint32_t *)buf;
+                chksum = 0;
+                for (cnt = 0; cnt < ((count >> 2) - 1); cnt++)
+                        chksum += le32_to_cpu(*iter++);
+                chksum = ~chksum + 1;
+                *iter = cpu_to_le32(chksum);
+        } else {
+                uint8_t *iter;
+                uint8_t chksum;
+
+                iter = (uint8_t *)buf;
+                chksum = 0;
+                for (cnt = 0; cnt < count - 1; cnt++)
+                        chksum += *iter++;
+                chksum = ~chksum + 1;
+                *iter = chksum;
+        }
 
         /* Write NVRAM. */
         spin_lock_irqsave(&ha->hardware_lock, flags);
-        qla2x00_lock_nvram_access(ha);
-        qla2x00_release_nvram_protection(ha);
-        witer = (uint16_t *)buf;
-        for (cnt = 0; cnt < count / 2; cnt++) {
-                qla2x00_write_nvram_word(ha, cnt+ha->nvram_base,
-                    cpu_to_le16(*witer));
-                witer++;
-        }
-        qla2x00_unlock_nvram_access(ha);
+        ha->isp_ops.write_nvram(ha, (uint8_t *)buf, ha->nvram_base, count);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         return (count);
@@ -188,7 +187,7 @@ static struct bin_attribute sysfs_nvram_attr = {
                 .mode = S_IRUSR | S_IWUSR,
                 .owner = THIS_MODULE,
         },
-        .size = sizeof(nvram_t),
+        .size = 0,
         .read = qla2x00_sysfs_read_nvram,
         .write = qla2x00_sysfs_write_nvram,
 };
@@ -199,6 +198,7 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_t *ha)
         struct Scsi_Host *host = ha->host;
 
         sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_fw_dump_attr);
+        sysfs_nvram_attr.size = ha->nvram_size;
         sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_nvram_attr);
 }