qlcnic: 83xx data path routines
[linux-2.6-block.git] / drivers / net / ethernet / qlogic / qlcnic / qlcnic_ctx.c
index b14b8f0787ea10cfce41a77698b2239bb0b56f08..3098a14c67f070c40b22b1446af12d768cefab3e 100644 (file)
@@ -7,6 +7,86 @@
 
 #include "qlcnic.h"
 
+static const struct qlcnic_mailbox_metadata qlcnic_mbx_tbl[] = {
+       {QLCNIC_CMD_CREATE_RX_CTX, 4, 1},
+       {QLCNIC_CMD_DESTROY_RX_CTX, 2, 1},
+       {QLCNIC_CMD_CREATE_TX_CTX, 4, 1},
+       {QLCNIC_CMD_DESTROY_TX_CTX, 2, 1},
+       {QLCNIC_CMD_INTRPT_TEST, 4, 1},
+       {QLCNIC_CMD_SET_MTU, 4, 1},
+       {QLCNIC_CMD_READ_PHY, 4, 2},
+       {QLCNIC_CMD_WRITE_PHY, 5, 1},
+       {QLCNIC_CMD_READ_HW_REG, 4, 1},
+       {QLCNIC_CMD_GET_FLOW_CTL, 4, 2},
+       {QLCNIC_CMD_SET_FLOW_CTL, 4, 1},
+       {QLCNIC_CMD_READ_MAX_MTU, 4, 2},
+       {QLCNIC_CMD_READ_MAX_LRO, 4, 2},
+       {QLCNIC_CMD_MAC_ADDRESS, 4, 3},
+       {QLCNIC_CMD_GET_PCI_INFO, 4, 1},
+       {QLCNIC_CMD_GET_NIC_INFO, 4, 1},
+       {QLCNIC_CMD_SET_NIC_INFO, 4, 1},
+       {QLCNIC_CMD_GET_ESWITCH_CAPABILITY, 4, 3},
+       {QLCNIC_CMD_TOGGLE_ESWITCH, 4, 1},
+       {QLCNIC_CMD_GET_ESWITCH_STATUS, 4, 3},
+       {QLCNIC_CMD_SET_PORTMIRRORING, 4, 1},
+       {QLCNIC_CMD_CONFIGURE_ESWITCH, 4, 1},
+       {QLCNIC_CMD_GET_MAC_STATS, 4, 1},
+       {QLCNIC_CMD_GET_ESWITCH_PORT_CONFIG, 4, 3},
+       {QLCNIC_CMD_GET_ESWITCH_STATS, 5, 1},
+       {QLCNIC_CMD_CONFIG_PORT, 4, 1},
+       {QLCNIC_CMD_TEMP_SIZE, 4, 4},
+       {QLCNIC_CMD_GET_TEMP_HDR, 4, 1},
+       {QLCNIC_CMD_SET_DRV_VER, 4, 1},
+};
+
+static inline u32 qlcnic_get_cmd_signature(struct qlcnic_hardware_context *ahw)
+{
+       return (ahw->pci_func & 0xff) | ((ahw->fw_hal_version & 0xff) << 8) |
+              (0xcafe << 16);
+}
+
+/* Allocate mailbox registers */
+int qlcnic_82xx_alloc_mbx_args(struct qlcnic_cmd_args *mbx,
+                              struct qlcnic_adapter *adapter, u32 type)
+{
+       int i, size;
+       const struct qlcnic_mailbox_metadata *mbx_tbl;
+
+       mbx_tbl = qlcnic_mbx_tbl;
+       size = ARRAY_SIZE(qlcnic_mbx_tbl);
+       for (i = 0; i < size; i++) {
+               if (type == mbx_tbl[i].cmd) {
+                       mbx->req.num = mbx_tbl[i].in_args;
+                       mbx->rsp.num = mbx_tbl[i].out_args;
+                       mbx->req.arg = kcalloc(mbx->req.num,
+                                              sizeof(u32), GFP_ATOMIC);
+                       if (!mbx->req.arg)
+                               return -ENOMEM;
+                       mbx->rsp.arg = kcalloc(mbx->rsp.num,
+                                              sizeof(u32), GFP_ATOMIC);
+                       if (!mbx->rsp.arg) {
+                               kfree(mbx->req.arg);
+                               mbx->req.arg = NULL;
+                               return -ENOMEM;
+                       }
+                       memset(mbx->req.arg, 0, sizeof(u32) * mbx->req.num);
+                       memset(mbx->rsp.arg, 0, sizeof(u32) * mbx->rsp.num);
+                       mbx->req.arg[0] = type;
+                       break;
+               }
+       }
+       return 0;
+}
+
+/* Free up mailbox registers */
+void qlcnic_free_mbx_args(struct qlcnic_cmd_args *cmd)
+{
+       kfree(cmd->req.arg);
+       cmd->req.arg = NULL;
+       kfree(cmd->rsp.arg);
+       cmd->rsp.arg = NULL;
+}
+
 static int qlcnic_is_valid_nic_func(struct qlcnic_adapter *adapter, u8 pci_func)
 {
        int i;
@@ -38,194 +118,105 @@ qlcnic_poll_rsp(struct qlcnic_adapter *adapter)
        return rsp;
 }
 
