1 files changed, 131 insertions, 16 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 5ab953029f8..1c28215f8be 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2011 QLogic Corporation
+ * Copyright (c)  2003-2012 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -26,7 +26,7 @@ qla2x00_sysfs_read_fw_dump(struct file *filp, struct kobject *kobj,
         struct qla_hw_data *ha = vha->hw;
         int rval = 0;
 
-        if (ha->fw_dump_reading == 0)
+        if (!(ha->fw_dump_reading || ha->mctp_dump_reading))
                 return 0;
 
         if (IS_QLA82XX(ha)) {
@@ -39,9 +39,14 @@ qla2x00_sysfs_read_fw_dump(struct file *filp, struct kobject *kobj,
                 rval = memory_read_from_buffer(buf, count,
                     &off, ha->md_dump, ha->md_dump_size);
                 return rval;
-        } else
+        } else if (ha->mctp_dumped && ha->mctp_dump_reading)
+                return memory_read_from_buffer(buf, count, &off, ha->mctp_dump,
+                    MCTP_DUMP_SIZE);
+        else if (ha->fw_dump_reading)
                 return memory_read_from_buffer(buf, count, &off, ha->fw_dump,
                                         ha->fw_dump_len);
+        else
+                return 0;
 }
 
 static ssize_t
@@ -107,6 +112,22 @@ qla2x00_sysfs_write_fw_dump(struct file *filp, struct kobject *kobj,
                 if (IS_QLA82XX(ha))
                         set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
                 break;
+        case 6:
+                if (!ha->mctp_dump_reading)
+                        break;
+                ql_log(ql_log_info, vha, 0x70c1,
+                    "MCTP dump cleared on (%ld).\n", vha->host_no);
+                ha->mctp_dump_reading = 0;
+                ha->mctp_dumped = 0;
+                break;
+        case 7:
+                if (ha->mctp_dumped && !ha->mctp_dump_reading) {
+                        ha->mctp_dump_reading = 1;
+                        ql_log(ql_log_info, vha, 0x70c2,
+                            "Raw mctp dump ready for read on (%ld).\n",
+                            vha->host_no);
+                }
+                break;
         }
         return count;
 }
@@ -564,6 +585,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
         struct qla_hw_data *ha = vha->hw;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
         int type;
+        uint32_t idc_control;
 
         if (off != 0)
                 return -EINVAL;
@@ -587,22 +609,36 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
                 scsi_unblock_requests(vha->host);
                 break;
         case 0x2025d:
-                if (!IS_QLA81XX(ha) || !IS_QLA8031(ha))
+                if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
                         return -EPERM;
 
                 ql_log(ql_log_info, vha, 0x706f,
                     "Issuing MPI reset.\n");
 
-                /* Make sure FC side is not in reset */
-                qla2x00_wait_for_hba_online(vha);
-
-                /* Issue MPI reset */
-                scsi_block_requests(vha->host);
-                if (qla81xx_restart_mpi_firmware(vha) != QLA_SUCCESS)
-                        ql_log(ql_log_warn, vha, 0x7070,
-                            "MPI reset failed.\n");
-                scsi_unblock_requests(vha->host);
-                break;
+                if (IS_QLA83XX(ha)) {
+                        uint32_t idc_control;
+
+                        qla83xx_idc_lock(vha, 0);
+                        __qla83xx_get_idc_control(vha, &idc_control);
+                        idc_control |= QLA83XX_IDC_GRACEFUL_RESET;
+                        __qla83xx_set_idc_control(vha, idc_control);
+                        qla83xx_wr_reg(vha, QLA83XX_IDC_DEV_STATE,
+                            QLA8XXX_DEV_NEED_RESET);
+                        qla83xx_idc_audit(vha, IDC_AUDIT_TIMESTAMP);
+                        qla83xx_idc_unlock(vha, 0);
+                        break;
+                } else {
+                        /* Make sure FC side is not in reset */
+                        qla2x00_wait_for_hba_online(vha);
+
+                        /* Issue MPI reset */
+                        scsi_block_requests(vha->host);
+                        if (qla81xx_restart_mpi_firmware(vha) != QLA_SUCCESS)
+                                ql_log(ql_log_warn, vha, 0x7070,
+                                    "MPI reset failed.\n");
+                        scsi_unblock_requests(vha->host);
+                        break;
+                }
         case 0x2025e:
                 if (!IS_QLA82XX(ha) || vha != base_vha) {
                         ql_log(ql_log_info, vha, 0x7071,
@@ -616,6 +652,29 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
                 qla2xxx_wake_dpc(vha);
                 qla2x00_wait_for_fcoe_ctx_reset(vha);
                 break;
+        case 0x2025f:
+                if (!IS_QLA8031(ha))
+                        return -EPERM;
+                ql_log(ql_log_info, vha, 0x70bc,
+                    "Disabling Reset by IDC control\n");
+                qla83xx_idc_lock(vha, 0);
+                __qla83xx_get_idc_control(vha, &idc_control);
+                idc_control |= QLA83XX_IDC_RESET_DISABLED;
+                __qla83xx_set_idc_control(vha, idc_control);
+                qla83xx_idc_unlock(vha, 0);
+                break;
+        case 0x20260:
+                if (!IS_QLA8031(ha))
+                        return -EPERM;
+                ql_log(ql_log_info, vha, 0x70bd,
+                    "Enabling Reset by IDC control\n");
+                qla83xx_idc_lock(vha, 0);
+                __qla83xx_get_idc_control(vha, &idc_control);
+                idc_control &= ~QLA83XX_IDC_RESET_DISABLED;
+                __qla83xx_set_idc_control(vha, idc_control);
+                qla83xx_idc_unlock(vha, 0);
+                break;
+
         }
         return count;
 }
