net/bnxt: remove unused macro
[dpdk.git] / drivers / net / bnxt / tf_core / tf_msg.c
index 554a849..db471f6 100644 (file)
@@ -3,96 +3,57 @@
  * All rights reserved.
  */
 
+#include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
-
-#include "bnxt.h"
-#include "tf_core.h"
-#include "tf_session.h"
-#include "tfp.h"
+#include <string.h>
 
 #include "tf_msg_common.h"
+#include "tf_device.h"
 #include "tf_msg.h"
-#include "hsi_struct_def_dpdk.h"
+#include "tf_util.h"
+#include "tf_common.h"
+#include "tf_session.h"
+#include "tfp.h"
 #include "hwrm_tf.h"
 #include "tf_em.h"
 
-/**
- * Endian converts min and max values from the HW response to the query
- */
-#define TF_HW_RESP_TO_QUERY(query, index, response, element) do {            \
-       (query)->hw_query[index].min =                                       \
-               tfp_le_to_cpu_16(response. element ## _min);                 \
-       (query)->hw_query[index].max =                                       \
-               tfp_le_to_cpu_16(response. element ## _max);                 \
-} while (0)
-
-/**
- * Endian converts the number of entries from the alloc to the request
- */
-#define TF_HW_ALLOC_TO_REQ(alloc, index, request, element)                   \
-       (request. num_ ## element = tfp_cpu_to_le_16((alloc)->hw_num[index]))
-
-/**
- * Endian converts the start and stride value from the free to the request
- */
-#define TF_HW_FREE_TO_REQ(hw_entry, index, request, element) do {            \
-       request.element ## _start =                                          \
-               tfp_cpu_to_le_16(hw_entry[index].start);                     \
-       request.element ## _stride =                                         \
-               tfp_cpu_to_le_16(hw_entry[index].stride);                    \
-} while (0)
-
-/**
- * Endian converts the start and stride from the HW response to the
- * alloc
- */
-#define TF_HW_RESP_TO_ALLOC(hw_entry, index, response, element) do {         \
-       hw_entry[index].start =                                              \
-               tfp_le_to_cpu_16(response.element ## _start);                \
-       hw_entry[index].stride =                                             \
-               tfp_le_to_cpu_16(response.element ## _stride);               \
-} while (0)
+/* Logging defines */
+#define TF_RM_MSG_DEBUG  0
 
-/**
- * Endian converts min and max values from the SRAM response to the
- * query
+/* Specific msg size defines as we cannot use defines in tf.yaml. This
+ * means we have to manually sync hwrm with these defines if the
+ * tf.yaml changes.
  */
-#define TF_SRAM_RESP_TO_QUERY(query, index, response, element) do {          \
-       (query)->sram_query[index].min =                                     \
-               tfp_le_to_cpu_16(response.element ## _min);                  \
-       (query)->sram_query[index].max =                                     \
-               tfp_le_to_cpu_16(response.element ## _max);                  \
-} while (0)
-
-/**
- * Endian converts the number of entries from the action (alloc) to
- * the request
+#define TF_MSG_SET_GLOBAL_CFG_DATA_SIZE  16
+#define TF_MSG_EM_INSERT_KEY_SIZE        64
+#define TF_MSG_TBL_TYPE_SET_DATA_SIZE    88
+
+/* Compile check - Catch any msg changes that we depend on, like the
+ * defines listed above for array size checking.
+ *
+ * Checking array size is dangerous in that the type could change and
+ * we wouldn't be able to catch it. Thus we check if the complete msg
+ * changed instead. Best we can do.
+ *
+ * If failure is observed then both msg size (defines below) and the
+ * array size (define above) should be checked and compared.
  */
-#define TF_SRAM_ALLOC_TO_REQ(action, index, request, element)                \
-       (request. num_ ## element = tfp_cpu_to_le_16((action)->sram_num[index]))
+#define TF_MSG_SIZE_HWRM_TF_GLOBAL_CFG_SET 56
+static_assert(sizeof(struct hwrm_tf_global_cfg_set_input) ==
+             TF_MSG_SIZE_HWRM_TF_GLOBAL_CFG_SET,
+             "HWRM message size changed: hwrm_tf_global_cfg_set_input");
 
-/**
- * Endian converts the start and stride value from the free to the request
- */
-#define TF_SRAM_FREE_TO_REQ(sram_entry, index, request, element) do {        \
-       request.element ## _start =                                          \
-               tfp_cpu_to_le_16(sram_entry[index].start);                   \
-       request.element ## _stride =                                         \
-               tfp_cpu_to_le_16(sram_entry[index].stride);                  \
-} while (0)
+#define TF_MSG_SIZE_HWRM_TF_EM_INSERT      104
+static_assert(sizeof(struct hwrm_tf_em_insert_input) ==
+             TF_MSG_SIZE_HWRM_TF_EM_INSERT,
+             "HWRM message size changed: hwrm_tf_em_insert_input");
 
-/**
- * Endian converts the start and stride from the HW response to the
- * alloc
- */
-#define TF_SRAM_RESP_TO_ALLOC(sram_entry, index, response, element) do {     \
-       sram_entry[index].start =                                            \
-               tfp_le_to_cpu_16(response.element ## _start);                \
-       sram_entry[index].stride =                                           \
-               tfp_le_to_cpu_16(response.element ## _stride);               \
-} while (0)
+#define TF_MSG_SIZE_HWRM_TF_TBL_TYPE_SET   128
+static_assert(sizeof(struct hwrm_tf_tbl_type_set_input) ==
+             TF_MSG_SIZE_HWRM_TF_TBL_TYPE_SET,
+             "HWRM message size changed: hwrm_tf_tbl_type_set_input");
 
 /**
  * This is the MAX data we can transport across regular HWRM
@@ -107,46 +68,58 @@ struct tf_msg_dma_buf {
        uint64_t pa_addr;
 };
 
+/**
+ * Allocates a DMA buffer that can be used for message transfer.
+ *
+ * [in] buf
+ *   Pointer to DMA buffer structure
+ *
+ * [in] size
+ *   Requested size of the buffer in bytes
+ *
+ * Returns:
+ *    0      - Success
+ *   -ENOMEM - Unable to allocate buffer, no memory
+ */
 static int
-tf_tcam_tbl_2_hwrm(enum tf_tcam_tbl_type tcam_type,
-                  uint32_t *hwrm_type)
+tf_msg_alloc_dma_buf(struct tf_msg_dma_buf *buf, int size)
 {
-       int rc = 0;
+       struct tfp_calloc_parms alloc_parms;
+       int rc;
 
-       switch (tcam_type) {
-       case TF_TCAM_TBL_TYPE_L2_CTXT_TCAM:
-               *hwrm_type = TF_DEV_DATA_TYPE_TF_L2_CTX_ENTRY;
-               break;
-       case TF_TCAM_TBL_TYPE_PROF_TCAM:
-               *hwrm_type = TF_DEV_DATA_TYPE_TF_PROF_TCAM_ENTRY;
-               break;
-       case TF_TCAM_TBL_TYPE_WC_TCAM:
-               *hwrm_type = TF_DEV_DATA_TYPE_TF_WC_ENTRY;
-               break;
-       case TF_TCAM_TBL_TYPE_VEB_TCAM:
-               rc = -EOPNOTSUPP;
-               break;
-       case TF_TCAM_TBL_TYPE_SP_TCAM:
-               rc = -EOPNOTSUPP;
-               break;
-       case TF_TCAM_TBL_TYPE_CT_RULE_TCAM:
-               rc = -EOPNOTSUPP;
-               break;
-       default:
-               rc = -EOPNOTSUPP;
-               break;
-       }
+       /* Allocate session */
+       alloc_parms.nitems = 1;
+       alloc_parms.size = size;
+       alloc_parms.alignment = 4096;
+       rc = tfp_calloc(&alloc_parms);
+       if (rc)
+               return -ENOMEM;
 
-       return rc;
+       buf->pa_addr = (uintptr_t)alloc_parms.mem_pa;
+       buf->va_addr = alloc_parms.mem_va;
+
+       return 0;
 }
 
 /**
- * Sends session open request to TF Firmware
+ * Free's a previous allocated DMA buffer.
+ *
+ * [in] buf
+ *   Pointer to DMA buffer structure
  */
+static void
+tf_msg_free_dma_buf(struct tf_msg_dma_buf *buf)
+{
+       tfp_free(buf->va_addr);
+}
+
+/* HWRM Direct messages */
+
 int
 tf_msg_session_open(struct tf *tfp,
                    char *ctrl_chan_name,
-                   uint8_t *fw_session_id)
+                   uint8_t *fw_session_id,
+                   uint8_t *fw_session_client_id)
 {
        int rc;
        struct hwrm_tf_session_open_input req = { 0 };
@@ -154,7 +127,7 @@ tf_msg_session_open(struct tf *tfp,
        struct tfp_send_msg_parms parms = { 0 };
 
        /* Populate the request */
-       memcpy(&req.session_name, ctrl_chan_name, TF_SESSION_NAME_MAX);
+       tfp_memcpy(&req.session_name, ctrl_chan_name, TF_SESSION_NAME_MAX);
 
        parms.tf_type = HWRM_TF_SESSION_OPEN;
        parms.req_data = (uint32_t *)&req;
@@ -168,14 +141,13 @@ tf_msg_session_open(struct tf *tfp,
        if (rc)
                return rc;
 
-       *fw_session_id = resp.fw_session_id;
+       *fw_session_id = (uint8_t)tfp_le_to_cpu_32(resp.fw_session_id);
+       *fw_session_client_id =
+               (uint8_t)tfp_le_to_cpu_32(resp.fw_session_client_id);
 
        return rc;
 }
 
-/**
- * Sends session attach request to TF Firmware
- */
 int
 tf_msg_session_attach(struct tf *tfp __rte_unused,
                      char *ctrl_chan_name __rte_unused,
@@ -184,23 +156,32 @@ tf_msg_session_attach(struct tf *tfp __rte_unused,
        return -1;
 }
 
-/**
- * Sends session close request to TF Firmware
- */
 int
-tf_msg_session_close(struct tf *tfp)
+tf_msg_session_client_register(struct tf *tfp,
+                              char *ctrl_channel_name,
+                              uint8_t *fw_session_client_id)
 {
        int rc;
-       struct hwrm_tf_session_close_input req = { 0 };
-       struct hwrm_tf_session_close_output resp = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       struct hwrm_tf_session_register_input req = { 0 };
+       struct hwrm_tf_session_register_output resp = { 0 };
        struct tfp_send_msg_parms parms = { 0 };
+       uint8_t fw_session_id;
+
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "Unable to lookup FW id, rc:%s\n",
+                           strerror(-rc));
+               return rc;
+       }
 
        /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
+       tfp_memcpy(&req.session_client_name,
+                  ctrl_channel_name,
+                  TF_SESSION_NAME_MAX);
 
-       parms.tf_type = HWRM_TF_SESSION_CLOSE;
+       parms.tf_type = HWRM_TF_SESSION_REGISTER;
        parms.req_data = (uint32_t *)&req;
        parms.req_size = sizeof(req);
        parms.resp_data = (uint32_t *)&resp;
@@ -209,26 +190,38 @@ tf_msg_session_close(struct tf *tfp)
 
        rc = tfp_send_msg_direct(tfp,
                                 &parms);
+       if (rc)
+               return rc;
+
+       *fw_session_client_id =
+               (uint8_t)tfp_le_to_cpu_32(resp.fw_session_client_id);
+
        return rc;
 }
 
-/**
- * Sends session query config request to TF Firmware
- */
 int
-tf_msg_session_qcfg(struct tf *tfp)
+tf_msg_session_client_unregister(struct tf *tfp,
+                                uint8_t fw_session_client_id)
 {
        int rc;
-       struct hwrm_tf_session_qcfg_input  req = { 0 };
-       struct hwrm_tf_session_qcfg_output resp = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       struct hwrm_tf_session_unregister_input req = { 0 };
+       struct hwrm_tf_session_unregister_output resp = { 0 };
        struct tfp_send_msg_parms parms = { 0 };
+       uint8_t fw_session_id;
+
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "Unable to lookup FW id, rc:%s\n",
+                           strerror(-rc));
+               return rc;
+       }
 
        /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
+       req.fw_session_client_id = tfp_cpu_to_le_32(fw_session_client_id);
 
-       parms.tf_type = HWRM_TF_SESSION_QCFG,
+       parms.tf_type = HWRM_TF_SESSION_UNREGISTER;
        parms.req_data = (uint32_t *)&req;
        parms.req_size = sizeof(req);
        parms.resp_data = (uint32_t *)&resp;
@@ -237,647 +230,468 @@ tf_msg_session_qcfg(struct tf *tfp)
 
        rc = tfp_send_msg_direct(tfp,
                                 &parms);
+
        return rc;
 }
 
-/**
- * Sends session HW resource query capability request to TF Firmware
- */
 int
-tf_msg_session_hw_resc_qcaps(struct tf *tfp,
-                            enum tf_dir dir,
-                            struct tf_rm_hw_query *query)
+tf_msg_session_close(struct tf *tfp)
 {
        int rc;
+       struct hwrm_tf_session_close_input req = { 0 };
+       struct hwrm_tf_session_close_output resp = { 0 };
        struct tfp_send_msg_parms parms = { 0 };
-       struct tf_session_hw_resc_qcaps_input req = { 0 };
-       struct tf_session_hw_resc_qcaps_output resp = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       uint8_t fw_session_id;
 
-       memset(query, 0, sizeof(*query));
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "Unable to lookup FW id, rc:%s\n",
+                           strerror(-rc));
+               return rc;
+       }
 
        /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
-       req.flags = tfp_cpu_to_le_16(dir);
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
 
-       MSG_PREP(parms,
-                TF_KONG_MB,
-                HWRM_TF,
-                HWRM_TFT_SESSION_HW_RESC_QCAPS,
-                req,
-                resp);
+       parms.tf_type = HWRM_TF_SESSION_CLOSE;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
 
-       rc = tfp_send_msg_tunneled(tfp, &parms);
-       if (rc)
+       rc = tfp_send_msg_direct(tfp,
+                                &parms);
+       return rc;
+}
+
+int
+tf_msg_session_qcfg(struct tf *tfp)
+{
+       int rc;
+       struct hwrm_tf_session_qcfg_input req = { 0 };
+       struct hwrm_tf_session_qcfg_output resp = { 0 };
+       struct tfp_send_msg_parms parms = { 0 };
+       uint8_t fw_session_id;
+
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "Unable to lookup FW id, rc:%s\n",
+                           strerror(-rc));
                return rc;
