Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 31 insertions, 33 deletions

diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index 350cbeaae160..3f3fab91a7d1 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -21,7 +21,7 @@
 #include "be_mgmt.h"
 #include "be_iscsi.h"
 
-unsigned char mgmt_get_fw_config(struct be_ctrl_info *ctrl,
+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);
@@ -50,7 +50,7 @@ unsigned char mgmt_get_fw_config(struct be_ctrl_info *ctrl,
                                         pfw_cfg->ulp[0].sq_count;
                 if (phba->fw_config.iscsi_cid_count > (BE2_MAX_SESSIONS / 2)) {
                         SE_DEBUG(DBG_LVL_8,
-                                "FW reported MAX CXNS as %d \t"
+                                "FW reported MAX CXNS as %d\t"
                                 "Max Supported = %d.\n",
                                 phba->fw_config.iscsi_cid_count,
                                 BE2_MAX_SESSIONS);
@@ -58,14 +58,14 @@ unsigned char mgmt_get_fw_config(struct be_ctrl_info *ctrl,
                 }
         } else {
                 shost_printk(KERN_WARNING, phba->shost,
-                             "Failed in mgmt_get_fw_config \n");
+                             "Failed in mgmt_get_fw_config\n");
         }
 
         spin_unlock(&ctrl->mbox_lock);
         return status;
 }
 
-unsigned char mgmt_check_supported_fw(struct be_ctrl_info *ctrl,
+int mgmt_check_supported_fw(struct be_ctrl_info *ctrl,
                                       struct beiscsi_hba *phba)
 {
         struct be_dma_mem nonemb_cmd;
@@ -81,7 +81,7 @@ unsigned char mgmt_check_supported_fw(struct be_ctrl_info *ctrl,
                 SE_DEBUG(DBG_LVL_1,
                          "Failed to allocate memory for mgmt_check_supported_fw"
                          "\n");
-                return -1;
+                return -ENOMEM;
         }
         nonemb_cmd.size = sizeof(struct be_mgmt_controller_attributes);
         req = nonemb_cmd.va;
@@ -117,8 +117,7 @@ unsigned char mgmt_check_supported_fw(struct be_ctrl_info *ctrl,
         return status;
 }
 
-
-unsigned char mgmt_epfw_cleanup(struct beiscsi_hba *phba, unsigned short chute)
+int mgmt_epfw_cleanup(struct beiscsi_hba *phba, unsigned short chute)
 {
         struct be_ctrl_info *ctrl = &phba->ctrl;
         struct be_mcc_wrb *wrb = wrb_from_mccq(phba);
@@ -144,11 +143,12 @@ unsigned char mgmt_epfw_cleanup(struct beiscsi_hba *phba, unsigned short chute)
         return status;
 }
 
-unsigned char mgmt_invalidate_icds(struct beiscsi_hba *phba,
+unsigned int  mgmt_invalidate_icds(struct beiscsi_hba *phba,
                                 struct invalidate_command_table *inv_tbl,
-                                unsigned int num_invalidate, unsigned int cid)
+                                unsigned int num_invalidate, unsigned int cid,
+                                struct be_dma_mem *nonemb_cmd)
+
 {
-        struct be_dma_mem nonemb_cmd;
         struct be_ctrl_info *ctrl = &phba->ctrl;
         struct be_mcc_wrb *wrb;
         struct be_sge *sge;
@@ -162,17 +162,7 @@ unsigned char mgmt_invalidate_icds(struct beiscsi_hba *phba,
                 return tag;
         }
 
-        nonemb_cmd.va = pci_alloc_consistent(ctrl->pdev,
-                                sizeof(struct invalidate_commands_params_in),
-                                &nonemb_cmd.dma);
-        if (nonemb_cmd.va == NULL) {
-                SE_DEBUG(DBG_LVL_1,
-                         "Failed to allocate memory for mgmt_invalidate_icds\n");
-                spin_unlock(&ctrl->mbox_lock);
-                return 0;
-        }
-        nonemb_cmd.size = sizeof(struct invalidate_commands_params_in);
-        req = nonemb_cmd.va;
+        req = nonemb_cmd->va;
         memset(req, 0, sizeof(*req));
         wrb = wrb_from_mccq(phba);
         sge = nonembedded_sgl(wrb);
@@ -190,19 +180,16 @@ unsigned char mgmt_invalidate_icds(struct beiscsi_hba *phba,
                 req->icd_count++;
                 inv_tbl++;
         }
-        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);
+        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);
 
         be_mcc_notify(phba);
         spin_unlock(&ctrl->mbox_lock);
-        if (nonemb_cmd.va)
-                pci_free_consistent(ctrl->pdev, nonemb_cmd.size,
-                                    nonemb_cmd.va, nonemb_cmd.dma);
         return tag;
 }
 
