net/nfp: handle packets with length 0 as usual ones
[dpdk.git] / drivers / net / qede / base / ecore_mcp.c
index 30cb76e..88c5ceb 100644 (file)
@@ -364,6 +364,7 @@ ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn,
                        struct ecore_ptt *p_ptt,
                        struct ecore_mcp_mb_params *p_mb_params)
 {
+       union drv_union_data union_data;
        u32 union_data_addr;
        enum _ecore_status_t rc;
 
@@ -373,6 +374,15 @@ ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn,
                return ECORE_BUSY;
        }
 
+       if (p_mb_params->data_src_size > sizeof(union_data) ||
+           p_mb_params->data_dst_size > sizeof(union_data)) {
+               DP_ERR(p_hwfn,
+                      "The provided size is larger than the union data size [src_size %u, dst_size %u, union_data_size %zu]\n",
+                      p_mb_params->data_src_size, p_mb_params->data_dst_size,
+                      sizeof(union_data));
+               return ECORE_INVAL;
+       }
+
        union_data_addr = p_hwfn->mcp_info->drv_mb_addr +
                          OFFSETOF(struct public_drv_mb, union_data);
 
@@ -383,19 +393,21 @@ ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn,
        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,
-                               sizeof(*p_mb_params->p_data_src));
+       OSAL_MEM_ZERO(&union_data, sizeof(union_data));
+       if (p_mb_params->p_data_src != OSAL_NULL && p_mb_params->data_src_size)
+               OSAL_MEMCPY(&union_data, p_mb_params->p_data_src,
+                           p_mb_params->data_src_size);
+       ecore_memcpy_to(p_hwfn, p_ptt, union_data_addr, &union_data,
+                       sizeof(union_data));
 
        rc = ecore_do_mcp_cmd(p_hwfn, p_ptt, p_mb_params->cmd,
                              p_mb_params->param, &p_mb_params->mcp_resp,
                              &p_mb_params->mcp_param);
 
-       if (p_mb_params->p_data_dst != OSAL_NULL)
+       if (p_mb_params->p_data_dst != OSAL_NULL &&
+           p_mb_params->data_dst_size)
                ecore_memcpy_from(p_hwfn, p_ptt, p_mb_params->p_data_dst,
-                                 union_data_addr,
-                                 sizeof(*p_mb_params->p_data_dst));
+                                 union_data_addr, p_mb_params->data_dst_size);
 
        ecore_mcp_mb_unlock(p_hwfn, p_mb_params->cmd);
 