-void
-qlcnic_issue_cmd(struct qlcnic_adapter *adapter, struct qlcnic_cmd_args *cmd)
+int qlcnic_82xx_issue_cmd(struct qlcnic_adapter *adapter,
+                         struct qlcnic_cmd_args *cmd)
 {
+       int i;
        u32 rsp;
        u32 signature;
        struct pci_dev *pdev = adapter->pdev;
        struct qlcnic_hardware_context *ahw = adapter->ahw;
 
-       signature = QLCNIC_CDRP_SIGNATURE_MAKE(ahw->pci_func,
-                                              adapter->ahw->fw_hal_version);
+       signature = qlcnic_get_cmd_signature(ahw);
 
        /* Acquire semaphore before accessing CRB */
        if (qlcnic_api_lock(adapter)) {
-               cmd->rsp.cmd = QLCNIC_RCODE_TIMEOUT;
-               return;
+               cmd->rsp.arg[0] = QLCNIC_RCODE_TIMEOUT;
+               return cmd->rsp.arg[0];
        }
 
        QLCWR32(adapter, QLCNIC_SIGN_CRB_OFFSET, signature);
-       QLCWR32(adapter, QLCNIC_ARG1_CRB_OFFSET, cmd->req.arg1);
-       QLCWR32(adapter, QLCNIC_ARG2_CRB_OFFSET, cmd->req.arg2);
-       QLCWR32(adapter, QLCNIC_ARG3_CRB_OFFSET, cmd->req.arg3);
+       for (i = 1; i < QLCNIC_CDRP_MAX_ARGS; i++)
+               QLCWR32(adapter, QLCNIC_CDRP_ARG(i), cmd->req.arg[i]);
        QLCWR32(adapter, QLCNIC_CDRP_CRB_OFFSET,
-               QLCNIC_CDRP_FORM_CMD(cmd->req.cmd));
-
+               QLCNIC_CDRP_FORM_CMD(cmd->req.arg[0]));
        rsp = qlcnic_poll_rsp(adapter);
 
        if (rsp == QLCNIC_CDRP_RSP_TIMEOUT) {
-               dev_err(&pdev->dev, "CDRP response timeout.\n");
-               cmd->rsp.cmd = QLCNIC_RCODE_TIMEOUT;
+               dev_err(&pdev->dev, "card response timeout.\n");
+               cmd->rsp.arg[0] = QLCNIC_RCODE_TIMEOUT;
        } else if (rsp == QLCNIC_CDRP_RSP_FAIL) {
-               cmd->rsp.cmd = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
-               switch (cmd->rsp.cmd) {
-               case QLCNIC_RCODE_INVALID_ARGS:
-                       dev_err(&pdev->dev, "CDRP invalid args: 0x%x.\n",
-                               cmd->rsp.cmd);
-                       break;
-               case QLCNIC_RCODE_NOT_SUPPORTED:
-               case QLCNIC_RCODE_NOT_IMPL:
-                       dev_err(&pdev->dev,
-                               "CDRP command not supported: 0x%x.\n",
-                               cmd->rsp.cmd);
-                       break;
-               case QLCNIC_RCODE_NOT_PERMITTED:
-                       dev_err(&pdev->dev,
-                               "CDRP requested action not permitted: 0x%x.\n",
-                               cmd->rsp.cmd);
-                       break;
-               case QLCNIC_RCODE_INVALID:
-                       dev_err(&pdev->dev,
-                               "CDRP invalid or unknown cmd received: 0x%x.\n",
-                               cmd->rsp.cmd);
-                       break;
-               case QLCNIC_RCODE_TIMEOUT:
-                       dev_err(&pdev->dev, "CDRP command timeout: 0x%x.\n",
-                               cmd->rsp.cmd);
-                       break;
-               default:
-                       dev_err(&pdev->dev, "CDRP command failed: 0x%x.\n",
-                               cmd->rsp.cmd);
-               }
-       } else if (rsp == QLCNIC_CDRP_RSP_OK) {
-               cmd->rsp.cmd = QLCNIC_RCODE_SUCCESS;
-               if (cmd->rsp.arg2)
-                       cmd->rsp.arg2 = QLCRD32(adapter,
-                               QLCNIC_ARG2_CRB_OFFSET);
-               if (cmd->rsp.arg3)
-                       cmd->rsp.arg3 = QLCRD32(adapter,
-                               QLCNIC_ARG3_CRB_OFFSET);
-       }
-       if (cmd->rsp.arg1)
-               cmd->rsp.arg1 = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
+               cmd->rsp.arg[0] = QLCRD32(adapter, QLCNIC_CDRP_ARG(1));
+               dev_err(&pdev->dev, "failed card response code:0x%x\n",
+                       cmd->rsp.arg[0]);
+       } else if (rsp == QLCNIC_CDRP_RSP_OK)
+               cmd->rsp.arg[0] = QLCNIC_RCODE_SUCCESS;
+
+       for (i = 1; i < cmd->rsp.num; i++)
+               cmd->rsp.arg[i] = QLCRD32(adapter, QLCNIC_CDRP_ARG(i));
 
        /* Release semaphore */
        qlcnic_api_unlock(adapter);
