[SCSI] qla2xxx: Read capture firmware dump on mailbox timeout for ISP8044 and ISP82XX.

Allow for the capture of a firmware dump but have a sysfs node
(allow_cna_fw_dump) to allow the feature to be enabled/disabled dynamically.

The default is off.

Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index f2d42b961e92f2edba72028ceac0436fdc49b72e..aa81829aeb3a503e83c005bb4374eb3ebd31ad40 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1503,6 +1503,37 @@ qla2x00_fw_dump_size_show(struct device *dev, struct device_attribute *attr,
        return scnprintf(buf, PAGE_SIZE, "%d\n", size);
 }
 
+static ssize_t
+qla2x00_allow_cna_fw_dump_show(struct device *dev,
+       struct device_attribute *attr, char *buf)
+{
+       scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
+
+       if (!IS_P3P_TYPE(vha->hw))
+               return scnprintf(buf, PAGE_SIZE, "\n");
+       else
+               return scnprintf(buf, PAGE_SIZE, "%s\n",
+                   vha->hw->allow_cna_fw_dump ? "true" : "false");
+}
+
+static ssize_t
+qla2x00_allow_cna_fw_dump_store(struct device *dev,
+       struct device_attribute *attr, const char *buf, size_t count)
+{
+       scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
+       int val = 0;
+
+       if (!IS_P3P_TYPE(vha->hw))
+               return -EINVAL;
+
+       if (sscanf(buf, "%d", &val) != 1)
+               return -EINVAL;
+
+       vha->hw->allow_cna_fw_dump = val != 0;
+
+       return strlen(buf);
+}
+
 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);
@@ -1544,6 +1575,9 @@ 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);
+static DEVICE_ATTR(allow_cna_fw_dump, S_IRUGO | S_IWUSR,
+                  qla2x00_allow_cna_fw_dump_show,
+                  qla2x00_allow_cna_fw_dump_store);
 
 struct device_attribute *qla2x00_host_attrs[] = {
        &dev_attr_driver_version,
@@ -1576,6 +1610,7 @@ struct device_attribute *qla2x00_host_attrs[] = {
        &dev_attr_diag_requests,
        &dev_attr_diag_megabytes,
        &dev_attr_fw_dump_size,
+       &dev_attr_allow_cna_fw_dump,
        NULL,
 };
 

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 400ef02e161060bd219e6abf55cbe27f977d98e8..6a106136716c7e91e0ed545e1758ca94a37d945d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -3301,6 +3301,7 @@ struct qla_hw_data {
        struct mr_data_fx00 mr;
 
        struct qlt_hw_data tgt;
+       int     allow_cna_fw_dump;
 };
 
 /*

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 19a06620b0e53fcbcb1daa8f4dc7531170b0c826..dcd084a4e5c1fb6e784b1f2c6f2098289c0beb4d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -511,6 +511,8 @@ extern void qla2300_fw_dump(scsi_qla_host_t *, int);
 extern void qla24xx_fw_dump(scsi_qla_host_t *, int);
 extern void qla25xx_fw_dump(scsi_qla_host_t *, int);
 extern void qla81xx_fw_dump(scsi_qla_host_t *, int);
+extern void qla82xx_fw_dump(scsi_qla_host_t *, int);
+extern void qla8044_fw_dump(scsi_qla_host_t *, int);
 
 extern void qla27xx_fwdump(scsi_qla_host_t *, int);
 extern ulong qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *);

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 26326f336c597a0c46136b827eb8b9d7a4c548f3..5511e24b1f11ca3e5cc519eec8e84f08febbaa6a 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -4502,3 +4502,20 @@ exit:
        qla82xx_idc_unlock(ha);
        return rval;
 }
+
+void
+qla82xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
+{
+       struct qla_hw_data *ha = vha->hw;
+
+       if (!ha->allow_cna_fw_dump)
+               return;
+
+       scsi_block_requests(vha->host);
+       ha->flags.isp82xx_no_md_cap = 1;
+       qla82xx_idc_lock(ha);
+       qla82xx_set_reset_owner(vha);
+       qla82xx_idc_unlock(ha);
+       qla2x00_wait_for_chip_reset(vha);
+       scsi_unblock_requests(vha->host);
+}

diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
index b7ed4784d929a211b42bb5f166647d606d06e7e4..86cf10815db0c838ea92cfe9ff6727b2e07c94d2 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/drivers/scsi/qla2xxx/qla_nx2.c
@@ -3713,3 +3713,19 @@ exit_isp_reset:
        return rval;
 }
 
+void
+qla8044_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
+{
+       struct qla_hw_data *ha = vha->hw;
+
+       if (!ha->allow_cna_fw_dump)
+               return;
+
+       scsi_block_requests(vha->host);
+       ha->flags.isp82xx_no_md_cap = 1;
+       qla8044_idc_lock(ha);
+       qla82xx_set_reset_owner(vha);
+       qla8044_idc_unlock(ha);
+       qla2x00_wait_for_chip_reset(vha);
+       scsi_unblock_requests(vha->host);
+}

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index c0c95c180188003a9370bb254a86e7902019e0a7..7c36eb2dfae8712f6e40d53d700fcde6ff553e40 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1975,7 +1975,7 @@ static struct isp_operations qla82xx_isp_ops = {
        .prep_ms_fdmi_iocb      = qla24xx_prep_ms_fdmi_iocb,
        .read_nvram             = qla24xx_read_nvram_data,
        .write_nvram            = qla24xx_write_nvram_data,
-       .fw_dump                = qla24xx_fw_dump,
+       .fw_dump                = qla82xx_fw_dump,
        .beacon_on              = qla82xx_beacon_on,
        .beacon_off             = qla82xx_beacon_off,
        .beacon_blink           = NULL,
@@ -2013,7 +2013,7 @@ static struct isp_operations qla8044_isp_ops = {
        .prep_ms_fdmi_iocb      = qla24xx_prep_ms_fdmi_iocb,
        .read_nvram             = NULL,
        .write_nvram            = NULL,
-       .fw_dump                = qla24xx_fw_dump,
+       .fw_dump                = qla8044_fw_dump,
        .beacon_on              = qla82xx_beacon_on,
        .beacon_off             = qla82xx_beacon_off,
        .beacon_blink           = NULL,