6 files changed, 232 insertions, 264 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 5a49b64a93b4..cd95442341fd 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -466,7 +466,6 @@ struct qlcnic_hardware_context {
         u32 *ext_reg_tbl;
         u32 mbox_aen[QLC_83XX_MBX_AEN_CNT];
         u32 mbox_reg[4];
-        spinlock_t mbx_lock;
         struct qlcnic_mailbox *mailbox;
 };
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 74c8d84dc43d..1eeeed89ef6f 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -362,6 +362,10 @@ static inline void qlcnic_83xx_get_mbx_data(struct qlcnic_adapter *adapter,
                                      struct qlcnic_cmd_args *cmd)
 {
         int i;
+
+        if (cmd->op_type == QLC_83XX_MBX_POST_BC_OP)
+                return;
+
         for (i = 0; i < cmd->rsp.num; i++)
                 cmd->rsp.arg[i] = readl(QLCNIC_MBX_FW(adapter->ahw, i));
 }
@@ -406,22 +410,25 @@ static inline void qlcnic_83xx_notify_mbx_response(struct qlcnic_mailbox *mbx)
 
 static void qlcnic_83xx_poll_process_aen(struct qlcnic_adapter *adapter)
 {
-        u32 resp, event;
+        u32 resp, event, rsp_status = QLC_83XX_MBX_RESPONSE_ARRIVED;
+        struct qlcnic_mailbox *mbx = adapter->ahw->mailbox;
         unsigned long flags;
 
-        spin_lock_irqsave(&adapter->ahw->mbx_lock, flags);
-
+        spin_lock_irqsave(&mbx->aen_lock, flags);
         resp = QLCRDX(adapter->ahw, QLCNIC_FW_MBX_CTRL);
         if (!(resp & QLCNIC_SET_OWNER))
                 goto out;
 
         event = readl(QLCNIC_MBX_FW(adapter->ahw, 0));
-        if (event &  QLCNIC_MBX_ASYNC_EVENT)
+        if (event &  QLCNIC_MBX_ASYNC_EVENT) {
                 __qlcnic_83xx_process_aen(adapter);
-
+        } else {
+                if (atomic_read(&mbx->rsp_status) != rsp_status)
+                        qlcnic_83xx_notify_mbx_response(mbx);
+        }
 out:
         qlcnic_83xx_enable_legacy_msix_mbx_intr(adapter);
-        spin_unlock_irqrestore(&adapter->ahw->mbx_lock, flags);
+        spin_unlock_irqrestore(&mbx->aen_lock, flags);
 }
 
 irqreturn_t qlcnic_83xx_intr(int irq, void *data)
@@ -694,6 +701,9 @@ static void qlcnic_dump_mbx(struct qlcnic_adapter *adapter,
 {
         int i;
 
+        if (cmd->op_type == QLC_83XX_MBX_POST_BC_OP)
+                return;
+
         dev_info(&adapter->pdev->dev,
                  "Host MBX regs(%d)\n", cmd->req.num);
         for (i = 0; i < cmd->req.num; i++) {
@@ -712,120 +722,74 @@ static void qlcnic_dump_mbx(struct qlcnic_adapter *adapter,
         pr_info("\n");
 }
 
-/* Mailbox response for mac rcode */
-u32 qlcnic_83xx_mac_rcode(struct qlcnic_adapter *adapter)
+static inline void
+qlcnic_83xx_poll_for_mbx_completion(struct qlcnic_adapter *adapter,
+                                    struct qlcnic_cmd_args *cmd)
 {
-        u32 fw_data;
-        u8 mac_cmd_rcode;
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        int opcode = LSW(cmd->req.arg[0]);
+        unsigned long max_loops;
 
-        fw_data = readl(QLCNIC_MBX_FW(adapter->ahw, 2));
-        mac_cmd_rcode = (u8)fw_data;
-        if (mac_cmd_rcode == QLC_83XX_NO_NIC_RESOURCE ||
-            mac_cmd_rcode == QLC_83XX_MAC_PRESENT ||
-            mac_cmd_rcode == QLC_83XX_MAC_ABSENT)
-                return QLCNIC_RCODE_SUCCESS;
-        return 1;
-}
+        max_loops = cmd->total_cmds * QLC_83XX_MBX_CMD_LOOP;
 
-u32 qlcnic_83xx_mbx_poll(struct qlcnic_adapter *adapter, u32 *wait_time)
-{
-        u32 data;
-        struct qlcnic_hardware_context *ahw = adapter->ahw;
-        /* wait for mailbox completion */
-        do {
-                data = QLCRDX(ahw, QLCNIC_FW_MBX_CTRL);
-                if (++(*wait_time) > QLCNIC_MBX_TIMEOUT) {
-                        data = QLCNIC_RCODE_TIMEOUT;
-                        break;
-                }
-                mdelay(1);
-        } while (!data);
-        return data;
+        for (; max_loops; max_loops--) {
+                if (atomic_read(&cmd->rsp_status) ==
+                    QLC_83XX_MBX_RESPONSE_ARRIVED)
+                        return;
+
+                udelay(1);
+        }
+
+        dev_err(&adapter->pdev->dev,
+                "%s: Mailbox command timed out, cmd_op=0x%x, cmd_type=0x%x, pci_func=0x%x, op_mode=0x%x\n",
+                __func__, opcode, cmd->type, ahw->pci_func, ahw->op_mode);
+        flush_workqueue(ahw->mailbox->work_q);
+        return;
 }
 
 int qlcnic_83xx_issue_cmd(struct qlcnic_adapter *adapter,
                           struct qlcnic_cmd_args *cmd)
 {
-        int i;
-        u16 opcode;
-        u8 mbx_err_code;
-        unsigned long flags;
+        struct qlcnic_mailbox *mbx = adapter->ahw->mailbox;
         struct qlcnic_hardware_context *ahw = adapter->ahw;
-        u32 rsp, mbx_val, fw_data, rsp_num, mbx_cmd, wait_time = 0;
+        int cmd_type, err, opcode;
+        unsigned long timeout;
 
         opcode = LSW(cmd->req.arg[0]);
-        if (!test_bit(QLC_83XX_MBX_READY, &adapter->ahw->idc.status)) {
-                dev_info(&adapter->pdev->dev,
-                         "Mailbox cmd attempted, 0x%x\n", opcode);
-                dev_info(&adapter->pdev->dev, "Mailbox detached\n");
-                return 0;
+        cmd_type = cmd->type;
+        err = mbx->ops->enqueue_cmd(adapter, cmd, &timeout);
+        if (err) {
+                dev_err(&adapter->pdev->dev,
+                        "%s: Mailbox not available, cmd_op=0x%x, cmd_context=0x%x, pci_func=0x%x, op_mode=0x%x\n",
+                        __func__, opcode, cmd->type, ahw->pci_func,
+                        ahw->op_mode);
+                return err;
         }
 
-        spin_lock_irqsave(&adapter->ahw->mbx_lock, flags);
-        mbx_val = QLCRDX(ahw, QLCNIC_HOST_MBX_CTRL);
-
-        if (mbx_val) {
-                QLCDB(adapter, DRV,
-                      "Mailbox cmd attempted, 0x%x\n", opcode);
-                QLCDB(adapter, DRV,
-                      "Mailbox not available, 0x%x, collect FW dump\n",
-                      mbx_val);
+        switch (cmd_type) {
+        case QLC_83XX_MBX_CMD_WAIT:
+                if (!wait_for_completion_timeout(&cmd->completion, timeout)) {