[SCSI] qla4xxx: Added restore factory defaults support using BSG

This command will causes the firmware to update all
configurations to pre-defined factory default settings.

Signed-off-by: Harish Zunjarrao <harish.zunjarrao@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/qla4xxx/ql4_bsg.c b/drivers/scsi/qla4xxx/ql4_bsg.c
index c47545356f7b6645468794955260f39a66aa8f68..4704a52eaecd3fe3fb5e8dd58304cc2d21ef4087 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_bsg.c
+++ b/drivers/scsi/qla4xxx/ql4_bsg.c
@@ -337,6 +337,50 @@ leave:
        return rval;
 }
 
+static int
+qla4xxx_restore_defaults(struct bsg_job *bsg_job)
+{
+       struct Scsi_Host *host = iscsi_job_to_shost(bsg_job);
+       struct scsi_qla_host *ha = to_qla_host(host);
+       struct iscsi_bsg_request *bsg_req = bsg_job->request;
+       struct iscsi_bsg_reply *bsg_reply = bsg_job->reply;
+       uint32_t region = 0;
+       uint32_t field0 = 0;
+       uint32_t field1 = 0;
+       int rval = -EINVAL;
+
+       bsg_reply->reply_payload_rcv_len = 0;
+
+       if (unlikely(pci_channel_offline(ha->pdev)))
+               goto leave;
+
+       if (is_qla4010(ha))
+               goto leave;
+
+       if (ql4xxx_reset_active(ha)) {
+               ql4_printk(KERN_ERR, ha, "%s: reset active\n", __func__);
+               rval = -EBUSY;
+               goto leave;
+       }
+
+       region = bsg_req->rqst_data.h_vendor.vendor_cmd[1];
+       field0 = bsg_req->rqst_data.h_vendor.vendor_cmd[2];
+       field1 = bsg_req->rqst_data.h_vendor.vendor_cmd[3];
+
+       rval = qla4xxx_restore_factory_defaults(ha, region, field0, field1);
+       if (rval) {
+               ql4_printk(KERN_ERR, ha, "%s: set nvram failed\n", __func__);
+               bsg_reply->result = DID_ERROR << 16;
+               rval = -EIO;
+       } else
+               bsg_reply->result = DID_OK << 16;
+
+       bsg_job_done(bsg_job, bsg_reply->result,
+                    bsg_reply->reply_payload_rcv_len);
+leave:
+       return rval;
+}
+
 /**
  * qla4xxx_process_vendor_specific - handle vendor specific bsg request
  * @job: iscsi_bsg_job to handle
@@ -364,6 +408,9 @@ int qla4xxx_process_vendor_specific(struct bsg_job *bsg_job)
        case QLISCSI_VND_UPDATE_NVRAM:
                return qla4xxx_update_nvram(bsg_job);
 
+       case QLISCSI_VND_RESTORE_DEFAULTS:
+               return qla4xxx_restore_defaults(bsg_job);
+
        default:
                ql4_printk(KERN_ERR, ha, "%s: invalid BSG vendor command: "
                           "0x%x\n", __func__, bsg_req->msgcode);

diff --git a/drivers/scsi/qla4xxx/ql4_bsg.h b/drivers/scsi/qla4xxx/ql4_bsg.h
index 71df80d612dac6be4fd8051e4a59598d406fa62c..84a1391f9865203bc59d861b2095946567dd2d42 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_bsg.h
+++ b/drivers/scsi/qla4xxx/ql4_bsg.h
@@ -13,5 +13,6 @@
 #define QLISCSI_VND_GET_ACB_STATE      3
 #define QLISCSI_VND_READ_NVRAM         4
 #define QLISCSI_VND_UPDATE_NVRAM       5
+#define QLISCSI_VND_RESTORE_DEFAULTS   6
 
 #endif

diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index 35bd0c1ede38bddf0a359442b9dc38f5182a138c..1a0f60187ad647656871b68afccb375c91442596 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -166,6 +166,9 @@ int qla4xxx_get_nvram(struct scsi_qla_host *ha, dma_addr_t nvram_dma,
                      uint32_t offset, uint32_t size);
 int qla4xxx_set_nvram(struct scsi_qla_host *ha, dma_addr_t nvram_dma,
                      uint32_t offset, uint32_t size);
+int qla4xxx_restore_factory_defaults(struct scsi_qla_host *ha,
+                                    uint32_t region, uint32_t field0,
+                                    uint32_t field1);
 
 /* BSG Functions */
 int qla4xxx_bsg_request(struct bsg_job *bsg_job);

diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index e843758da3d42fc34004b0828d953683a9806e1f..dfc38aa8740d12dfb2b19a8b298507bbcd1dc94e 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -1744,3 +1744,29 @@ int qla4xxx_set_nvram(struct scsi_qla_host *ha, dma_addr_t nvram_dma,
        }
        return status;
 }
+
+int qla4xxx_restore_factory_defaults(struct scsi_qla_host *ha,
+                                    uint32_t region, uint32_t field0,
+                                    uint32_t field1)
+{
+       int status = QLA_SUCCESS;
+       uint32_t mbox_cmd[MBOX_REG_COUNT];
+       uint32_t mbox_sts[MBOX_REG_COUNT];
+
+       memset(&mbox_cmd, 0, sizeof(mbox_cmd));
+       memset(&mbox_sts, 0, sizeof(mbox_sts));
+
+       mbox_cmd[0] = MBOX_CMD_RESTORE_FACTORY_DEFAULTS;
+       mbox_cmd[3] = region;
+       mbox_cmd[4] = field0;
+       mbox_cmd[5] = field1;
+
+       status = qla4xxx_mailbox_command(ha, MBOX_REG_COUNT, 3, &mbox_cmd[0],
+                                        &mbox_sts[0]);
+       if (status != QLA_SUCCESS) {
+               DEBUG2(ql4_printk(KERN_ERR, ha, "scsi%ld: %s: failed "
+                                 "status %04X\n", ha->host_no, __func__,
+                                 mbox_sts[0]));
+       }
+       return status;
+}