+       }
 
-       /* Process the response */
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_L2_CTXT_TCAM, resp,
-                           l2_ctx_tcam_entries);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_PROF_FUNC, resp,
-                           prof_func);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_PROF_TCAM, resp,
-                           prof_tcam_entries);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_EM_PROF_ID, resp,
-                           em_prof_id);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_EM_REC, resp,
-                           em_record_entries);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_WC_TCAM_PROF_ID, resp,
-                           wc_tcam_prof_id);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_WC_TCAM, resp,
-                           wc_tcam_entries);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_METER_PROF, resp,
-                           meter_profiles);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_METER_INST,
-                           resp, meter_inst);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_MIRROR, resp,
-                           mirrors);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_UPAR, resp,
-                           upar);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_SP_TCAM, resp,
-                           sp_tcam_entries);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_L2_FUNC, resp,
-                           l2_func);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_FKB, resp,
-                           flex_key_templ);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_TBL_SCOPE, resp,
-                           tbl_scope);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_EPOCH0, resp,
-                           epoch0_entries);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_EPOCH1, resp,
-                           epoch1_entries);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_METADATA, resp,
-                           metadata);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_CT_STATE, resp,
-                           ct_state);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_RANGE_PROF, resp,
-                           range_prof);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_RANGE_ENTRY, resp,
-                           range_entries);
-       TF_HW_RESP_TO_QUERY(query, TF_RESC_TYPE_HW_LAG_ENTRY, resp,
-                           lag_tbl_entries);
+       /* Populate the request */
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
 
-       return tfp_le_to_cpu_32(parms.tf_resp_code);
+       parms.tf_type = HWRM_TF_SESSION_QCFG,
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
+
+       rc = tfp_send_msg_direct(tfp,
+                                &parms);
+       return rc;
 }
 
-/**
- * Sends session HW resource allocation request to TF Firmware
- */
 int
-tf_msg_session_hw_resc_alloc(struct tf *tfp __rte_unused,
-                            enum tf_dir dir,
-                            struct tf_rm_hw_alloc *hw_alloc __rte_unused,
-                            struct tf_rm_entry *hw_entry __rte_unused)
+tf_msg_session_resc_qcaps(struct tf *tfp,
+                         enum tf_dir dir,
+                         uint16_t size,
+                         struct tf_rm_resc_req_entry *query,
+                         enum tf_rm_resc_resv_strategy *resv_strategy)
 {
        int rc;
+       int i;
        struct tfp_send_msg_parms parms = { 0 };
-       struct tf_session_hw_resc_alloc_input req = { 0 };
-       struct tf_session_hw_resc_alloc_output resp = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       struct hwrm_tf_session_resc_qcaps_input req = { 0 };
+       struct hwrm_tf_session_resc_qcaps_output resp = { 0 };
+       uint8_t fw_session_id;
+       struct tf_msg_dma_buf qcaps_buf = { 0 };
+       struct tf_rm_resc_req_entry *data;
+       int dma_size;
+
+       TF_CHECK_PARMS3(tfp, query, resv_strategy);
+
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(dir),
+                           strerror(-rc));
+               return rc;
+       }
 
-       memset(hw_entry, 0, sizeof(*hw_entry));
+       /* Prepare DMA buffer */
+       dma_size = size * sizeof(struct tf_rm_resc_req_entry);
+       rc = tf_msg_alloc_dma_buf(&qcaps_buf, dma_size);
+       if (rc)
+               return rc;
 
        /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
        req.flags = tfp_cpu_to_le_16(dir);