@@ -443,14 +455,13 @@ enum _ecore_status_t ecore_mcp_nvm_wr_cmd(struct ecore_hwfn *p_hwfn,
                                          u32 i_txn_size, u32 *i_buf)
 {
        struct ecore_mcp_mb_params mb_params;
-       union drv_union_data union_data;
        enum _ecore_status_t rc;
 
        OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
        mb_params.cmd = cmd;
        mb_params.param = param;
-       OSAL_MEMCPY((u32 *)&union_data.raw_data, i_buf, i_txn_size);
-       mb_params.p_data_src = &union_data;
+       mb_params.p_data_src = i_buf;
+       mb_params.data_src_size = (u8)i_txn_size;
        rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
        if (rc != ECORE_SUCCESS)
                return rc;
@@ -470,13 +481,17 @@ enum _ecore_status_t ecore_mcp_nvm_rd_cmd(struct ecore_hwfn *p_hwfn,
                                          u32 *o_txn_size, u32 *o_buf)
 {
        struct ecore_mcp_mb_params mb_params;
-       union drv_union_data union_data;
+       u8 raw_data[MCP_DRV_NVM_BUF_LEN];
        enum _ecore_status_t rc;
 
        OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
        mb_params.cmd = cmd;
        mb_params.param = param;
-       mb_params.p_data_dst = &union_data;
+       mb_params.p_data_dst = raw_data;
+
+       /* Use the maximal value since the actual one is part of the response */
+       mb_params.data_dst_size = MCP_DRV_NVM_BUF_LEN;
+
        rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
        if (rc != ECORE_SUCCESS)
                return rc;
@@ -485,7 +500,8 @@ enum _ecore_status_t ecore_mcp_nvm_rd_cmd(struct ecore_hwfn *p_hwfn,
        *o_mcp_param = mb_params.mcp_param;
 
        *o_txn_size = *o_mcp_param;
-       OSAL_MEMCPY(o_buf, (u32 *)&union_data.raw_data, *o_txn_size);
+       /* @DPDK */
+       OSAL_MEMCPY(o_buf, raw_data, RTE_MIN(*o_txn_size, MCP_DRV_NVM_BUF_LEN));
 
        return ECORE_SUCCESS;
 }
@@ -518,54 +534,413 @@ 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)
+{
+       struct ecore_mcp_mb_params mb_params;
+       struct load_req_stc load_req;
+       struct load_rsp_stc load_rsp;
+       u32 hsi_ver;
+       enum _ecore_status_t rc;
+
+       OSAL_MEM_ZERO(&load_req, sizeof(load_req));
+       load_req.drv_ver_0 = p_in_params->drv_ver_0;
+       load_req.drv_ver_1 = p_in_params->drv_ver_1;
+       load_req.fw_ver = p_in_params->fw_ver;
+       ECORE_MFW_SET_FIELD(load_req.misc0, LOAD_REQ_ROLE,
+                           p_in_params->drv_role);
+       ECORE_MFW_SET_FIELD(load_req.misc0, LOAD_REQ_LOCK_TO,
+                           p_in_params->timeout_val);
+       ECORE_MFW_SET_FIELD(load_req.misc0, LOAD_REQ_FORCE,
+                           p_in_params->force_cmd);
+       ECORE_MFW_SET_FIELD(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 = &load_req;
+       mb_params.data_src_size = sizeof(load_req);
+       mb_params.p_data_dst = &load_rsp;
+       mb_params.data_dst_size = sizeof(load_rsp);
+
+       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",
+                          load_req.drv_ver_0, load_req.drv_ver_1,
+                          load_req.fw_ver, load_req.misc0,
+                          ECORE_MFW_GET_FIELD(load_req.misc0, LOAD_REQ_ROLE),
+                          ECORE_MFW_GET_FIELD(load_req.misc0,
+                                              LOAD_REQ_LOCK_TO),
+                          ECORE_MFW_GET_FIELD(load_req.misc0, LOAD_REQ_FORCE),
+                          ECORE_MFW_GET_FIELD(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) {
+               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",
+                          load_rsp.drv_ver_0, load_rsp.drv_ver_1,
+                          load_rsp.fw_ver, load_rsp.misc0,
+                          ECORE_MFW_GET_FIELD(load_rsp.misc0, LOAD_RSP_ROLE),
+                          ECORE_MFW_GET_FIELD(load_rsp.misc0, LOAD_RSP_HSI),
+                          ECORE_MFW_GET_FIELD(load_rsp.misc0,
+                                              LOAD_RSP_FLAGS0));
+
+               p_out_params->exist_drv_ver_0 = load_rsp.drv_ver_0;
+               p_out_params->exist_drv_ver_1 = load_rsp.drv_ver_1;
+               p_out_params->exist_fw_ver = load_rsp.fw_ver;
+               p_out_params->exist_drv_role =
+                       ECORE_MFW_GET_FIELD(load_rsp.misc0, LOAD_RSP_ROLE);
+               p_out_params->mfw_hsi_ver =
+                       ECORE_MFW_GET_FIELD(load_rsp.misc0, LOAD_RSP_HSI);
+               p_out_params->drv_exists =
+                       ECORE_MFW_GET_FIELD(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;
+       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;
-       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;
-       }
 
-       *p_load_code = mb_params.mcp_resp;
+       in_params.force_cmd = mfw_force_cmd;
+       in_params.avoid_eng_reset = p_params->avoid_eng_reset;
 
-       /* 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.
-        *      -
+       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 (!(*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");
+       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;
+               }
+       }
+
+       /* 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.
+        */
+       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;
+}
+
+enum _ecore_status_t ecore_mcp_load_done(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_LOAD_DONE, 0, &resp,
+                          &param);
+       if (rc != ECORE_SUCCESS) {
+               DP_NOTICE(p_hwfn, false,
+                         "Failed to send a LOAD_DONE command, rc = %d\n", rc);
+               return rc;
        }
 
+#define FW_MB_PARAM_LOAD_DONE_DID_EFUSE_ERROR     (1 << 0)
+
+       /* Check if there is a DID mismatch between nvm-cfg/efuse */
+       if (param & FW_MB_PARAM_LOAD_DONE_DID_EFUSE_ERROR)
+               DP_NOTICE(p_hwfn, false,
+                         "warning: device configuration is not supported on this board type. The device may not function as expected.\n");
+
        return ECORE_SUCCESS;
 }
 
+enum _ecore_status_t ecore_mcp_unload_req(struct ecore_hwfn *p_hwfn,
+                                         struct ecore_ptt *p_ptt)
+{
+       u32 wol_param, mcp_resp, mcp_param;
+
+       /* @DPDK */
+       wol_param = DRV_MB_PARAM_UNLOAD_WOL_MCP;
+
+       return ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_UNLOAD_REQ, wol_param,
+                            &mcp_resp, &mcp_param);
+}
+
+enum _ecore_status_t ecore_mcp_unload_done(struct ecore_hwfn *p_hwfn,
+                                          struct ecore_ptt *p_ptt)
+{
+       struct ecore_mcp_mb_params mb_params;
+       struct mcp_mac wol_mac;
+
+       OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
+       mb_params.cmd = DRV_MSG_CODE_UNLOAD_DONE;
+
+       return ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
+}
+
 static void ecore_mcp_handle_vf_flr(struct ecore_hwfn *p_hwfn,
                                    struct ecore_ptt *p_ptt)
 {
@@ -607,7 +982,6 @@ enum _ecore_status_t ecore_mcp_ack_vf_flr(struct ecore_hwfn *p_hwfn,
        u32 func_addr = SECTION_ADDR(mfw_func_offsize,
                                     MCP_PF_ID(p_hwfn));
        struct ecore_mcp_mb_params mb_params;
-       union drv_union_data union_data;
        enum _ecore_status_t rc;
        int i;
 
@@ -618,8 +992,8 @@ enum _ecore_status_t ecore_mcp_ack_vf_flr(struct ecore_hwfn *p_hwfn,
 
        OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
        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;
+       mb_params.p_data_src = vfs_to_ack;
+       mb_params.data_src_size = VF_MAX_STATIC / 8;
        rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt,
                                     &mb_params);
        if (rc != ECORE_SUCCESS) {
@@ -805,8 +1179,7 @@ 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 eth_phy_cfg *p_phy_cfg;
+       struct eth_phy_cfg phy_cfg;
        enum _ecore_status_t rc = ECORE_SUCCESS;
        u32 cmd;
 
@@ -816,30 +1189,30 @@ enum _ecore_status_t ecore_mcp_set_link(struct ecore_hwfn *p_hwfn,
 #endif
 
        /* Set the shmem configuration according to params */
-       p_phy_cfg = &union_data.drv_phy_cfg;
-       OSAL_MEMSET(p_phy_cfg, 0, sizeof(*p_phy_cfg));
+       OSAL_MEM_ZERO(&phy_cfg, sizeof(phy_cfg));
        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) ? 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;
+               phy_cfg.speed = params->speed.forced_speed;
+       phy_cfg.pause |= (params->pause.autoneg) ? ETH_PAUSE_AUTONEG : 0;
+       phy_cfg.pause |= (params->pause.forced_rx) ? ETH_PAUSE_RX : 0;
+       phy_cfg.pause |= (params->pause.forced_tx) ? ETH_PAUSE_TX : 0;
+       phy_cfg.adv_speed = params->speed.advertised_speeds;
+       phy_cfg.loopback_mode = params->loopback_mode;
        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\n",
-                          p_phy_cfg->speed, p_phy_cfg->pause,
-                          p_phy_cfg->adv_speed, p_phy_cfg->loopback_mode);
+                          phy_cfg.speed, phy_cfg.pause, phy_cfg.adv_speed,
+                          phy_cfg.loopback_mode);
        else
                DP_VERBOSE(p_hwfn, ECORE_MSG_LINK, "Resetting link\n");
 
        OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
        mb_params.cmd = cmd;
-       mb_params.p_data_src = &union_data;
+       mb_params.p_data_src = &phy_cfg;
+       mb_params.data_src_size = sizeof(phy_cfg);
        rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
 
        /* if mcp fails to respond we must abort */
@@ -918,8 +1291,8 @@ 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;
-       union drv_union_data union_data;
        u32 hsi_param;
+       enum _ecore_status_t rc;
 
        switch (type) {
        case MFW_DRV_MSG_GET_LAN_STATS:
@@ -936,9 +1309,11 @@ static void ecore_mcp_send_protocol_stats(struct ecore_hwfn *p_hwfn,
        OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
        mb_params.cmd = DRV_MSG_CODE_GET_STATS;
        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);
+       mb_params.p_data_src = &stats;
+       mb_params.data_src_size = sizeof(stats);
+       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,
@@ -1033,28 +1408,38 @@ static void ecore_mcp_handle_fan_failure(struct ecore_hwfn *p_hwfn,
        ecore_hw_err_notify(p_hwfn, ECORE_HW_ERR_FAN_FAIL);
 }
 
+struct ecore_mdump_cmd_params {
+       u32 cmd;
+       void *p_data_src;
+       u8 data_src_size;
+       void *p_data_dst;
+       u8 data_dst_size;
+       u32 mcp_resp;
+};
+
 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_mdump_cmd_params *p_mdump_cmd_params)
 {
        struct ecore_mcp_mb_params mb_params;
        enum _ecore_status_t rc;
 
        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;
+       mb_params.param = p_mdump_cmd_params->cmd;
+       mb_params.p_data_src = p_mdump_cmd_params->p_data_src;
+       mb_params.data_src_size = p_mdump_cmd_params->data_src_size;
+       mb_params.p_data_dst = p_mdump_cmd_params->p_data_dst;
+       mb_params.data_dst_size = p_mdump_cmd_params->data_dst_size;
        rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
        if (rc != ECORE_SUCCESS)
                return rc;
 
-       *p_mcp_resp = mb_params.mcp_resp;
-       if (*p_mcp_resp == FW_MSG_CODE_MDUMP_INVALID_CMD) {
+       p_mdump_cmd_params->mcp_resp = mb_params.mcp_resp;
+       if (p_mdump_cmd_params->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);
+                         p_mdump_cmd_params->cmd);
                rc = ECORE_INVAL;
        }
 
@@ -1064,63 +1449,68 @@ ecore_mcp_mdump_cmd(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
 static enum _ecore_status_t ecore_mcp_mdump_ack(struct ecore_hwfn *p_hwfn,
                                                struct ecore_ptt *p_ptt)
 {
-       u32 mcp_resp;
+       struct ecore_mdump_cmd_params mdump_cmd_params;
+
+       OSAL_MEM_ZERO(&mdump_cmd_params, sizeof(mdump_cmd_params));
+       mdump_cmd_params.cmd = DRV_MSG_CODE_MDUMP_ACK;
 
-       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_ACK,
-                                  OSAL_NULL, OSAL_NULL, &mcp_resp);
+       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, &mdump_cmd_params);
 }
 
 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;