-
-}
-
-static uint32_t qlcnic_temp_checksum(uint32_t *temp_buffer, u32 temp_size)
-{
-       uint64_t sum = 0;
-       int count = temp_size / sizeof(uint32_t);
-       while (count-- > 0)
-               sum += *temp_buffer++;
-       while (sum >> 32)
-               sum = (sum & 0xFFFFFFFF) + (sum >> 32);
-       return ~sum;
+       return cmd->rsp.arg[0];
 }
 
 int qlcnic_fw_cmd_get_minidump_temp(struct qlcnic_adapter *adapter)
 {
-       int err, i;
+       int err = 0;
        void *tmp_addr;
-       u32 temp_size, version, csum, *template;
-       __le32 *tmp_buf;
        struct qlcnic_cmd_args cmd;
-       struct qlcnic_hardware_context *ahw;
-       struct qlcnic_dump_template_hdr *tmpl_hdr;
        dma_addr_t tmp_addr_t = 0;
 
-       ahw = adapter->ahw;
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_TEMP_SIZE;
-       memset(&cmd.rsp, 1, sizeof(struct _cdrp_cmd));
-       qlcnic_issue_cmd(adapter, &cmd);
-       if (cmd.rsp.cmd != QLCNIC_RCODE_SUCCESS) {
-               dev_info(&adapter->pdev->dev,
-                       "Can't get template size %d\n", cmd.rsp.cmd);
-               err = -EIO;
-               return err;
-       }
-       temp_size = cmd.rsp.arg2;
-       version = cmd.rsp.arg3;
-       dev_info(&adapter->pdev->dev,
-                "minidump template version = 0x%x", version);
-       if (!temp_size)
-               return -EIO;
-
-       tmp_addr = dma_alloc_coherent(&adapter->pdev->dev, temp_size,
-                       &tmp_addr_t, GFP_KERNEL);
+       tmp_addr = dma_alloc_coherent(&adapter->pdev->dev, 0x1000,
+                                     &tmp_addr_t, GFP_KERNEL);
        if (!tmp_addr) {
                dev_err(&adapter->pdev->dev,
                        "Can't get memory for FW dump template\n");
                return -ENOMEM;
        }
-       memset(&cmd.rsp, 0, sizeof(struct _cdrp_cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_GET_TEMP_HDR;
-       cmd.req.arg1 = LSD(tmp_addr_t);
-       cmd.req.arg2 = MSD(tmp_addr_t);
-       cmd.req.arg3 = temp_size;
-       qlcnic_issue_cmd(adapter, &cmd);
-
-       err = cmd.rsp.cmd;
-       if (err != QLCNIC_RCODE_SUCCESS) {
-               dev_err(&adapter->pdev->dev,
-                       "Failed to get mini dump template header %d\n", err);
-               err = -EIO;
-               goto error;
-       }
-       ahw->fw_dump.tmpl_hdr = vzalloc(temp_size);
-       if (!ahw->fw_dump.tmpl_hdr) {
-               err = -EIO;
-               goto error;
-       }
-       tmp_buf = tmp_addr;
-       template = (u32 *) ahw->fw_dump.tmpl_hdr;
-       for (i = 0; i < temp_size/sizeof(u32); i++)
-               *template++ = __le32_to_cpu(*tmp_buf++);
 
-       csum = qlcnic_temp_checksum((u32 *)ahw->fw_dump.tmpl_hdr, temp_size);
-       if (csum) {
-               dev_err(&adapter->pdev->dev,
-                       "Template header checksum validation failed\n");
-               err = -EIO;
-               goto error;
+       if (qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_TEMP_HDR)) {
+               err = -ENOMEM;
+               goto free_mem;
        }
 
-       tmpl_hdr = ahw->fw_dump.tmpl_hdr;
-       tmpl_hdr->drv_cap_mask = QLCNIC_DUMP_MASK_DEF;
-       ahw->fw_dump.enable = 1;
-error:
-       dma_free_coherent(&adapter->pdev->dev, temp_size, tmp_addr, tmp_addr_t);
+       cmd.req.arg[1] = LSD(tmp_addr_t);
+       cmd.req.arg[2] = MSD(tmp_addr_t);
+       cmd.req.arg[3] = 0x1000;
+       err = qlcnic_issue_cmd(adapter, &cmd);
+
+
+       qlcnic_free_mbx_args(&cmd);
+
+free_mem:
+       dma_free_coherent(&adapter->pdev->dev, 0x1000, tmp_addr, tmp_addr_t);
+
        return err;
 }
 
 int
 qlcnic_fw_cmd_set_mtu(struct qlcnic_adapter *adapter, int mtu)
 {
+       int err = 0;
        struct qlcnic_cmd_args cmd;
        struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
 
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_SET_MTU;
-       cmd.req.arg1 = recv_ctx->context_id;
-       cmd.req.arg2 = mtu;
-       cmd.req.arg3 = 0;
-       if (recv_ctx->state == QLCNIC_HOST_CTX_STATE_ACTIVE) {
-               qlcnic_issue_cmd(adapter, &cmd);
-               if (cmd.rsp.cmd) {
-                       dev_err(&adapter->pdev->dev, "Failed to set mtu\n");
-                       return -EIO;
-               }
-       }
+       if (recv_ctx->state != QLCNIC_HOST_CTX_STATE_ACTIVE)
+               return err;
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_SET_MTU);
+       cmd.req.arg[1] = recv_ctx->context_id;
+       cmd.req.arg[2] = mtu;
 
-       return 0;
+       err = qlcnic_issue_cmd(adapter, &cmd);
+       if (err) {
+               dev_err(&adapter->pdev->dev, "Failed to set mtu\n");
+               err = -EIO;
+       }
+       qlcnic_free_mbx_args(&cmd);
+       return err;
 }
 
-static int
-qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
+int qlcnic_82xx_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
 {
        void *addr;
        struct qlcnic_hostrq_rx_ctx *prq;
@@ -242,10 +233,10 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
        u64 phys_addr;
 
        u8 i, nrds_rings, nsds_rings;
+       u16 temp_u16;
        size_t rq_size, rsp_size;
        u32 cap, reg, val, reg2;
        int err;
-       u16 temp;
 
        struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
 
@@ -279,11 +270,8 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
                                                | QLCNIC_CAP0_VALIDOFF);
        cap |= (QLCNIC_CAP0_JUMBO_CONTIGUOUS | QLCNIC_CAP0_LRO_CONTIGUOUS);
 
-       if (adapter->flags & QLCNIC_FW_LRO_MSS_CAP)
-               cap |= QLCNIC_CAP0_LRO_MSS;
-
-       temp = offsetof(struct qlcnic_hostrq_rx_ctx, msix_handler);
-       prq->valid_field_offset = cpu_to_le16(temp);
+       temp_u16 = offsetof(struct qlcnic_hostrq_rx_ctx, msix_handler);
+       prq->valid_field_offset = cpu_to_le16(temp_u16);
        prq->txrx_sds_binding = nsds_rings - 1;
 
        prq->capabilities[0] = cpu_to_le32(cap);
@@ -329,20 +317,17 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
        }
 
        phys_addr = hostrq_phys_addr;
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.arg1 = (u32) (phys_addr >> 32);
-       cmd.req.arg2 = (u32) (phys_addr & 0xffffffff);
-       cmd.req.arg3 = rq_size;
-       cmd.req.cmd = QLCNIC_CDRP_CMD_CREATE_RX_CTX;
-       qlcnic_issue_cmd(adapter, &cmd);
-       err = cmd.rsp.cmd;
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CREATE_RX_CTX);
+       cmd.req.arg[1] = MSD(phys_addr);
+       cmd.req.arg[2] = LSD(phys_addr);
+       cmd.req.arg[3] = rq_size;
+       err = qlcnic_issue_cmd(adapter, &cmd);
        if (err) {
                dev_err(&adapter->pdev->dev,
                        "Failed to create rx ctx in firmware%d\n", err);
                goto out_free_rsp;
        }
 
-
        prsp_rds = ((struct qlcnic_cardrsp_rds_ring *)
                         &prsp->data[le32_to_cpu(prsp->rds_ring_offset)]);
 