+       req.qcaps_size = size;
+       req.qcaps_addr = tfp_cpu_to_le_64(qcaps_buf.pa_addr);
 
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_L2_CTXT_TCAM, req,
-                          l2_ctx_tcam_entries);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_PROF_FUNC, req,
-                          prof_func_entries);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_PROF_TCAM, req,
-                          prof_tcam_entries);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_EM_PROF_ID, req,
-                          em_prof_id);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_EM_REC, req,
-                          em_record_entries);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_WC_TCAM_PROF_ID, req,
-                          wc_tcam_prof_id);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_WC_TCAM, req,
-                          wc_tcam_entries);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_METER_PROF, req,
-                          meter_profiles);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_METER_INST, req,
-                          meter_inst);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_MIRROR, req,
-                          mirrors);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_UPAR, req,
-                          upar);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_SP_TCAM, req,
-                          sp_tcam_entries);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_L2_FUNC, req,
-                          l2_func);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_FKB, req,
-                          flex_key_templ);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_TBL_SCOPE, req,
-                          tbl_scope);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_EPOCH0, req,
-                          epoch0_entries);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_EPOCH1, req,
-                          epoch1_entries);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_METADATA, req,
-                          metadata);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_CT_STATE, req,
-                          ct_state);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_RANGE_PROF, req,
-                          range_prof);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_RANGE_ENTRY, req,
-                          range_entries);
-       TF_HW_ALLOC_TO_REQ(hw_alloc, TF_RESC_TYPE_HW_LAG_ENTRY, req,
-                          lag_tbl_entries);
-
-       MSG_PREP(parms,
-                TF_KONG_MB,
-                HWRM_TF,
-                HWRM_TFT_SESSION_HW_RESC_ALLOC,
-                req,
-                resp);
+       parms.tf_type = HWRM_TF_SESSION_RESC_QCAPS;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
 
-       rc = tfp_send_msg_tunneled(tfp, &parms);
+       rc = tfp_send_msg_direct(tfp, &parms);
        if (rc)
-               return rc;
+               goto cleanup;
+
+       /* Process the response
+        * Should always get expected number of entries
+        */
+       if (tfp_le_to_cpu_32(resp.size) != size) {
+               TFP_DRV_LOG(ERR,
+                           "%s: QCAPS message size error, rc:%s\n",
+                           tf_dir_2_str(dir),
+                           strerror(EINVAL));
+               rc = -EINVAL;
+               goto cleanup;
+       }
 
-       /* Process the response */
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_L2_CTXT_TCAM, resp,
-                           l2_ctx_tcam_entries);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_PROF_FUNC, resp,
-                           prof_func);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_PROF_TCAM, resp,
-                           prof_tcam_entries);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_EM_PROF_ID, resp,
-                           em_prof_id);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_EM_REC, resp,
-                           em_record_entries);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_WC_TCAM_PROF_ID, resp,
-                           wc_tcam_prof_id);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_WC_TCAM, resp,
-                           wc_tcam_entries);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_METER_PROF, resp,
-                           meter_profiles);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_METER_INST, resp,
-                           meter_inst);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_MIRROR, resp,
-                           mirrors);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_UPAR, resp,
-                           upar);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_SP_TCAM, resp,
-                           sp_tcam_entries);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_L2_FUNC, resp,
-                           l2_func);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_FKB, resp,
-                           flex_key_templ);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_TBL_SCOPE, resp,
-                           tbl_scope);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_EPOCH0, resp,
-                           epoch0_entries);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_EPOCH1, resp,
-                           epoch1_entries);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_METADATA, resp,
-                           metadata);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_CT_STATE, resp,
-                           ct_state);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_RANGE_PROF, resp,
-                           range_prof);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_RANGE_ENTRY, resp,
-                           range_entries);
-       TF_HW_RESP_TO_ALLOC(hw_entry, TF_RESC_TYPE_HW_LAG_ENTRY, resp,
-                           lag_tbl_entries);
+#if (TF_RM_MSG_DEBUG == 1)
+       printf("size: %d\n", tfp_le_to_cpu_32(resp.size));
+#endif /* (TF_RM_MSG_DEBUG == 1) */
+
+       /* Post process the response */
+       data = (struct tf_rm_resc_req_entry *)qcaps_buf.va_addr;
+
+#if (TF_RM_MSG_DEBUG == 1)
+       printf("\nQCAPS\n");
+#endif /* (TF_RM_MSG_DEBUG == 1) */
+       for (i = 0; i < size; i++) {
+               query[i].type = tfp_le_to_cpu_32(data[i].type);
+               query[i].min = tfp_le_to_cpu_16(data[i].min);
+               query[i].max = tfp_le_to_cpu_16(data[i].max);
+
+#if (TF_RM_MSG_DEBUG == 1)
+               printf("type: %d(0x%x) %d %d\n",
+                      query[i].type,
+                      query[i].type,
+                      query[i].min,
+                      query[i].max);
+#endif /* (TF_RM_MSG_DEBUG == 1) */
 
-       return tfp_le_to_cpu_32(parms.tf_resp_code);
+       }
+
+       *resv_strategy = resp.flags &
+             HWRM_TF_SESSION_RESC_QCAPS_OUTPUT_FLAGS_SESS_RESV_STRATEGY_MASK;
+
+cleanup:
+       tf_msg_free_dma_buf(&qcaps_buf);
+
+       return rc;
 }
 
-/**
- * Sends session HW resource free request to TF Firmware
- */
 int
-tf_msg_session_hw_resc_free(struct tf *tfp,
-                           enum tf_dir dir,
-                           struct tf_rm_entry *hw_entry)
+tf_msg_session_resc_alloc(struct tf *tfp,
+                         enum tf_dir dir,
+                         uint16_t size,
+                         struct tf_rm_resc_req_entry *request,
+                         struct tf_rm_resc_entry *resv)
 {
        int rc;
+       int i;
        struct tfp_send_msg_parms parms = { 0 };
-       struct tf_session_hw_resc_free_input req = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       struct hwrm_tf_session_resc_alloc_input req = { 0 };
+       struct hwrm_tf_session_resc_alloc_output resp = { 0 };
+       uint8_t fw_session_id;
+       struct tf_msg_dma_buf req_buf = { 0 };
+       struct tf_msg_dma_buf resv_buf = { 0 };
+       struct tf_rm_resc_req_entry *req_data;
+       struct tf_rm_resc_entry *resv_data;
+       int dma_size;
+
+       TF_CHECK_PARMS3(tfp, request, resv);
+
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(dir),
+                           strerror(-rc));
+               return rc;
+       }
 
-       memset(hw_entry, 0, sizeof(*hw_entry));
+       /* Prepare DMA buffers */
+       dma_size = size * sizeof(struct tf_rm_resc_req_entry);
+       rc = tf_msg_alloc_dma_buf(&req_buf, dma_size);
+       if (rc)
+               return rc;
+
+       dma_size = size * sizeof(struct tf_rm_resc_entry);
+       rc = tf_msg_alloc_dma_buf(&resv_buf, dma_size);
+       if (rc) {
+               tf_msg_free_dma_buf(&req_buf);
+               return rc;
+       }
 
        /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
        req.flags = tfp_cpu_to_le_16(dir);
+       req.req_size = size;
 
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_L2_CTXT_TCAM, req,
-                         l2_ctx_tcam_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_PROF_FUNC, req,
-                         prof_func);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_PROF_TCAM, req,
-                         prof_tcam_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_EM_PROF_ID, req,
-                         em_prof_id);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_EM_REC, req,
-                         em_record_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_WC_TCAM_PROF_ID, req,
-                         wc_tcam_prof_id);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_WC_TCAM, req,
-                         wc_tcam_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_METER_PROF, req,
-                         meter_profiles);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_METER_INST, req,
-                         meter_inst);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_MIRROR, req,
-                         mirrors);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_UPAR, req,
-                         upar);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_SP_TCAM, req,
-                         sp_tcam_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_L2_FUNC, req,
-                         l2_func);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_FKB, req,
-                         flex_key_templ);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_TBL_SCOPE, req,
-                         tbl_scope);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_EPOCH0, req,
-                         epoch0_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_EPOCH1, req,
-                         epoch1_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_METADATA, req,
-                         metadata);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_CT_STATE, req,
-                         ct_state);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_RANGE_PROF, req,
-                         range_prof);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_RANGE_ENTRY, req,
-                         range_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_LAG_ENTRY, req,
-                         lag_tbl_entries);
+       req_data = (struct tf_rm_resc_req_entry *)req_buf.va_addr;
+       for (i = 0; i < size; i++) {
+               req_data[i].type = tfp_cpu_to_le_32(request[i].type);
+               req_data[i].min = tfp_cpu_to_le_16(request[i].min);
+               req_data[i].max = tfp_cpu_to_le_16(request[i].max);
+       }
 
-       MSG_PREP_NO_RESP(parms,
-                        TF_KONG_MB,
-                        HWRM_TF,
-                        HWRM_TFT_SESSION_HW_RESC_FREE,
-                        req);
+       req.req_addr = tfp_cpu_to_le_64(req_buf.pa_addr);
+       req.resc_addr = tfp_cpu_to_le_64(resv_buf.pa_addr);
 
