scsi: be2iscsi: Move functions to right files
authorJitendra Bhivare <jitendra.bhivare@broadcom.com>
Fri, 19 Aug 2016 09:50:15 +0000 (15:20 +0530)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 24 Aug 2016 02:42:43 +0000 (22:42 -0400)
beiscsi_fail_session is defined in be_cmds.c: move it to be_iscsi.c
Move card configuration commands to be_cmds.c.

Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/be2iscsi/be_cmds.c
drivers/scsi/be2iscsi/be_cmds.h
drivers/scsi/be2iscsi/be_iscsi.c
drivers/scsi/be2iscsi/be_iscsi.h
drivers/scsi/be2iscsi/be_main.c
drivers/scsi/be2iscsi/be_mgmt.c
drivers/scsi/be2iscsi/be_mgmt.h

index a246abebb1de4bd0bba07d2eafd1c08be98c9576..1ebb6ce127429f3985f371411d1d404f363a3c4f 100644 (file)
@@ -119,15 +119,6 @@ void free_mcc_wrb(struct be_ctrl_info *ctrl, unsigned int tag)
        spin_unlock(&ctrl->mcc_lock);
 }
 
-/**
- * beiscsi_fail_session(): Closing session with appropriate error
- * @cls_session: ptr to session
- **/
-void beiscsi_fail_session(struct iscsi_cls_session *cls_session)
-{
-       iscsi_session_failure(cls_session->dd_data, ISCSI_ERR_CONN_FAILED);
-}
-
 /*
  * beiscsi_mcc_compl_status - Return the status of MCC completion
  * @phba: Driver private structure
@@ -342,7 +333,7 @@ static void beiscsi_process_async_link(struct beiscsi_hba *phba,
                              "BC_%d : Link Down on Port %d tag 0x%x\n",
                              evt->physical_port, evt->event_tag);
                iscsi_host_for_each_session(phba->shost,
-                                           beiscsi_fail_session);
+                                           beiscsi_session_fail);
        }
 }
 
@@ -638,7 +629,7 @@ static int be_mbox_db_ready_poll(struct be_ctrl_info *ctrl)
  * Success: 0
  * Failure: Non-Zero
  **/
