net/qede/base: add return code check
[dpdk.git] / drivers / net / qede / base / ecore_mcp.c
index 24211a3..0ebb5cd 100644 (file)
@@ -15,6 +15,7 @@
 #include "ecore_hw.h"
 #include "ecore_init_fw_funcs.h"
 #include "ecore_sriov.h"
+#include "ecore_vf.h"
 #include "ecore_iov_api.h"
 #include "ecore_gtt_reg_addr.h"
 #include "ecore_iro.h"
@@ -103,7 +104,6 @@ enum _ecore_status_t ecore_mcp_free(struct ecore_hwfn *p_hwfn)
                OSAL_SPIN_LOCK_DEALLOC(&p_hwfn->mcp_info->lock);
        }
        OSAL_FREE(p_hwfn->p_dev, p_hwfn->mcp_info);
-       p_hwfn->mcp_info = OSAL_NULL;
 
        return ECORE_SUCCESS;
 }
@@ -202,6 +202,52 @@ err:
        return ECORE_NOMEM;
 }
 
+/* Locks the MFW mailbox of a PF to ensure a single access.
+ * The lock is achieved in most cases by holding a spinlock, causing other
+ * threads to wait till a previous access is done.
+ * In some cases (currently when a [UN]LOAD_REQ commands are sent), the single
+ * access is achieved by setting a blocking flag, which will fail other
+ * competing contexts to send their mailboxes.
+ */
+static enum _ecore_status_t ecore_mcp_mb_lock(struct ecore_hwfn *p_hwfn,
+                                             u32 cmd)
+{
+       OSAL_SPIN_LOCK(&p_hwfn->mcp_info->lock);
+
+       /* The spinlock shouldn't be acquired when the mailbox command is
+        * [UN]LOAD_REQ, since the engine is locked by the MFW, and a parallel
+        * pending [UN]LOAD_REQ command of another PF together with a spinlock
+        * (i.e. interrupts are disabled) - can lead to a deadlock.
+        * It is assumed that for a single PF, no other mailbox commands can be
+        * sent from another context while sending LOAD_REQ, and that any
+        * parallel commands to UNLOAD_REQ can be cancelled.
+        */
+       if (cmd == DRV_MSG_CODE_LOAD_DONE || cmd == DRV_MSG_CODE_UNLOAD_DONE)
+               p_hwfn->mcp_info->block_mb_sending = false;
+
+       if (p_hwfn->mcp_info->block_mb_sending) {
+               DP_NOTICE(p_hwfn, false,
+                         "Trying to send a MFW mailbox command [0x%x]"
+                         " in parallel to [UN]LOAD_REQ. Aborting.\n",
+                         cmd);
+               OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->lock);
+               return ECORE_BUSY;
+       }
+
+       if (cmd == DRV_MSG_CODE_LOAD_REQ || cmd == DRV_MSG_CODE_UNLOAD_REQ) {
+               p_hwfn->mcp_info->block_mb_sending = true;
+               OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->lock);
+       }
+
+       return ECORE_SUCCESS;
+}
+
+static void ecore_mcp_mb_unlock(struct ecore_hwfn *p_hwfn, u32 cmd)
+{
+       if (cmd != DRV_MSG_CODE_LOAD_REQ && cmd != DRV_MSG_CODE_UNLOAD_REQ)
+               OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->lock);
+}
+
 enum _ecore_status_t ecore_mcp_reset(struct ecore_hwfn *p_hwfn,
                                     struct ecore_ptt *p_ptt)
 {
@@ -215,7 +261,12 @@ enum _ecore_status_t ecore_mcp_reset(struct ecore_hwfn *p_hwfn,
                delay = EMUL_MCP_RESP_ITER_US;
 #endif
 
-       OSAL_SPIN_LOCK(&p_hwfn->mcp_info->lock);
+       /* Ensure that only a single thread is accessing the mailbox at a
+        * certain time.
+        */
+       rc = ecore_mcp_mb_lock(p_hwfn, DRV_MSG_CODE_MCP_RESET);
+       if (rc != ECORE_SUCCESS)
+               return rc;
 
        /* Set drv command along with the updated sequence */
        org_mcp_reset_seq = ecore_rd(p_hwfn, p_ptt, MISCS_REG_GENERIC_POR_0);
@@ -238,12 +289,11 @@ enum _ecore_status_t ecore_mcp_reset(struct ecore_hwfn *p_hwfn,
                rc = ECORE_AGAIN;
        }
 
-       OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->lock);
+       ecore_mcp_mb_unlock(p_hwfn, DRV_MSG_CODE_MCP_RESET);
 
        return rc;
 }
 