@@ -1251,6 +1310,49 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr,
             state[1], state[2], state[3], state[4]);
 }
 
+static ssize_t
+qla2x00_diag_requests_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
+
+        if (!IS_BIDI_CAPABLE(vha->hw))
+                return snprintf(buf, PAGE_SIZE, "\n");
+
+        return snprintf(buf, PAGE_SIZE, "%llu\n", vha->bidi_stats.io_count);
+}
+
+static ssize_t
+qla2x00_diag_megabytes_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
+
+        if (!IS_BIDI_CAPABLE(vha->hw))
+                return snprintf(buf, PAGE_SIZE, "\n");
+
+        return snprintf(buf, PAGE_SIZE, "%llu\n",
+            vha->bidi_stats.transfer_bytes >> 20);
+}
+
+static ssize_t
+qla2x00_fw_dump_size_show(struct device *dev, struct device_attribute *attr,
+        char *buf)
+{
+        scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
+        struct qla_hw_data *ha = vha->hw;
+        uint32_t size;
+
+        if (!ha->fw_dumped)
+                size = 0;
+        else if (IS_QLA82XX(ha))
+                size = ha->md_template_size + ha->md_dump_size;
+        else
+                size = ha->fw_dump_len;
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", size);
+}
+
 static DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show, NULL);
 static DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL);
 static DEVICE_ATTR(serial_num, S_IRUGO, qla2x00_serial_num_show, NULL);
@@ -1289,6 +1391,9 @@ static DEVICE_ATTR(vn_port_mac_address, S_IRUGO,
 static DEVICE_ATTR(fabric_param, S_IRUGO, qla2x00_fabric_param_show, NULL);
 static DEVICE_ATTR(fw_state, S_IRUGO, qla2x00_fw_state_show, NULL);
 static DEVICE_ATTR(thermal_temp, S_IRUGO, qla2x00_thermal_temp_show, NULL);
+static DEVICE_ATTR(diag_requests, S_IRUGO, qla2x00_diag_requests_show, NULL);
+static DEVICE_ATTR(diag_megabytes, S_IRUGO, qla2x00_diag_megabytes_show, NULL);
+static DEVICE_ATTR(fw_dump_size, S_IRUGO, qla2x00_fw_dump_size_show, NULL);
 
 struct device_attribute *qla2x00_host_attrs[] = {
         &dev_attr_driver_version,
@@ -1318,6 +1423,9 @@ struct device_attribute *qla2x00_host_attrs[] = {
         &dev_attr_fw_state,
         &dev_attr_optrom_gold_fw_version,
         &dev_attr_thermal_temp,
+        &dev_attr_diag_requests,
+        &dev_attr_diag_megabytes,
+        &dev_attr_fw_dump_size,
         NULL,
 };
 
@@ -1704,7 +1812,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
 
         if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) {
                 if (ha->fw_attributes & BIT_4) {
-                        int prot = 0;
+                        int prot = 0, guard;
                         vha->flags.difdix_supported = 1;
                         ql_dbg(ql_dbg_user, vha, 0x7082,
                             "Registered for DIF/DIX type 1 and 3 protection.\n");
@@ -1717,7 +1825,14 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
                             | SHOST_DIX_TYPE1_PROTECTION
                             | SHOST_DIX_TYPE2_PROTECTION
                             | SHOST_DIX_TYPE3_PROTECTION);
-                        scsi_host_set_guard(vha->host, SHOST_DIX_GUARD_CRC);
+
+                        guard = SHOST_DIX_GUARD_CRC;
+
+                        if (IS_PI_IPGUARD_CAPABLE(ha) &&
+                            (ql2xenabledif > 1 || IS_PI_DIFB_DIX0_CAPABLE(ha)))
+                                guard |= SHOST_DIX_GUARD_IP;
+
+                        scsi_host_set_guard(vha->host, guard);
                 } else
                         vha->flags.difdix_supported = 0;
         }