-       rc = tfp_send_msg_tunneled(tfp, &parms);
+       parms.tf_type = HWRM_TF_SESSION_RESC_ALLOC;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
+
+       rc = tfp_send_msg_direct(tfp, &parms);
        if (rc)
-               return rc;
+               goto cleanup;
+
+       /* Process the response
+        * Should always get expected number of entries
+        */
+       if (tfp_le_to_cpu_32(resp.size) != size) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Alloc message size error, rc:%s\n",
+                           tf_dir_2_str(dir),
+                           strerror(EINVAL));
+               rc = -EINVAL;
+               goto cleanup;
+       }
 
-       return tfp_le_to_cpu_32(parms.tf_resp_code);
+#if (TF_RM_MSG_DEBUG == 1)
+       printf("\nRESV\n");
+       printf("size: %d\n", tfp_le_to_cpu_32(resp.size));
+#endif /* (TF_RM_MSG_DEBUG == 1) */
+
+       /* Post process the response */
+       resv_data = (struct tf_rm_resc_entry *)resv_buf.va_addr;
+       for (i = 0; i < size; i++) {
+               resv[i].type = tfp_le_to_cpu_32(resv_data[i].type);
+               resv[i].start = tfp_le_to_cpu_16(resv_data[i].start);
+               resv[i].stride = tfp_le_to_cpu_16(resv_data[i].stride);
+
+#if (TF_RM_MSG_DEBUG == 1)
+               printf("%d type: %d(0x%x) %d %d\n",
+                      i,
+                      resv[i].type,
+                      resv[i].type,
+                      resv[i].start,
+                      resv[i].stride);
+#endif /* (TF_RM_MSG_DEBUG == 1) */
+       }
+
+cleanup:
+       tf_msg_free_dma_buf(&req_buf);
+       tf_msg_free_dma_buf(&resv_buf);
+
+       return rc;
 }
 
-/**
- * Sends session HW resource flush request to TF Firmware
- */
 int
-tf_msg_session_hw_resc_flush(struct tf *tfp,
-                            enum tf_dir dir,
-                            struct tf_rm_entry *hw_entry)
+tf_msg_session_resc_flush(struct tf *tfp,
+                         enum tf_dir dir,
+                         uint16_t size,
+                         struct tf_rm_resc_entry *resv)
 {
        int rc;
+       int i;
        struct tfp_send_msg_parms parms = { 0 };
-       struct tf_session_hw_resc_free_input req = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       struct hwrm_tf_session_resc_flush_input req = { 0 };
+       struct hwrm_tf_session_resc_flush_output resp = { 0 };
+       uint8_t fw_session_id;
+       struct tf_msg_dma_buf resv_buf = { 0 };
+       struct tf_rm_resc_entry *resv_data;
+       int dma_size;
+
+       TF_CHECK_PARMS2(tfp, resv);
+
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* Prepare DMA buffers */
+       dma_size = size * sizeof(struct tf_rm_resc_entry);
+       rc = tf_msg_alloc_dma_buf(&resv_buf, dma_size);
+       if (rc)
+               return rc;
 
        /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
        req.flags = tfp_cpu_to_le_16(dir);
+       req.flush_size = size;
 
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_L2_CTXT_TCAM, req,
-                         l2_ctx_tcam_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_PROF_FUNC, req,
-                         prof_func);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_PROF_TCAM, req,
-                         prof_tcam_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_EM_PROF_ID, req,
-                         em_prof_id);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_EM_REC, req,
-                         em_record_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_WC_TCAM_PROF_ID, req,
-                         wc_tcam_prof_id);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_WC_TCAM, req,
-                         wc_tcam_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_METER_PROF, req,
-                         meter_profiles);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_METER_INST, req,
-                         meter_inst);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_MIRROR, req,
-                         mirrors);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_UPAR, req,
-                         upar);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_SP_TCAM, req,
-                         sp_tcam_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_L2_FUNC, req,
-                         l2_func);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_FKB, req,
-                         flex_key_templ);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_TBL_SCOPE, req,
-                         tbl_scope);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_EPOCH0, req,
-                         epoch0_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_EPOCH1, req,
-                         epoch1_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_METADATA, req,
-                         metadata);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_CT_STATE, req,
-                         ct_state);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_RANGE_PROF, req,
-                         range_prof);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_RANGE_ENTRY, req,
-                         range_entries);
-       TF_HW_FREE_TO_REQ(hw_entry, TF_RESC_TYPE_HW_LAG_ENTRY, req,
-                         lag_tbl_entries);
+       resv_data = (struct tf_rm_resc_entry *)resv_buf.va_addr;
+       for (i = 0; i < size; i++) {
+               resv_data[i].type = tfp_cpu_to_le_32(resv[i].type);
+               resv_data[i].start = tfp_cpu_to_le_16(resv[i].start);
+               resv_data[i].stride = tfp_cpu_to_le_16(resv[i].stride);
+       }
 
-       MSG_PREP_NO_RESP(parms,
-                        TF_KONG_MB,
-                        TF_TYPE_TRUFLOW,
-                        HWRM_TFT_SESSION_HW_RESC_FLUSH,
-                        req);
+       req.flush_addr = tfp_cpu_to_le_64(resv_buf.pa_addr);
 
-       rc = tfp_send_msg_tunneled(tfp, &parms);
-       if (rc)
-               return rc;
+       parms.tf_type = HWRM_TF_SESSION_RESC_FLUSH;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
 
-       return tfp_le_to_cpu_32(parms.tf_resp_code);
+       rc = tfp_send_msg_direct(tfp, &parms);
+
+       tf_msg_free_dma_buf(&resv_buf);
+
+       return rc;
 }
 
-/**
- * Sends session SRAM resource query capability request to TF Firmware
- */
 int
-tf_msg_session_sram_resc_qcaps(struct tf *tfp __rte_unused,
-                              enum tf_dir dir,
-                              struct tf_rm_sram_query *query __rte_unused)
+tf_msg_insert_em_internal_entry(struct tf *tfp,
+                               struct tf_insert_em_entry_parms *em_parms,
+                               uint16_t *rptr_index,
+                               uint8_t *rptr_entry,
+                               uint8_t *num_of_entries)
 {
        int rc;
        struct tfp_send_msg_parms parms = { 0 };
-       struct tf_session_sram_resc_qcaps_input req = { 0 };
-       struct tf_session_sram_resc_qcaps_output resp = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       struct hwrm_tf_em_insert_input req = { 0 };
+       struct hwrm_tf_em_insert_output resp = { 0 };
+       struct tf_em_64b_entry *em_result =
+               (struct tf_em_64b_entry *)em_parms->em_record;
+       uint16_t flags;
+       uint8_t fw_session_id;
+       uint8_t msg_key_size;
+
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(em_parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
 
        /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
-       req.flags = tfp_cpu_to_le_16(dir);
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
+
+       /* Check for key size conformity */
+       msg_key_size = (em_parms->key_sz_in_bits + 7) / 8;
+       if (msg_key_size > TF_MSG_EM_INSERT_KEY_SIZE) {
+               rc = -EINVAL;
+               TFP_DRV_LOG(ERR,
+                           "%s: Invalid parameters for msg type, rc:%s\n",
+                           tf_dir_2_str(em_parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
 
-       MSG_PREP(parms,
-                TF_KONG_MB,
-                HWRM_TF,
-                HWRM_TFT_SESSION_SRAM_RESC_QCAPS,
-                req,
-                resp);
+       tfp_memcpy(req.em_key,
+                  em_parms->key,
+                  msg_key_size);
+
+       flags = (em_parms->dir == TF_DIR_TX ?
+                HWRM_TF_EM_INSERT_INPUT_FLAGS_DIR_TX :
+                HWRM_TF_EM_INSERT_INPUT_FLAGS_DIR_RX);
+       req.flags = tfp_cpu_to_le_16(flags);
+       req.strength = (em_result->hdr.word1 &
+                       CFA_P4_EEM_ENTRY_STRENGTH_MASK) >>
+                       CFA_P4_EEM_ENTRY_STRENGTH_SHIFT;
+       req.em_key_bitlen = em_parms->key_sz_in_bits;
+       req.action_ptr = em_result->hdr.pointer;
+       req.em_record_idx = *rptr_index;
 
-       rc = tfp_send_msg_tunneled(tfp, &parms);
+       parms.tf_type = HWRM_TF_EM_INSERT;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
+
+       rc = tfp_send_msg_direct(tfp,
+                                &parms);
        if (rc)
                return rc;
 
-       /* Process the response */
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_FULL_ACTION, resp,
-                             full_action);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_MCG, resp,
-                             mcg);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_ENCAP_8B, resp,
-                             encap_8b);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_ENCAP_16B, resp,
-                             encap_16b);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_ENCAP_64B, resp,
-                             encap_64b);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_SP_SMAC, resp,
-                             sp_smac);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_SP_SMAC_IPV4, resp,
-                             sp_smac_ipv4);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_SP_SMAC_IPV6, resp,
-                             sp_smac_ipv6);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_COUNTER_64B, resp,
-                             counter_64b);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_NAT_SPORT, resp,
-                             nat_sport);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_NAT_DPORT, resp,
-                             nat_dport);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_NAT_S_IPV4, resp,
-                             nat_s_ipv4);
-       TF_SRAM_RESP_TO_QUERY(query, TF_RESC_TYPE_SRAM_NAT_D_IPV4, resp,
-                             nat_d_ipv4);
+       *rptr_entry = resp.rptr_entry;
+       *rptr_index = resp.rptr_index;
+       *num_of_entries = resp.num_of_entries;
 
