linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git] / drivers / scsi / qla2xxx / qla_attr.c
index 87f90c4..92b3e13 100644 (file)
@@ -16,16 +16,15 @@ qla2x00_sysfs_read_fw_dump(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)));
-       char *rbuf = (char *)ha->fw_dump;
 
        if (ha->fw_dump_reading == 0)
                return 0;
-       if (off > ha->fw_dump_len)
-                return 0;
-       if (off + count > ha->fw_dump_len)
-               count = ha->fw_dump_len - off;
+       if (off > ha->fw_dump_buffer_len)
+               return 0;
+       if (off + count > ha->fw_dump_buffer_len)
+               count = ha->fw_dump_buffer_len - off;
 
-       memcpy(buf, &rbuf[off], count);
+       memcpy(buf, &ha->fw_dump_buffer[off], count);
 
        return (count);
 }
@@ -37,6 +36,7 @@ qla2x00_sysfs_write_fw_dump(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)));
        int reading;
+       uint32_t dump_size;
 
        if (off != 0)
                return (0);
@@ -44,27 +44,52 @@ qla2x00_sysfs_write_fw_dump(struct kobject *kobj, char *buf, loff_t off,
        reading = simple_strtol(buf, NULL, 10);
        switch (reading) {
        case 0:
-               if (!ha->fw_dump_reading)
-                       break;
+               if (ha->fw_dump_reading == 1) {
+                       qla_printk(KERN_INFO, ha,
+                           "Firmware dump cleared on (%ld).\n",
+                           ha->host_no);
 
-               qla_printk(KERN_INFO, ha,
-                   "Firmware dump cleared on (%ld).\n", ha->host_no);
+                       vfree(ha->fw_dump_buffer);
+                       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_dumped = 0;
+                       ha->fw_dump_reading = 0;
+                       ha->fw_dump_buffer = NULL;
+                       ha->fw_dump = NULL;
+                       ha->fw_dumped = 0;
+               }
                break;
        case 1:
-               if (ha->fw_dumped && !ha->fw_dump_reading) {
+               if ((ha->fw_dump || ha->fw_dumped) && !ha->fw_dump_reading) {
                        ha->fw_dump_reading = 1;
 
+                       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,
+                                   "Unable to allocate memory for firmware "
+                                   "dump buffer (%d).\n", dump_size);
+
+                               ha->fw_dump_reading = 0;
+                               return (count);
+                       }
                        qla_printk(KERN_INFO, ha,
-                           "Raw firmware dump ready for read on (%ld).\n",
+                           "Firmware dump ready for read on (%ld).\n",
                            ha->host_no);
+                       memset(ha->fw_dump_buffer, 0, dump_size);
+                       ha->isp_ops.ascii_fw_dump(ha);
+                       ha->fw_dump_buffer_len = strlen(ha->fw_dump_buffer);
                }
                break;
-       case 2:
-               qla2x00_alloc_fw_dump(ha);
-               break;
        }
        return (count);
 }