@@ -373,6 +358,7 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
 out_free_rsp:
        dma_free_coherent(&adapter->pdev->dev, rsp_size, prsp,
                cardrsp_phys_addr);
+       qlcnic_free_mbx_args(&cmd);
 out_free_rq:
        dma_free_coherent(&adapter->pdev->dev, rq_size, prq, hostrq_phys_addr);
        return err;
@@ -381,24 +367,24 @@ out_free_rq:
 static void
 qlcnic_fw_cmd_destroy_rx_ctx(struct qlcnic_adapter *adapter)
 {
+       int err;
        struct qlcnic_cmd_args cmd;
        struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
 
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.arg1 = recv_ctx->context_id;
-       cmd.req.arg2 = QLCNIC_DESTROY_CTX_RESET;
-       cmd.req.arg3 = 0;
-       cmd.req.cmd = QLCNIC_CDRP_CMD_DESTROY_RX_CTX;
-       qlcnic_issue_cmd(adapter, &cmd);
-       if (cmd.rsp.cmd)
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_DESTROY_RX_CTX);
+       cmd.req.arg[1] = recv_ctx->context_id;
+       err = qlcnic_issue_cmd(adapter, &cmd);
+       if (err)
                dev_err(&adapter->pdev->dev,
                        "Failed to destroy rx ctx in firmware\n");
 
        recv_ctx->state = QLCNIC_HOST_CTX_STATE_FREED;
+       qlcnic_free_mbx_args(&cmd);
 }
 
-static int
-qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
+int qlcnic_82xx_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter,
+                                    struct qlcnic_host_tx_ring *tx_ring,
+                                    int ring)
 {
        struct qlcnic_hostrq_tx_ctx     *prq;
        struct qlcnic_hostrq_cds_ring   *prq_cds;
@@ -410,7 +396,6 @@ qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
        int     err;
        u64     phys_addr;
        dma_addr_t      rq_phys_addr, rsp_phys_addr;
-       struct qlcnic_host_tx_ring *tx_ring = adapter->tx_ring;
 
        /* reset host resources */
        tx_ring->producer = 0;
@@ -445,9 +430,9 @@ qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
 
        prq->host_int_crb_mode =
                cpu_to_le32(QLCNIC_HOST_INT_CRB_MODE_SHARED);
+       prq->msi_index = 0;
 
        prq->interrupt_ctl = 0;
-       prq->msi_index = 0;
        prq->cmd_cons_dma_addr = cpu_to_le64(tx_ring->hw_cons_phys_addr);
 
        prq_cds = &prq->cds_ring;
@@ -456,19 +441,17 @@ qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
        prq_cds->ring_size = cpu_to_le32(tx_ring->num_desc);
 
        phys_addr = rq_phys_addr;
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.arg1 = (u32)(phys_addr >> 32);
-       cmd.req.arg2 = ((u32)phys_addr & 0xffffffff);
-       cmd.req.arg3 = rq_size;
-       cmd.req.cmd = QLCNIC_CDRP_CMD_CREATE_TX_CTX;
-       qlcnic_issue_cmd(adapter, &cmd);
-       err = cmd.rsp.cmd;
+
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CREATE_TX_CTX);
+       cmd.req.arg[1] = MSD(phys_addr);
+       cmd.req.arg[2] = LSD(phys_addr);
+       cmd.req.arg[3] = rq_size;
+       err = qlcnic_issue_cmd(adapter, &cmd);
 
        if (err == QLCNIC_RCODE_SUCCESS) {
                temp = le32_to_cpu(prsp->cds_ring.host_producer_crb);
                tx_ring->crb_cmd_producer = adapter->ahw->pci_base0 + temp;
-
-               adapter->tx_ring->ctx_id = le16_to_cpu(prsp->context_id);
+               tx_ring->ctx_id = le16_to_cpu(prsp->context_id);
        } else {
                dev_err(&adapter->pdev->dev,
                        "Failed to create tx ctx in firmware%d\n", err);
@@ -476,76 +459,81 @@ qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
        }
 
        dma_free_coherent(&adapter->pdev->dev, rsp_size, rsp_addr,
-               rsp_phys_addr);
+                         rsp_phys_addr);
 
 out_free_rq:
        dma_free_coherent(&adapter->pdev->dev, rq_size, rq_addr, rq_phys_addr);
+       qlcnic_free_mbx_args(&cmd);
 
        return err;
 }
 
 static void
-qlcnic_fw_cmd_destroy_tx_ctx(struct qlcnic_adapter *adapter)
+qlcnic_fw_cmd_destroy_tx_ctx(struct qlcnic_adapter *adapter,
+                            struct qlcnic_host_tx_ring *tx_ring)
 {
        struct qlcnic_cmd_args cmd;
 
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.arg1 = adapter->tx_ring->ctx_id;
-       cmd.req.arg2 = QLCNIC_DESTROY_CTX_RESET;
-       cmd.req.arg3 = 0;
-       cmd.req.cmd = QLCNIC_CDRP_CMD_DESTROY_TX_CTX;
-       qlcnic_issue_cmd(adapter, &cmd);
-       if (cmd.rsp.cmd)
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_DESTROY_TX_CTX);
+       cmd.req.arg[1] = tx_ring->ctx_id;
+       if (qlcnic_issue_cmd(adapter, &cmd))
                dev_err(&adapter->pdev->dev,
                        "Failed to destroy tx ctx in firmware\n");