+       struct ecore_mdump_cmd_params mdump_cmd_params;
 
-       OSAL_MEMCPY(&union_data.raw_data, &epoch, sizeof(epoch));
+       OSAL_MEM_ZERO(&mdump_cmd_params, sizeof(mdump_cmd_params));
+       mdump_cmd_params.cmd = DRV_MSG_CODE_MDUMP_SET_VALUES;
+       mdump_cmd_params.p_data_src = &epoch;
+       mdump_cmd_params.data_src_size = sizeof(epoch);
 
-       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_SET_VALUES,
-                                  &union_data, OSAL_NULL, &mcp_resp);
+       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, &mdump_cmd_params);
 }
 
 enum _ecore_status_t ecore_mcp_mdump_trigger(struct ecore_hwfn *p_hwfn,
                                             struct ecore_ptt *p_ptt)
 {
-       u32 mcp_resp;
+       struct ecore_mdump_cmd_params mdump_cmd_params;
 
-       p_hwfn->p_dev->mdump_en = true;
+       OSAL_MEM_ZERO(&mdump_cmd_params, sizeof(mdump_cmd_params));
+       mdump_cmd_params.cmd = DRV_MSG_CODE_MDUMP_TRIGGER;
 
-       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_TRIGGER,
-                                  OSAL_NULL, OSAL_NULL, &mcp_resp);
+       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, &mdump_cmd_params);
 }
 
 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;