-       return tfp_le_to_cpu_32(parms.tf_resp_code);
+       return 0;
 }
 
-/**
- * Sends session SRAM resource allocation request to TF Firmware
- */
 int
-tf_msg_session_sram_resc_alloc(struct tf *tfp __rte_unused,
-                              enum tf_dir dir,
-                              struct tf_rm_sram_alloc *sram_alloc __rte_unused,
-                              struct tf_rm_entry *sram_entry __rte_unused)
+tf_msg_delete_em_entry(struct tf *tfp,
+                      struct tf_delete_em_entry_parms *em_parms)
 {
        int rc;
        struct tfp_send_msg_parms parms = { 0 };
-       struct tf_session_sram_resc_alloc_input req = { 0 };
-       struct tf_session_sram_resc_alloc_output resp;
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       struct hwrm_tf_em_delete_input req = { 0 };
+       struct hwrm_tf_em_delete_output resp = { 0 };
+       uint16_t flags;
+       uint8_t fw_session_id;
 
-       memset(&resp, 0, sizeof(resp));
-
-       /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
-       req.flags = tfp_cpu_to_le_16(dir);
-
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_FULL_ACTION, req,
-                            full_action);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_MCG, req,
-                            mcg);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_ENCAP_8B, req,
-                            encap_8b);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_ENCAP_16B, req,
-                            encap_16b);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_ENCAP_64B, req,
-                            encap_64b);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_SP_SMAC, req,
-                            sp_smac);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_SP_SMAC_IPV4,
-                            req, sp_smac_ipv4);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_SP_SMAC_IPV6,
-                            req, sp_smac_ipv6);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_COUNTER_64B,
-                            req, counter_64b);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_NAT_SPORT, req,
-                            nat_sport);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_NAT_DPORT, req,
-                            nat_dport);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_NAT_S_IPV4, req,
-                            nat_s_ipv4);
-       TF_SRAM_ALLOC_TO_REQ(sram_alloc, TF_RESC_TYPE_SRAM_NAT_D_IPV4, req,
-                            nat_d_ipv4);
-
-       MSG_PREP(parms,
-                TF_KONG_MB,
-                HWRM_TF,
-                HWRM_TFT_SESSION_SRAM_RESC_ALLOC,
-                req,
-                resp);
-
-       rc = tfp_send_msg_tunneled(tfp, &parms);
-       if (rc)
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(em_parms->dir),
+                           strerror(-rc));
                return rc;
-
-       /* Process the response */
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_FULL_ACTION,
-                             resp, full_action);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_MCG, resp,
-                             mcg);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_ENCAP_8B, resp,
-                             encap_8b);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_ENCAP_16B, resp,
-                             encap_16b);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_ENCAP_64B, resp,
-                             encap_64b);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_SP_SMAC, resp,
-                             sp_smac);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_SP_SMAC_IPV4,
-                             resp, sp_smac_ipv4);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_SP_SMAC_IPV6,
-                             resp, sp_smac_ipv6);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_COUNTER_64B, resp,
-                             counter_64b);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_NAT_SPORT, resp,
-                             nat_sport);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_NAT_DPORT, resp,
-                             nat_dport);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_NAT_S_IPV4, resp,
-                             nat_s_ipv4);
-       TF_SRAM_RESP_TO_ALLOC(sram_entry, TF_RESC_TYPE_SRAM_NAT_D_IPV4, resp,
-                             nat_d_ipv4);
-
-       return tfp_le_to_cpu_32(parms.tf_resp_code);
-}
-
-/**
- * Sends session SRAM resource free request to TF Firmware
- */
-int
-tf_msg_session_sram_resc_free(struct tf *tfp __rte_unused,
-                             enum tf_dir dir,
-                             struct tf_rm_entry *sram_entry __rte_unused)
-{
-       int rc;
-       struct tfp_send_msg_parms parms = { 0 };
-       struct tf_session_sram_resc_free_input req = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       }
 
        /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
-       req.flags = tfp_cpu_to_le_16(dir);
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
 
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_FULL_ACTION, req,
-                           full_action);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_MCG, req,
-                           mcg);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_ENCAP_8B, req,
-                           encap_8b);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_ENCAP_16B, req,
-                           encap_16b);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_ENCAP_64B, req,
-                           encap_64b);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_SP_SMAC, req,
-                           sp_smac);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_SP_SMAC_IPV4, req,
-                           sp_smac_ipv4);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_SP_SMAC_IPV6, req,
-                           sp_smac_ipv6);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_COUNTER_64B, req,
-                           counter_64b);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_NAT_SPORT, req,
-                           nat_sport);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_NAT_DPORT, req,
-                           nat_dport);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_NAT_S_IPV4, req,
-                           nat_s_ipv4);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_NAT_D_IPV4, req,
-                           nat_d_ipv4);
+       flags = (em_parms->dir == TF_DIR_TX ?
+                HWRM_TF_EM_DELETE_INPUT_FLAGS_DIR_TX :
+                HWRM_TF_EM_DELETE_INPUT_FLAGS_DIR_RX);
+       req.flags = tfp_cpu_to_le_16(flags);
+       req.flow_handle = tfp_cpu_to_le_64(em_parms->flow_handle);
 
-       MSG_PREP_NO_RESP(parms,
-                        TF_KONG_MB,
-                        HWRM_TF,
-                        HWRM_TFT_SESSION_SRAM_RESC_FREE,
-                        req);
+       parms.tf_type = HWRM_TF_EM_DELETE;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
 
-       rc = tfp_send_msg_tunneled(tfp, &parms);
+       rc = tfp_send_msg_direct(tfp,
+                                &parms);
        if (rc)
                return rc;
 
-       return tfp_le_to_cpu_32(parms.tf_resp_code);
-}
-
-/**
- * Sends session SRAM resource flush request to TF Firmware
- */
-int
-tf_msg_session_sram_resc_flush(struct tf *tfp,
-                              enum tf_dir dir,
-                              struct tf_rm_entry *sram_entry)
-{
-       int rc;
-       struct tfp_send_msg_parms parms = { 0 };
-       struct tf_session_sram_resc_free_input req = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
-
-       /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
-       req.flags = tfp_cpu_to_le_16(dir);
-
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_FULL_ACTION, req,
-                           full_action);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_MCG, req,
-                           mcg);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_ENCAP_8B, req,
-                           encap_8b);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_ENCAP_16B, req,
-                           encap_16b);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_ENCAP_64B, req,
-                           encap_64b);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_SP_SMAC, req,
-                           sp_smac);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_SP_SMAC_IPV4, req,
-                           sp_smac_ipv4);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_SP_SMAC_IPV6, req,
-                           sp_smac_ipv6);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_COUNTER_64B, req,
-                           counter_64b);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_NAT_SPORT, req,
-                           nat_sport);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_NAT_DPORT, req,
-                           nat_dport);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_NAT_S_IPV4, req,
-                           nat_s_ipv4);
-       TF_SRAM_FREE_TO_REQ(sram_entry, TF_RESC_TYPE_SRAM_NAT_D_IPV4, req,
-                           nat_d_ipv4);
-
-       MSG_PREP_NO_RESP(parms,
-                        TF_KONG_MB,
-                        TF_TYPE_TRUFLOW,
-                        HWRM_TFT_SESSION_SRAM_RESC_FLUSH,
-                        req);
-
-       rc = tfp_send_msg_tunneled(tfp, &parms);
-       if (rc)
-               return rc;
+       em_parms->index = tfp_le_to_cpu_16(resp.em_index);
 
-       return tfp_le_to_cpu_32(parms.tf_resp_code);
+       return 0;
 }
 