-int be_mbox_notify(struct be_ctrl_info *ctrl)
+static int be_mbox_notify(struct be_ctrl_info *ctrl)
 {
        int status;
        u32 val = 0;
@@ -1362,6 +1353,267 @@ int be_cmd_set_vlan(struct beiscsi_hba *phba,
        return tag;
 }
 
+int beiscsi_check_supported_fw(struct be_ctrl_info *ctrl,
+                              struct beiscsi_hba *phba)
+{
+       struct be_dma_mem nonemb_cmd;
+       struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+       struct be_mgmt_controller_attributes *req;
+       struct be_sge *sge = nonembedded_sgl(wrb);
+       int status = 0;
+
+       nonemb_cmd.va = pci_alloc_consistent(ctrl->pdev,
+                               sizeof(struct be_mgmt_controller_attributes),
+                               &nonemb_cmd.dma);
+       if (nonemb_cmd.va == NULL) {
+               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
+                           "BG_%d : pci_alloc_consistent failed in %s\n",
+                           __func__);
+               return -ENOMEM;
+       }
+       nonemb_cmd.size = sizeof(struct be_mgmt_controller_attributes);
+       req = nonemb_cmd.va;
+       memset(req, 0, sizeof(*req));
+       mutex_lock(&ctrl->mbox_lock);
+       memset(wrb, 0, sizeof(*wrb));
+       be_wrb_hdr_prepare(wrb, sizeof(*req), false, 1);
+       be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                          OPCODE_COMMON_GET_CNTL_ATTRIBUTES, sizeof(*req));
+       sge->pa_hi = cpu_to_le32(upper_32_bits(nonemb_cmd.dma));
+       sge->pa_lo = cpu_to_le32(nonemb_cmd.dma & 0xFFFFFFFF);
+       sge->len = cpu_to_le32(nonemb_cmd.size);
+       status = be_mbox_notify(ctrl);
+       if (!status) {
+               struct be_mgmt_controller_attributes_resp *resp = nonemb_cmd.va;
+
+               beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
+                           "BG_%d : Firmware Version of CMD : %s\n"
+                           "Firmware Version is : %s\n"
+                           "Developer Build, not performing version check...\n",
+                           resp->params.hba_attribs
+                           .flashrom_version_string,
+                           resp->params.hba_attribs.
+                           firmware_version_string);
+
+               phba->fw_config.iscsi_features =
+                               resp->params.hba_attribs.iscsi_features;
+               beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
+                           "BM_%d : phba->fw_config.iscsi_features = %d\n",
+                           phba->fw_config.iscsi_features);
+               memcpy(phba->fw_ver_str, resp->params.hba_attribs.
+                      firmware_version_string, BEISCSI_VER_STRLEN);
+       } else
+               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
+                           "BG_%d :  Failed in beiscsi_check_supported_fw\n");
+       mutex_unlock(&ctrl->mbox_lock);
+       if (nonemb_cmd.va)
+               pci_free_consistent(ctrl->pdev, nonemb_cmd.size,
+                                   nonemb_cmd.va, nonemb_cmd.dma);
+
+       return status;
+}
+
+/**
+ * beiscsi_get_fw_config()- Get the FW config for the function
+ * @ctrl: ptr to Ctrl Info
+ * @phba: ptr to the dev priv structure
+ *
+ * Get the FW config and resources available for the function.
+ * The resources are created based on the count received here.
+ *
+ * return
+ *     Success: 0
+ *     Failure: Non-Zero Value
+ **/
+int beiscsi_get_fw_config(struct be_ctrl_info *ctrl,
+                         struct beiscsi_hba *phba)
+{
+       struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
+       struct be_fw_cfg *pfw_cfg = embedded_payload(wrb);
+       uint32_t cid_count, icd_count;
+       int status = -EINVAL;
+       uint8_t ulp_num = 0;
+
+       mutex_lock(&ctrl->mbox_lock);
+       memset(wrb, 0, sizeof(*wrb));
+       be_wrb_hdr_prepare(wrb, sizeof(*pfw_cfg), true, 0);
+
+       be_cmd_hdr_prepare(&pfw_cfg->hdr, CMD_SUBSYSTEM_COMMON,
+                          OPCODE_COMMON_QUERY_FIRMWARE_CONFIG,
+                          EMBED_MBX_MAX_PAYLOAD_SIZE);
+
+       if (be_mbox_notify(ctrl)) {
+               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
+                           "BG_%d : Failed in beiscsi_get_fw_config\n");
+               goto fail_init;
+       }
+
+       /* FW response formats depend on port id */
+       phba->fw_config.phys_port = pfw_cfg->phys_port;
+       if (phba->fw_config.phys_port >= BEISCSI_PHYS_PORT_MAX) {
+               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
+                           "BG_%d : invalid physical port id %d\n",
+                           phba->fw_config.phys_port);
+               goto fail_init;
+       }
+
+       /* populate and check FW config against min and max values */
+       if (!is_chip_be2_be3r(phba)) {
+               phba->fw_config.eqid_count = pfw_cfg->eqid_count;
+               phba->fw_config.cqid_count = pfw_cfg->cqid_count;
+               if (phba->fw_config.eqid_count == 0 ||
+                   phba->fw_config.eqid_count > 2048) {
+                       beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
+                                   "BG_%d : invalid EQ count %d\n",
+                                   phba->fw_config.eqid_count);
+                       goto fail_init;
+               }
+               if (phba->fw_config.cqid_count == 0 ||
+                   phba->fw_config.cqid_count > 4096) {
+                       beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
+                                   "BG_%d : invalid CQ count %d\n",
+                                   phba->fw_config.cqid_count);
+                       goto fail_init;
+               }
+               beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
+                           "BG_%d : EQ_Count : %d CQ_Count : %d\n",
+                           phba->fw_config.eqid_count,
+                           phba->fw_config.cqid_count);
+       }
+
+       /**
+        * Check on which all ULP iSCSI Protocol is loaded.
+        * Set the Bit for those ULP. This set flag is used
+        * at all places in the code to check on which ULP
+        * iSCSi Protocol is loaded
+        **/
+       for (ulp_num = 0; ulp_num < BEISCSI_ULP_COUNT; ulp_num++) {
+               if (pfw_cfg->ulp[ulp_num].ulp_mode &
+                   BEISCSI_ULP_ISCSI_INI_MODE) {
+                       set_bit(ulp_num, &phba->fw_config.ulp_supported);
+
+                       /* Get the CID, ICD and Chain count for each ULP */
+                       phba->fw_config.iscsi_cid_start[ulp_num] =
+                               pfw_cfg->ulp[ulp_num].sq_base;
+                       phba->fw_config.iscsi_cid_count[ulp_num] =
+                               pfw_cfg->ulp[ulp_num].sq_count;
+
+                       phba->fw_config.iscsi_icd_start[ulp_num] =
+                               pfw_cfg->ulp[ulp_num].icd_base;
+                       phba->fw_config.iscsi_icd_count[ulp_num] =
+                               pfw_cfg->ulp[ulp_num].icd_count;
+
+                       phba->fw_config.iscsi_chain_start[ulp_num] =
+                               pfw_cfg->chain_icd[ulp_num].chain_base;
+                       phba->fw_config.iscsi_chain_count[ulp_num] =
+                               pfw_cfg->chain_icd[ulp_num].chain_count;
+
+                       beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
+                                   "BG_%d : Function loaded on ULP : %d\n"
+                                   "\tiscsi_cid_count : %d\n"
+                                   "\tiscsi_cid_start : %d\n"
+                                   "\t iscsi_icd_count : %d\n"
+                                   "\t iscsi_icd_start : %d\n",
+                                   ulp_num,
+                                   phba->fw_config.
+                                   iscsi_cid_count[ulp_num],
+                                   phba->fw_config.
+                                   iscsi_cid_start[ulp_num],
+                                   phba->fw_config.
+                                   iscsi_icd_count[ulp_num],
+                                   phba->fw_config.
+                                   iscsi_icd_start[ulp_num]);
+               }
+       }
+
+       if (phba->fw_config.ulp_supported == 0) {
+               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
+                           "BG_%d : iSCSI initiator mode not set: ULP0 %x ULP1 %x\n",
+                           pfw_cfg->ulp[BEISCSI_ULP0].ulp_mode,
+                           pfw_cfg->ulp[BEISCSI_ULP1].ulp_mode);
+               goto fail_init;
+       }
+
+       /**
+        * ICD is shared among ULPs. Use icd_count of any one loaded ULP
+        **/
+       for (ulp_num = 0; ulp_num < BEISCSI_ULP_COUNT; ulp_num++)
+               if (test_bit(ulp_num, &phba->fw_config.ulp_supported))
+                       break;
+       icd_count = phba->fw_config.iscsi_icd_count[ulp_num];
+       if (icd_count == 0 || icd_count > 65536) {
+               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
+                           "BG_%d: invalid ICD count %d\n", icd_count);
+               goto fail_init;
+       }
+
+       cid_count = BEISCSI_GET_CID_COUNT(phba, BEISCSI_ULP0) +
+                   BEISCSI_GET_CID_COUNT(phba, BEISCSI_ULP1);
+       if (cid_count == 0 || cid_count > 4096) {
+               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
+                           "BG_%d: invalid CID count %d\n", cid_count);
+               goto fail_init;
+       }
+
+       /**
+        * Check FW is dual ULP aware i.e. can handle either
+        * of the protocols.
+        */
+       phba->fw_config.dual_ulp_aware = (pfw_cfg->function_mode &
+                                         BEISCSI_FUNC_DUA_MODE);
+
+       beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
+                   "BG_%d : DUA Mode : 0x%x\n",
+                   phba->fw_config.dual_ulp_aware);
+
+       /* all set, continue using this FW config */
+       status = 0;
+fail_init:
+       mutex_unlock(&ctrl->mbox_lock);
+       return status;
+}
+
+/**
+ * beiscsi_get_port_name()- Get port name for the function
+ * @ctrl: ptr to Ctrl Info
+ * @phba: ptr to the dev priv structure
+ *
+ * Get the alphanumeric character for port
+ *
+ **/
+int beiscsi_get_port_name(struct be_ctrl_info *ctrl, struct beiscsi_hba *phba)
+{
+       int ret = 0;
+       struct be_mcc_wrb *wrb;
+       struct be_cmd_get_port_name *ioctl;
+
+       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_GET_PORT_NAME,
+                          EMBED_MBX_MAX_PAYLOAD_SIZE);
+       ret = be_mbox_notify(ctrl);
+       phba->port_name = 0;
+       if (!ret) {
+               phba->port_name = ioctl->p.resp.port_names >>
+                                 (phba->fw_config.phys_port * 8) & 0xff;
+       } else {
+               beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
+                           "BG_%d : GET_PORT_NAME ret 0x%x status 0x%x\n",
+                           ret, ioctl->h.resp_hdr.status);
+       }
+
+       if (phba->port_name == 0)
+               phba->port_name = '?';
+
+       mutex_unlock(&ctrl->mbox_lock);
+       return ret;
+}
+
 int beiscsi_set_uer_feature(struct beiscsi_hba *phba)
 {
        struct be_ctrl_info *ctrl = &phba->ctrl;
index f1356c941e4427f95d93d76e9d262dd7ed381626..c9823b00b254a7d1cc6ced9a811ee070b5a73cd7 100644 (file)
@@ -716,14 +716,13 @@ struct be_cmd_get_nic_conf_resp {
 
 /******************** Get HBA NAME *******************/
 
-#define BEISCSI_ALIAS_LEN 32
-
 struct be_cmd_hba_name {
        struct be_cmd_req_hdr hdr;
        u16 flags;
        u16 rsvd0;
        u8 initiator_name[ISCSI_NAME_LEN];
-       u8 initiator_alias[BEISCSI_ALIAS_LEN];
+#define BE_INI_ALIAS_LEN 32
+       u8 initiator_alias[BE_INI_ALIAS_LEN];
 } __packed;
 
 /******************** COMMON SET Features *******************/
@@ -769,8 +768,7 @@ int beiscsi_cmd_mccq_create(struct beiscsi_hba *phba,
                        struct be_queue_info *cq);
 
 int be_poll_mcc(struct be_ctrl_info *ctrl);
-int mgmt_check_supported_fw(struct be_ctrl_info *ctrl,
-                                     struct beiscsi_hba *phba);
+
 unsigned int be_cmd_get_initname(struct beiscsi_hba *phba);
 
 void free_mcc_wrb(struct be_ctrl_info *ctrl, unsigned int tag);
@@ -799,9 +797,6 @@ void beiscsi_process_async_event(struct beiscsi_hba *phba,
 int beiscsi_process_mcc_compl(struct be_ctrl_info *ctrl,
                              struct be_mcc_compl *compl);
 
-
-int be_mbox_notify(struct be_ctrl_info *ctrl);
-
 int be_cmd_create_default_pdu_queue(struct be_ctrl_info *ctrl,
                                    struct be_queue_info *cq,
                                    struct be_queue_info *dq, int length,
@@ -827,6 +822,13 @@ int be_cmd_wrbq_create(struct be_ctrl_info *ctrl, struct be_dma_mem *q_mem,
 /* Configuration Functions */
 int be_cmd_set_vlan(struct beiscsi_hba *phba, uint16_t vlan_tag);
 
+int beiscsi_check_supported_fw(struct be_ctrl_info *ctrl,
+                              struct beiscsi_hba *phba);
+
+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);
 
 struct be_default_pdu_context {
@@ -1427,6 +1429,4 @@ void be_wrb_hdr_prepare(struct be_mcc_wrb *wrb, int payload_len,
 
 void be_cmd_hdr_prepare(struct be_cmd_req_hdr *req_hdr,
                        u8 subsystem, u8 opcode, int cmd_len);
-
-void beiscsi_fail_session(struct iscsi_cls_session *cls_session);
 #endif /* !BEISCSI_CMDS_H */
index ddb458abbf598d598432eba0d6dee8c9d2e0afce..677491a4b0b431fe2b95d3e735d008170f48f1de 100644 (file)
@@ -117,6 +117,16 @@ void beiscsi_session_destroy(struct iscsi_cls_session *cls_session)
        iscsi_session_teardown(cls_session);
 }
 
+/**
+ * beiscsi_session_fail(): Closing session with appropriate error
+ * @cls_session: ptr to session
+ **/
+void beiscsi_session_fail(struct iscsi_cls_session *cls_session)
+{
+       iscsi_session_failure(cls_session->dd_data, ISCSI_ERR_CONN_FAILED);
+}
+
+
 /**
  * beiscsi_conn_create - create an instance of iscsi connection
  * @cls_session: ptr to iscsi_cls_session
index 0089e67badf8f3ef2de61c8726e000ef05373886..2a4097a17ad0bbffc4fdd9812453647ca04eeffd 100644 (file)
@@ -50,6 +50,8 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep,
 
 void beiscsi_session_destroy(struct iscsi_cls_session *cls_session);
 
+void beiscsi_session_fail(struct iscsi_cls_session *cls_session);
+
 struct iscsi_cls_conn *beiscsi_conn_create(struct iscsi_cls_session
                                           *cls_session, uint32_t cid);
 
index 55dc6439ae64b39d4f302c5317411d28bfc2385c..77ecd6c482073164aab6a4bb2e67b58b5b03e900 100644 (file)
@@ -3715,7 +3715,7 @@ static int hwi_init_port(struct beiscsi_hba *phba)
        if (status != 0)
                goto error;
 
-       status = mgmt_check_supported_fw(ctrl, phba);
+       status = beiscsi_check_supported_fw(ctrl, phba);
        if (status != 0) {
                beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
                            "BM_%d : Unsupported fw version\n");
@@ -5652,13 +5652,13 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,
        spin_lock_init(&phba->io_sgl_lock);
        spin_lock_init(&phba->mgmt_sgl_lock);
        spin_lock_init(&phba->async_pdu_lock);
-       ret = mgmt_get_fw_config(&phba->ctrl, phba);
+       ret = beiscsi_get_fw_config(&phba->ctrl, phba);
        if (ret != 0) {
                beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
                            "BM_%d : Error getting fw config\n");
                goto free_port;
        }
-       mgmt_get_port_name(&phba->ctrl, phba);
+       beiscsi_get_port_name(&phba->ctrl, phba);
        beiscsi_get_params(phba);
        beiscsi_set_uer_feature(phba);
 
index 08d94b014459b6d68fe4cdf4f8fbe4df1bf70987..706a817b8313e16633931c20e74893152d14736d 100644 (file)
@@ -189,267 +189,6 @@ int beiscsi_modify_eq_delay(struct beiscsi_hba *phba,
        return tag;
 }
 
-/**
- * mgmt_get_port_name()- Get port name for the function
- * @ctrl: ptr to Ctrl Info
- * @phba: ptr to the dev priv structure
- *
- * Get the alphanumeric character for port
- *
- **/
-int mgmt_get_port_name(struct be_ctrl_info *ctrl,
-                      struct beiscsi_hba *phba)
-{
-       int ret = 0;
-       struct be_mcc_wrb *wrb;
-       struct be_cmd_get_port_name *ioctl;
-
-       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_GET_PORT_NAME,
-                          EMBED_MBX_MAX_PAYLOAD_SIZE);
-       ret = be_mbox_notify(ctrl);
-       phba->port_name = 0;
-       if (!ret) {
-               phba->port_name = ioctl->p.resp.port_names >>
-                                 (phba->fw_config.phys_port * 8) & 0xff;
-       } else {
-               beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
-                           "BG_%d : GET_PORT_NAME ret 0x%x status 0x%x\n",
-                           ret, ioctl->h.resp_hdr.status);
-       }
-
-       if (phba->port_name == 0)
-               phba->port_name = '?';
-
-       mutex_unlock(&ctrl->mbox_lock);
-       return ret;
-}
-
-/**
- * mgmt_get_fw_config()- Get the FW config for the function
- * @ctrl: ptr to Ctrl Info
- * @phba: ptr to the dev priv structure
- *
- * Get the FW config and resources available for the function.
- * The resources are created based on the count received here.
- *
- * return
- *     Success: 0
- *     Failure: Non-Zero Value
- **/
-int mgmt_get_fw_config(struct be_ctrl_info *ctrl,
-                               struct beiscsi_hba *phba)
-{
-       struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
-       struct be_fw_cfg *pfw_cfg = embedded_payload(wrb);
-       uint32_t cid_count, icd_count;
-       int status = -EINVAL;
-       uint8_t ulp_num = 0;
-
-       mutex_lock(&ctrl->mbox_lock);
-       memset(wrb, 0, sizeof(*wrb));
-       be_wrb_hdr_prepare(wrb, sizeof(*pfw_cfg), true, 0);
-
-       be_cmd_hdr_prepare(&pfw_cfg->hdr, CMD_SUBSYSTEM_COMMON,
-                          OPCODE_COMMON_QUERY_FIRMWARE_CONFIG,
-                          EMBED_MBX_MAX_PAYLOAD_SIZE);
-
-       if (be_mbox_notify(ctrl)) {
-               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
-                           "BG_%d : Failed in mgmt_get_fw_config\n");
-               goto fail_init;
-       }
-
-       /* FW response formats depend on port id */
-       phba->fw_config.phys_port = pfw_cfg->phys_port;
-       if (phba->fw_config.phys_port >= BEISCSI_PHYS_PORT_MAX) {
-               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
-                           "BG_%d : invalid physical port id %d\n",
-                           phba->fw_config.phys_port);
-               goto fail_init;
-       }
-
-       /* populate and check FW config against min and max values */
-       if (!is_chip_be2_be3r(phba)) {
-               phba->fw_config.eqid_count = pfw_cfg->eqid_count;
-               phba->fw_config.cqid_count = pfw_cfg->cqid_count;
-               if (phba->fw_config.eqid_count == 0 ||
-                   phba->fw_config.eqid_count > 2048) {
-                       beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
-                                   "BG_%d : invalid EQ count %d\n",
-                                   phba->fw_config.eqid_count);
-                       goto fail_init;
-               }
-               if (phba->fw_config.cqid_count == 0 ||
-                   phba->fw_config.cqid_count > 4096) {
-                       beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
-                                   "BG_%d : invalid CQ count %d\n",
-                                   phba->fw_config.cqid_count);
-                       goto fail_init;
-               }
-               beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
-                           "BG_%d : EQ_Count : %d CQ_Count : %d\n",
-                           phba->fw_config.eqid_count,
-                           phba->fw_config.cqid_count);
-       }
-
-       /**
-        * Check on which all ULP iSCSI Protocol is loaded.
-        * Set the Bit for those ULP. This set flag is used
-        * at all places in the code to check on which ULP
-        * iSCSi Protocol is loaded
-        **/
-       for (ulp_num = 0; ulp_num < BEISCSI_ULP_COUNT; ulp_num++) {
-               if (pfw_cfg->ulp[ulp_num].ulp_mode &
-                   BEISCSI_ULP_ISCSI_INI_MODE) {
-                       set_bit(ulp_num, &phba->fw_config.ulp_supported);
-
-                       /* Get the CID, ICD and Chain count for each ULP */
-                       phba->fw_config.iscsi_cid_start[ulp_num] =
-                               pfw_cfg->ulp[ulp_num].sq_base;
-                       phba->fw_config.iscsi_cid_count[ulp_num] =
-                               pfw_cfg->ulp[ulp_num].sq_count;
-
-                       phba->fw_config.iscsi_icd_start[ulp_num] =
-                               pfw_cfg->ulp[ulp_num].icd_base;
-                       phba->fw_config.iscsi_icd_count[ulp_num] =
-                               pfw_cfg->ulp[ulp_num].icd_count;
-
-                       phba->fw_config.iscsi_chain_start[ulp_num] =
-                               pfw_cfg->chain_icd[ulp_num].chain_base;
-                       phba->fw_config.iscsi_chain_count[ulp_num] =
-                               pfw_cfg->chain_icd[ulp_num].chain_count;
-
-                       beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
-                                   "BG_%d : Function loaded on ULP : %d\n"
-                                   "\tiscsi_cid_count : %d\n"
-                                   "\tiscsi_cid_start : %d\n"
-                                   "\t iscsi_icd_count : %d\n"
-                                   "\t iscsi_icd_start : %d\n",
-                                   ulp_num,
-                                   phba->fw_config.
-                                   iscsi_cid_count[ulp_num],
-                                   phba->fw_config.
-                                   iscsi_cid_start[ulp_num],
-                                   phba->fw_config.
-                                   iscsi_icd_count[ulp_num],
-                                   phba->fw_config.
-                                   iscsi_icd_start[ulp_num]);
-               }
-       }
-
-       if (phba->fw_config.ulp_supported == 0) {
-               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
-                           "BG_%d : iSCSI initiator mode not set: ULP0 %x ULP1 %x\n",
-                           pfw_cfg->ulp[BEISCSI_ULP0].ulp_mode,
-                           pfw_cfg->ulp[BEISCSI_ULP1].ulp_mode);
-               goto fail_init;
-       }
-
-       /**
-        * ICD is shared among ULPs. Use icd_count of any one loaded ULP
-        **/
-       for (ulp_num = 0; ulp_num < BEISCSI_ULP_COUNT; ulp_num++)
-               if (test_bit(ulp_num, &phba->fw_config.ulp_supported))
-                       break;
-       icd_count = phba->fw_config.iscsi_icd_count[ulp_num];
-       if (icd_count == 0 || icd_count > 65536) {
-               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
-                           "BG_%d: invalid ICD count %d\n", icd_count);
-               goto fail_init;
-       }
-
-       cid_count = BEISCSI_GET_CID_COUNT(phba, BEISCSI_ULP0) +
-                   BEISCSI_GET_CID_COUNT(phba, BEISCSI_ULP1);
-       if (cid_count == 0 || cid_count > 4096) {
-               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
-                           "BG_%d: invalid CID count %d\n", cid_count);
-               goto fail_init;
-       }
-
-       /**
-        * Check FW is dual ULP aware i.e. can handle either
-        * of the protocols.
-        */
-       phba->fw_config.dual_ulp_aware = (pfw_cfg->function_mode &
-                                         BEISCSI_FUNC_DUA_MODE);
-
-       beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
-                   "BG_%d : DUA Mode : 0x%x\n",
-                   phba->fw_config.dual_ulp_aware);
-
-       /* all set, continue using this FW config */
-       status = 0;
-fail_init:
-       mutex_unlock(&ctrl->mbox_lock);
-       return status;
-}
-
-int mgmt_check_supported_fw(struct be_ctrl_info *ctrl,
-                                     struct beiscsi_hba *phba)
-{
-       struct be_dma_mem nonemb_cmd;
-       struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
-       struct be_mgmt_controller_attributes *req;
-       struct be_sge *sge = nonembedded_sgl(wrb);
-       int status = 0;
-
-       nonemb_cmd.va = pci_alloc_consistent(ctrl->pdev,
-                               sizeof(struct be_mgmt_controller_attributes),
-                               &nonemb_cmd.dma);
-       if (nonemb_cmd.va == NULL) {
-               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
-                           "BG_%d : Failed to allocate memory for "
-                           "mgmt_check_supported_fw\n");
-               return -ENOMEM;
-       }
-       nonemb_cmd.size = sizeof(struct be_mgmt_controller_attributes);
-       req = nonemb_cmd.va;
-       memset(req, 0, sizeof(*req));
-       mutex_lock(&ctrl->mbox_lock);
-       memset(wrb, 0, sizeof(*wrb));
-       be_wrb_hdr_prepare(wrb, sizeof(*req), false, 1);
-       be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                          OPCODE_COMMON_GET_CNTL_ATTRIBUTES, sizeof(*req));
-       sge->pa_hi = cpu_to_le32(upper_32_bits(nonemb_cmd.dma));
-       sge->pa_lo = cpu_to_le32(nonemb_cmd.dma & 0xFFFFFFFF);
-       sge->len = cpu_to_le32(nonemb_cmd.size);
-       status = be_mbox_notify(ctrl);
-       if (!status) {
-               struct be_mgmt_controller_attributes_resp *resp = nonemb_cmd.va;
-               beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
-                           "BG_%d : Firmware Version of CMD : %s\n"
-                           "Firmware Version is : %s\n"
-                           "Developer Build, not performing version check...\n",
-                           resp->params.hba_attribs
-                           .flashrom_version_string,
-                           resp->params.hba_attribs.
-                           firmware_version_string);
-
-               phba->fw_config.iscsi_features =
-                               resp->params.hba_attribs.iscsi_features;
-               beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
-                           "BM_%d : phba->fw_config.iscsi_features = %d\n",
-                           phba->fw_config.iscsi_features);
-               memcpy(phba->fw_ver_str, resp->params.hba_attribs.
-                      firmware_version_string, BEISCSI_VER_STRLEN);
-       } else
-               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
-                           "BG_%d :  Failed in mgmt_check_supported_fw\n");
-       mutex_unlock(&ctrl->mbox_lock);
-       if (nonemb_cmd.va)
-               pci_free_consistent(ctrl->pdev, nonemb_cmd.size,
-                                   nonemb_cmd.va, nonemb_cmd.dma);
-
-       return status;
-}
-
 unsigned int mgmt_vendor_specific_fw_cmd(struct be_ctrl_info *ctrl,
                                         struct beiscsi_hba *phba,
                                         struct bsg_job *job,
index 25053483cf28a063c09cb14cbfe44dae94f1477e..f8d27783f207bf9aac075c0b784ccfb14b304670 100644 (file)
@@ -266,11 +266,6 @@ struct beiscsi_endpoint {
        u16 cid_vld;
 };
 
-int mgmt_get_fw_config(struct be_ctrl_info *ctrl,
-                                struct beiscsi_hba *phba);
-int mgmt_get_port_name(struct be_ctrl_info *ctrl,
-                      struct beiscsi_hba *phba);
-
 unsigned int mgmt_invalidate_connection(struct beiscsi_hba *phba,
                                         struct beiscsi_endpoint *beiscsi_ep,
                                         unsigned short cid,
@@ -282,17 +277,17 @@ int beiscsi_if_en_dhcp(struct beiscsi_hba *phba, u32 ip_type);
 int beiscsi_if_en_static(struct beiscsi_hba *phba, u32 ip_type,
                         u8 *ip, u8 *subnet);
 
+int beiscsi_if_set_gw(struct beiscsi_hba *phba, u32 ip_type, u8 *gw);
+
+int beiscsi_if_get_gw(struct beiscsi_hba *phba, u32 ip_type,
+                     struct be_cmd_get_def_gateway_resp *resp);
+
 int mgmt_get_nic_conf(struct beiscsi_hba *phba,
                      struct be_cmd_get_nic_conf_resp *mac);
 
 int beiscsi_if_get_info(struct beiscsi_hba *phba, int ip_type,
                        struct be_cmd_get_if_info_resp **if_info);
 
-int beiscsi_if_get_gw(struct beiscsi_hba *phba, u32 ip_type,
-                     struct be_cmd_get_def_gateway_resp *resp);
-
-int beiscsi_if_set_gw(struct beiscsi_hba *phba, u32 ip_type, u8 *gw);
-
 unsigned int beiscsi_if_get_handle(struct beiscsi_hba *phba);
 
 int beiscsi_if_set_vlan(struct beiscsi_hba *phba, uint16_t vlan_tag);