+       qlcnic_free_mbx_args(&cmd);
 }
 
 int
 qlcnic_fw_cmd_set_port(struct qlcnic_adapter *adapter, u32 config)
 {
+       int err;
        struct qlcnic_cmd_args cmd;
 
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.arg1 = config;
-       cmd.req.cmd = QLCNIC_CDRP_CMD_CONFIG_PORT;
-       qlcnic_issue_cmd(adapter, &cmd);
-
-       return cmd.rsp.cmd;
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CONFIG_PORT);
+       cmd.req.arg[1] = config;
+       err = qlcnic_issue_cmd(adapter, &cmd);
+       qlcnic_free_mbx_args(&cmd);
+       return err;
 }
 
 int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
 {
        void *addr;
-       int err;
-       int ring;
+       int err, ring;
        struct qlcnic_recv_context *recv_ctx;
        struct qlcnic_host_rds_ring *rds_ring;
        struct qlcnic_host_sds_ring *sds_ring;
        struct qlcnic_host_tx_ring *tx_ring;
+       __le32 *ptr;
 
        struct pci_dev *pdev = adapter->pdev;
 
        recv_ctx = adapter->recv_ctx;
-       tx_ring = adapter->tx_ring;
 
-       tx_ring->hw_consumer = (__le32 *) dma_alloc_coherent(&pdev->dev,
-               sizeof(u32), &tx_ring->hw_cons_phys_addr, GFP_KERNEL);
-       if (tx_ring->hw_consumer == NULL) {
-               dev_err(&pdev->dev, "failed to allocate tx consumer\n");
-               return -ENOMEM;
-       }
+       for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+               tx_ring = &adapter->tx_ring[ring];
+               ptr = (__le32 *)dma_alloc_coherent(&pdev->dev, sizeof(u32),
+                                                  &tx_ring->hw_cons_phys_addr,
+                                                  GFP_KERNEL);
 
-       /* cmd desc ring */
-       addr = dma_alloc_coherent(&pdev->dev, TX_DESC_RINGSIZE(tx_ring),
-                       &tx_ring->phys_addr, GFP_KERNEL);
+               if (ptr == NULL) {
+                       dev_err(&pdev->dev, "failed to allocate tx consumer\n");
+                       return -ENOMEM;
+               }
+               tx_ring->hw_consumer = ptr;
+               /* cmd desc ring */
+               addr = dma_alloc_coherent(&pdev->dev, TX_DESC_RINGSIZE(tx_ring),
+                                         &tx_ring->phys_addr,
+                                         GFP_KERNEL);
 
-       if (addr == NULL) {
-               dev_err(&pdev->dev, "failed to allocate tx desc ring\n");
-               err = -ENOMEM;
-               goto err_out_free;
-       }
+               if (addr == NULL) {
+                       dev_err(&pdev->dev,
+                               "failed to allocate tx desc ring\n");
+                       err = -ENOMEM;
+                       goto err_out_free;
+               }
 
-       tx_ring->desc_head = addr;
+               tx_ring->desc_head = addr;
+       }
 
        for (ring = 0; ring < adapter->max_rds_rings; ring++) {
                rds_ring = &recv_ctx->rds_rings[ring];
@@ -584,36 +572,49 @@ err_out_free:
        return err;
 }
 
-
-int qlcnic_fw_create_ctx(struct qlcnic_adapter *adapter)
+int qlcnic_fw_create_ctx(struct qlcnic_adapter *dev)
 {
-       int err;
+       int i, err, ring;
 
-       if (adapter->flags & QLCNIC_NEED_FLR) {
-               pci_reset_function(adapter->pdev);
-               adapter->flags &= ~QLCNIC_NEED_FLR;
+       if (dev->flags & QLCNIC_NEED_FLR) {
+               pci_reset_function(dev->pdev);
+               dev->flags &= ~QLCNIC_NEED_FLR;
        }
 
-       err = qlcnic_fw_cmd_create_rx_ctx(adapter);
+       err = qlcnic_fw_cmd_create_rx_ctx(dev);
        if (err)
                return err;
 
-       err = qlcnic_fw_cmd_create_tx_ctx(adapter);
-       if (err) {
-               qlcnic_fw_cmd_destroy_rx_ctx(adapter);
-               return err;
+       for (ring = 0; ring < dev->max_drv_tx_rings; ring++) {
+               err = qlcnic_fw_cmd_create_tx_ctx(dev,
+                                                 &dev->tx_ring[ring],
+                                                 ring);
+               if (err) {
+                       qlcnic_fw_cmd_destroy_rx_ctx(dev);
+                       if (ring == 0)
+                               return err;
+
+                       for (i = 0; i < ring; i++)
+                               qlcnic_fw_cmd_destroy_tx_ctx(dev,
+                                                            &dev->tx_ring[i]);
+
+                       return err;
+               }
        }
 
-       set_bit(__QLCNIC_FW_ATTACHED, &adapter->state);
+       set_bit(__QLCNIC_FW_ATTACHED, &dev->state);
        return 0;
 }
 
 void qlcnic_fw_destroy_ctx(struct qlcnic_adapter *adapter)
 {
+       int ring;
+
        if (test_and_clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state)) {
                qlcnic_fw_cmd_destroy_rx_ctx(adapter);
-               qlcnic_fw_cmd_destroy_tx_ctx(adapter);
-
+               for (ring = 0; ring < adapter->max_drv_tx_rings; ring++)
+                       qlcnic_fw_cmd_destroy_tx_ctx(adapter,
+                                                    &adapter->tx_ring[ring]);
                /* Allow dma queues to drain after context reset */
                mdelay(20);
        }
@@ -629,20 +630,23 @@ void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter)
 
        recv_ctx = adapter->recv_ctx;
 
-       tx_ring = adapter->tx_ring;
-       if (tx_ring->hw_consumer != NULL) {
-               dma_free_coherent(&adapter->pdev->dev,
-                               sizeof(u32),
-                               tx_ring->hw_consumer,
-                               tx_ring->hw_cons_phys_addr);
-               tx_ring->hw_consumer = NULL;
-       }
+       for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+               tx_ring = &adapter->tx_ring[ring];
+               if (tx_ring->hw_consumer != NULL) {
+                       dma_free_coherent(&adapter->pdev->dev, sizeof(u32),
+                                         tx_ring->hw_consumer,
+                                         tx_ring->hw_cons_phys_addr);
+
+                       tx_ring->hw_consumer = NULL;
+               }
 
-       if (tx_ring->desc_head != NULL) {
-               dma_free_coherent(&adapter->pdev->dev,
-                               TX_DESC_RINGSIZE(tx_ring),
-                               tx_ring->desc_head, tx_ring->phys_addr);
-               tx_ring->desc_head = NULL;
+               if (tx_ring->desc_head != NULL) {
+                       dma_free_coherent(&adapter->pdev->dev,
+                                         TX_DESC_RINGSIZE(tx_ring),
+                                         tx_ring->desc_head,
+                                         tx_ring->phys_addr);
+                       tx_ring->desc_head = NULL;
+               }
        }
 
        for (ring = 0; ring < adapter->max_rds_rings; ring++) {
@@ -671,40 +675,43 @@ void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter)
 }
 
 