-unsigned char mgmt_invalidate_connection(struct beiscsi_hba *phba,
+unsigned int mgmt_invalidate_connection(struct beiscsi_hba *phba,
                                          struct beiscsi_endpoint *beiscsi_ep,
                                          unsigned short cid,
                                          unsigned short issue_reset,
@@ -239,7 +226,7 @@ unsigned char mgmt_invalidate_connection(struct beiscsi_hba *phba,
         return tag;
 }
 
-unsigned char mgmt_upload_connection(struct beiscsi_hba *phba,
+unsigned int mgmt_upload_connection(struct beiscsi_hba *phba,
                                 unsigned short cid, unsigned int upload_flag)
 {
         struct be_ctrl_info *ctrl = &phba->ctrl;
@@ -269,7 +256,9 @@ unsigned char mgmt_upload_connection(struct beiscsi_hba *phba,
 
 int mgmt_open_connection(struct beiscsi_hba *phba,
                          struct sockaddr *dst_addr,
-                         struct beiscsi_endpoint *beiscsi_ep)
+                         struct beiscsi_endpoint *beiscsi_ep,
+                         struct be_dma_mem *nonemb_cmd)
+
 {
         struct hwi_controller *phwi_ctrlr;
         struct hwi_context_memory *phwi_context;
@@ -285,6 +274,7 @@ int mgmt_open_connection(struct beiscsi_hba *phba,
         unsigned int tag = 0;
         unsigned int i;
         unsigned short cid = beiscsi_ep->ep_cid;
+        struct be_sge *sge;
 
         phwi_ctrlr = phba->phwi_ctrlr;
         phwi_context = phwi_ctrlr->phwi_ctxt;
@@ -300,10 +290,14 @@ int mgmt_open_connection(struct beiscsi_hba *phba,
                 return tag;
         }
         wrb = wrb_from_mccq(phba);
-        req = embedded_payload(wrb);
+        memset(wrb, 0, sizeof(*wrb));
+        sge = nonembedded_sgl(wrb);
+
+        req = nonemb_cmd->va;
+        memset(req, 0, sizeof(*req));
         wrb->tag0 |= tag;
 
-        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
+        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 1);
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ISCSI,
                            OPCODE_COMMON_ISCSI_TCP_CONNECT_AND_OFFLOAD,
                            sizeof(*req));
@@ -331,6 +325,7 @@ int mgmt_open_connection(struct beiscsi_hba *phba,
                 shost_printk(KERN_ERR, phba->shost, "unknown addr family %d\n",
                              dst_addr->sa_family);
                 spin_unlock(&ctrl->mbox_lock);
+                free_mcc_tag(&phba->ctrl, tag);
                 return -EINVAL;
 
         }
@@ -339,13 +334,16 @@ int mgmt_open_connection(struct beiscsi_hba *phba,
         if (phba->nxt_cqid == phba->num_cpus)
                 phba->nxt_cqid = 0;
         req->cq_id = phwi_context->be_cq[i].id;
-        SE_DEBUG(DBG_LVL_8, "i=%d cq_id=%d \n", i, req->cq_id);
+        SE_DEBUG(DBG_LVL_8, "i=%d cq_id=%d\n", i, req->cq_id);
         req->defq_id = def_hdr_id;
         req->hdr_ring_id = def_hdr_id;
         req->data_ring_id = def_data_id;
         req->do_offload = 1;
         req->dataout_template_pa.lo = ptemplate_address->lo;
         req->dataout_template_pa.hi = ptemplate_address->hi;
+        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);
         be_mcc_notify(phba);
         spin_unlock(&ctrl->mbox_lock);
         return tag;