+       struct ecore_mdump_cmd_params mdump_cmd_params;
        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);
+       OSAL_MEM_ZERO(&mdump_cmd_params, sizeof(mdump_cmd_params));
+       mdump_cmd_params.cmd = DRV_MSG_CODE_MDUMP_GET_CONFIG;
+       mdump_cmd_params.p_data_dst = p_mdump_config;
+       mdump_cmd_params.data_dst_size = sizeof(*p_mdump_config);
+
+       rc = ecore_mcp_mdump_cmd(p_hwfn, p_ptt, &mdump_cmd_params);
        if (rc != ECORE_SUCCESS)
                return rc;
 
-       /* A zero response implies that the mdump command is not supported */
-       if (!mcp_resp)
+       if (mdump_cmd_params.mcp_resp == FW_MSG_CODE_UNSUPPORTED) {
+               DP_INFO(p_hwfn,
+                       "The mdump command is not supported by the MFW\n");
                return ECORE_NOTIMPL;
+       }
 
-       if (mcp_resp != FW_MSG_CODE_OK) {
+       if (mdump_cmd_params.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);
+                         mdump_cmd_params.mcp_resp);
                rc = ECORE_UNKNOWN_ERROR;
        }
 
-       OSAL_MEMCPY(p_mdump_config, &union_data.mdump_config,
-                   sizeof(*p_mdump_config));
-
        return rc;
 }
 