-/* Get MAC address of a NIC partition */
-int qlcnic_get_mac_address(struct qlcnic_adapter *adapter, u8 *mac)
+int qlcnic_82xx_get_mac_address(struct qlcnic_adapter *adapter, u8 *mac)
 {
-       int err;
+       int err, i;
        struct qlcnic_cmd_args cmd;
+       u32 mac_low, mac_high;
 
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.arg1 = adapter->ahw->pci_func | BIT_8;
-       cmd.req.cmd = QLCNIC_CDRP_CMD_MAC_ADDRESS;
-       cmd.rsp.arg1 = cmd.rsp.arg2 = 1;
-       qlcnic_issue_cmd(adapter, &cmd);
-       err = cmd.rsp.cmd;
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_MAC_ADDRESS);
+       cmd.req.arg[1] = adapter->ahw->pci_func | BIT_8;
+       err = qlcnic_issue_cmd(adapter, &cmd);
 
-       if (err == QLCNIC_RCODE_SUCCESS)
-               qlcnic_fetch_mac(cmd.rsp.arg1, cmd.rsp.arg2, 0, mac);
-       else {
+       if (err == QLCNIC_RCODE_SUCCESS) {
+               mac_low = cmd.rsp.arg[1];
+               mac_high = cmd.rsp.arg[2];
+
+               for (i = 0; i < 2; i++)
+                       mac[i] = (u8) (mac_high >> ((1 - i) * 8));
+               for (i = 2; i < 6; i++)
+                       mac[i] = (u8) (mac_low >> ((5 - i) * 8));
+       } else {
                dev_err(&adapter->pdev->dev,
                        "Failed to get mac address%d\n", err);
                err = -EIO;
        }
-
+       qlcnic_free_mbx_args(&cmd);
        return err;
 }
 
 /* Get info of a NIC partition */
-int qlcnic_get_nic_info(struct qlcnic_adapter *adapter,
-                               struct qlcnic_info *npar_info, u8 func_id)
+int qlcnic_82xx_get_nic_info(struct qlcnic_adapter *adapter,
+                            struct qlcnic_info *npar_info, u8 func_id)
 {
        int     err;
        dma_addr_t nic_dma_t;
-       struct qlcnic_info_le *nic_info;
+       const struct qlcnic_info_le *nic_info;
        void *nic_info_addr;
        struct qlcnic_cmd_args cmd;
-       size_t  nic_size = sizeof(struct qlcnic_info_le);
+       size_t  nic_size = sizeof(struct qlcnic_info_le);
 
        nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size,
                                &nic_dma_t, GFP_KERNEL);
@@ -713,47 +720,39 @@ int qlcnic_get_nic_info(struct qlcnic_adapter *adapter,
        memset(nic_info_addr, 0, nic_size);
 
        nic_info = nic_info_addr;
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_GET_NIC_INFO;
-       cmd.req.arg1 = MSD(nic_dma_t);
-       cmd.req.arg2 = LSD(nic_dma_t);
-       cmd.req.arg3 = (func_id << 16 | nic_size);
-       qlcnic_issue_cmd(adapter, &cmd);
-       err = cmd.rsp.cmd;
 
-       if (err == QLCNIC_RCODE_SUCCESS) {
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_NIC_INFO);
+       cmd.req.arg[1] = MSD(nic_dma_t);
+       cmd.req.arg[2] = LSD(nic_dma_t);
+       cmd.req.arg[3] = (func_id << 16 | nic_size);
+       err = qlcnic_issue_cmd(adapter, &cmd);
+       if (err != QLCNIC_RCODE_SUCCESS) {
+               dev_err(&adapter->pdev->dev,
+                       "Failed to get nic info%d\n", err);
+               err = -EIO;
+       } else {
                npar_info->pci_func = le16_to_cpu(nic_info->pci_func);
                npar_info->op_mode = le16_to_cpu(nic_info->op_mode);
+               npar_info->min_tx_bw = le16_to_cpu(nic_info->min_tx_bw);
+               npar_info->max_tx_bw = le16_to_cpu(nic_info->max_tx_bw);
                npar_info->phys_port = le16_to_cpu(nic_info->phys_port);
                npar_info->switch_mode = le16_to_cpu(nic_info->switch_mode);
                npar_info->max_tx_ques = le16_to_cpu(nic_info->max_tx_ques);
                npar_info->max_rx_ques = le16_to_cpu(nic_info->max_rx_ques);
-               npar_info->min_tx_bw = le16_to_cpu(nic_info->min_tx_bw);
-               npar_info->max_tx_bw = le16_to_cpu(nic_info->max_tx_bw);
                npar_info->capabilities = le32_to_cpu(nic_info->capabilities);
                npar_info->max_mtu = le16_to_cpu(nic_info->max_mtu);
-
-               dev_info(&adapter->pdev->dev,
-                       "phy port: %d switch_mode: %d,\n"
-                       "\tmax_tx_q: %d max_rx_q: %d min_tx_bw: 0x%x,\n"
-                       "\tmax_tx_bw: 0x%x max_mtu:0x%x, capabilities: 0x%x\n",
-                       npar_info->phys_port, npar_info->switch_mode,
-                       npar_info->max_tx_ques, npar_info->max_rx_ques,
-                       npar_info->min_tx_bw, npar_info->max_tx_bw,
-                       npar_info->max_mtu, npar_info->capabilities);
-       } else {
-               dev_err(&adapter->pdev->dev,
-                       "Failed to get nic info%d\n", err);
-               err = -EIO;
        }
 
        dma_free_coherent(&adapter->pdev->dev, nic_size, nic_info_addr,
-               nic_dma_t);
+                         nic_dma_t);
+       qlcnic_free_mbx_args(&cmd);
+
        return err;
 }
 
 /* Configure a NIC partition */
