scsi: be2iscsi: Add cmd to set host data

Provide driver version in host data to FW.

Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c
index 6af448d6912661a28b673f83e6689df752536534..04996665e608bb86be7b8a27edccc3b002776fe5 100644 (file)
--- a/drivers/scsi/be2iscsi/be_cmds.c
+++ b/drivers/scsi/be2iscsi/be_cmds.c
@@ -1522,6 +1522,52 @@ int beiscsi_get_port_name(struct be_ctrl_info *ctrl, struct beiscsi_hba *phba)
        return ret;
 }
 
+int beiscsi_set_host_data(struct beiscsi_hba *phba)
+{
+       struct be_ctrl_info *ctrl = &phba->ctrl;
+       struct be_cmd_set_host_data *ioctl;
+       struct be_mcc_wrb *wrb;
+       int ret = 0;
+
+       if (is_chip_be2_be3r(phba))
+               return ret;
+
+       mutex_lock(&ctrl->mbox_lock);
+       wrb = wrb_from_mbox(&ctrl->mbox_mem);
+       memset(wrb, 0, sizeof(*wrb));
+       ioctl = embedded_payload(wrb);
+
+       be_wrb_hdr_prepare(wrb, sizeof(*ioctl), true, 0);
+       be_cmd_hdr_prepare(&ioctl->h.req_hdr, CMD_SUBSYSTEM_COMMON,
+                          OPCODE_COMMON_SET_HOST_DATA,
+                          EMBED_MBX_MAX_PAYLOAD_SIZE);
+       ioctl->param.req.param_id = BE_CMD_SET_HOST_PARAM_ID;
+       ioctl->param.req.param_len =
+               snprintf((char *)ioctl->param.req.param_data,
+                        sizeof(ioctl->param.req.param_data),
+                        "Linux iSCSI v%s", BUILD_STR);
+       ioctl->param.req.param_len = ALIGN(ioctl->param.req.param_len, 4);
+       if (ioctl->param.req.param_len > BE_CMD_MAX_DRV_VERSION)
+               ioctl->param.req.param_len = BE_CMD_MAX_DRV_VERSION;
+       ret = be_mbox_notify(ctrl);
+       if (!ret) {
+               beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
+                           "BG_%d : HBA set host driver version\n");
+       } else {
+               /**
+                * Check "MCC_STATUS_INVALID_LENGTH" for SKH.
+                * Older FW versions return this error.
+                */
+               if (ret == MCC_STATUS_ILLEGAL_REQUEST ||
+                               ret == MCC_STATUS_INVALID_LENGTH)
+                       __beiscsi_log(phba, KERN_INFO,
+                                     "BG_%d : HBA failed to set host driver version\n");
+       }
+
+       mutex_unlock(&ctrl->mbox_lock);
+       return ret;
+}
+
 int beiscsi_set_uer_feature(struct beiscsi_hba *phba)
 {
        struct be_ctrl_info *ctrl = &phba->ctrl;

diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
index 4f1ac97d992151a756608a85cdf15a4a22665f62..5d5e8fbd9a57c357914e7b13bee26e7de8b95348 100644 (file)
--- a/drivers/scsi/be2iscsi/be_cmds.h
+++ b/drivers/scsi/be2iscsi/be_cmds.h
@@ -230,6 +230,7 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_QUERY_FIRMWARE_CONFIG            58
 #define OPCODE_COMMON_FUNCTION_RESET                   61
 #define OPCODE_COMMON_GET_PORT_NAME                    77
+#define OPCODE_COMMON_SET_HOST_DATA                    93
 #define OPCODE_COMMON_SET_FEATURES                     191
 
 /**
@@ -737,6 +738,30 @@ struct be_cmd_hba_name {
        u8 initiator_alias[BE_INI_ALIAS_LEN];
 } __packed;
 
+/******************** COMMON SET HOST DATA *******************/
+#define BE_CMD_SET_HOST_PARAM_ID       0x2
+#define BE_CMD_MAX_DRV_VERSION         0x30
+struct be_sethost_req {
+       u32 param_id;
+       u32 param_len;
+       u32 param_data[32];
+};
+
+struct be_sethost_resp {
+       u32 rsvd0;
+};
+
+struct be_cmd_set_host_data {
+       union {
+               struct be_cmd_req_hdr req_hdr;
+               struct be_cmd_resp_hdr resp_hdr;
+       } h;
+       union {
+               struct be_sethost_req req;
+               struct be_sethost_resp resp;
+       } param;
+} __packed;
+
 /******************** COMMON SET Features *******************/
 #define BE_CMD_SET_FEATURE_UER 0x10
 #define BE_CMD_UER_SUPP_BIT    0x1
@@ -845,6 +870,7 @@ int beiscsi_get_fw_config(struct be_ctrl_info *ctrl, struct beiscsi_hba *phba);
 int beiscsi_get_port_name(struct be_ctrl_info *ctrl, struct beiscsi_hba *phba);
 
 int beiscsi_set_uer_feature(struct beiscsi_hba *phba);
+int beiscsi_set_host_data(struct beiscsi_hba *phba);
 
 struct be_default_pdu_context {
        u32 dw[4];

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 8f7e394ec9646959010f0a460438c8949899187e..02144c5a2b9352f3454055f1213c051d53112020 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -5325,6 +5325,7 @@ static int beiscsi_enable_port(struct beiscsi_hba *phba)
        be2iscsi_enable_msix(phba);
 
        beiscsi_get_params(phba);
+       beiscsi_set_host_data(phba);
        /* Re-enable UER. If different TPE occurs then it is recoverable. */
        beiscsi_set_uer_feature(phba);
 
@@ -5623,6 +5624,7 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,
        }
        beiscsi_get_port_name(&phba->ctrl, phba);
        beiscsi_get_params(phba);
+       beiscsi_set_host_data(phba);
        beiscsi_set_uer_feature(phba);
 
        be2iscsi_enable_msix(phba);