@@ -1170,10 +1560,12 @@ ecore_mcp_mdump_get_info(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
 enum _ecore_status_t ecore_mcp_mdump_clear_logs(struct ecore_hwfn *p_hwfn,
                                                struct ecore_ptt *p_ptt)
 {
-       u32 mcp_resp;
+       struct ecore_mdump_cmd_params mdump_cmd_params;
 
-       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_CLEAR_LOGS,
-                                  OSAL_NULL, OSAL_NULL, &mcp_resp);
+       OSAL_MEM_ZERO(&mdump_cmd_params, sizeof(mdump_cmd_params));
+       mdump_cmd_params.cmd = DRV_MSG_CODE_MDUMP_CLEAR_LOGS;
+
+       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, &mdump_cmd_params);
 }
 
 static void ecore_mcp_handle_critical_error(struct ecore_hwfn *p_hwfn,
@@ -1188,10 +1580,9 @@ static void ecore_mcp_handle_critical_error(struct ecore_hwfn *p_hwfn,
        DP_NOTICE(p_hwfn, false,
                  "Received a critical error notification from the MFW!\n");
 
-       if (p_hwfn->p_dev->mdump_en) {
+       if (p_hwfn->p_dev->allow_mdump) {
                DP_NOTICE(p_hwfn, false,
                          "Not acknowledging the notification to allow the MFW crash dump\n");
-               p_hwfn->p_dev->mdump_en = false;
                return;
        }
 
@@ -1682,9 +2073,8 @@ 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)
 {
-       struct drv_version_stc *p_drv_version;
        struct ecore_mcp_mb_params mb_params;
-       union drv_union_data union_data;
+       struct drv_version_stc drv_version;
        u32 num_words, i;
        void *p_name;
        OSAL_BE32 val;
@@ -1695,19 +2085,20 @@ ecore_mcp_send_drv_version(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
                return ECORE_SUCCESS;
 #endif
 
-       p_drv_version = &union_data.drv_version;
-       p_drv_version->version = p_ver->version;
+       OSAL_MEM_ZERO(&drv_version, sizeof(drv_version));
+       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;
+               *(u32 *)&drv_version.name[i * sizeof(u32)] = val;
        }
 
        OSAL_MEM_ZERO(&mb_params, sizeof(mb_params));
        mb_params.cmd = DRV_MSG_CODE_SET_VERSION;
-       mb_params.p_data_src = &union_data;
+       mb_params.p_data_src = &drv_version;
+       mb_params.data_src_size = sizeof(drv_version);
        rc = ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
        if (rc != ECORE_SUCCESS)
                DP_ERR(p_hwfn, "MCP response failure, aborting\n");
@@ -2376,28 +2767,25 @@ ecore_mcp_get_temperature_info(struct ecore_hwfn *p_hwfn,
                               struct ecore_temperature_info *p_temp_info)
 {
        struct ecore_temperature_sensor *p_temp_sensor;
-       struct temperature_status_stc *p_mfw_temp_info;
+       struct temperature_status_stc 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;
+       mb_params.p_data_dst = &mfw_temp_info;
+       mb_params.data_dst_size = sizeof(mfw_temp_info);
        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,
+       p_temp_info->num_sensors = OSAL_MIN_T(u32, 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];
+               val = 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;
@@ -2452,7 +2840,60 @@ enum _ecore_status_t ecore_mcp_mem_ecc_events(struct ecore_hwfn *p_hwfn,
                             0, &rsp, (u32 *)num_events);
 }
 
-#define ECORE_RESC_ALLOC_VERSION_MAJOR 1
+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 <<                     \
@@ -2460,36 +2901,167 @@ enum _ecore_status_t ecore_mcp_mem_ecc_events(struct ecore_hwfn *p_hwfn,
         (ECORE_RESC_ALLOC_VERSION_MINOR <<                     \
          DRV_MB_PARAM_RESOURCE_ALLOC_VERSION_MINOR_SHIFT))
 
-enum _ecore_status_t ecore_mcp_get_resc_info(struct ecore_hwfn *p_hwfn,
-                                            struct ecore_ptt *p_ptt,
-                                            struct resource_info *p_resc_info,
-                                            u32 *p_mcp_resp, u32 *p_mcp_param)
+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;
+};
+
+#define ECORE_RECOVERY_PROLOG_SLEEP_MS 100
+
+enum _ecore_status_t ecore_recovery_prolog(struct ecore_dev *p_dev)
+{
+       struct ecore_hwfn *p_hwfn = ECORE_LEADING_HWFN(p_dev);
+       struct ecore_ptt *p_ptt = p_hwfn->p_main_ptt;
+       enum _ecore_status_t rc;
+
+       /* Allow ongoing PCIe transactions to complete */
+       OSAL_MSLEEP(ECORE_RECOVERY_PROLOG_SLEEP_MS);
+
+       /* Clear the PF's internal FID_enable in the PXP */
+       rc = ecore_pglueb_set_pfid_enable(p_hwfn, p_ptt, false);
+       if (rc != ECORE_SUCCESS)
+               DP_NOTICE(p_hwfn, false,
+                         "ecore_pglueb_set_pfid_enable() failed. rc = %d.\n",
+                         rc);
+
+       return rc;
+}
+
+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 ecore_mcp_mb_params mb_params;
-       union drv_union_data union_data;
+       struct resource_info mfw_resc_info;
        enum _ecore_status_t rc;
 
+       OSAL_MEM_ZERO(&mfw_resc_info, sizeof(mfw_resc_info));
+
+       mfw_resc_info.res_id = ecore_mcp_get_mfw_res_id(p_in_params->res_id);
+       if (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:
+               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 = DRV_MSG_GET_RESOURCE_ALLOC_MSG;
+       mb_params.cmd = p_in_params->cmd;
        mb_params.param = ECORE_RESC_ALLOC_VERSION;
-       OSAL_MEMCPY(&union_data.resource, p_resc_info, sizeof(*p_resc_info));
-       mb_params.p_data_src = &union_data;
-       mb_params.p_data_dst = &union_data;
+       mb_params.p_data_src = &mfw_resc_info;
+       mb_params.data_src_size = sizeof(mfw_resc_info);
+       mb_params.p_data_dst = mb_params.p_data_src;
+       mb_params.data_dst_size = mb_params.data_src_size;
+
+       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_mcp_resp = mb_params.mcp_resp;
-       *p_mcp_param = mb_params.mcp_param;
-
-       OSAL_MEMCPY(p_resc_info, &union_data.resource, sizeof(*p_resc_info));
+       p_out_params->mcp_resp = mb_params.mcp_resp;
+       p_out_params->mcp_param = mb_params.mcp_param;
+       p_out_params->resc_num = mfw_resc_info.size;
+       p_out_params->resc_start = mfw_resc_info.offset;
+       p_out_params->vf_resc_num = mfw_resc_info.vf_size;
+       p_out_params->vf_resc_start = mfw_resc_info.vf_offset;
+       p_out_params->flags = mfw_resc_info.flags;
 
        DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
-                  "MFW resource_info: version 0x%x, res_id 0x%x, size 0x%x,"
-                  " offset 0x%x, vf_size 0x%x, vf_offset 0x%x, flags 0x%x\n",
-                  *p_mcp_param, p_resc_info->res_id, p_resc_info->size,
-                  p_resc_info->offset, p_resc_info->vf_size,
-                  p_resc_info->vf_offset, p_resc_info->flags);
+                  "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;
 }
@@ -2515,9 +3087,11 @@ static enum _ecore_status_t ecore_mcp_resource_cmd(struct ecore_hwfn *p_hwfn,
        if (rc != ECORE_SUCCESS)
                return rc;
 
-       /* A zero response implies that the resource command is not supported */
-       if (!*p_mcp_resp)
+       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);
@@ -2531,36 +3105,35 @@ static enum _ecore_status_t ecore_mcp_resource_cmd(struct ecore_hwfn *p_hwfn,
        return rc;
 }
 
-enum _ecore_status_t ecore_mcp_resc_lock(struct ecore_hwfn *p_hwfn,
-                                        struct ecore_ptt *p_ptt,
-                                        u8 resource_num, u8 timeout,
-                                        bool *p_granted, u8 *p_owner)
+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 (timeout) {
+       switch (p_params->timeout) {
        case ECORE_MCP_RESC_LOCK_TO_DEFAULT:
                opcode = RESOURCE_OPCODE_REQ;
-               timeout = 0;
+               p_params->timeout = 0;
                break;
        case ECORE_MCP_RESC_LOCK_TO_NONE:
                opcode = RESOURCE_OPCODE_REQ_WO_AGING;
-               timeout = 0;
+               p_params->timeout = 0;
                break;
        default:
                opcode = RESOURCE_OPCODE_REQ_W_AGING;
                break;
        }
 
-       ECORE_MFW_SET_FIELD(param, RESOURCE_CMD_REQ_RESC, resource_num);
+       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, timeout);
+       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, resc_num %d]\n",
-                  param, timeout, opcode, resource_num);
+                  "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,
@@ -2569,19 +3142,20 @@ enum _ecore_status_t ecore_mcp_resc_lock(struct ecore_hwfn *p_hwfn,
                return rc;
 
        /* Analyze the response */
-       *p_owner = ECORE_MFW_GET_FIELD(mcp_param, RESOURCE_CMD_RSP_OWNER);
+       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_owner);
+                  mcp_param, opcode, p_params->owner);
 
        switch (opcode) {
        case RESOURCE_OPCODE_GNT:
-               *p_granted = true;
+               p_params->b_granted = true;
                break;
        case RESOURCE_OPCODE_BUSY:
-               *p_granted = false;
+               p_params->b_granted = false;
                break;
        default:
                DP_NOTICE(p_hwfn, false,
@@ -2593,23 +3167,54 @@ enum _ecore_status_t ecore_mcp_resc_lock(struct ecore_hwfn *p_hwfn,
        return ECORE_SUCCESS;
 }
 
-enum _ecore_status_t ecore_mcp_resc_unlock(struct ecore_hwfn *p_hwfn,
-                                          struct ecore_ptt *p_ptt,
-                                          u8 resource_num, bool force,
-                                          bool *p_released)
+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 = force ? RESOURCE_OPCODE_FORCE_RELEASE
-                      : RESOURCE_OPCODE_RELEASE;
-       ECORE_MFW_SET_FIELD(param, RESOURCE_CMD_REQ_RESC, resource_num);
+       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, resc_num %d]\n",
-                  param, opcode, resource_num);
+                  "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,
@@ -2627,14 +3232,14 @@ enum _ecore_status_t ecore_mcp_resc_unlock(struct ecore_hwfn *p_hwfn,
        switch (opcode) {
        case RESOURCE_OPCODE_RELEASED_PREVIOUS:
                DP_INFO(p_hwfn,
-                       "Resource unlock request for an already released resource [resc_num %d]\n",
-                       resource_num);
+                       "Resource unlock request for an already released resource [%d]\n",
+                       p_params->resource);
                /* Fallthrough */
        case RESOURCE_OPCODE_RELEASED:
-               *p_released = true;
+               p_params->b_released = true;
                break;
        case RESOURCE_OPCODE_WRONG_OWNER:
-               *p_released = false;
+               p_params->b_released = false;
                break;
        default:
                DP_NOTICE(p_hwfn, false,