-int qlcnic_set_nic_info(struct qlcnic_adapter *adapter, struct qlcnic_info *nic)
+int qlcnic_82xx_set_nic_info(struct qlcnic_adapter *adapter,
+                            struct qlcnic_info *nic)
 {
        int err = -EIO;
        dma_addr_t nic_dma_t;
@@ -784,13 +783,11 @@ int qlcnic_set_nic_info(struct qlcnic_adapter *adapter, struct qlcnic_info *nic)
        nic_info->min_tx_bw = cpu_to_le16(nic->min_tx_bw);
        nic_info->max_tx_bw = cpu_to_le16(nic->max_tx_bw);
 
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_SET_NIC_INFO;
-       cmd.req.arg1 = MSD(nic_dma_t);
-       cmd.req.arg2 = LSD(nic_dma_t);
-       cmd.req.arg3 = ((nic->pci_func << 16) | nic_size);
-       qlcnic_issue_cmd(adapter, &cmd);
-       err = cmd.rsp.cmd;
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_SET_NIC_INFO);
+       cmd.req.arg[1] = MSD(nic_dma_t);
+       cmd.req.arg[2] = LSD(nic_dma_t);
+       cmd.req.arg[3] = ((nic->pci_func << 16) | nic_size);
+       err = qlcnic_issue_cmd(adapter, &cmd);
 
        if (err != QLCNIC_RCODE_SUCCESS) {
                dev_err(&adapter->pdev->dev,
@@ -800,12 +797,14 @@ int qlcnic_set_nic_info(struct qlcnic_adapter *adapter, struct qlcnic_info *nic)
 
        dma_free_coherent(&adapter->pdev->dev, nic_size, nic_info_addr,
                nic_dma_t);
+       qlcnic_free_mbx_args(&cmd);
+
        return err;
 }
 
 /* Get PCI Info of a partition */
-int qlcnic_get_pci_info(struct qlcnic_adapter *adapter,
-                               struct qlcnic_pci_info *pci_info)
+int qlcnic_82xx_get_pci_info(struct qlcnic_adapter *adapter,
+                            struct qlcnic_pci_info *pci_info)
 {
        int err = 0, i;
        struct qlcnic_cmd_args cmd;
@@ -822,13 +821,11 @@ int qlcnic_get_pci_info(struct qlcnic_adapter *adapter,
        memset(pci_info_addr, 0, pci_size);
 
        npar = pci_info_addr;
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_GET_PCI_INFO;
-       cmd.req.arg1 = MSD(pci_info_dma_t);
-       cmd.req.arg2 = LSD(pci_info_dma_t);
-       cmd.req.arg3 = pci_size;
-       qlcnic_issue_cmd(adapter, &cmd);
-       err = cmd.rsp.cmd;
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_PCI_INFO);
+       cmd.req.arg[1] = MSD(pci_info_dma_t);
+       cmd.req.arg[2] = LSD(pci_info_dma_t);
+       cmd.req.arg[3] = pci_size;
+       err = qlcnic_issue_cmd(adapter, &cmd);
 
        adapter->ahw->act_pci_func = 0;
        if (err == QLCNIC_RCODE_SUCCESS) {
@@ -854,6 +851,8 @@ int qlcnic_get_pci_info(struct qlcnic_adapter *adapter,
 
        dma_free_coherent(&adapter->pdev->dev, pci_size, pci_info_addr,
                pci_info_dma_t);
+       qlcnic_free_mbx_args(&cmd);
+
        return err;
 }
 
@@ -872,21 +871,19 @@ int qlcnic_config_port_mirroring(struct qlcnic_adapter *adapter, u8 id,
        arg1 = id | (enable_mirroring ? BIT_4 : 0);
        arg1 |= pci_func << 8;
 
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_SET_PORTMIRRORING;
-       cmd.req.arg1 = arg1;
-       qlcnic_issue_cmd(adapter, &cmd);
-       err = cmd.rsp.cmd;
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_SET_PORTMIRRORING);
+       cmd.req.arg[1] = arg1;
+       err = qlcnic_issue_cmd(adapter, &cmd);
 
-       if (err != QLCNIC_RCODE_SUCCESS) {
+       if (err != QLCNIC_RCODE_SUCCESS)
                dev_err(&adapter->pdev->dev,
                        "Failed to configure port mirroring%d on eswitch:%d\n",
                        pci_func, id);
-       } else {
+       else
                dev_info(&adapter->pdev->dev,
                        "Configured eSwitch %d for port mirroring:%d\n",
                        id, pci_func);
-       }
+       qlcnic_free_mbx_args(&cmd);
 
        return err;
 }
@@ -923,13 +920,11 @@ int qlcnic_get_port_stats(struct qlcnic_adapter *adapter, const u8 func,
        arg1 = func | QLCNIC_STATS_VERSION << 8 | QLCNIC_STATS_PORT << 12;
        arg1 |= rx_tx << 15 | stats_size << 16;
 
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_GET_ESWITCH_STATS;
-       cmd.req.arg1 = arg1;
-       cmd.req.arg2 = MSD(stats_dma_t);
-       cmd.req.arg3 = LSD(stats_dma_t);
-       qlcnic_issue_cmd(adapter, &cmd);
-       err = cmd.rsp.cmd;
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_ESWITCH_STATS);
+       cmd.req.arg[1] = arg1;
+       cmd.req.arg[2] = MSD(stats_dma_t);
+       cmd.req.arg[3] = LSD(stats_dma_t);
+       err = qlcnic_issue_cmd(adapter, &cmd);
 
        if (!err) {
                stats = stats_addr;
@@ -949,6 +944,8 @@ int qlcnic_get_port_stats(struct qlcnic_adapter *adapter, const u8 func,
 
        dma_free_coherent(&adapter->pdev->dev, stats_size, stats_addr,
                stats_dma_t);
+       qlcnic_free_mbx_args(&cmd);
+
        return err;
 }
 
@@ -963,6 +960,9 @@ int qlcnic_get_mac_stats(struct qlcnic_adapter *adapter,
        void *stats_addr;
        int err;
 
+       if (mac_stats == NULL)
+               return -ENOMEM;
+
        stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size,
                        &stats_dma_t, GFP_KERNEL);
        if (!stats_addr) {
@@ -971,15 +971,11 @@ int qlcnic_get_mac_stats(struct qlcnic_adapter *adapter,
                return -ENOMEM;
        }
        memset(stats_addr, 0, stats_size);
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_GET_MAC_STATS;
-       cmd.req.arg1 = stats_size << 16;
-       cmd.req.arg2 = MSD(stats_dma_t);
-       cmd.req.arg3 = LSD(stats_dma_t);
-
-       qlcnic_issue_cmd(adapter, &cmd);
-       err = cmd.rsp.cmd;
-
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_MAC_STATS);
+       cmd.req.arg[1] = stats_size << 16;
+       cmd.req.arg[2] = MSD(stats_dma_t);
+       cmd.req.arg[3] = LSD(stats_dma_t);
+       err = qlcnic_issue_cmd(adapter, &cmd);
        if (!err) {
                stats = stats_addr;
                mac_stats->mac_tx_frames = le64_to_cpu(stats->mac_tx_frames);
@@ -1001,10 +997,16 @@ int qlcnic_get_mac_stats(struct qlcnic_adapter *adapter,
                mac_stats->mac_rx_jabber = le64_to_cpu(stats->mac_rx_jabber);
                mac_stats->mac_rx_dropped = le64_to_cpu(stats->mac_rx_dropped);
                mac_stats->mac_rx_crc_error = le64_to_cpu(stats->mac_rx_crc_error);
+       } else {
+               dev_err(&adapter->pdev->dev,
+                       "%s: Get mac stats failed, err=%d.\n", __func__, err);
        }
 
        dma_free_coherent(&adapter->pdev->dev, stats_size, stats_addr,
                stats_dma_t);
+
+       qlcnic_free_mbx_args(&cmd);
+
        return err;
 }
 
@@ -1065,7 +1067,7 @@ int qlcnic_get_eswitch_stats(struct qlcnic_adapter *adapter, const u8 eswitch,
 int qlcnic_clear_esw_stats(struct qlcnic_adapter *adapter, const u8 func_esw,
                const u8 port, const u8 rx_tx)
 {
-
+       int err;
        u32 arg1;
        struct qlcnic_cmd_args cmd;
 
@@ -1088,15 +1090,16 @@ int qlcnic_clear_esw_stats(struct qlcnic_adapter *adapter, const u8 func_esw,
        arg1 = port | QLCNIC_STATS_VERSION << 8 | func_esw << 12;
        arg1 |= BIT_14 | rx_tx << 15;
 
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_GET_ESWITCH_STATS;
-       cmd.req.arg1 = arg1;
-       qlcnic_issue_cmd(adapter, &cmd);
-       return cmd.rsp.cmd;
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_GET_ESWITCH_STATS);
+       cmd.req.arg[1] = arg1;
+       err = qlcnic_issue_cmd(adapter, &cmd);
+       qlcnic_free_mbx_args(&cmd);
+       return err;
 
 err_ret:
-       dev_err(&adapter->pdev->dev, "Invalid argument func_esw=%d port=%d"
-               "rx_ctx=%d\n", func_esw, port, rx_tx);
+       dev_err(&adapter->pdev->dev,
+               "Invalid args func_esw %d port %d rx_ctx %d\n",
+               func_esw, port, rx_tx);
        return -EIO;
 }
 
@@ -1109,22 +1112,21 @@ __qlcnic_get_eswitch_port_config(struct qlcnic_adapter *adapter,
        u8 pci_func;
        pci_func = (*arg1 >> 8);
 
-       cmd.req.cmd = QLCNIC_CDRP_CMD_GET_ESWITCH_PORT_CONFIG;
-       cmd.req.arg1 = *arg1;
-       cmd.rsp.arg1 = cmd.rsp.arg2 = 1;
-       qlcnic_issue_cmd(adapter, &cmd);
-       *arg1 = cmd.rsp.arg1;
-       *arg2 = cmd.rsp.arg2;
-       err = cmd.rsp.cmd;
+       qlcnic_alloc_mbx_args(&cmd, adapter,
+                             QLCNIC_CMD_GET_ESWITCH_PORT_CONFIG);
+       cmd.req.arg[1] = *arg1;
+       err = qlcnic_issue_cmd(adapter, &cmd);
+       *arg1 = cmd.rsp.arg[1];
+       *arg2 = cmd.rsp.arg[2];
+       qlcnic_free_mbx_args(&cmd);
 
-       if (err == QLCNIC_RCODE_SUCCESS) {
+       if (err == QLCNIC_RCODE_SUCCESS)
                dev_info(&adapter->pdev->dev,
-                       "eSwitch port config for pci func %d\n", pci_func);
-       } else {
+                        "eSwitch port config for pci func %d\n", pci_func);
+       else
                dev_err(&adapter->pdev->dev,
                        "Failed to get eswitch port config for pci func %d\n",
                                                                pci_func);
-       }
        return err;
 }
 /* Configure eSwitch port
@@ -1189,20 +1191,18 @@ int qlcnic_config_switch_port(struct qlcnic_adapter *adapter,
                return err;
        }
 
-       memset(&cmd, 0, sizeof(cmd));
-       cmd.req.cmd = QLCNIC_CDRP_CMD_CONFIGURE_ESWITCH;
-       cmd.req.arg1 = arg1;
-       cmd.req.arg2 = arg2;
-       qlcnic_issue_cmd(adapter, &cmd);
+       qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_CONFIGURE_ESWITCH);
+       cmd.req.arg[1] = arg1;
+       cmd.req.arg[2] = arg2;
+       err = qlcnic_issue_cmd(adapter, &cmd);
+       qlcnic_free_mbx_args(&cmd);
 
-       err = cmd.rsp.cmd;
-       if (err != QLCNIC_RCODE_SUCCESS) {
+       if (err != QLCNIC_RCODE_SUCCESS)
                dev_err(&adapter->pdev->dev,
                        "Failed to configure eswitch pci func %d\n", pci_func);
-       } else {
+       else
                dev_info(&adapter->pdev->dev,
-                       "Configured eSwitch for pci func %d\n", pci_func);
-       }
+                        "Configured eSwitch for pci func %d\n", pci_func);
 
        return err;
 }