@@ -113,7 +138,7 @@ qla2x00_sysfs_write_nvram(struct kobject *kobj, char *buf, loff_t off,
                return 0;
 
        /* Checksum NVRAM. */
-       if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
+       if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
                uint32_t *iter;
                uint32_t chksum;
 
@@ -283,102 +308,6 @@ static struct bin_attribute sysfs_optrom_ctl_attr = {
        .write = qla2x00_sysfs_write_optrom_ctl,
 };
 
-static ssize_t
-qla2x00_sysfs_read_vpd(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
-{
-       struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
-           struct device, kobj)));
-       unsigned long flags;
-
-       if (!capable(CAP_SYS_ADMIN) || off != 0)
-               return 0;
-
-       /* Read NVRAM. */
-       spin_lock_irqsave(&ha->hardware_lock, flags);
-       ha->isp_ops.read_nvram(ha, (uint8_t *)buf, ha->vpd_base, ha->vpd_size);
-       spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-       return ha->vpd_size;
-}
-
-static ssize_t
-qla2x00_sysfs_write_vpd(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
-{
-       struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
-           struct device, kobj)));
-       unsigned long flags;
-
-       if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->vpd_size)
-               return 0;
-
-       /* Write NVRAM. */
-       spin_lock_irqsave(&ha->hardware_lock, flags);
-       ha->isp_ops.write_nvram(ha, (uint8_t *)buf, ha->vpd_base, count);
-       spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
-       return count;
-}
-
-static struct bin_attribute sysfs_vpd_attr = {
-       .attr = {
-               .name = "vpd",
-               .mode = S_IRUSR | S_IWUSR,
-               .owner = THIS_MODULE,
-       },
-       .size = 0,
-       .read = qla2x00_sysfs_read_vpd,
-       .write = qla2x00_sysfs_write_vpd,
-};
-
-static ssize_t
-qla2x00_sysfs_read_sfp(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
-{
-       struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
-           struct device, kobj)));
-       uint16_t iter, addr, offset;
-       int rval;
-
-       if (!capable(CAP_SYS_ADMIN) || off != 0 || count != SFP_DEV_SIZE * 2)
-               return 0;
-
-       addr = 0xa0;
-       for (iter = 0, offset = 0; iter < (SFP_DEV_SIZE * 2) / SFP_BLOCK_SIZE;
-           iter++, offset += SFP_BLOCK_SIZE) {
-               if (iter == 4) {
-                       /* Skip to next device address. */
-                       addr = 0xa2;
-                       offset = 0;
-               }
-
-               rval = qla2x00_read_sfp(ha, ha->sfp_data_dma, addr, offset,
-                   SFP_BLOCK_SIZE);
-               if (rval != QLA_SUCCESS) {
-                       qla_printk(KERN_WARNING, ha,
-                           "Unable to read SFP data (%x/%x/%x).\n", rval,
-                           addr, offset);
-                       count = 0;
-                       break;
-               }
-               memcpy(buf, ha->sfp_data, SFP_BLOCK_SIZE);
-               buf += SFP_BLOCK_SIZE;
-       }
-
-       return count;
-}
-
-static struct bin_attribute sysfs_sfp_attr = {
-       .attr = {
-               .name = "sfp",
-               .mode = S_IRUSR | S_IWUSR,
-               .owner = THIS_MODULE,
-       },
-       .size = SFP_DEV_SIZE * 2,
-       .read = qla2x00_sysfs_read_sfp,
-};
-
 void
 qla2x00_alloc_sysfs_attr(scsi_qla_host_t *ha)
 {
@@ -389,12 +318,6 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_t *ha)
        sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_optrom_attr);
        sysfs_create_bin_file(&host->shost_gendev.kobj,
            &sysfs_optrom_ctl_attr);
-       if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
-               sysfs_create_bin_file(&host->shost_gendev.kobj,
-                   &sysfs_vpd_attr);
-               sysfs_create_bin_file(&host->shost_gendev.kobj,
-                   &sysfs_sfp_attr);
-       }
 }
 
 void
@@ -407,12 +330,6 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *ha)
        sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_optrom_attr);
        sysfs_remove_bin_file(&host->shost_gendev.kobj,
            &sysfs_optrom_ctl_attr);
-       if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
-               sysfs_remove_bin_file(&host->shost_gendev.kobj,
-                   &sysfs_vpd_attr);
-               sysfs_remove_bin_file(&host->shost_gendev.kobj,
-                   &sysfs_sfp_attr);
-       }
 
        if (ha->beacon_blink_led == 1)
                ha->isp_ops.beacon_off(ha);
@@ -533,6 +450,9 @@ qla2x00_zio_show(struct class_device *cdev, char *buf)
        int len = 0;
 
        switch (ha->zio_mode) {
+       case QLA_ZIO_MODE_5:
+               len += snprintf(buf + len, PAGE_SIZE-len, "Mode 5\n");
+               break;
        case QLA_ZIO_MODE_6:
                len += snprintf(buf + len, PAGE_SIZE-len, "Mode 6\n");
                break;
@@ -550,16 +470,20 @@ qla2x00_zio_store(struct class_device *cdev, const char *buf, size_t count)
        int val = 0;
        uint16_t zio_mode;
 
-       if (!IS_ZIO_SUPPORTED(ha))
-               return -ENOTSUPP;
-
        if (sscanf(buf, "%d", &val) != 1)
                return -EINVAL;
 
-       if (val)
+       switch (val) {
+       case 1:
+               zio_mode = QLA_ZIO_MODE_5;
+               break;
+       case 2:
                zio_mode = QLA_ZIO_MODE_6;
-       else
+               break;
+       default:
                zio_mode = QLA_ZIO_DISABLED;
+               break;
+       }
 
        /* Update per-hba values and queue a reset. */
        if (zio_mode != QLA_ZIO_DISABLED || ha->zio_mode != QLA_ZIO_DISABLED) {
@@ -826,7 +750,7 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
        pfc_host_stat = &ha->fc_host_stat;
        memset(pfc_host_stat, -1, sizeof(struct fc_host_statistics));
 
-       if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
+       if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
                rval = qla24xx_get_isp_stats(ha, (uint32_t *)&stat_buf,
                    sizeof(stat_buf) / 4, mb_stat);
        } else {