-/**
- * Sends EM mem register request to Firmware
- */
-int tf_msg_em_mem_rgtr(struct tf *tfp,
-                      int           page_lvl,
-                      int           page_size,
-                      uint64_t      dma_addr,
-                      uint16_t     *ctx_id)
+int
+tf_msg_em_mem_rgtr(struct tf *tfp,
+                  int page_lvl,
+                  int page_size,
+                  uint64_t dma_addr,
+                  uint16_t *ctx_id)
 {
        int rc;
        struct hwrm_tf_ctxt_mem_rgtr_input req = { 0 };
@@ -905,11 +719,9 @@ int tf_msg_em_mem_rgtr(struct tf *tfp,
        return rc;
 }
 
-/**
- * Sends EM mem unregister request to Firmware
- */
-int tf_msg_em_mem_unrgtr(struct tf *tfp,
-                        uint16_t  *ctx_id)
+int
+tf_msg_em_mem_unrgtr(struct tf *tfp,
+                    uint16_t *ctx_id)
 {
        int rc;
        struct hwrm_tf_ctxt_mem_unrgtr_input req = {0};
@@ -930,12 +742,10 @@ int tf_msg_em_mem_unrgtr(struct tf *tfp,
        return rc;
 }
 
-/**
- * Sends EM qcaps request to Firmware
- */
-int tf_msg_em_qcaps(struct tf *tfp,
-                   int dir,
-                   struct tf_em_caps *em_caps)
+int
+tf_msg_em_qcaps(struct tf *tfp,
+               int dir,
+               struct tf_em_caps *em_caps)
 {
        int rc;
        struct hwrm_tf_ext_em_qcaps_input  req = {0};
@@ -970,17 +780,15 @@ int tf_msg_em_qcaps(struct tf *tfp,
        return rc;
 }
 
-/**
- * Sends EM config request to Firmware
- */
-int tf_msg_em_cfg(struct tf *tfp,
-                 uint32_t   num_entries,
-                 uint16_t   key0_ctx_id,
-                 uint16_t   key1_ctx_id,
-                 uint16_t   record_ctx_id,
-                 uint16_t   efc_ctx_id,
-                 uint8_t    flush_interval,
-                 int        dir)
+int
+tf_msg_em_cfg(struct tf *tfp,
+             uint32_t num_entries,
+             uint16_t key0_ctx_id,
+             uint16_t key1_ctx_id,
+             uint16_t record_ctx_id,
+             uint16_t efc_ctx_id,
+             uint8_t flush_interval,
+             int dir)
 {
        int rc;
        struct hwrm_tf_ext_em_cfg_input  req = {0};
@@ -1014,104 +822,133 @@ int tf_msg_em_cfg(struct tf *tfp,
        return rc;
 }
 
-/**
- * Sends EM internal insert request to Firmware
- */
-int tf_msg_insert_em_internal_entry(struct tf *tfp,
-                               struct tf_insert_em_entry_parms *em_parms,
-                               uint16_t *rptr_index,
-                               uint8_t *rptr_entry,
-                               uint8_t *num_of_entries)
+int
+tf_msg_em_op(struct tf *tfp,
+            int dir,
+            uint16_t op)
 {
        int rc;
+       struct hwrm_tf_ext_em_op_input req = {0};
+       struct hwrm_tf_ext_em_op_output resp = {0};
+       uint32_t flags;
        struct tfp_send_msg_parms parms = { 0 };
-       struct tf_em_internal_insert_input req = { 0 };
-       struct tf_em_internal_insert_output resp = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
-       struct tf_em_64b_entry *em_result =
-               (struct tf_em_64b_entry *)em_parms->em_record;
-
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
-       memcpy(req.em_key, em_parms->key, ((em_parms->key_sz_in_bits + 7) / 8));
-       req.flags = tfp_cpu_to_le_16(em_parms->dir);
-       req.strength = (em_result->hdr.word1 & TF_LKUP_RECORD_STRENGTH_MASK) >>
-               TF_LKUP_RECORD_STRENGTH_SHIFT;
-       req.em_key_bitlen = em_parms->key_sz_in_bits;
-       req.action_ptr = em_result->hdr.pointer;
-       req.em_record_idx = *rptr_index;
 
-       MSG_PREP(parms,
-                TF_KONG_MB,
-                HWRM_TF,
-                HWRM_TFT_EM_RULE_INSERT,
-                req,
-                resp);
-
-       rc = tfp_send_msg_tunneled(tfp, &parms);
-       if (rc)
-               return rc;
+       flags = (dir == TF_DIR_TX ? HWRM_TF_EXT_EM_CFG_INPUT_FLAGS_DIR_TX :
+                HWRM_TF_EXT_EM_CFG_INPUT_FLAGS_DIR_RX);
+       req.flags = tfp_cpu_to_le_32(flags);
+       req.op = tfp_cpu_to_le_16(op);
 
-       *rptr_entry = resp.rptr_entry;
-       *rptr_index = resp.rptr_index;
-       *num_of_entries = resp.num_of_entries;
+       parms.tf_type = HWRM_TF_EXT_EM_OP;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
 
-       return tfp_le_to_cpu_32(parms.tf_resp_code);
+       rc = tfp_send_msg_direct(tfp,
+                                &parms);
+       return rc;
 }
 
-/**
- * Sends EM delete insert request to Firmware
- */
-int tf_msg_delete_em_entry(struct tf *tfp,
-                          struct tf_delete_em_entry_parms *em_parms)
+int
+tf_msg_tcam_entry_set(struct tf *tfp,
+                     struct tf_tcam_set_parms *parms)
 {
        int rc;
-       struct tfp_send_msg_parms parms = { 0 };
-       struct tf_em_internal_delete_input req = { 0 };
-       struct tf_em_internal_delete_output resp = { 0 };
-       struct tf_session *tfs =
-               (struct tf_session *)(tfp->session->core_data);
+       struct tfp_send_msg_parms mparms = { 0 };
+       struct hwrm_tf_tcam_set_input req = { 0 };
+       struct hwrm_tf_tcam_set_output resp = { 0 };
+       struct tf_msg_dma_buf buf = { 0 };
+       uint8_t *data = NULL;
+       int data_size = 0;
+       uint8_t fw_session_id;
 
-       req.tf_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
-       req.flags = tfp_cpu_to_le_16(em_parms->dir);
-       req.flow_handle = tfp_cpu_to_le_64(em_parms->flow_handle);
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
 
-       MSG_PREP(parms,
-                TF_KONG_MB,
-                HWRM_TF,
-                HWRM_TFT_EM_RULE_DELETE,
-                req,
-               resp);
+       /* Populate the request */
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
+       req.type = parms->hcapi_type;
+       req.idx = tfp_cpu_to_le_16(parms->idx);
+       if (parms->dir == TF_DIR_TX)
+               req.flags |= HWRM_TF_TCAM_SET_INPUT_FLAGS_DIR_TX;
 
-       rc = tfp_send_msg_tunneled(tfp, &parms);
-       if (rc)
-               return rc;
+       req.key_size = parms->key_size;
+       req.mask_offset = parms->key_size;
+       /* Result follows after key and mask, thus multiply by 2 */
+       req.result_offset = 2 * parms->key_size;
+       req.result_size = parms->result_size;
+       data_size = 2 * req.key_size + req.result_size;
 
-       em_parms->index = tfp_le_to_cpu_16(resp.em_index);
+       if (data_size <= TF_PCI_BUF_SIZE_MAX) {
+               /* use pci buffer */
+               data = &req.dev_data[0];
+       } else {
+               /* use dma buffer */
+               req.flags |= HWRM_TF_TCAM_SET_INPUT_FLAGS_DMA;
+               rc = tf_msg_alloc_dma_buf(&buf, data_size);
+               if (rc)
+                       goto cleanup;
+               data = buf.va_addr;
+               tfp_memcpy(&req.dev_data[0],
+                          &buf.pa_addr,
+                          sizeof(buf.pa_addr));
+       }
 
-       return tfp_le_to_cpu_32(parms.tf_resp_code);
+       tfp_memcpy(&data[0], parms->key, parms->key_size);
+       tfp_memcpy(&data[parms->key_size], parms->mask, parms->key_size);
+       tfp_memcpy(&data[req.result_offset], parms->result, parms->result_size);
+
+       mparms.tf_type = HWRM_TF_TCAM_SET;
+       mparms.req_data = (uint32_t *)&req;
+       mparms.req_size = sizeof(req);
+       mparms.resp_data = (uint32_t *)&resp;
+       mparms.resp_size = sizeof(resp);
+       mparms.mailbox = TF_KONG_MB;
+
+       rc = tfp_send_msg_direct(tfp,
+                                &mparms);
+
+cleanup:
+       tf_msg_free_dma_buf(&buf);
+
+       return rc;
 }
 
-/**
- * Sends EM operation request to Firmware
- */
-int tf_msg_em_op(struct tf *tfp,
-                int dir,
-                uint16_t op)
+int
+tf_msg_tcam_entry_free(struct tf *tfp,
+                      struct tf_tcam_free_parms *in_parms)
 {
        int rc;
-       struct hwrm_tf_ext_em_op_input req = {0};
-       struct hwrm_tf_ext_em_op_output resp = {0};
-       uint32_t flags;
+       struct hwrm_tf_tcam_free_input req =  { 0 };
+       struct hwrm_tf_tcam_free_output resp = { 0 };
        struct tfp_send_msg_parms parms = { 0 };
+       uint8_t fw_session_id;
 
-       flags = (dir == TF_DIR_TX ? HWRM_TF_EXT_EM_CFG_INPUT_FLAGS_DIR_TX :
-                HWRM_TF_EXT_EM_CFG_INPUT_FLAGS_DIR_RX);
-       req.flags = tfp_cpu_to_le_32(flags);
-       req.op = tfp_cpu_to_le_16(op);
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(in_parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
 
-       parms.tf_type = HWRM_TF_EXT_EM_OP;
+       /* Populate the request */
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
+       req.type = in_parms->hcapi_type;
+       req.count = 1;
+       req.idx_list[0] = tfp_cpu_to_le_16(in_parms->idx);
+       if (in_parms->dir == TF_DIR_TX)
+               req.flags |= HWRM_TF_TCAM_FREE_INPUT_FLAGS_DIR_TX;
+
+       parms.tf_type = HWRM_TF_TCAM_FREE;
        parms.req_data = (uint32_t *)&req;
        parms.req_size = sizeof(req);
        parms.resp_data = (uint32_t *)&resp;
@@ -1126,35 +963,56 @@ int tf_msg_em_op(struct tf *tfp,
 int
 tf_msg_set_tbl_entry(struct tf *tfp,
                     enum tf_dir dir,
-                    enum tf_tbl_type type,
+                    uint16_t hcapi_type,
                     uint16_t size,
                     uint8_t *data,
                     uint32_t index)
 {
        int rc;
+       struct hwrm_tf_tbl_type_set_input req = { 0 };
+       struct hwrm_tf_tbl_type_set_output resp = { 0 };
        struct tfp_send_msg_parms parms = { 0 };
-       struct tf_tbl_type_set_input req = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       uint8_t fw_session_id;
+
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(dir),
+                           strerror(-rc));
+               return rc;
+       }
 
        /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
        req.flags = tfp_cpu_to_le_16(dir);
-       req.type = tfp_cpu_to_le_32(type);
+       req.type = tfp_cpu_to_le_32(hcapi_type);
        req.size = tfp_cpu_to_le_16(size);
        req.index = tfp_cpu_to_le_32(index);
 
+       /* Check for data size conformity */
+       if (size > TF_MSG_TBL_TYPE_SET_DATA_SIZE) {
+               rc = -EINVAL;
+               TFP_DRV_LOG(ERR,
+                           "%s: Invalid parameters for msg type, rc:%s\n",
+                           tf_dir_2_str(dir),
+                           strerror(-rc));
+               return rc;
+       }
+
        tfp_memcpy(&req.data,
                   data,
                   size);
 
-       MSG_PREP_NO_RESP(parms,
-                        TF_KONG_MB,
-                        HWRM_TF,
-                        HWRM_TFT_TBL_TYPE_SET,
-                        req);
+       parms.tf_type = HWRM_TF_TBL_TYPE_SET;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
 
-       rc = tfp_send_msg_tunneled(tfp, &parms);
+       rc = tfp_send_msg_direct(tfp,
+                                &parms);
        if (rc)
                return rc;
 
@@ -1164,168 +1022,323 @@ tf_msg_set_tbl_entry(struct tf *tfp,
 int
 tf_msg_get_tbl_entry(struct tf *tfp,
                     enum tf_dir dir,
-                    enum tf_tbl_type type,
+                    uint16_t hcapi_type,
                     uint16_t size,
                     uint8_t *data,
                     uint32_t index)
 {
        int rc;
+       struct hwrm_tf_tbl_type_get_input req = { 0 };
+       struct hwrm_tf_tbl_type_get_output resp = { 0 };
        struct tfp_send_msg_parms parms = { 0 };
-       struct tf_tbl_type_get_input req = { 0 };
-       struct tf_tbl_type_get_output resp = { 0 };
-       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+       uint8_t fw_session_id;
+
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(dir),
+                           strerror(-rc));
+               return rc;
+       }
 
        /* Populate the request */
-       req.fw_session_id =
-               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
        req.flags = tfp_cpu_to_le_16(dir);
-       req.type = tfp_cpu_to_le_32(type);
+       req.type = tfp_cpu_to_le_32(hcapi_type);
        req.index = tfp_cpu_to_le_32(index);
 
-       MSG_PREP(parms,
-                TF_KONG_MB,
-                HWRM_TF,
-                HWRM_TFT_TBL_TYPE_GET,
-                req,
-                resp);
+       parms.tf_type = HWRM_TF_TBL_TYPE_GET;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
 
-       rc = tfp_send_msg_tunneled(tfp, &parms);
+       rc = tfp_send_msg_direct(tfp,
+                                &parms);
        if (rc)
                return rc;
 
        /* Verify that we got enough buffer to return the requested data */
-       if (resp.size < size)
+       if (tfp_le_to_cpu_32(resp.size) != size)
                return -EINVAL;
 
        tfp_memcpy(data,
                   &resp.data,
-                  resp.size);
+                  size);
 
        return tfp_le_to_cpu_32(parms.tf_resp_code);
 }
 
-#define TF_BYTES_PER_SLICE(tfp) 12
-#define NUM_SLICES(tfp, bytes) \
-       (((bytes) + TF_BYTES_PER_SLICE(tfp) - 1) / TF_BYTES_PER_SLICE(tfp))
+/* HWRM Tunneled messages */
 
-static int
-tf_msg_get_dma_buf(struct tf_msg_dma_buf *buf, int size)
+int
+tf_msg_get_global_cfg(struct tf *tfp,
+                     struct tf_dev_global_cfg_parms *params)
 {
-       struct tfp_calloc_parms alloc_parms;
-       int rc;
+       int rc = 0;
+       struct tfp_send_msg_parms parms = { 0 };
+       struct hwrm_tf_global_cfg_get_input req = { 0 };
+       struct hwrm_tf_global_cfg_get_output resp = { 0 };
+       uint32_t flags = 0;
+       uint8_t fw_session_id;
+       uint16_t resp_size = 0;
 
-       /* Allocate session */
-       alloc_parms.nitems = 1;
-       alloc_parms.size = size;
-       alloc_parms.alignment = 0;
-       rc = tfp_calloc(&alloc_parms);
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
        if (rc) {
-               /* Log error */
-               PMD_DRV_LOG(ERR,
-                           "Failed to allocate tcam dma entry, rc:%d\n",
-                           rc);
-               return -ENOMEM;
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(params->dir),
+                           strerror(-rc));
+               return rc;
        }
 
-       buf->pa_addr = (uintptr_t)alloc_parms.mem_pa;
-       buf->va_addr = alloc_parms.mem_va;
+       flags = (params->dir == TF_DIR_TX ?
+                HWRM_TF_GLOBAL_CFG_GET_INPUT_FLAGS_DIR_TX :
+                HWRM_TF_GLOBAL_CFG_GET_INPUT_FLAGS_DIR_RX);
 
-       return 0;
+       /* Populate the request */
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
+       req.flags = tfp_cpu_to_le_32(flags);
+       req.type = tfp_cpu_to_le_32(params->type);
+       req.offset = tfp_cpu_to_le_32(params->offset);
+       req.size = tfp_cpu_to_le_32(params->config_sz_in_bytes);
+
+       parms.tf_type = HWRM_TF_GLOBAL_CFG_GET;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
+
+       rc = tfp_send_msg_direct(tfp, &parms);
+       if (rc != 0)
+               return rc;
+
+       /* Verify that we got enough buffer to return the requested data */
+       resp_size = tfp_le_to_cpu_16(resp.size);
+       if (resp_size < params->config_sz_in_bytes)
+               return -EINVAL;
+
+       if (params->config)
+               tfp_memcpy(params->config,
+                          resp.data,
+                          resp_size);
+       else
+               return -EFAULT;
+
+       return tfp_le_to_cpu_32(parms.tf_resp_code);
 }
 
 int
-tf_msg_tcam_entry_set(struct tf *tfp,
-                     struct tf_set_tcam_entry_parms *parms)
+tf_msg_set_global_cfg(struct tf *tfp,
+                     struct tf_dev_global_cfg_parms *params)
 {
-       int rc;
-       struct tfp_send_msg_parms mparms = { 0 };
-       struct hwrm_tf_tcam_set_input req = { 0 };
-       struct hwrm_tf_tcam_set_output resp = { 0 };
-       uint16_t key_bytes =
-               TF_BITS2BYTES_WORD_ALIGN(parms->key_sz_in_bits);
-       uint16_t result_bytes =
-               TF_BITS2BYTES_WORD_ALIGN(parms->result_sz_in_bits);
-       struct tf_msg_dma_buf buf = { 0 };
-       uint8_t *data = NULL;
-       int data_size = 0;
+       int rc = 0;
+       struct tfp_send_msg_parms parms = { 0 };
+       struct hwrm_tf_global_cfg_set_input req = { 0 };
+       struct hwrm_tf_global_cfg_set_output resp = { 0 };
+       uint32_t flags = 0;
+       uint8_t fw_session_id;
+
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(params->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       flags = (params->dir == TF_DIR_TX ?
+                HWRM_TF_GLOBAL_CFG_SET_INPUT_FLAGS_DIR_TX :
+                HWRM_TF_GLOBAL_CFG_SET_INPUT_FLAGS_DIR_RX);
+
+       /* Populate the request */
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
+       req.flags = tfp_cpu_to_le_32(flags);
+       req.type = tfp_cpu_to_le_32(params->type);
+       req.offset = tfp_cpu_to_le_32(params->offset);
+
+       /* Check for data size conformity */
+       if (params->config_sz_in_bytes > TF_MSG_SET_GLOBAL_CFG_DATA_SIZE) {
+               rc = -EINVAL;
+               TFP_DRV_LOG(ERR,
+                           "%s: Invalid parameters for msg type, rc:%s\n",
+                           tf_dir_2_str(params->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       tfp_memcpy(req.data, params->config,
+                  params->config_sz_in_bytes);
+       req.size = tfp_cpu_to_le_32(params->config_sz_in_bytes);
+
+       parms.tf_type = HWRM_TF_GLOBAL_CFG_SET;
+       parms.req_data = (uint32_t *)&req;
+       parms.req_size = sizeof(req);
+       parms.resp_data = (uint32_t *)&resp;
+       parms.resp_size = sizeof(resp);
+       parms.mailbox = TF_KONG_MB;
+
+       rc = tfp_send_msg_direct(tfp, &parms);
 
-       rc = tf_tcam_tbl_2_hwrm(parms->tcam_tbl_type, &req.type);
        if (rc != 0)
                return rc;
 
-       req.idx = tfp_cpu_to_le_16(parms->idx);
-       if (parms->dir == TF_DIR_TX)
-               req.flags |= HWRM_TF_TCAM_SET_INPUT_FLAGS_DIR_TX;
+       return tfp_le_to_cpu_32(parms.tf_resp_code);
+}
 
-       req.key_size = key_bytes;
-       req.mask_offset = key_bytes;
-       /* Result follows after key and mask, thus multiply by 2 */
-       req.result_offset = 2 * key_bytes;
-       req.result_size = result_bytes;
-       data_size = 2 * req.key_size + req.result_size;
+int
+tf_msg_bulk_get_tbl_entry(struct tf *tfp,
+                         enum tf_dir dir,
+                         uint16_t hcapi_type,
+                         uint32_t starting_idx,
+                         uint16_t num_entries,
+                         uint16_t entry_sz_in_bytes,
+                         uint64_t physical_mem_addr)
+{
+       int rc;
+       struct tfp_send_msg_parms parms = { 0 };
+       struct tf_tbl_type_bulk_get_input req = { 0 };
+       struct tf_tbl_type_bulk_get_output resp = { 0 };
+       int data_size = 0;
+       uint8_t fw_session_id;
 
-       if (data_size <= TF_PCI_BUF_SIZE_MAX) {
-               /* use pci buffer */
-               data = &req.dev_data[0];
-       } else {
-               /* use dma buffer */
-               req.flags |= HWRM_TF_TCAM_SET_INPUT_FLAGS_DMA;
-               rc = tf_msg_get_dma_buf(&buf, data_size);
-               if (rc != 0)
-                       return rc;
-               data = buf.va_addr;
-               memcpy(&req.dev_data[0], &buf.pa_addr, sizeof(buf.pa_addr));
+       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Unable to lookup FW id, rc:%s\n",
+                           tf_dir_2_str(dir),
+                           strerror(-rc));
+               return rc;
        }
 
-       memcpy(&data[0], parms->key, key_bytes);
-       memcpy(&data[key_bytes], parms->mask, key_bytes);
-       memcpy(&data[req.result_offset], parms->result, result_bytes);
+       /* Populate the request */
+       req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
+       req.flags = tfp_cpu_to_le_16(dir);
+       req.type = tfp_cpu_to_le_32(hcapi_type);
+       req.start_index = tfp_cpu_to_le_32(starting_idx);
+       req.num_entries = tfp_cpu_to_le_32(num_entries);
 
-       mparms.tf_type = HWRM_TF_TCAM_SET;
-       mparms.req_data = (uint32_t *)&req;
-       mparms.req_size = sizeof(req);
-       mparms.resp_data = (uint32_t *)&resp;
-       mparms.resp_size = sizeof(resp);
-       mparms.mailbox = TF_KONG_MB;
+       data_size = num_entries * entry_sz_in_bytes;
 
-       rc = tfp_send_msg_direct(tfp,
-                                &mparms);
+       req.host_addr = tfp_cpu_to_le_64(physical_mem_addr);
+
+       MSG_PREP(parms,
+                TF_KONG_MB,
+                HWRM_TF,
+                HWRM_TFT_TBL_TYPE_BULK_GET,
+                req,
+                resp);
+
+       rc = tfp_send_msg_tunneled(tfp, &parms);
        if (rc)
                return rc;
 
-       if (buf.va_addr != NULL)
-               tfp_free(buf.va_addr);
+       /* Verify that we got enough buffer to return the requested data */
+       if (tfp_le_to_cpu_32(resp.size) != data_size)
+               return -EINVAL;
 
-       return rc;
+       return tfp_le_to_cpu_32(parms.tf_resp_code);
 }
 
 int
-tf_msg_tcam_entry_free(struct tf *tfp,
-                      struct tf_free_tcam_entry_parms *in_parms)
+tf_msg_get_if_tbl_entry(struct tf *tfp,
+                       struct tf_if_tbl_get_parms *params)
 {
-       int rc;
-       struct hwrm_tf_tcam_free_input req =  { 0 };
-       struct hwrm_tf_tcam_free_output resp = { 0 };
+       int rc = 0;
        struct tfp_send_msg_parms parms = { 0 };
+       tf_if_tbl_get_input_t req = { 0 };
+       tf_if_tbl_get_output_t resp;
+       uint32_t flags = 0;
+       struct tf_session *tfs;
+
+       /* Retrieve the session information */
+       rc = tf_session_get_session(tfp, &tfs);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup session, rc:%s\n",
+                           tf_dir_2_str(params->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       flags = (params->dir == TF_DIR_TX ? TF_IF_TBL_GET_INPUT_FLAGS_DIR_TX :
+                TF_IF_TBL_GET_INPUT_FLAGS_DIR_RX);
 
        /* Populate the request */
-       rc = tf_tcam_tbl_2_hwrm(in_parms->tcam_tbl_type, &req.type);
+       req.fw_session_id =
+               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
+       req.flags = flags;
+       req.tf_if_tbl_type = params->hcapi_type;
+       req.idx = tfp_cpu_to_le_16(params->idx);
+       req.data_sz_in_bytes = tfp_cpu_to_le_16(params->data_sz_in_bytes);
+
+       MSG_PREP(parms,
+                TF_KONG_MB,
+                HWRM_TF,
+                HWRM_TFT_IF_TBL_GET,
+                req,
+                resp);
+
+       rc = tfp_send_msg_tunneled(tfp, &parms);
+
        if (rc != 0)
                return rc;
 
-       req.count = 1;
-       req.idx_list[0] = tfp_cpu_to_le_16(in_parms->idx);
-       if (in_parms->dir == TF_DIR_TX)
-               req.flags |= HWRM_TF_TCAM_FREE_INPUT_FLAGS_DIR_TX;
+       if (parms.tf_resp_code != 0)
+               return tfp_le_to_cpu_32(parms.tf_resp_code);
 
-       parms.tf_type = HWRM_TF_TCAM_FREE;
-       parms.req_data = (uint32_t *)&req;
-       parms.req_size = sizeof(req);
-       parms.resp_data = (uint32_t *)&resp;
-       parms.resp_size = sizeof(resp);
-       parms.mailbox = TF_KONG_MB;
+       tfp_memcpy(&params->data[0], resp.data, req.data_sz_in_bytes);
 
-       rc = tfp_send_msg_direct(tfp,
-                                &parms);
-       return rc;
+       return tfp_le_to_cpu_32(parms.tf_resp_code);
+}
+
+int
+tf_msg_set_if_tbl_entry(struct tf *tfp,
+                       struct tf_if_tbl_set_parms *params)
+{
+       int rc = 0;
+       struct tfp_send_msg_parms parms = { 0 };
+       tf_if_tbl_set_input_t req = { 0 };
+       uint32_t flags = 0;
+       struct tf_session *tfs;
+
+       /* Retrieve the session information */
+       rc = tf_session_get_session(tfp, &tfs);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup session, rc:%s\n",
+                           tf_dir_2_str(params->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+
+       flags = (params->dir == TF_DIR_TX ? TF_IF_TBL_SET_INPUT_FLAGS_DIR_TX :
+                TF_IF_TBL_SET_INPUT_FLAGS_DIR_RX);
+
+       /* Populate the request */
+       req.fw_session_id =
+               tfp_cpu_to_le_32(tfs->session_id.internal.fw_session_id);
+       req.flags = flags;
+       req.tf_if_tbl_type = params->hcapi_type;
+       req.idx = tfp_cpu_to_le_32(params->idx);
+       req.data_sz_in_bytes = tfp_cpu_to_le_32(params->data_sz_in_bytes);
+       tfp_memcpy(&req.data[0], params->data, params->data_sz_in_bytes);
+
+       MSG_PREP_NO_RESP(parms,
+                        TF_KONG_MB,
+                        HWRM_TF,
+                        HWRM_TFT_IF_TBL_SET,
+                        req);
+
+       rc = tfp_send_msg_tunneled(tfp, &parms);
+
+       if (rc != 0)
+               return rc;
+
+       return tfp_le_to_cpu_32(parms.tf_resp_code);
 }