qlcnic: fix mailbox response handling

o Do not read mailbox registers on timeout
o Add a helper function to handle mailbox response

Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 40 insertions, 26 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 51b4340deffa..f7b39d1067fb 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -664,6 +664,21 @@ static void qlcnic_dump_mbx(struct qlcnic_adapter *adapter,
         pr_info("\n");
 }
 
+/* Mailbox response for mac rcode */
+static u32 qlcnic_83xx_mac_rcode(struct qlcnic_adapter *adapter)
+{
+        u32 fw_data;
+        u8 mac_cmd_rcode;
+
+        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;
+}
+
 static u32 qlcnic_83xx_mbx_poll(struct qlcnic_adapter *adapter)
 {
         u32 data;
@@ -686,7 +701,7 @@ int qlcnic_83xx_mbx_op(struct qlcnic_adapter *adapter,
 {
         int i;
         u16 opcode;
-        u8 mbx_err_code, mac_cmd_rcode;
+        u8 mbx_err_code;
         u32 rsp, mbx_val, fw_data, rsp_num, mbx_cmd;
         struct qlcnic_hardware_context *ahw = adapter->ahw;
 
@@ -722,45 +737,44 @@ int qlcnic_83xx_mbx_op(struct qlcnic_adapter *adapter,
         QLCWRX(ahw, QLCNIC_HOST_MBX_CTRL, QLCNIC_SET_OWNER);
 poll:
         rsp = qlcnic_83xx_mbx_poll(adapter);
-        /* Get the FW response data */
-        fw_data = readl(QLCNIC_MBX_FW(ahw, 0));
-        mbx_err_code = QLCNIC_MBX_STATUS(fw_data);
-        rsp_num = QLCNIC_MBX_NUM_REGS(fw_data);
-        opcode = QLCNIC_MBX_RSP(fw_data);
-
         if (rsp != QLCNIC_RCODE_TIMEOUT) {
+                /* Get the FW response data */
+                fw_data = readl(QLCNIC_MBX_FW(ahw, 0));
                 if (fw_data &  QLCNIC_MBX_ASYNC_EVENT) {
                         qlcnic_83xx_process_aen(adapter);
                         mbx_val = QLCRDX(ahw, QLCNIC_HOST_MBX_CTRL);
                         if (mbx_val)
                                 goto poll;
-                } else if ((mbx_err_code == QLCNIC_MBX_RSP_OK) ||
-                           (mbx_err_code == QLCNIC_MBX_PORT_RSP_OK)) {
-                        qlcnic_83xx_get_mbx_data(adapter, cmd);
+                }
+                mbx_err_code = QLCNIC_MBX_STATUS(fw_data);
+                rsp_num = QLCNIC_MBX_NUM_REGS(fw_data);
+                opcode = QLCNIC_MBX_RSP(fw_data);
+                qlcnic_83xx_get_mbx_data(adapter, cmd);
+
+                switch (mbx_err_code) {
+                case QLCNIC_MBX_RSP_OK:
+                case QLCNIC_MBX_PORT_RSP_OK:
                         rsp = QLCNIC_RCODE_SUCCESS;
-                } else {
-                        qlcnic_83xx_get_mbx_data(adapter, cmd);
+                        break;
+                default:
                         if (opcode == QLCNIC_CMD_CONFIG_MAC_VLAN) {
-                                fw_data = readl(QLCNIC_MBX_FW(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) {
-                                        rsp = QLCNIC_RCODE_SUCCESS;
+                                rsp = qlcnic_83xx_mac_rcode(adapter);
+                                if (!rsp)
                                         goto out;
-                                }
                         }
-                        dev_info(&adapter->pdev->dev,
-                                 "MBX command 0x%x failed with err:0x%x\n",
-                                 opcode, mbx_err_code);
+                        dev_err(&adapter->pdev->dev,
+                                "MBX command 0x%x failed with err:0x%x\n",
+                                opcode, mbx_err_code);
                         rsp = mbx_err_code;
                         qlcnic_dump_mbx(adapter, cmd);
+                        break;
                 }
-        } else {
-                dev_info(&adapter->pdev->dev,
-                         "MBX command 0x%x timed out\n", opcode);
-                qlcnic_dump_mbx(adapter, cmd);
+                goto out;
         }
+
+        dev_err(&adapter->pdev->dev, "MBX command 0x%x timed out\n",
+                QLCNIC_MBX_RSP(mbx_cmd));
+        rsp = QLCNIC_RCODE_TIMEOUT;
 out:
         /* clear fw mbx control register */
         QLCWRX(ahw, QLCNIC_FW_MBX_CTRL, QLCNIC_CLR_OWNER);