-/* Should be called while the dedicated spinlock is acquired */
 static enum _ecore_status_t ecore_do_mcp_cmd(struct ecore_hwfn *p_hwfn,
                                             struct ecore_ptt *p_ptt,
                                             u32 cmd, u32 param,
@@ -251,12 +301,16 @@ static enum _ecore_status_t ecore_do_mcp_cmd(struct ecore_hwfn *p_hwfn,
                                             u32 *o_mcp_param)
 {
        u32 delay = CHIP_MCP_RESP_ITER_US;
+       u32 max_retries = ECORE_DRV_MB_MAX_RETRIES;
        u32 seq, cnt = 1, actual_mb_seq;
        enum _ecore_status_t rc = ECORE_SUCCESS;
 
 #ifndef ASIC_ONLY
        if (CHIP_REV_IS_EMUL(p_hwfn->p_dev))
                delay = EMUL_MCP_RESP_ITER_US;
+       /* There is a built-in delay of 100usec in each MFW response read */
+       if (CHIP_REV_IS_FPGA(p_hwfn->p_dev))
+               max_retries /= 10;
 #endif
 
        /* Get actual driver mailbox sequence */
@@ -280,10 +334,6 @@ static enum _ecore_status_t ecore_do_mcp_cmd(struct ecore_hwfn *p_hwfn,
        /* Set drv command along with the updated sequence */
        DRV_MB_WR(p_hwfn, p_ptt, drv_mb_header, (cmd | seq));
 
-       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
-                  "wrote command (%x) to MFW MB param 0x%08x\n",
-                  (cmd | seq), param);
-
        do {
                /* Wait for MFW response */
                OSAL_UDELAY(delay);
@@ -291,11 +341,7 @@ static enum _ecore_status_t ecore_do_mcp_cmd(struct ecore_hwfn *p_hwfn,
 
                /* Give the FW up to 5 second (500*10ms) */
        } while ((seq != (*o_mcp_resp & FW_MSG_SEQ_NUMBER_MASK)) &&
-                (cnt++ < ECORE_DRV_MB_MAX_RETRIES));
-
-       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
-                  "[after %d ms] read (%x) seq is (%x) from FW MB\n",
-                  cnt * delay, *o_mcp_resp, seq);
+                (cnt++ < max_retries));
 
        /* Is this a reply to our command? */
        if (seq == (*o_mcp_resp & FW_MSG_SEQ_NUMBER_MASK)) {
@@ -313,9 +359,9 @@ static enum _ecore_status_t ecore_do_mcp_cmd(struct ecore_hwfn *p_hwfn,
        return rc;
 }
 
-
 static enum _ecore_status_t
-ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn,
+                       struct ecore_ptt *p_ptt,
                        struct ecore_mcp_mb_params *p_mb_params)
 {
        u32 union_data_addr;
@@ -327,14 +373,16 @@ ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
                return ECORE_BUSY;
        }
 
-       /* Acquiring a spinlock is needed to ensure that only a single thread
-        * is accessing the mailbox at a certain time.
-        */
-       OSAL_SPIN_LOCK(&p_hwfn->mcp_info->lock);
-
        union_data_addr = p_hwfn->mcp_info->drv_mb_addr +
                          OFFSETOF(struct public_drv_mb, union_data);
 
+       /* Ensure that only a single thread is accessing the mailbox at a
+        * certain time.
+        */
+       rc = ecore_mcp_mb_lock(p_hwfn, p_mb_params->cmd);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
        if (p_mb_params->p_data_src != OSAL_NULL)
                ecore_memcpy_to(p_hwfn, p_ptt, union_data_addr,
                                p_mb_params->p_data_src,
@@ -348,6 +396,9 @@ ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
                ecore_memcpy_from(p_hwfn, p_ptt, p_mb_params->p_data_dst,
                                  union_data_addr,
                                  sizeof(*p_mb_params->p_data_dst));
+
+       ecore_mcp_mb_unlock(p_hwfn, p_mb_params->cmd);
+
        return rc;
 }
 
@@ -369,6 +420,7 @@ enum _ecore_status_t ecore_mcp_cmd(struct ecore_hwfn *p_hwfn,
                return ECORE_SUCCESS;
        }
 #endif
+
        OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
        mb_params.cmd = cmd;
        mb_params.param = param;
@@ -397,7 +449,7 @@ enum _ecore_status_t ecore_mcp_nvm_wr_cmd(struct ecore_hwfn *p_hwfn,
        OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
        mb_params.cmd = cmd;
        mb_params.param = param;
-       OSAL_MEMCPY(&union_data.raw_data, i_buf, i_txn_size);
+       OSAL_MEMCPY((u32 *)&union_data.raw_data, i_buf, i_txn_size);
        mb_params.p_data_src = &union_data;
        rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
        if (rc != ECORE_SUCCESS)
@@ -417,30 +469,25 @@ enum _ecore_status_t ecore_mcp_nvm_rd_cmd(struct ecore_hwfn *p_hwfn,
                                          u32 *o_mcp_param,
                                          u32 *o_txn_size, u32 *o_buf)
 {
+       struct ecore_mcp_mb_params mb_params;
+       union drv_union_data union_data;
        enum _ecore_status_t rc;
-       u32 i;
 
-       /* MCP not initialized */
-       if (!ecore_mcp_is_init(p_hwfn)) {
-               DP_NOTICE(p_hwfn, true, "MFW is not initialized !\n");
-               return ECORE_BUSY;
-       }
-
-       OSAL_SPIN_LOCK(&p_hwfn->mcp_info->lock);
-       rc = ecore_do_mcp_cmd(p_hwfn, p_ptt, cmd, param, o_mcp_resp,
-                             o_mcp_param);
+       OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
+       mb_params.cmd = cmd;
+       mb_params.param = param;
+       mb_params.p_data_dst = &union_data;
+       rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
        if (rc != ECORE_SUCCESS)
-               goto out;
+               return rc;
+
+       *o_mcp_resp = mb_params.mcp_resp;
+       *o_mcp_param = mb_params.mcp_param;
 
-       /* Get payload after operation completes successfully */
        *o_txn_size = *o_mcp_param;
-       for (i = 0; i < *o_txn_size; i += 4)
-               o_buf[i / sizeof(u32)] = DRV_MB_RD(p_hwfn, p_ptt,
-                                                  union_data.raw_data[i]);
+       OSAL_MEMCPY(o_buf, (u32 *)&union_data.raw_data, *o_txn_size);
 
-out:
-       OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->lock);
-       return rc;
+       return ECORE_SUCCESS;
 }
 
 #ifndef ASIC_ONLY
@@ -471,53 +518,368 @@ static void ecore_mcp_mf_workaround(struct ecore_hwfn *p_hwfn,
 }
 #endif
 
+static bool ecore_mcp_can_force_load(u8 drv_role, u8 exist_drv_role)
+{
+       return (drv_role == DRV_ROLE_OS &&
+               exist_drv_role == DRV_ROLE_PREBOOT) ||
+              (drv_role == DRV_ROLE_KDUMP && exist_drv_role == DRV_ROLE_OS);
+}
+
+static enum _ecore_status_t ecore_mcp_cancel_load_req(struct ecore_hwfn *p_hwfn,
+                                                     struct ecore_ptt *p_ptt)
+{
+       u32 resp = 0, param = 0;
+       enum _ecore_status_t rc;
+
+       rc = ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_CANCEL_LOAD_REQ, 0,
+                          &resp, &param);
+       if (rc != ECORE_SUCCESS)
+               DP_NOTICE(p_hwfn, false,
+                         "Failed to send cancel load request, rc = %d\n", rc);
+
+       return rc;
+}
+
+#define CONFIG_ECORE_L2_BITMAP_IDX     (0x1 << 0)
+#define CONFIG_ECORE_SRIOV_BITMAP_IDX  (0x1 << 1)
+#define CONFIG_ECORE_ROCE_BITMAP_IDX   (0x1 << 2)
+#define CONFIG_ECORE_IWARP_BITMAP_IDX  (0x1 << 3)
+#define CONFIG_ECORE_FCOE_BITMAP_IDX   (0x1 << 4)
+#define CONFIG_ECORE_ISCSI_BITMAP_IDX  (0x1 << 5)
+#define CONFIG_ECORE_LL2_BITMAP_IDX    (0x1 << 6)
+
+static u32 ecore_get_config_bitmap(void)
+{
+       u32 config_bitmap = 0x0;
+
+#ifdef CONFIG_ECORE_L2
+       config_bitmap |= CONFIG_ECORE_L2_BITMAP_IDX;
+#endif
+#ifdef CONFIG_ECORE_SRIOV
+       config_bitmap |= CONFIG_ECORE_SRIOV_BITMAP_IDX;
+#endif
+#ifdef CONFIG_ECORE_ROCE
+       config_bitmap |= CONFIG_ECORE_ROCE_BITMAP_IDX;
+#endif
+#ifdef CONFIG_ECORE_IWARP
+       config_bitmap |= CONFIG_ECORE_IWARP_BITMAP_IDX;
+#endif
+#ifdef CONFIG_ECORE_FCOE
+       config_bitmap |= CONFIG_ECORE_FCOE_BITMAP_IDX;
+#endif
+#ifdef CONFIG_ECORE_ISCSI
+       config_bitmap |= CONFIG_ECORE_ISCSI_BITMAP_IDX;
+#endif
+#ifdef CONFIG_ECORE_LL2
+       config_bitmap |= CONFIG_ECORE_LL2_BITMAP_IDX;
+#endif
+
+       return config_bitmap;
+}
+
+struct ecore_load_req_in_params {
+       u8 hsi_ver;
+#define ECORE_LOAD_REQ_HSI_VER_DEFAULT 0
+#define ECORE_LOAD_REQ_HSI_VER_1       1
+       u32 drv_ver_0;
+       u32 drv_ver_1;
+       u32 fw_ver;
+       u8 drv_role;
+       u8 timeout_val;
+       u8 force_cmd;
+       bool avoid_eng_reset;
+};
+
+struct ecore_load_req_out_params {
+       u32 load_code;
+       u32 exist_drv_ver_0;
+       u32 exist_drv_ver_1;
+       u32 exist_fw_ver;
+       u8 exist_drv_role;
+       u8 mfw_hsi_ver;
+       bool drv_exists;
+};
+
+static enum _ecore_status_t
+__ecore_mcp_load_req(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+                    struct ecore_load_req_in_params *p_in_params,
+                    struct ecore_load_req_out_params *p_out_params)
+{
+       union drv_union_data union_data_src, union_data_dst;
+       struct ecore_mcp_mb_params mb_params;
+       struct load_req_stc *p_load_req;
+       struct load_rsp_stc *p_load_rsp;
+       u32 hsi_ver;
+       enum _ecore_status_t rc;
+
+       p_load_req = &union_data_src.load_req;
+       OSAL_MEM_ZERO(p_load_req, sizeof(*p_load_req));
+       p_load_req->drv_ver_0 = p_in_params->drv_ver_0;
+       p_load_req->drv_ver_1 = p_in_params->drv_ver_1;
+       p_load_req->fw_ver = p_in_params->fw_ver;
+       ECORE_MFW_SET_FIELD(p_load_req->misc0, LOAD_REQ_ROLE,
+                           p_in_params->drv_role);
+       ECORE_MFW_SET_FIELD(p_load_req->misc0, LOAD_REQ_LOCK_TO,
+                           p_in_params->timeout_val);
+       ECORE_MFW_SET_FIELD(p_load_req->misc0, LOAD_REQ_FORCE,
+                           p_in_params->force_cmd);
+       ECORE_MFW_SET_FIELD(p_load_req->misc0, LOAD_REQ_FLAGS0,
+                           p_in_params->avoid_eng_reset);
+
+       hsi_ver = (p_in_params->hsi_ver == ECORE_LOAD_REQ_HSI_VER_DEFAULT) ?
+                 DRV_ID_MCP_HSI_VER_CURRENT :
+                 (p_in_params->hsi_ver << DRV_ID_MCP_HSI_VER_SHIFT);
+
+       OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
+       mb_params.cmd = DRV_MSG_CODE_LOAD_REQ;
+       mb_params.param = PDA_COMP | hsi_ver | p_hwfn->p_dev->drv_type;
+       mb_params.p_data_src = &union_data_src;
+       mb_params.p_data_dst = &union_data_dst;
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                  "Load Request: param 0x%08x [init_hw %d, drv_type %d, hsi_ver %d, pda 0x%04x]\n",
+                  mb_params.param,
+                  ECORE_MFW_GET_FIELD(mb_params.param, DRV_ID_DRV_INIT_HW),
+                  ECORE_MFW_GET_FIELD(mb_params.param, DRV_ID_DRV_TYPE),
+                  ECORE_MFW_GET_FIELD(mb_params.param, DRV_ID_MCP_HSI_VER),
+                  ECORE_MFW_GET_FIELD(mb_params.param, DRV_ID_PDA_COMP_VER));
+
+       if (p_in_params->hsi_ver != ECORE_LOAD_REQ_HSI_VER_1)
+               DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                          "Load Request: drv_ver 0x%08x_0x%08x, fw_ver 0x%08x, misc0 0x%08x [role %d, timeout %d, force %d, flags0 0x%x]\n",
+                          p_load_req->drv_ver_0, p_load_req->drv_ver_1,
+                          p_load_req->fw_ver, p_load_req->misc0,
+                          ECORE_MFW_GET_FIELD(p_load_req->misc0,
+                                              LOAD_REQ_ROLE),
+                          ECORE_MFW_GET_FIELD(p_load_req->misc0,
+                                              LOAD_REQ_LOCK_TO),
+                          ECORE_MFW_GET_FIELD(p_load_req->misc0,
+                                              LOAD_REQ_FORCE),
+                          ECORE_MFW_GET_FIELD(p_load_req->misc0,
+                                              LOAD_REQ_FLAGS0));
+
+       rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
+       if (rc != ECORE_SUCCESS) {
+               DP_NOTICE(p_hwfn, false,
+                         "Failed to send load request, rc = %d\n", rc);
+               return rc;
+       }
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                  "Load Response: resp 0x%08x\n", mb_params.mcp_resp);
+       p_out_params->load_code = mb_params.mcp_resp;
+
+       if (p_in_params->hsi_ver != ECORE_LOAD_REQ_HSI_VER_1 &&
+           p_out_params->load_code != FW_MSG_CODE_DRV_LOAD_REFUSED_HSI_1) {
+               p_load_rsp = &union_data_dst.load_rsp;
+               DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                          "Load Response: exist_drv_ver 0x%08x_0x%08x, exist_fw_ver 0x%08x, misc0 0x%08x [exist_role %d, mfw_hsi %d, flags0 0x%x]\n",
+                          p_load_rsp->drv_ver_0, p_load_rsp->drv_ver_1,
+                          p_load_rsp->fw_ver, p_load_rsp->misc0,
+                          ECORE_MFW_GET_FIELD(p_load_rsp->misc0,
+                                              LOAD_RSP_ROLE),
+                          ECORE_MFW_GET_FIELD(p_load_rsp->misc0,
+                                              LOAD_RSP_HSI),
+                          ECORE_MFW_GET_FIELD(p_load_rsp->misc0,
+                                              LOAD_RSP_FLAGS0));
+
+               p_out_params->exist_drv_ver_0 = p_load_rsp->drv_ver_0;
+               p_out_params->exist_drv_ver_1 = p_load_rsp->drv_ver_1;
+               p_out_params->exist_fw_ver = p_load_rsp->fw_ver;
+               p_out_params->exist_drv_role =
+                       ECORE_MFW_GET_FIELD(p_load_rsp->misc0, LOAD_RSP_ROLE);
+               p_out_params->mfw_hsi_ver =
+                       ECORE_MFW_GET_FIELD(p_load_rsp->misc0, LOAD_RSP_HSI);
+               p_out_params->drv_exists =
+                       ECORE_MFW_GET_FIELD(p_load_rsp->misc0,
+                                           LOAD_RSP_FLAGS0) &
+                       LOAD_RSP_FLAGS0_DRV_EXISTS;
+       }
+
+       return ECORE_SUCCESS;
+}
+
+static enum _ecore_status_t eocre_get_mfw_drv_role(struct ecore_hwfn *p_hwfn,
+                                                  enum ecore_drv_role drv_role,
+                                                  u8 *p_mfw_drv_role)
+{
+       switch (drv_role) {
+       case ECORE_DRV_ROLE_OS:
+               *p_mfw_drv_role = DRV_ROLE_OS;
+               break;
+       case ECORE_DRV_ROLE_KDUMP:
+               *p_mfw_drv_role = DRV_ROLE_KDUMP;
+               break;
+       default:
+               DP_ERR(p_hwfn, "Unexpected driver role %d\n", drv_role);
+               return ECORE_INVAL;
+       }
+
+       return ECORE_SUCCESS;
+}
+
+enum ecore_load_req_force {
+       ECORE_LOAD_REQ_FORCE_NONE,
+       ECORE_LOAD_REQ_FORCE_PF,
+       ECORE_LOAD_REQ_FORCE_ALL,
+};
+
+static enum _ecore_status_t
+ecore_get_mfw_force_cmd(struct ecore_hwfn *p_hwfn,
+                       enum ecore_load_req_force force_cmd,
+                       u8 *p_mfw_force_cmd)
+{
+       switch (force_cmd) {
+       case ECORE_LOAD_REQ_FORCE_NONE:
+               *p_mfw_force_cmd = LOAD_REQ_FORCE_NONE;
+               break;
+       case ECORE_LOAD_REQ_FORCE_PF:
+               *p_mfw_force_cmd = LOAD_REQ_FORCE_PF;
+               break;
+       case ECORE_LOAD_REQ_FORCE_ALL:
+               *p_mfw_force_cmd = LOAD_REQ_FORCE_ALL;
+               break;
+       default:
+               DP_ERR(p_hwfn, "Unexpected force value %d\n", force_cmd);
+               return ECORE_INVAL;
+       }
+
+       return ECORE_SUCCESS;
+}
+
 enum _ecore_status_t ecore_mcp_load_req(struct ecore_hwfn *p_hwfn,
                                        struct ecore_ptt *p_ptt,
-                                       u32 *p_load_code)
+                                       struct ecore_load_req_params *p_params)
 {
-       struct ecore_dev *p_dev = p_hwfn->p_dev;
-       struct ecore_mcp_mb_params mb_params;
-       union drv_union_data union_data;
-       u32 param;
+       struct ecore_load_req_out_params out_params;
+       struct ecore_load_req_in_params in_params;
+       u8 mfw_drv_role, mfw_force_cmd;
        enum _ecore_status_t rc;
 
 #ifndef ASIC_ONLY
        if (CHIP_REV_IS_EMUL(p_hwfn->p_dev)) {
-               ecore_mcp_mf_workaround(p_hwfn, p_load_code);
+               ecore_mcp_mf_workaround(p_hwfn, &p_params->load_code);
                return ECORE_SUCCESS;
        }
 #endif
 
-       OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
-       mb_params.cmd = DRV_MSG_CODE_LOAD_REQ;
-       mb_params.param = PDA_COMP | DRV_ID_MCP_HSI_VER_CURRENT |
-                         p_dev->drv_type;
-       OSAL_MEMCPY(&union_data.ver_str, p_dev->ver_str, MCP_DRV_VER_STR_SIZE);
-       mb_params.p_data_src = &union_data;
-       rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
+       OSAL_MEM_ZERO(&in_params, sizeof(in_params));
+       in_params.hsi_ver = ECORE_LOAD_REQ_HSI_VER_DEFAULT;
+       in_params.drv_ver_0 = ECORE_VERSION;
+       in_params.drv_ver_1 = ecore_get_config_bitmap();
+       in_params.fw_ver = STORM_FW_VERSION;
+       rc = eocre_get_mfw_drv_role(p_hwfn, p_params->drv_role, &mfw_drv_role);
+       if (rc != ECORE_SUCCESS)
+               return rc;
 
-       /* if mcp fails to respond we must abort */
-       if (rc != ECORE_SUCCESS) {
-               DP_ERR(p_hwfn, "MCP response failure, aborting\n");
+       in_params.drv_role = mfw_drv_role;
+       in_params.timeout_val = p_params->timeout_val;
+       rc = ecore_get_mfw_force_cmd(p_hwfn, ECORE_LOAD_REQ_FORCE_NONE,
+                                    &mfw_force_cmd);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       in_params.force_cmd = mfw_force_cmd;
+       in_params.avoid_eng_reset = p_params->avoid_eng_reset;
+
+       OSAL_MEM_ZERO(&out_params, sizeof(out_params));
+       rc = __ecore_mcp_load_req(p_hwfn, p_ptt, &in_params, &out_params);
+       if (rc != ECORE_SUCCESS)
                return rc;
+
+       /* First handle cases where another load request should/might be sent:
+        * - MFW expects the old interface [HSI version = 1]
+        * - MFW responds that a force load request is required
+        */
+       if (out_params.load_code == FW_MSG_CODE_DRV_LOAD_REFUSED_HSI_1) {
+               DP_INFO(p_hwfn,
+                       "MFW refused a load request due to HSI > 1. Resending with HSI = 1.\n");
+
+               /* The previous load request set the mailbox blocking */
+               p_hwfn->mcp_info->block_mb_sending = false;
+
+               in_params.hsi_ver = ECORE_LOAD_REQ_HSI_VER_1;
+               OSAL_MEM_ZERO(&out_params, sizeof(out_params));
+               rc = __ecore_mcp_load_req(p_hwfn, p_ptt, &in_params,
+                                         &out_params);
+               if (rc != ECORE_SUCCESS)
+                       return rc;
+       } else if (out_params.load_code ==
+                  FW_MSG_CODE_DRV_LOAD_REFUSED_REQUIRES_FORCE) {
+               /* The previous load request set the mailbox blocking */
+               p_hwfn->mcp_info->block_mb_sending = false;
+
+               if (ecore_mcp_can_force_load(in_params.drv_role,
+                                            out_params.exist_drv_role)) {
+                       DP_INFO(p_hwfn,
+                               "A force load is required [existing: role %d, fw_ver 0x%08x, drv_ver 0x%08x_0x%08x]. Sending a force load request.\n",
+                               out_params.exist_drv_role,
+                               out_params.exist_fw_ver,
+                               out_params.exist_drv_ver_0,
+                               out_params.exist_drv_ver_1);
+
+                       rc = ecore_get_mfw_force_cmd(p_hwfn,
+                                                    ECORE_LOAD_REQ_FORCE_ALL,
+                                                    &mfw_force_cmd);
+                       if (rc != ECORE_SUCCESS)
+                               return rc;
+
+                       in_params.force_cmd = mfw_force_cmd;
+                       OSAL_MEM_ZERO(&out_params, sizeof(out_params));
+                       rc = __ecore_mcp_load_req(p_hwfn, p_ptt, &in_params,
+                                                 &out_params);
+                       if (rc != ECORE_SUCCESS)
+                               return rc;
+               } else {
+                       DP_NOTICE(p_hwfn, false,
+                                 "A force load is required [existing: role %d, fw_ver 0x%08x, drv_ver 0x%08x_0x%08x]. Avoiding to prevent disruption of active PFs.\n",
+                                 out_params.exist_drv_role,
+                                 out_params.exist_fw_ver,
+                                 out_params.exist_drv_ver_0,
+                                 out_params.exist_drv_ver_1);
+
+                       ecore_mcp_cancel_load_req(p_hwfn, p_ptt);
+                       return ECORE_BUSY;
+               }
        }
 
-       /* If MFW refused (e.g. other port is in diagnostic mode) we
-        * must abort. This can happen in the following cases:
-        * - Other port is in diagnostic mode
-        * - Previously loaded function on the engine is not compliant with
-        *   the requester.
-        * - MFW cannot cope with the requester's DRV_MFW_HSI_VERSION.
-        *      -
+       /* Now handle the other types of responses.
+        * The "REFUSED_HSI_1" and "REFUSED_REQUIRES_FORCE" responses are not
+        * expected here after the additional revised load requests were sent.
         */
-       if (!(*p_load_code) ||
-           ((*p_load_code) == FW_MSG_CODE_DRV_LOAD_REFUSED_HSI) ||
-           ((*p_load_code) == FW_MSG_CODE_DRV_LOAD_REFUSED_PDA) ||
-           ((*p_load_code) == FW_MSG_CODE_DRV_LOAD_REFUSED_DIAG)) {
-               DP_ERR(p_hwfn, "MCP refused load request, aborting\n");
+       switch (out_params.load_code) {
+       case FW_MSG_CODE_DRV_LOAD_ENGINE:
+       case FW_MSG_CODE_DRV_LOAD_PORT:
+       case FW_MSG_CODE_DRV_LOAD_FUNCTION:
+               if (out_params.mfw_hsi_ver != ECORE_LOAD_REQ_HSI_VER_1 &&
+                   out_params.drv_exists) {
+                       /* The role and fw/driver version match, but the PF is
+                        * already loaded and has not been unloaded gracefully.
+                        * This is unexpected since a quasi-FLR request was
+                        * previously sent as part of ecore_hw_prepare().
+                        */
+                       DP_NOTICE(p_hwfn, false,
+                                 "PF is already loaded - shouldn't have got here since a quasi-FLR request was previously sent!\n");
+                       return ECORE_INVAL;
+               }
+               break;
+       case FW_MSG_CODE_DRV_LOAD_REFUSED_PDA:
+       case FW_MSG_CODE_DRV_LOAD_REFUSED_DIAG:
+       case FW_MSG_CODE_DRV_LOAD_REFUSED_HSI:
+       case FW_MSG_CODE_DRV_LOAD_REFUSED_REJECT:
+               DP_NOTICE(p_hwfn, false,
+                         "MFW refused a load request [resp 0x%08x]. Aborting.\n",
+                         out_params.load_code);
                return ECORE_BUSY;
+       default:
+               DP_NOTICE(p_hwfn, false,
+                         "Unexpected response to load request [resp 0x%08x]. Aborting.\n",
+                         out_params.load_code);
+               break;
        }
 
+       p_params->load_code = out_params.load_code;
+
        return ECORE_SUCCESS;
 }
 
@@ -563,7 +925,6 @@ enum _ecore_status_t ecore_mcp_ack_vf_flr(struct ecore_hwfn *p_hwfn,
                                     MCP_PF_ID(p_hwfn));
        struct ecore_mcp_mb_params mb_params;
        union drv_union_data union_data;
-       u32 resp, param;
        enum _ecore_status_t rc;
        int i;
 
@@ -576,9 +937,10 @@ enum _ecore_status_t ecore_mcp_ack_vf_flr(struct ecore_hwfn *p_hwfn,
        mb_params.cmd = DRV_MSG_CODE_VF_DISABLED_DONE;
        OSAL_MEMCPY(&union_data.ack_vf_disabled, vfs_to_ack, VF_MAX_STATIC / 8);
        mb_params.p_data_src = &union_data;
-       rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
+       rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt,
+                                    &mb_params);
        if (rc != ECORE_SUCCESS) {
-               DP_NOTICE(p_hwfn, (ECORE_MSG_SP | ECORE_MSG_IOV),
+               DP_NOTICE(p_hwfn, false,
                          "Failed to pass ACK for VF flr to MFW\n");
                return ECORE_TIMEOUT;
        }
@@ -610,18 +972,20 @@ static void ecore_mcp_handle_transceiver_change(struct ecore_hwfn *p_hwfn,
                                            OFFSETOF(struct public_port,
                                                     transceiver_data)));
 
-       transceiver_state = GET_FIELD(transceiver_state, PMM_TRANSCEIVER_STATE);
+       transceiver_state = GET_FIELD(transceiver_state, ETH_TRANSCEIVER_STATE);
 
-       if (transceiver_state == PMM_TRANSCEIVER_STATE_PRESENT)
+       if (transceiver_state == ETH_TRANSCEIVER_STATE_PRESENT)
                DP_NOTICE(p_hwfn, false, "Transceiver is present.\n");
        else
                DP_NOTICE(p_hwfn, false, "Transceiver is unplugged.\n");
 }
 
 static void ecore_mcp_handle_link_change(struct ecore_hwfn *p_hwfn,
-                                        struct ecore_ptt *p_ptt, bool b_reset)
+                                        struct ecore_ptt *p_ptt,
+                                        bool b_reset)
 {
        struct ecore_mcp_link_state *p_link;
+       u8 max_bw, min_bw;
        u32 status = 0;
 
        p_link = &p_hwfn->mcp_info->link_output;
@@ -685,23 +1049,18 @@ static void ecore_mcp_handle_link_change(struct ecore_hwfn *p_hwfn,
        else
                p_link->line_speed = 0;
 
-       /* Correct speed according to bandwidth allocation */
-       if (p_hwfn->mcp_info->func_info.bandwidth_max && p_link->speed) {
-               u8 max_bw = p_hwfn->mcp_info->func_info.bandwidth_max;
+       max_bw = p_hwfn->mcp_info->func_info.bandwidth_max;
+       min_bw = p_hwfn->mcp_info->func_info.bandwidth_min;
 
+       /* Max bandwidth configuration */
        __ecore_configure_pf_max_bandwidth(p_hwfn, p_ptt,
                                           p_link, max_bw);
-       }
-
-       if (p_hwfn->mcp_info->func_info.bandwidth_min && p_link->speed) {
-               u8 min_bw = p_hwfn->mcp_info->func_info.bandwidth_min;
 
+       /* Mintz bandwidth configuration */
        __ecore_configure_pf_min_bandwidth(p_hwfn, p_ptt,
                                           p_link, min_bw);
-
        ecore_configure_vp_wfq_on_link_change(p_hwfn->p_dev,
                                              p_link->min_pf_rate);
-       }
 
        p_link->an = !!(status & LINK_STATUS_AUTO_NEGOTIATE_ENABLED);
        p_link->an_complete = !!(status & LINK_STATUS_AUTO_NEGOTIATE_COMPLETE);
@@ -755,9 +1114,6 @@ static void ecore_mcp_handle_link_change(struct ecore_hwfn *p_hwfn,
 
        p_link->sfp_tx_fault = !!(status & LINK_STATUS_SFP_TX_FAULT);
 
-       if (p_link->link_up)
-               ecore_dcbx_eagle_workaround(p_hwfn, p_ptt, p_link->pfc_enabled);
-
        OSAL_LINK_UPDATE(p_hwfn);
 }
 
@@ -767,9 +1123,9 @@ enum _ecore_status_t ecore_mcp_set_link(struct ecore_hwfn *p_hwfn,
        struct ecore_mcp_link_params *params = &p_hwfn->mcp_info->link_input;
        struct ecore_mcp_mb_params mb_params;
        union drv_union_data union_data;
-       struct pmm_phy_cfg *p_phy_cfg;
-       u32 param = 0, reply = 0, cmd;
+       struct eth_phy_cfg *p_phy_cfg;
        enum _ecore_status_t rc = ECORE_SUCCESS;
+       u32 cmd;
 
 #ifndef ASIC_ONLY
        if (CHIP_REV_IS_EMUL(p_hwfn->p_dev))
@@ -782,31 +1138,19 @@ enum _ecore_status_t ecore_mcp_set_link(struct ecore_hwfn *p_hwfn,
        cmd = b_up ? DRV_MSG_CODE_INIT_PHY : DRV_MSG_CODE_LINK_RESET;
        if (!params->speed.autoneg)
                p_phy_cfg->speed = params->speed.forced_speed;
-       p_phy_cfg->pause |= (params->pause.autoneg) ? PMM_PAUSE_AUTONEG : 0;
-       p_phy_cfg->pause |= (params->pause.forced_rx) ? PMM_PAUSE_RX : 0;
-       p_phy_cfg->pause |= (params->pause.forced_tx) ? PMM_PAUSE_TX : 0;
+       p_phy_cfg->pause |= (params->pause.autoneg) ? ETH_PAUSE_AUTONEG : 0;
+       p_phy_cfg->pause |= (params->pause.forced_rx) ? ETH_PAUSE_RX : 0;
+       p_phy_cfg->pause |= (params->pause.forced_tx) ? ETH_PAUSE_TX : 0;
        p_phy_cfg->adv_speed = params->speed.advertised_speeds;
        p_phy_cfg->loopback_mode = params->loopback_mode;
-
-#ifndef ASIC_ONLY
-       if (CHIP_REV_IS_FPGA(p_hwfn->p_dev)) {
-               DP_INFO(p_hwfn,
-                       "Link on FPGA - Ask for loopback mode '5' at 10G\n");
-               p_phy_cfg->loopback_mode = 5;
-               p_phy_cfg->speed = 10000;
-       }
-#endif
-
        p_hwfn->b_drv_link_init = b_up;
 
        if (b_up)
                DP_VERBOSE(p_hwfn, ECORE_MSG_LINK,
                           "Configuring Link: Speed 0x%08x, Pause 0x%08x,"
-                          " adv_speed 0x%08x, loopback 0x%08x,"
-                          " features 0x%08x\n",
+                          " adv_speed 0x%08x, loopback 0x%08x\n",
                           p_phy_cfg->speed, p_phy_cfg->pause,
-                          p_phy_cfg->adv_speed, p_phy_cfg->loopback_mode,
-                          p_phy_cfg->feature_config_flags);
+                          p_phy_cfg->adv_speed, p_phy_cfg->loopback_mode);
        else
                DP_VERBOSE(p_hwfn, ECORE_MSG_LINK, "Resetting link\n");
 
@@ -891,8 +1235,9 @@ static void ecore_mcp_send_protocol_stats(struct ecore_hwfn *p_hwfn,
        enum ecore_mcp_protocol_type stats_type;
        union ecore_mcp_protocol_stats stats;
        struct ecore_mcp_mb_params mb_params;
-       u32 hsi_param, param = 0, reply = 0;
        union drv_union_data union_data;
+       u32 hsi_param;
+       enum _ecore_status_t rc;
 
        switch (type) {
        case MFW_DRV_MSG_GET_LAN_STATS:
@@ -900,7 +1245,7 @@ static void ecore_mcp_send_protocol_stats(struct ecore_hwfn *p_hwfn,
                hsi_param = DRV_MSG_CODE_STATS_TYPE_LAN;
                break;
        default:
-               DP_NOTICE(p_hwfn, false, "Invalid protocol type %d\n", type);
+               DP_INFO(p_hwfn, "Invalid protocol type %d\n", type);
                return;
        }
 
@@ -911,32 +1256,13 @@ static void ecore_mcp_send_protocol_stats(struct ecore_hwfn *p_hwfn,
        mb_params.param = hsi_param;
        OSAL_MEMCPY(&union_data, &stats, sizeof(stats));
        mb_params.p_data_src = &union_data;
-       ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
-}
-
-static u32 ecore_mcp_get_shmem_func(struct ecore_hwfn *p_hwfn,
-                                   struct ecore_ptt *p_ptt,
-                                   struct public_func *p_data, int pfid)
-{
-       u32 addr = SECTION_OFFSIZE_ADDR(p_hwfn->mcp_info->public_base,
-                                       PUBLIC_FUNC);
-       u32 mfw_path_offsize = ecore_rd(p_hwfn, p_ptt, addr);
-       u32 func_addr = SECTION_ADDR(mfw_path_offsize, pfid);
-       u32 i, size;
-
-       OSAL_MEM_ZERO(p_data, sizeof(*p_data));
-
-       size = OSAL_MIN_T(u32, sizeof(*p_data), SECTION_SIZE(mfw_path_offsize));
-       for (i = 0; i < size / sizeof(u32); i++)
-               ((u32 *)p_data)[i] = ecore_rd(p_hwfn, p_ptt,
-                                             func_addr + (i << 2));
-
-       return size;
+       rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
+       if (rc != ECORE_SUCCESS)
+               DP_ERR(p_hwfn, "Failed to send protocol stats, rc = %d\n", rc);
 }
 
-static void
-ecore_read_pf_bandwidth(struct ecore_hwfn *p_hwfn,
-                       struct public_func *p_shmem_info)
+static void ecore_read_pf_bandwidth(struct ecore_hwfn *p_hwfn,
+                                   struct public_func *p_shmem_info)
 {
        struct ecore_mcp_function_info *p_info;
 
@@ -969,6 +1295,28 @@ ecore_read_pf_bandwidth(struct ecore_hwfn *p_hwfn,
        }
 }
 
+static u32 ecore_mcp_get_shmem_func(struct ecore_hwfn *p_hwfn,
+                                   struct ecore_ptt *p_ptt,
+                                   struct public_func *p_data,
+                                   int pfid)
+{
+       u32 addr = SECTION_OFFSIZE_ADDR(p_hwfn->mcp_info->public_base,
+                                       PUBLIC_FUNC);
+       u32 mfw_path_offsize = ecore_rd(p_hwfn, p_ptt, addr);
+       u32 func_addr = SECTION_ADDR(mfw_path_offsize, pfid);
+       u32 i, size;
+
+       OSAL_MEM_ZERO(p_data, sizeof(*p_data));
+
+       size = OSAL_MIN_T(u32, sizeof(*p_data),
+                         SECTION_SIZE(mfw_path_offsize));
+       for (i = 0; i < size / sizeof(u32); i++)
+               ((u32 *)p_data)[i] = ecore_rd(p_hwfn, p_ptt,
+                                             func_addr + (i << 2));
+
+       return size;
+}
+
 static void
 ecore_mcp_update_bw(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt)
 {
@@ -1005,36 +1353,201 @@ static void ecore_mcp_handle_fan_failure(struct ecore_hwfn *p_hwfn,
        ecore_hw_err_notify(p_hwfn, ECORE_HW_ERR_FAN_FAIL);
 }
 
-enum _ecore_status_t ecore_mcp_handle_events(struct ecore_hwfn *p_hwfn,
-                                            struct ecore_ptt *p_ptt)
+static enum _ecore_status_t
+ecore_mcp_mdump_cmd(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+                   u32 mdump_cmd, union drv_union_data *p_data_src,
+                   union drv_union_data *p_data_dst, u32 *p_mcp_resp)
 {
-       struct ecore_mcp_info *info = p_hwfn->mcp_info;
-       enum _ecore_status_t rc = ECORE_SUCCESS;
-       bool found = false;
-       u16 i;
+       struct ecore_mcp_mb_params mb_params;
+       enum _ecore_status_t rc;
 
-       DP_VERBOSE(p_hwfn, ECORE_MSG_SP, "Received message from MFW\n");
+       OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
+       mb_params.cmd = DRV_MSG_CODE_MDUMP_CMD;
+       mb_params.param = mdump_cmd;
+       mb_params.p_data_src = p_data_src;
+       mb_params.p_data_dst = p_data_dst;
+       rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
+       if (rc != ECORE_SUCCESS)
+               return rc;
 
-       /* Read Messages from MFW */
-       ecore_mcp_read_mb(p_hwfn, p_ptt);
+       *p_mcp_resp = mb_params.mcp_resp;
+       if (*p_mcp_resp == FW_MSG_CODE_MDUMP_INVALID_CMD) {
+               DP_NOTICE(p_hwfn, false,
+                         "MFW claims that the mdump command is illegal [mdump_cmd 0x%x]\n",
+                         mdump_cmd);
+               rc = ECORE_INVAL;
+       }
 
-       /* Compare current messages to old ones */
-       for (i = 0; i < info->mfw_mb_length; i++) {
-               if (info->mfw_mb_cur[i] == info->mfw_mb_shadow[i])
-                       continue;
+       return rc;
+}
 
-               found = true;
+static enum _ecore_status_t ecore_mcp_mdump_ack(struct ecore_hwfn *p_hwfn,
+                                               struct ecore_ptt *p_ptt)
+{
+       u32 mcp_resp;
 
-               DP_VERBOSE(p_hwfn, ECORE_MSG_LINK,
-                          "Msg [%d] - old CMD 0x%02x, new CMD 0x%02x\n",
-                          i, info->mfw_mb_shadow[i], info->mfw_mb_cur[i]);
+       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_ACK,
+                                  OSAL_NULL, OSAL_NULL, &mcp_resp);
+}
 
-               switch (i) {
-               case MFW_DRV_MSG_LINK_CHANGE:
-                       ecore_mcp_handle_link_change(p_hwfn, p_ptt, false);
-                       break;
-               case MFW_DRV_MSG_VF_DISABLED:
-                       ecore_mcp_handle_vf_flr(p_hwfn, p_ptt);
+enum _ecore_status_t ecore_mcp_mdump_set_values(struct ecore_hwfn *p_hwfn,
+                                               struct ecore_ptt *p_ptt,
+                                               u32 epoch)
+{
+       union drv_union_data union_data;
+       u32 mcp_resp;
+
+       OSAL_MEMCPY(&union_data.raw_data, &epoch, sizeof(epoch));
+
+       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_SET_VALUES,
+                                  &union_data, OSAL_NULL, &mcp_resp);
+}
+
+enum _ecore_status_t ecore_mcp_mdump_trigger(struct ecore_hwfn *p_hwfn,
+                                            struct ecore_ptt *p_ptt)
+{
+       u32 mcp_resp;
+
+       p_hwfn->p_dev->mdump_en = true;
+
+       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_TRIGGER,
+                                  OSAL_NULL, OSAL_NULL, &mcp_resp);
+}
+
+static enum _ecore_status_t
+ecore_mcp_mdump_get_config(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+                          struct mdump_config_stc *p_mdump_config)
+{
+       union drv_union_data union_data;
+       u32 mcp_resp;
+       enum _ecore_status_t rc;
+
+       rc = ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_GET_CONFIG,
+                                OSAL_NULL, &union_data, &mcp_resp);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       if (mcp_resp == FW_MSG_CODE_UNSUPPORTED)
+               return ECORE_NOTIMPL;
+
+       if (mcp_resp != FW_MSG_CODE_OK) {
+               DP_NOTICE(p_hwfn, false,
+                         "Failed to get the mdump configuration and logs info [mcp_resp 0x%x]\n",
+                         mcp_resp);
+               rc = ECORE_UNKNOWN_ERROR;
+       }
+
+       OSAL_MEMCPY(p_mdump_config, &union_data.mdump_config,
+                   sizeof(*p_mdump_config));
+
+       return rc;
+}
+
+enum _ecore_status_t
+ecore_mcp_mdump_get_info(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+                        struct ecore_mdump_info *p_mdump_info)
+{
+       u32 addr, global_offsize, global_addr;
+       struct mdump_config_stc mdump_config;
+       enum _ecore_status_t rc;
+
+       OSAL_MEMSET(p_mdump_info, 0, sizeof(*p_mdump_info));
+
+       addr = SECTION_OFFSIZE_ADDR(p_hwfn->mcp_info->public_base,
+                                   PUBLIC_GLOBAL);
+       global_offsize = ecore_rd(p_hwfn, p_ptt, addr);
+       global_addr = SECTION_ADDR(global_offsize, 0);
+       p_mdump_info->reason = ecore_rd(p_hwfn, p_ptt,
+                                       global_addr +
+                                       OFFSETOF(struct public_global,
+                                                mdump_reason));
+
+       if (p_mdump_info->reason) {
+               rc = ecore_mcp_mdump_get_config(p_hwfn, p_ptt, &mdump_config);
+               if (rc != ECORE_SUCCESS)
+                       return rc;
+
+               p_mdump_info->version = mdump_config.version;
+               p_mdump_info->config = mdump_config.config;
+               p_mdump_info->epoch = mdump_config.epoc;
+               p_mdump_info->num_of_logs = mdump_config.num_of_logs;
+               p_mdump_info->valid_logs = mdump_config.valid_logs;
+
+               DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                          "MFW mdump info: reason %d, version 0x%x, config 0x%x, epoch 0x%x, num_of_logs 0x%x, valid_logs 0x%x\n",
+                          p_mdump_info->reason, p_mdump_info->version,
+                          p_mdump_info->config, p_mdump_info->epoch,
+                          p_mdump_info->num_of_logs, p_mdump_info->valid_logs);
+       } else {
+               DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                          "MFW mdump info: reason %d\n", p_mdump_info->reason);
+       }
+
+       return ECORE_SUCCESS;
+}
+
+enum _ecore_status_t ecore_mcp_mdump_clear_logs(struct ecore_hwfn *p_hwfn,
+                                               struct ecore_ptt *p_ptt)
+{
+       u32 mcp_resp;
+
+       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_CLEAR_LOGS,
+                                  OSAL_NULL, OSAL_NULL, &mcp_resp);
+}
+
+static void ecore_mcp_handle_critical_error(struct ecore_hwfn *p_hwfn,
+                                           struct ecore_ptt *p_ptt)
+{
+       /* In CMT mode - no need for more than a single acknowledgment to the
+        * MFW, and no more than a single notification to the upper driver.
+        */
+       if (p_hwfn != ECORE_LEADING_HWFN(p_hwfn->p_dev))
+               return;
+
+       DP_NOTICE(p_hwfn, false,
+                 "Received a critical error notification from the MFW!\n");
+
+       if (p_hwfn->p_dev->mdump_en) {
+               DP_NOTICE(p_hwfn, false,
+                         "Not acknowledging the notification to allow the MFW crash dump\n");
+               p_hwfn->p_dev->mdump_en = false;
+               return;
+       }
+
+       ecore_mcp_mdump_ack(p_hwfn, p_ptt);
+       ecore_hw_err_notify(p_hwfn, ECORE_HW_ERR_HW_ATTN);
+}
+
+enum _ecore_status_t ecore_mcp_handle_events(struct ecore_hwfn *p_hwfn,
+                                            struct ecore_ptt *p_ptt)
+{
+       struct ecore_mcp_info *info = p_hwfn->mcp_info;
+       enum _ecore_status_t rc = ECORE_SUCCESS;
+       bool found = false;
+       u16 i;
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_SP, "Received message from MFW\n");
+
+       /* Read Messages from MFW */
+       ecore_mcp_read_mb(p_hwfn, p_ptt);
+
+       /* Compare current messages to old ones */
+       for (i = 0; i < info->mfw_mb_length; i++) {
+               if (info->mfw_mb_cur[i] == info->mfw_mb_shadow[i])
+                       continue;
+
+               found = true;
+
+               DP_VERBOSE(p_hwfn, ECORE_MSG_LINK,
+                          "Msg [%d] - old CMD 0x%02x, new CMD 0x%02x\n",
+                          i, info->mfw_mb_shadow[i], info->mfw_mb_cur[i]);
+
+               switch (i) {
+               case MFW_DRV_MSG_LINK_CHANGE:
+                       ecore_mcp_handle_link_change(p_hwfn, p_ptt, false);
+                       break;
+               case MFW_DRV_MSG_VF_DISABLED:
+                       ecore_mcp_handle_vf_flr(p_hwfn, p_ptt);
                        break;
                case MFW_DRV_MSG_LLDP_DATA_UPDATED:
                        ecore_dcbx_mib_update_event(p_hwfn, p_ptt,
@@ -1048,6 +1561,9 @@ enum _ecore_status_t ecore_mcp_handle_events(struct ecore_hwfn *p_hwfn,
                        ecore_dcbx_mib_update_event(p_hwfn, p_ptt,
                                                    ECORE_DCBX_OPERATIONAL_MIB);
                        break;
+               case MFW_DRV_MSG_TRANSCEIVER_STATE_CHANGE:
+                       ecore_mcp_handle_transceiver_change(p_hwfn, p_ptt);
+                       break;
                case MFW_DRV_MSG_ERROR_RECOVERY:
                        ecore_mcp_handle_process_kill(p_hwfn, p_ptt);
                        break;
@@ -1060,16 +1576,14 @@ enum _ecore_status_t ecore_mcp_handle_events(struct ecore_hwfn *p_hwfn,
                case MFW_DRV_MSG_BW_UPDATE:
                        ecore_mcp_update_bw(p_hwfn, p_ptt);
                        break;
-               case MFW_DRV_MSG_TRANSCEIVER_STATE_CHANGE:
-                       ecore_mcp_handle_transceiver_change(p_hwfn, p_ptt);
-                       break;
                case MFW_DRV_MSG_FAILURE_DETECTED:
                        ecore_mcp_handle_fan_failure(p_hwfn, p_ptt);
                        break;
+               case MFW_DRV_MSG_CRITICAL_ERROR_OCCURRED:
+                       ecore_mcp_handle_critical_error(p_hwfn, p_ptt);
+                       break;
                default:
-                       /* @DPDK */
-                       DP_NOTICE(p_hwfn, false,
-                                 "Unimplemented MFW message %d\n", i);
+                       DP_INFO(p_hwfn, "Unimplemented MFW message %d\n", i);
                        rc = ECORE_INVAL;
                }
        }
@@ -1098,34 +1612,33 @@ enum _ecore_status_t ecore_mcp_handle_events(struct ecore_hwfn *p_hwfn,
        return rc;
 }
 
-enum _ecore_status_t ecore_mcp_get_mfw_ver(struct ecore_dev *p_dev,
+enum _ecore_status_t ecore_mcp_get_mfw_ver(struct ecore_hwfn *p_hwfn,
                                           struct ecore_ptt *p_ptt,
                                           u32 *p_mfw_ver,
                                           u32 *p_running_bundle_id)
 {
-       struct ecore_hwfn *p_hwfn = ECORE_LEADING_HWFN(p_dev);
        u32 global_offsize;
 
 #ifndef ASIC_ONLY
-       if (CHIP_REV_IS_EMUL(p_dev)) {
-               DP_NOTICE(p_dev, false, "Emulation - can't get MFW version\n");
+       if (CHIP_REV_IS_EMUL(p_hwfn->p_dev)) {
+               DP_NOTICE(p_hwfn, false, "Emulation - can't get MFW version\n");
                return ECORE_SUCCESS;
        }
 #endif
 
-       if (IS_VF(p_dev)) {
+       if (IS_VF(p_hwfn->p_dev)) {
                if (p_hwfn->vf_iov_info) {
                        struct pfvf_acquire_resp_tlv *p_resp;
 
                        p_resp = &p_hwfn->vf_iov_info->acquire_resp;
                        *p_mfw_ver = p_resp->pfdev_info.mfw_ver;
                        return ECORE_SUCCESS;
-               }
-
-               DP_VERBOSE(p_dev, ECORE_MSG_IOV,
-                          "VF requested MFW vers prior to ACQUIRE\n");
+               } else {
+                       DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
+                                  "VF requested MFW version prior to ACQUIRE\n");
                        return ECORE_INVAL;
                }
+       }
 
        global_offsize = ecore_rd(p_hwfn, p_ptt,
                                  SECTION_OFFSIZE_ADDR(p_hwfn->mcp_info->
@@ -1176,16 +1689,47 @@ enum _ecore_status_t ecore_mcp_get_media_type(struct ecore_dev *p_dev,
        return ECORE_SUCCESS;
 }
 
+/* @DPDK */
+/* Old MFW has a global configuration for all PFs regarding RDMA support */
+static void
+ecore_mcp_get_shmem_proto_legacy(struct ecore_hwfn *p_hwfn,
+                                enum ecore_pci_personality *p_proto)
+{
+       *p_proto = ECORE_PCI_ETH;
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_IFUP,
+                  "According to Legacy capabilities, L2 personality is %08x\n",
+                  (u32)*p_proto);
+}
+
+/* @DPDK */
+static enum _ecore_status_t
+ecore_mcp_get_shmem_proto_mfw(struct ecore_hwfn *p_hwfn,
+                             struct ecore_ptt *p_ptt,
+                             enum ecore_pci_personality *p_proto)
+{
+       u32 resp = 0, param = 0;
+       enum _ecore_status_t rc;
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_IFUP,
+                  "According to capabilities, L2 personality is %08x [resp %08x param %08x]\n",
+                  (u32)*p_proto, resp, param);
+       return ECORE_SUCCESS;
+}
+
 static enum _ecore_status_t
 ecore_mcp_get_shmem_proto(struct ecore_hwfn *p_hwfn,
                          struct public_func *p_info,
+                         struct ecore_ptt *p_ptt,
                          enum ecore_pci_personality *p_proto)
 {
        enum _ecore_status_t rc = ECORE_SUCCESS;
 
        switch (p_info->config & FUNC_MF_CFG_PROTOCOL_MASK) {
        case FUNC_MF_CFG_PROTOCOL_ETHERNET:
-               *p_proto = ECORE_PCI_ETH;
+               if (ecore_mcp_get_shmem_proto_mfw(p_hwfn, p_ptt, p_proto) !=
+                   ECORE_SUCCESS)
+                       ecore_mcp_get_shmem_proto_legacy(p_hwfn, p_proto);
                break;
        default:
                rc = ECORE_INVAL;
@@ -1206,7 +1750,8 @@ enum _ecore_status_t ecore_mcp_fill_shmem_func_info(struct ecore_hwfn *p_hwfn,
        info->pause_on_host = (shmem_info.config &
                               FUNC_MF_CFG_PAUSE_ON_HOST_RING) ? 1 : 0;
 
-       if (ecore_mcp_get_shmem_proto(p_hwfn, &shmem_info, &info->protocol)) {
+       if (ecore_mcp_get_shmem_proto(p_hwfn, &shmem_info, p_ptt,
+                                     &info->protocol)) {
                DP_ERR(p_hwfn, "Unknown personality %08x\n",
                       (u32)(shmem_info.config & FUNC_MF_CFG_PROTOCOL_MASK));
                return ECORE_INVAL;
@@ -1226,18 +1771,32 @@ enum _ecore_status_t ecore_mcp_fill_shmem_func_info(struct ecore_hwfn *p_hwfn,
                DP_NOTICE(p_hwfn, false, "MAC is 0 in shmem\n");
        }
 
+       /* TODO - are these calculations true for BE machine? */
+       info->wwn_port = (u64)shmem_info.fcoe_wwn_port_name_upper |
+                        (((u64)shmem_info.fcoe_wwn_port_name_lower) << 32);
+       info->wwn_node = (u64)shmem_info.fcoe_wwn_node_name_upper |
+                        (((u64)shmem_info.fcoe_wwn_node_name_lower) << 32);
+
        info->ovlan = (u16)(shmem_info.ovlan_stag & FUNC_MF_CFG_OV_STAG_MASK);
 
+       info->mtu = (u16)shmem_info.mtu_size;
+
+       if (info->mtu == 0)
+               info->mtu = 1500;
+
+       info->mtu = (u16)shmem_info.mtu_size;
+
        DP_VERBOSE(p_hwfn, (ECORE_MSG_SP | ECORE_MSG_IFUP),
                   "Read configuration from shmem: pause_on_host %02x"
                    " protocol %02x BW [%02x - %02x]"
-                   " MAC %02x:%02x:%02x:%02x:%02x:%02x wwn port %" PRIx64
-                   " node %" PRIx64 " ovlan %04x\n",
+                   " MAC %02x:%02x:%02x:%02x:%02x:%02x wwn port %lx"
+                   " node %lx ovlan %04x\n",
                   info->pause_on_host, info->protocol,
                   info->bandwidth_min, info->bandwidth_max,
                   info->mac[0], info->mac[1], info->mac[2],
                   info->mac[3], info->mac[4], info->mac[5],
-                  info->wwn_port, info->wwn_node, info->ovlan);
+                  (unsigned long)info->wwn_port,
+                  (unsigned long)info->wwn_node, info->ovlan);
 
        return ECORE_SUCCESS;
 }
@@ -1277,14 +1836,14 @@ struct ecore_mcp_link_capabilities
 enum _ecore_status_t ecore_mcp_drain(struct ecore_hwfn *p_hwfn,
                                     struct ecore_ptt *p_ptt)
 {
-       enum _ecore_status_t rc;
        u32 resp = 0, param = 0;
+       enum _ecore_status_t rc;
 
        rc = ecore_mcp_cmd(p_hwfn, p_ptt,
-                          DRV_MSG_CODE_NIG_DRAIN, 100, &resp, &param);
+                          DRV_MSG_CODE_NIG_DRAIN, 1000, &resp, &param);
 
        /* Wait for the drain to complete before returning */
-       OSAL_MSLEEP(120);
+       OSAL_MSLEEP(1020);
 
        return rc;
 }
@@ -1348,8 +1907,9 @@ int ecore_mcp_get_personality_cnt(struct ecore_hwfn *p_hwfn,
                if (shmem_info.config & FUNC_MF_CFG_FUNC_HIDE)
                        continue;
 
-               if (ecore_mcp_get_shmem_proto(p_hwfn, &shmem_info,
-                                             &protocol) != ECORE_SUCCESS)
+               if (ecore_mcp_get_shmem_proto(p_hwfn, &shmem_info, p_ptt,
+                                             &protocol) !=
+                   ECORE_SUCCESS)
                        continue;
 
                if ((1 << ((u32)protocol)) & personalities)
@@ -1410,6 +1970,12 @@ enum _ecore_status_t ecore_mcp_config_vf_msix(struct ecore_hwfn *p_hwfn,
        u32 resp = 0, param = 0, rc_param = 0;
        enum _ecore_status_t rc;
 
+/* Only Leader can configure MSIX, and need to take CMT into account */
+
+       if (!IS_LEAD_HWFN(p_hwfn))
+               return ECORE_SUCCESS;
+       num *= p_hwfn->p_dev->num_hwfns;
+
        param |= (vf_id << DRV_MB_PARAM_CFG_VF_MSIX_VF_ID_SHIFT) &
            DRV_MB_PARAM_CFG_VF_MSIX_VF_ID_MASK;
        param |= (num << DRV_MB_PARAM_CFG_VF_MSIX_SB_NUM_SHIFT) &
@@ -1422,6 +1988,10 @@ enum _ecore_status_t ecore_mcp_config_vf_msix(struct ecore_hwfn *p_hwfn,
                DP_NOTICE(p_hwfn, true, "VF[%d]: MFW failed to set MSI-X\n",
                          vf_id);
                rc = ECORE_INVAL;
+       } else {
+               DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
+                          "Requested 0x%02x MSI-x interrupts from VF 0x%02x\n",
+                           num, vf_id);
        }
 
        return rc;
@@ -1431,10 +2001,10 @@ enum _ecore_status_t
 ecore_mcp_send_drv_version(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
                           struct ecore_mcp_drv_version *p_ver)
 {
-       u32 param = 0, reply = 0, num_words, i;
        struct drv_version_stc *p_drv_version;
        struct ecore_mcp_mb_params mb_params;
        union drv_union_data union_data;
+       u32 num_words, i;
        void *p_name;
        OSAL_BE32 val;
        enum _ecore_status_t rc;
@@ -1448,6 +2018,7 @@ ecore_mcp_send_drv_version(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
        p_drv_version->version = p_ver->version;
        num_words = (MCP_DRV_VER_STR_SIZE - 4) / 4;
        for (i = 0; i < num_words; i++) {
+               /* The driver name is expected to be in a big-endian format */
                p_name = &p_ver->name[i * sizeof(u32)];
                val = OSAL_CPU_TO_BE32(*(u32 *)p_name);
                *(u32 *)&p_drv_version->name[i * sizeof(u32)] = val;
@@ -1495,22 +2066,24 @@ enum _ecore_status_t ecore_mcp_resume(struct ecore_hwfn *p_hwfn,
 enum _ecore_status_t
 ecore_mcp_ov_update_current_config(struct ecore_hwfn *p_hwfn,
                                   struct ecore_ptt *p_ptt,
-                                  enum ecore_ov_config_method config,
                                   enum ecore_ov_client client)
 {
        enum _ecore_status_t rc;
        u32 resp = 0, param = 0;
        u32 drv_mb_param;
 
-       switch (config) {
+       switch (client) {
        case ECORE_OV_CLIENT_DRV:
                drv_mb_param = DRV_MB_PARAM_OV_CURR_CFG_OS;
                break;
        case ECORE_OV_CLIENT_USER:
                drv_mb_param = DRV_MB_PARAM_OV_CURR_CFG_OTHER;
                break;
+       case ECORE_OV_CLIENT_VENDOR_SPEC:
+               drv_mb_param = DRV_MB_PARAM_OV_CURR_CFG_VENDOR_SPEC;
+               break;
        default:
-               DP_NOTICE(p_hwfn, true, "Invalid client type %d\n", config);
+               DP_NOTICE(p_hwfn, true, "Invalid client type %d\n", client);
                return ECORE_INVAL;
        }
 
@@ -1547,9 +2120,9 @@ ecore_mcp_ov_update_driver_state(struct ecore_hwfn *p_hwfn,
        }
 
        rc = ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_OV_UPDATE_DRIVER_STATE,
-                          drv_state, &resp, &param);
+                          drv_mb_param, &resp, &param);
        if (rc != ECORE_SUCCESS)
-               DP_ERR(p_hwfn, "MCP response failure, aborting\n");
+               DP_ERR(p_hwfn, "Failed to send driver state\n");
 
        return rc;
 }
@@ -1651,6 +2224,14 @@ enum _ecore_status_t ecore_mcp_nvm_read(struct ecore_dev *p_dev, u32 addr,
                        DP_NOTICE(p_dev, false, "MCP command rc = %d\n", rc);
                        break;
                }
+
+               /* This can be a lengthy process, and it's possible scheduler
+                * isn't preemptible. Sleep a bit to prevent CPU hogging.
+                */
+               if (bytes_left % 0x1000 <
+                   (bytes_left - *params.nvm_rd.buf_size) % 0x1000)
+                       OSAL_MSLEEP(1);
+
                offset += *params.nvm_rd.buf_size;
                bytes_left -= *params.nvm_rd.buf_size;
        }
@@ -1788,6 +2369,13 @@ enum _ecore_status_t ecore_mcp_nvm_write(struct ecore_dev *p_dev, u32 cmd,
                      FW_MSG_CODE_NVM_PUT_FILE_FINISH_OK)))
                        DP_NOTICE(p_dev, false, "MCP command rc = %d\n", rc);
 
+               /* This can be a lengthy process, and it's possible scheduler
+                * isn't preemptible. Sleep a bit to prevent CPU hogging.
+                */
+               if (buf_idx % 0x1000 >
+                   (buf_idx + buf_size) % 0x1000)
+                       OSAL_MSLEEP(1);
+
                buf_idx += buf_size;
        }
 
@@ -1858,10 +2446,9 @@ enum _ecore_status_t ecore_mcp_phy_sfp_read(struct ecore_hwfn *p_hwfn,
        u32 bytes_left, bytes_to_copy, buf_size;
 
        OSAL_MEMSET(&params, 0, sizeof(struct ecore_mcp_nvm_params));
-       SET_FIELD(params.nvm_common.offset,
-                 DRV_MB_PARAM_TRANSCEIVER_PORT, port);
-       SET_FIELD(params.nvm_common.offset,
-                 DRV_MB_PARAM_TRANSCEIVER_I2C_ADDRESS, addr);
+       params.nvm_common.offset =
+               (port << DRV_MB_PARAM_TRANSCEIVER_PORT_SHIFT) |
+               (addr << DRV_MB_PARAM_TRANSCEIVER_I2C_ADDRESS_SHIFT);
        addr = offset;
        offset = 0;
        bytes_left = len;
@@ -1872,10 +2459,14 @@ enum _ecore_status_t ecore_mcp_phy_sfp_read(struct ecore_hwfn *p_hwfn,
                bytes_to_copy = OSAL_MIN_T(u32, bytes_left,
                                           MAX_I2C_TRANSACTION_SIZE);
                params.nvm_rd.buf = (u32 *)(p_buf + offset);
-               SET_FIELD(params.nvm_common.offset,
-                         DRV_MB_PARAM_TRANSCEIVER_OFFSET, addr + offset);
-               SET_FIELD(params.nvm_common.offset,
-                         DRV_MB_PARAM_TRANSCEIVER_SIZE, bytes_to_copy);
+               params.nvm_common.offset &=
+                       (DRV_MB_PARAM_TRANSCEIVER_I2C_ADDRESS_MASK |
+                        DRV_MB_PARAM_TRANSCEIVER_PORT_MASK);
+               params.nvm_common.offset |=
+                       ((addr + offset) <<
+                        DRV_MB_PARAM_TRANSCEIVER_OFFSET_SHIFT);
+               params.nvm_common.offset |=
+                       (bytes_to_copy << DRV_MB_PARAM_TRANSCEIVER_SIZE_SHIFT);
                rc = ecore_mcp_nvm_command(p_hwfn, p_ptt, &params);
                if ((params.nvm_common.resp & FW_MSG_CODE_MASK) ==
                    FW_MSG_CODE_TRANSCEIVER_NOT_PRESENT) {
@@ -1901,20 +2492,23 @@ enum _ecore_status_t ecore_mcp_phy_sfp_write(struct ecore_hwfn *p_hwfn,
        u32 buf_idx, buf_size;
 
        OSAL_MEMSET(&params, 0, sizeof(struct ecore_mcp_nvm_params));
-       SET_FIELD(params.nvm_common.offset,
-                 DRV_MB_PARAM_TRANSCEIVER_PORT, port);
-       SET_FIELD(params.nvm_common.offset,
-                 DRV_MB_PARAM_TRANSCEIVER_I2C_ADDRESS, addr);
+       params.nvm_common.offset =
+               (port << DRV_MB_PARAM_TRANSCEIVER_PORT_SHIFT) |
+               (addr << DRV_MB_PARAM_TRANSCEIVER_I2C_ADDRESS_SHIFT);
        params.type = ECORE_MCP_NVM_WR;
        params.nvm_common.cmd = DRV_MSG_CODE_TRANSCEIVER_WRITE;
        buf_idx = 0;
        while (buf_idx < len) {
                buf_size = OSAL_MIN_T(u32, (len - buf_idx),
                                      MAX_I2C_TRANSACTION_SIZE);
-               SET_FIELD(params.nvm_common.offset,
-                         DRV_MB_PARAM_TRANSCEIVER_OFFSET, offset + buf_idx);
-               SET_FIELD(params.nvm_common.offset,
-                         DRV_MB_PARAM_TRANSCEIVER_SIZE, buf_size);
+               params.nvm_common.offset &=
+                       (DRV_MB_PARAM_TRANSCEIVER_I2C_ADDRESS_MASK |
+                        DRV_MB_PARAM_TRANSCEIVER_PORT_MASK);
+               params.nvm_common.offset |=
+                       ((offset + buf_idx) <<
+                        DRV_MB_PARAM_TRANSCEIVER_OFFSET_SHIFT);
+               params.nvm_common.offset |=
+                       (buf_size << DRV_MB_PARAM_TRANSCEIVER_SIZE_SHIFT);
                params.nvm_wr.buf_size = buf_size;
                params.nvm_wr.buf = (u32 *)&p_buf[buf_idx];
                rc = ecore_mcp_nvm_command(p_hwfn, p_ptt, &params);
@@ -1938,11 +2532,14 @@ enum _ecore_status_t ecore_mcp_gpio_read(struct ecore_hwfn *p_hwfn,
        enum _ecore_status_t rc = ECORE_SUCCESS;
        u32 drv_mb_param = 0, rsp;
 
-       SET_FIELD(drv_mb_param, DRV_MB_PARAM_GPIO_NUMBER, gpio);
+       drv_mb_param = (gpio << DRV_MB_PARAM_GPIO_NUMBER_SHIFT);
 
        rc = ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_GPIO_READ,
                           drv_mb_param, &rsp, gpio_val);
 
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
        if ((rsp & FW_MSG_CODE_MASK) != FW_MSG_CODE_GPIO_OK)
                return ECORE_UNKNOWN_ERROR;
 
@@ -1956,14 +2553,610 @@ enum _ecore_status_t ecore_mcp_gpio_write(struct ecore_hwfn *p_hwfn,
        enum _ecore_status_t rc = ECORE_SUCCESS;
        u32 drv_mb_param = 0, param, rsp;
 
-       SET_FIELD(drv_mb_param, DRV_MB_PARAM_GPIO_NUMBER, gpio);
-       SET_FIELD(drv_mb_param, DRV_MB_PARAM_GPIO_VALUE, gpio_val);
+       drv_mb_param = (gpio << DRV_MB_PARAM_GPIO_NUMBER_SHIFT) |
+               (gpio_val << DRV_MB_PARAM_GPIO_VALUE_SHIFT);
 
        rc = ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_GPIO_WRITE,
                           drv_mb_param, &rsp, &param);
 
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
        if ((rsp & FW_MSG_CODE_MASK) != FW_MSG_CODE_GPIO_OK)
                return ECORE_UNKNOWN_ERROR;
 
        return ECORE_SUCCESS;
 }
+
+enum _ecore_status_t ecore_mcp_gpio_info(struct ecore_hwfn *p_hwfn,
+                                        struct ecore_ptt *p_ptt,
+                                        u16 gpio, u32 *gpio_direction,
+                                        u32 *gpio_ctrl)
+{
+       u32 drv_mb_param = 0, rsp, val = 0;
+       enum _ecore_status_t rc = ECORE_SUCCESS;
+
+       drv_mb_param = gpio << DRV_MB_PARAM_GPIO_NUMBER_SHIFT;
+
+       rc = ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_GPIO_INFO,
+                          drv_mb_param, &rsp, &val);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       *gpio_direction = (val & DRV_MB_PARAM_GPIO_DIRECTION_MASK) >>
+                          DRV_MB_PARAM_GPIO_DIRECTION_SHIFT;
+       *gpio_ctrl = (val & DRV_MB_PARAM_GPIO_CTRL_MASK) >>
+                     DRV_MB_PARAM_GPIO_CTRL_SHIFT;
+
+       if ((rsp & FW_MSG_CODE_MASK) != FW_MSG_CODE_GPIO_OK)
+               return ECORE_UNKNOWN_ERROR;
+
+       return ECORE_SUCCESS;
+}
+
+enum _ecore_status_t ecore_mcp_bist_register_test(struct ecore_hwfn *p_hwfn,
+                                                 struct ecore_ptt *p_ptt)
+{
+       u32 drv_mb_param = 0, rsp, param;
+       enum _ecore_status_t rc = ECORE_SUCCESS;
+
+       drv_mb_param = (DRV_MB_PARAM_BIST_REGISTER_TEST <<
+                       DRV_MB_PARAM_BIST_TEST_INDEX_SHIFT);
+
+       rc = ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_BIST_TEST,
+                          drv_mb_param, &rsp, &param);
+
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       if (((rsp & FW_MSG_CODE_MASK) != FW_MSG_CODE_OK) ||
+           (param != DRV_MB_PARAM_BIST_RC_PASSED))
+               rc = ECORE_UNKNOWN_ERROR;
+
+       return rc;
+}
+
+enum _ecore_status_t ecore_mcp_bist_clock_test(struct ecore_hwfn *p_hwfn,
+                                              struct ecore_ptt *p_ptt)
+{
+       u32 drv_mb_param, rsp, param;
+       enum _ecore_status_t rc = ECORE_SUCCESS;
+
+       drv_mb_param = (DRV_MB_PARAM_BIST_CLOCK_TEST <<
+                       DRV_MB_PARAM_BIST_TEST_INDEX_SHIFT);
+
+       rc = ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_BIST_TEST,
+                          drv_mb_param, &rsp, &param);
+
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       if (((rsp & FW_MSG_CODE_MASK) != FW_MSG_CODE_OK) ||
+           (param != DRV_MB_PARAM_BIST_RC_PASSED))
+               rc = ECORE_UNKNOWN_ERROR;
+
+       return rc;
+}
+
+enum _ecore_status_t ecore_mcp_bist_nvm_test_get_num_images(
+       struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, u32 *num_images)
+{
+       u32 drv_mb_param = 0, rsp;
+       enum _ecore_status_t rc = ECORE_SUCCESS;
+
+       drv_mb_param = (DRV_MB_PARAM_BIST_NVM_TEST_NUM_IMAGES <<
+                       DRV_MB_PARAM_BIST_TEST_INDEX_SHIFT);
+
+       rc = ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_BIST_TEST,
+                          drv_mb_param, &rsp, num_images);
+
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       if (((rsp & FW_MSG_CODE_MASK) != FW_MSG_CODE_OK))
+               rc = ECORE_UNKNOWN_ERROR;
+
+       return rc;
+}
+
+enum _ecore_status_t ecore_mcp_bist_nvm_test_get_image_att(
+       struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+       struct bist_nvm_image_att *p_image_att, u32 image_index)
+{
+       struct ecore_mcp_nvm_params params;
+       enum _ecore_status_t rc;
+       u32 buf_size;
+
+       OSAL_MEMSET(&params, 0, sizeof(struct ecore_mcp_nvm_params));
+       params.nvm_common.offset = (DRV_MB_PARAM_BIST_NVM_TEST_IMAGE_BY_INDEX <<
+                                   DRV_MB_PARAM_BIST_TEST_INDEX_SHIFT);
+       params.nvm_common.offset |= (image_index <<
+                                   DRV_MB_PARAM_BIST_TEST_IMAGE_INDEX_SHIFT);
+
+       params.type = ECORE_MCP_NVM_RD;
+       params.nvm_rd.buf_size = &buf_size;
+       params.nvm_common.cmd = DRV_MSG_CODE_BIST_TEST;
+       params.nvm_rd.buf = (u32 *)p_image_att;
+
+       rc = ecore_mcp_nvm_command(p_hwfn, p_ptt, &params);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       if (((params.nvm_common.resp & FW_MSG_CODE_MASK) != FW_MSG_CODE_OK) ||
+           (p_image_att->return_code != 1))
+               rc = ECORE_UNKNOWN_ERROR;
+
+       return rc;
+}
+
+enum _ecore_status_t
+ecore_mcp_get_temperature_info(struct ecore_hwfn *p_hwfn,
+                              struct ecore_ptt *p_ptt,
+                              struct ecore_temperature_info *p_temp_info)
+{
+       struct ecore_temperature_sensor *p_temp_sensor;
+       struct temperature_status_stc *p_mfw_temp_info;
+       struct ecore_mcp_mb_params mb_params;
+       union drv_union_data union_data;
+       u32 val;
+       enum _ecore_status_t rc;
+       u8 i;
+
+       OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
+       mb_params.cmd = DRV_MSG_CODE_GET_TEMPERATURE;
+       mb_params.p_data_dst = &union_data;
+       rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       p_mfw_temp_info = &union_data.temp_info;
+
+       OSAL_BUILD_BUG_ON(ECORE_MAX_NUM_OF_SENSORS != MAX_NUM_OF_SENSORS);
+       p_temp_info->num_sensors = OSAL_MIN_T(u32,
+                                             p_mfw_temp_info->num_of_sensors,
+                                             ECORE_MAX_NUM_OF_SENSORS);
+       for (i = 0; i < p_temp_info->num_sensors; i++) {
+               val = p_mfw_temp_info->sensor[i];
+               p_temp_sensor = &p_temp_info->sensors[i];
+               p_temp_sensor->sensor_location = (val & SENSOR_LOCATION_MASK) >>
+                                                SENSOR_LOCATION_SHIFT;
+               p_temp_sensor->threshold_high = (val & THRESHOLD_HIGH_MASK) >>
+                                               THRESHOLD_HIGH_SHIFT;
+               p_temp_sensor->critical = (val & CRITICAL_TEMPERATURE_MASK) >>
+                                         CRITICAL_TEMPERATURE_SHIFT;
+               p_temp_sensor->current_temp = (val & CURRENT_TEMP_MASK) >>
+                                             CURRENT_TEMP_SHIFT;
+       }
+
+       return ECORE_SUCCESS;
+}
+
+enum _ecore_status_t ecore_mcp_get_mba_versions(
+       struct ecore_hwfn *p_hwfn,
+       struct ecore_ptt *p_ptt,
+       struct ecore_mba_vers *p_mba_vers)
+{
+       struct ecore_mcp_nvm_params params;
+       enum _ecore_status_t rc;
+       u32 buf_size;
+
+       OSAL_MEM_ZERO(&params, sizeof(params));
+       params.type = ECORE_MCP_NVM_RD;
+       params.nvm_common.cmd = DRV_MSG_CODE_GET_MBA_VERSION;
+       params.nvm_common.offset = 0;
+       params.nvm_rd.buf = &p_mba_vers->mba_vers[0];
+       params.nvm_rd.buf_size = &buf_size;
+       rc = ecore_mcp_nvm_command(p_hwfn, p_ptt, &params);
+
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       if ((params.nvm_common.resp & FW_MSG_CODE_MASK) !=
+           FW_MSG_CODE_NVM_OK)
+               rc = ECORE_UNKNOWN_ERROR;
+
+       if (buf_size != MCP_DRV_NVM_BUF_LEN)
+               rc = ECORE_UNKNOWN_ERROR;
+
+       return rc;
+}
+
+enum _ecore_status_t ecore_mcp_mem_ecc_events(struct ecore_hwfn *p_hwfn,
+                                             struct ecore_ptt *p_ptt,
+                                             u64 *num_events)
+{
+       u32 rsp;
+
+       return ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MEM_ECC_EVENTS,
+                            0, &rsp, (u32 *)num_events);
+}
+
+static enum resource_id_enum
+ecore_mcp_get_mfw_res_id(enum ecore_resources res_id)
+{
+       enum resource_id_enum mfw_res_id = RESOURCE_NUM_INVALID;
+
+       switch (res_id) {
+       case ECORE_SB:
+               mfw_res_id = RESOURCE_NUM_SB_E;
+               break;
+       case ECORE_L2_QUEUE:
+               mfw_res_id = RESOURCE_NUM_L2_QUEUE_E;
+               break;
+       case ECORE_VPORT:
+               mfw_res_id = RESOURCE_NUM_VPORT_E;
+               break;
+       case ECORE_RSS_ENG:
+               mfw_res_id = RESOURCE_NUM_RSS_ENGINES_E;
+               break;
+       case ECORE_PQ:
+               mfw_res_id = RESOURCE_NUM_PQ_E;
+               break;
+       case ECORE_RL:
+               mfw_res_id = RESOURCE_NUM_RL_E;
+               break;
+       case ECORE_MAC:
+       case ECORE_VLAN:
+               /* Each VFC resource can accommodate both a MAC and a VLAN */
+               mfw_res_id = RESOURCE_VFC_FILTER_E;
+               break;
+       case ECORE_ILT:
+               mfw_res_id = RESOURCE_ILT_E;
+               break;
+       case ECORE_LL2_QUEUE:
+               mfw_res_id = RESOURCE_LL2_QUEUE_E;
+               break;
+       case ECORE_RDMA_CNQ_RAM:
+       case ECORE_CMDQS_CQS:
+               /* CNQ/CMDQS are the same resource */
+               mfw_res_id = RESOURCE_CQS_E;
+               break;
+       case ECORE_RDMA_STATS_QUEUE:
+               mfw_res_id = RESOURCE_RDMA_STATS_QUEUE_E;
+               break;
+       case ECORE_BDQ:
+               mfw_res_id = RESOURCE_BDQ_E;
+               break;
+       default:
+               break;
+       }
+
+       return mfw_res_id;
+}
+
+#define ECORE_RESC_ALLOC_VERSION_MAJOR 2
+#define ECORE_RESC_ALLOC_VERSION_MINOR 0
+#define ECORE_RESC_ALLOC_VERSION                               \
+       ((ECORE_RESC_ALLOC_VERSION_MAJOR <<                     \
+         DRV_MB_PARAM_RESOURCE_ALLOC_VERSION_MAJOR_SHIFT) |    \
+        (ECORE_RESC_ALLOC_VERSION_MINOR <<                     \
+         DRV_MB_PARAM_RESOURCE_ALLOC_VERSION_MINOR_SHIFT))
+
+struct ecore_resc_alloc_in_params {
+       u32 cmd;
+       enum ecore_resources res_id;
+       u32 resc_max_val;
+};
+
+struct ecore_resc_alloc_out_params {
+       u32 mcp_resp;
+       u32 mcp_param;
+       u32 resc_num;
+       u32 resc_start;
+       u32 vf_resc_num;
+       u32 vf_resc_start;
+       u32 flags;
+};
+
+static enum _ecore_status_t
+ecore_mcp_resc_allocation_msg(struct ecore_hwfn *p_hwfn,
+                             struct ecore_ptt *p_ptt,
+                             struct ecore_resc_alloc_in_params *p_in_params,
+                             struct ecore_resc_alloc_out_params *p_out_params)
+{
+       struct resource_info *p_mfw_resc_info;
+       struct ecore_mcp_mb_params mb_params;
+       union drv_union_data union_data;
+       enum _ecore_status_t rc;
+
+       p_mfw_resc_info = &union_data.resource;
+       OSAL_MEM_ZERO(p_mfw_resc_info, sizeof(*p_mfw_resc_info));
+
+       p_mfw_resc_info->res_id = ecore_mcp_get_mfw_res_id(p_in_params->res_id);
+       if (p_mfw_resc_info->res_id == RESOURCE_NUM_INVALID) {
+               DP_ERR(p_hwfn,
+                      "Failed to match resource %d [%s] with the MFW resources\n",
+                      p_in_params->res_id,
+                      ecore_hw_get_resc_name(p_in_params->res_id));
+               return ECORE_INVAL;
+       }
+
+       switch (p_in_params->cmd) {
+       case DRV_MSG_SET_RESOURCE_VALUE_MSG:
+               p_mfw_resc_info->size = p_in_params->resc_max_val;
+               /* Fallthrough */
+       case DRV_MSG_GET_RESOURCE_ALLOC_MSG:
+               break;
+       default:
+               DP_ERR(p_hwfn, "Unexpected resource alloc command [0x%08x]\n",
+                      p_in_params->cmd);
+               return ECORE_INVAL;
+       }
+
+       OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
+       mb_params.cmd = p_in_params->cmd;
+       mb_params.param = ECORE_RESC_ALLOC_VERSION;
+       mb_params.p_data_src = &union_data;
+       mb_params.p_data_dst = &union_data;
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                  "Resource message request: cmd 0x%08x, res_id %d [%s], hsi_version %d.%d, val 0x%x\n",
+                  p_in_params->cmd, p_in_params->res_id,
+                  ecore_hw_get_resc_name(p_in_params->res_id),
+                  ECORE_MFW_GET_FIELD(mb_params.param,
+                          DRV_MB_PARAM_RESOURCE_ALLOC_VERSION_MAJOR),
+                  ECORE_MFW_GET_FIELD(mb_params.param,
+                          DRV_MB_PARAM_RESOURCE_ALLOC_VERSION_MINOR),
+                  p_in_params->resc_max_val);
+
+       rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       p_out_params->mcp_resp = mb_params.mcp_resp;
+       p_out_params->mcp_param = mb_params.mcp_param;
+       p_out_params->resc_num = p_mfw_resc_info->size;
+       p_out_params->resc_start = p_mfw_resc_info->offset;
+       p_out_params->vf_resc_num = p_mfw_resc_info->vf_size;
+       p_out_params->vf_resc_start = p_mfw_resc_info->vf_offset;
+       p_out_params->flags = p_mfw_resc_info->flags;
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                  "Resource message response: mfw_hsi_version %d.%d, num 0x%x, start 0x%x, vf_num 0x%x, vf_start 0x%x, flags 0x%08x\n",
+                  ECORE_MFW_GET_FIELD(p_out_params->mcp_param,
+                          FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MAJOR),
+                  ECORE_MFW_GET_FIELD(p_out_params->mcp_param,
+                          FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MINOR),
+                  p_out_params->resc_num, p_out_params->resc_start,
+                  p_out_params->vf_resc_num, p_out_params->vf_resc_start,
+                  p_out_params->flags);
+
+       return ECORE_SUCCESS;
+}
+
+enum _ecore_status_t
+ecore_mcp_set_resc_max_val(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+                          enum ecore_resources res_id, u32 resc_max_val,
+                          u32 *p_mcp_resp)
+{
+       struct ecore_resc_alloc_out_params out_params;
+       struct ecore_resc_alloc_in_params in_params;
+       enum _ecore_status_t rc;
+
+       OSAL_MEM_ZERO(&in_params, sizeof(in_params));
+       in_params.cmd = DRV_MSG_SET_RESOURCE_VALUE_MSG;
+       in_params.res_id = res_id;
+       in_params.resc_max_val = resc_max_val;
+       OSAL_MEM_ZERO(&out_params, sizeof(out_params));
+       rc = ecore_mcp_resc_allocation_msg(p_hwfn, p_ptt, &in_params,
+                                          &out_params);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       *p_mcp_resp = out_params.mcp_resp;
+
+       return ECORE_SUCCESS;
+}
+
+enum _ecore_status_t
+ecore_mcp_get_resc_info(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+                       enum ecore_resources res_id, u32 *p_mcp_resp,
+                       u32 *p_resc_num, u32 *p_resc_start)
+{
+       struct ecore_resc_alloc_out_params out_params;
+       struct ecore_resc_alloc_in_params in_params;
+       enum _ecore_status_t rc;
+
+       OSAL_MEM_ZERO(&in_params, sizeof(in_params));
+       in_params.cmd = DRV_MSG_GET_RESOURCE_ALLOC_MSG;
+       in_params.res_id = res_id;
+       OSAL_MEM_ZERO(&out_params, sizeof(out_params));
+       rc = ecore_mcp_resc_allocation_msg(p_hwfn, p_ptt, &in_params,
+                                          &out_params);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       *p_mcp_resp = out_params.mcp_resp;
+
+       if (*p_mcp_resp == FW_MSG_CODE_RESOURCE_ALLOC_OK) {
+               *p_resc_num = out_params.resc_num;
+               *p_resc_start = out_params.resc_start;
+       }
+
+       return ECORE_SUCCESS;
+}
+
+enum _ecore_status_t ecore_mcp_initiate_pf_flr(struct ecore_hwfn *p_hwfn,
+                                              struct ecore_ptt *p_ptt)
+{
+       u32 mcp_resp, mcp_param;
+
+       return ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_INITIATE_PF_FLR, 0,
+                            &mcp_resp, &mcp_param);
+}
+
+static enum _ecore_status_t ecore_mcp_resource_cmd(struct ecore_hwfn *p_hwfn,
+                                                  struct ecore_ptt *p_ptt,
+                                                  u32 param, u32 *p_mcp_resp,
+                                                  u32 *p_mcp_param)
+{
+       enum _ecore_status_t rc;
+
+       rc = ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_RESOURCE_CMD, param,
+                          p_mcp_resp, p_mcp_param);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       if (*p_mcp_resp == FW_MSG_CODE_UNSUPPORTED) {
+               DP_INFO(p_hwfn,
+                       "The resource command is unsupported by the MFW\n");
+               return ECORE_NOTIMPL;
+       }
+
+       if (*p_mcp_param == RESOURCE_OPCODE_UNKNOWN_CMD) {
+               u8 opcode = ECORE_MFW_GET_FIELD(param, RESOURCE_CMD_REQ_OPCODE);
+
+               DP_NOTICE(p_hwfn, false,
+                         "The resource command is unknown to the MFW [param 0x%08x, opcode %d]\n",
+                         param, opcode);
+               return ECORE_INVAL;
+       }
+
+       return rc;
+}
+
+enum _ecore_status_t
+__ecore_mcp_resc_lock(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+                     struct ecore_resc_lock_params *p_params)
+{
+       u32 param = 0, mcp_resp, mcp_param;
+       u8 opcode;
+       enum _ecore_status_t rc;
+
+       switch (p_params->timeout) {
+       case ECORE_MCP_RESC_LOCK_TO_DEFAULT:
+               opcode = RESOURCE_OPCODE_REQ;
+               p_params->timeout = 0;
+               break;
+       case ECORE_MCP_RESC_LOCK_TO_NONE:
+               opcode = RESOURCE_OPCODE_REQ_WO_AGING;
+               p_params->timeout = 0;
+               break;
+       default:
+               opcode = RESOURCE_OPCODE_REQ_W_AGING;
+               break;
+       }
+
+       ECORE_MFW_SET_FIELD(param, RESOURCE_CMD_REQ_RESC, p_params->resource);
+       ECORE_MFW_SET_FIELD(param, RESOURCE_CMD_REQ_OPCODE, opcode);
+       ECORE_MFW_SET_FIELD(param, RESOURCE_CMD_REQ_AGE, p_params->timeout);
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                  "Resource lock request: param 0x%08x [age %d, opcode %d, resource %d]\n",
+                  param, p_params->timeout, opcode, p_params->resource);
+
+       /* Attempt to acquire the resource */
+       rc = ecore_mcp_resource_cmd(p_hwfn, p_ptt, param, &mcp_resp,
+                                   &mcp_param);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       /* Analyze the response */
+       p_params->owner = ECORE_MFW_GET_FIELD(mcp_param,
+                                            RESOURCE_CMD_RSP_OWNER);
+       opcode = ECORE_MFW_GET_FIELD(mcp_param, RESOURCE_CMD_RSP_OPCODE);
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                  "Resource lock response: mcp_param 0x%08x [opcode %d, owner %d]\n",
+                  mcp_param, opcode, p_params->owner);
+
+       switch (opcode) {
+       case RESOURCE_OPCODE_GNT:
+               p_params->b_granted = true;
+               break;
+       case RESOURCE_OPCODE_BUSY:
+               p_params->b_granted = false;
+               break;
+       default:
+               DP_NOTICE(p_hwfn, false,
+                         "Unexpected opcode in resource lock response [mcp_param 0x%08x, opcode %d]\n",
+                         mcp_param, opcode);
+               return ECORE_INVAL;
+       }
+
+       return ECORE_SUCCESS;
+}
+
+enum _ecore_status_t
+ecore_mcp_resc_lock(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+                   struct ecore_resc_lock_params *p_params)
+{
+       u32 retry_cnt = 0;
+       enum _ecore_status_t rc;
+
+       do {
+               /* No need for an interval before the first iteration */
+               if (retry_cnt) {
+                       if (p_params->sleep_b4_retry) {
+                               u16 retry_interval_in_ms =
+                                       DIV_ROUND_UP(p_params->retry_interval,
+                                                    1000);
+
+                               OSAL_MSLEEP(retry_interval_in_ms);
+                       } else {
+                               OSAL_UDELAY(p_params->retry_interval);
+                       }
+               }
+
+               rc = __ecore_mcp_resc_lock(p_hwfn, p_ptt, p_params);
+               if (rc != ECORE_SUCCESS)
+                       return rc;
+
+               if (p_params->b_granted)
+                       break;
+       } while (retry_cnt++ < p_params->retry_num);
+
+       return ECORE_SUCCESS;
+}
+
+enum _ecore_status_t
+ecore_mcp_resc_unlock(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+                     struct ecore_resc_unlock_params *p_params)
+{
+       u32 param = 0, mcp_resp, mcp_param;
+       u8 opcode;
+       enum _ecore_status_t rc;
+
+       opcode = p_params->b_force ? RESOURCE_OPCODE_FORCE_RELEASE
+                                  : RESOURCE_OPCODE_RELEASE;
+       ECORE_MFW_SET_FIELD(param, RESOURCE_CMD_REQ_RESC, p_params->resource);
+       ECORE_MFW_SET_FIELD(param, RESOURCE_CMD_REQ_OPCODE, opcode);
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                  "Resource unlock request: param 0x%08x [opcode %d, resource %d]\n",
+                  param, opcode, p_params->resource);
+
+       /* Attempt to release the resource */
+       rc = ecore_mcp_resource_cmd(p_hwfn, p_ptt, param, &mcp_resp,
+                                   &mcp_param);
+       if (rc != ECORE_SUCCESS)
+               return rc;
+
+       /* Analyze the response */
+       opcode = ECORE_MFW_GET_FIELD(mcp_param, RESOURCE_CMD_RSP_OPCODE);
+
+       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                  "Resource unlock response: mcp_param 0x%08x [opcode %d]\n",
+                  mcp_param, opcode);
+
+       switch (opcode) {
+       case RESOURCE_OPCODE_RELEASED_PREVIOUS:
+               DP_INFO(p_hwfn,
+                       "Resource unlock request for an already released resource [%d]\n",
+                       p_params->resource);
+               /* Fallthrough */
+       case RESOURCE_OPCODE_RELEASED:
+               p_params->b_released = true;
+               break;
+       case RESOURCE_OPCODE_WRONG_OWNER:
+               p_params->b_released = false;
+               break;
+       default:
+               DP_NOTICE(p_hwfn, false,
+                         "Unexpected opcode in resource unlock response [mcp_param 0x%08x, opcode %d]\n",
+                         mcp_param, opcode);
+               return ECORE_INVAL;
+       }
+
+       return ECORE_SUCCESS;
+}