net/bnxt: add core changes for EM and EEM lookups
[dpdk.git] / drivers / net / bnxt / tf_core / tf_tbl.c
index 236affe..a683353 100644 (file)
@@ -15,6 +15,7 @@
 #include "hsi_struct_def_dpdk.h"
 
 #include "tf_core.h"
+#include "tf_util.h"
 #include "tf_em.h"
 #include "tf_msg.h"
 #include "tfp.h"
@@ -22,6 +23,8 @@
 #include "bnxt.h"
 #include "tf_resources.h"
 #include "tf_rm.h"
+#include "stack.h"
+#include "tf_common.h"
 
 #define PTU_PTE_VALID          0x1UL
 #define PTU_PTE_LAST           0x2UL
  *   Pointer to the page table to free
  */
 static void
-tf_em_free_pg_tbl(struct tf_em_page_tbl *tp)
+tf_em_free_pg_tbl(struct hcapi_cfa_em_page_tbl *tp)
 {
        uint32_t i;
 
        for (i = 0; i < tp->pg_count; i++) {
                if (!tp->pg_va_tbl[i]) {
-                       PMD_DRV_LOG(WARNING,
-                                   "No map for page %d table %016" PRIu64 "\n",
+                       TFP_DRV_LOG(WARNING,
+                                   "No mapping for page: %d table: %016" PRIu64 "\n",
                                    i,
                                    (uint64_t)(uintptr_t)tp);
                        continue;
@@ -82,15 +85,14 @@ tf_em_free_pg_tbl(struct tf_em_page_tbl *tp)
  *   Pointer to the EM table to free
  */
 static void
-tf_em_free_page_table(struct tf_em_table *tbl)
+tf_em_free_page_table(struct hcapi_cfa_em_table *tbl)
 {
-       struct tf_em_page_tbl *tp;
+       struct hcapi_cfa_em_page_tbl *tp;
        int i;
 
        for (i = 0; i < tbl->num_lvl; i++) {
                tp = &tbl->pg_tbl[i];
-
-               PMD_DRV_LOG(INFO,
+               TFP_DRV_LOG(INFO,
                           "EEM: Freeing page table: size %u lvl %d cnt %u\n",
                           TF_EM_PAGE_SIZE,
                            i,
@@ -122,7 +124,7 @@ tf_em_free_page_table(struct tf_em_table *tbl)
  *   -ENOMEM - Out of memory
  */
 static int
-tf_em_alloc_pg_tbl(struct tf_em_page_tbl *tp,
+tf_em_alloc_pg_tbl(struct hcapi_cfa_em_page_tbl *tp,
                   uint32_t pg_count,
                   uint32_t pg_size)
 {
@@ -156,7 +158,7 @@ tf_em_alloc_pg_tbl(struct tf_em_page_tbl *tp,
                if (tfp_calloc(&parms) != 0)
                        goto cleanup;
 
-               tp->pg_pa_tbl[i] = (uint64_t)(uintptr_t)parms.mem_pa;
+               tp->pg_pa_tbl[i] = (uintptr_t)parms.mem_pa;
                tp->pg_va_tbl[i] = parms.mem_va;
 
                memset(tp->pg_va_tbl[i], 0, pg_size);
@@ -181,9 +183,9 @@ cleanup:
  *   -ENOMEM - Out of memory
  */
 static int
-tf_em_alloc_page_table(struct tf_em_table *tbl)
+tf_em_alloc_page_table(struct hcapi_cfa_em_table *tbl)
 {
-       struct tf_em_page_tbl *tp;
+       struct hcapi_cfa_em_page_tbl *tp;
        int rc = 0;
        int i;
        uint32_t j;
@@ -195,14 +197,15 @@ tf_em_alloc_page_table(struct tf_em_table *tbl)
                                        tbl->page_cnt[i],
                                        TF_EM_PAGE_SIZE);
                if (rc) {
-                       PMD_DRV_LOG(WARNING,
-                               "Failed to allocate page table: lvl: %d\n",
-                               i);
+                       TFP_DRV_LOG(WARNING,
+                               "Failed to allocate page table: lvl: %d, rc:%s\n",
+                               i,
+                               strerror(-rc));
                        goto cleanup;
                }
 
                for (j = 0; j < tp->pg_count; j++) {
-                       PMD_DRV_LOG(INFO,
+                       TFP_DRV_LOG(INFO,
                                "EEM: Allocated page table: size %u lvl %d cnt"
                                " %u VA:%p PA:%p\n",
                                TF_EM_PAGE_SIZE,
@@ -232,8 +235,8 @@ cleanup:
  *   Flag controlling if the page table is last
  */
 static void
-tf_em_link_page_table(struct tf_em_page_tbl *tp,
-                     struct tf_em_page_tbl *tp_next,
+tf_em_link_page_table(struct hcapi_cfa_em_page_tbl *tp,
+                     struct hcapi_cfa_em_page_tbl *tp_next,
                      bool set_pte_last)
 {
        uint64_t *pg_pa = tp_next->pg_pa_tbl;
@@ -268,10 +271,10 @@ tf_em_link_page_table(struct tf_em_page_tbl *tp,
  *   Pointer to EM page table
  */
 static void
-tf_em_setup_page_table(struct tf_em_table *tbl)
+tf_em_setup_page_table(struct hcapi_cfa_em_table *tbl)
 {
-       struct tf_em_page_tbl *tp_next;
-       struct tf_em_page_tbl *tp;
+       struct hcapi_cfa_em_page_tbl *tp_next;
+       struct hcapi_cfa_em_page_tbl *tp;
        bool set_pte_last = 0;
        int i;
 
@@ -283,8 +286,8 @@ tf_em_setup_page_table(struct tf_em_table *tbl)
                tf_em_link_page_table(tp, tp_next, set_pte_last);
        }
 
-       tbl->l0_addr = tbl->pg_tbl[PT_LVL_0].pg_va_tbl[0];
-       tbl->l0_dma_addr = tbl->pg_tbl[PT_LVL_0].pg_pa_tbl[0];
+       tbl->l0_addr = tbl->pg_tbl[TF_PT_LVL_0].pg_va_tbl[0];
+       tbl->l0_dma_addr = tbl->pg_tbl[TF_PT_LVL_0].pg_pa_tbl[0];
 }
 
 /**
@@ -315,7 +318,7 @@ tf_em_size_page_tbl_lvl(uint32_t page_size,
                        uint64_t *num_data_pages)
 {
        uint64_t lvl_data_size = page_size;
-       int lvl = PT_LVL_0;
+       int lvl = TF_PT_LVL_0;
        uint64_t data_size;
 
        *num_data_pages = 0;
@@ -324,10 +327,10 @@ tf_em_size_page_tbl_lvl(uint32_t page_size,
        while (lvl_data_size < data_size) {
                lvl++;
 
-               if (lvl == PT_LVL_1)
+               if (lvl == TF_PT_LVL_1)
                        lvl_data_size = (uint64_t)MAX_PAGE_PTRS(page_size) *
                                page_size;
-               else if (lvl == PT_LVL_2)
+               else if (lvl == TF_PT_LVL_2)
                        lvl_data_size = (uint64_t)MAX_PAGE_PTRS(page_size) *
                                MAX_PAGE_PTRS(page_size) * page_size;
                else
@@ -384,18 +387,18 @@ tf_em_size_page_tbls(int max_lvl,
                     uint32_t page_size,
                     uint32_t *page_cnt)
 {
-       if (max_lvl == PT_LVL_0) {
-               page_cnt[PT_LVL_0] = num_data_pages;
-       } else if (max_lvl == PT_LVL_1) {
-               page_cnt[PT_LVL_1] = num_data_pages;
-               page_cnt[PT_LVL_0] =
-               tf_em_page_tbl_pgcnt(page_cnt[PT_LVL_1], page_size);
-       } else if (max_lvl == PT_LVL_2) {
-               page_cnt[PT_LVL_2] = num_data_pages;
-               page_cnt[PT_LVL_1] =
-               tf_em_page_tbl_pgcnt(page_cnt[PT_LVL_2], page_size);
-               page_cnt[PT_LVL_0] =
-               tf_em_page_tbl_pgcnt(page_cnt[PT_LVL_1], page_size);
+       if (max_lvl == TF_PT_LVL_0) {
+               page_cnt[TF_PT_LVL_0] = num_data_pages;
+       } else if (max_lvl == TF_PT_LVL_1) {
+               page_cnt[TF_PT_LVL_1] = num_data_pages;
+               page_cnt[TF_PT_LVL_0] =
+               tf_em_page_tbl_pgcnt(page_cnt[TF_PT_LVL_1], page_size);
+       } else if (max_lvl == TF_PT_LVL_2) {
+               page_cnt[TF_PT_LVL_2] = num_data_pages;
+               page_cnt[TF_PT_LVL_1] =
+               tf_em_page_tbl_pgcnt(page_cnt[TF_PT_LVL_2], page_size);
+               page_cnt[TF_PT_LVL_0] =
+               tf_em_page_tbl_pgcnt(page_cnt[TF_PT_LVL_1], page_size);
        } else {
                return;
        }
@@ -413,7 +416,7 @@ tf_em_size_page_tbls(int max_lvl,
  *   - ENOMEM - Out of memory
  */
 static int
-tf_em_size_table(struct tf_em_table *tbl)
+tf_em_size_table(struct hcapi_cfa_em_table *tbl)
 {
        uint64_t num_data_pages;
        uint32_t *page_cnt;
@@ -432,7 +435,7 @@ tf_em_size_table(struct tf_em_table *tbl)
        /* Determine number of page table levels and the number
         * of data pages needed to process the given eem table.
         */
-       if (tbl->type == RECORD_TABLE) {
+       if (tbl->type == TF_RECORD_TABLE) {
                /*
                 * For action records just a memory size is provided. Work
                 * backwards to resolve to number of entries
@@ -454,11 +457,10 @@ tf_em_size_table(struct tf_em_table *tbl)
                                          tbl->num_entries,
                                          &num_data_pages);
        if (max_lvl < 0) {
-               PMD_DRV_LOG(WARNING, "EEM: Failed to size page table levels\n");
-               PMD_DRV_LOG(WARNING,
+               TFP_DRV_LOG(WARNING, "EEM: Failed to size page table levels\n");
+               TFP_DRV_LOG(WARNING,
                            "table: %d data-sz: %016" PRIu64 " page-sz: %u\n",
-                           tbl->type,
-                           (uint64_t)num_entries * tbl->entry_size,
+                           tbl->type, (uint64_t)num_entries * tbl->entry_size,
                            TF_EM_PAGE_SIZE);
                return -ENOMEM;
        }
@@ -472,15 +474,15 @@ tf_em_size_table(struct tf_em_table *tbl)
        tf_em_size_page_tbls(max_lvl, num_data_pages, TF_EM_PAGE_SIZE,
                                page_cnt);
 
-       PMD_DRV_LOG(INFO, "EEM: Sized page table: %d\n", tbl->type);
-       PMD_DRV_LOG(INFO,
+       TFP_DRV_LOG(INFO, "EEM: Sized page table: %d\n", tbl->type);
+       TFP_DRV_LOG(INFO,
                    "EEM: lvls: %d sz: %016" PRIu64 " pgs: %016" PRIu64 " l0: %u l1: %u l2: %u\n",
                    max_lvl + 1,
                    (uint64_t)num_data_pages * TF_EM_PAGE_SIZE,
                    num_data_pages,
-                   page_cnt[PT_LVL_0],
-                   page_cnt[PT_LVL_1],
-                   page_cnt[PT_LVL_2]);
+                   page_cnt[TF_PT_LVL_0],
+                   page_cnt[TF_PT_LVL_1],
+                   page_cnt[TF_PT_LVL_2]);
 
        return 0;
 }
@@ -502,11 +504,12 @@ tf_em_ctx_unreg(struct tf *tfp,
                struct tf_tbl_scope_cb *tbl_scope_cb,
                int dir)
 {
-       struct tf_em_ctx_mem_info *ctxp = &tbl_scope_cb->em_ctx_info[dir];
-       struct tf_em_table *tbl;
+       struct hcapi_cfa_em_ctx_mem_info *ctxp =
+               &tbl_scope_cb->em_ctx_info[dir];
+       struct hcapi_cfa_em_table *tbl;
        int i;
 
-       for (i = KEY0_TABLE; i < MAX_TABLE; i++) {
+       for (i = TF_KEY0_TABLE; i < TF_MAX_TABLE; i++) {
                tbl = &ctxp->em_tables[i];
 
                if (tbl->num_entries != 0 && tbl->entry_size != 0) {
@@ -537,12 +540,13 @@ tf_em_ctx_reg(struct tf *tfp,
              struct tf_tbl_scope_cb *tbl_scope_cb,
              int dir)
 {
-       struct tf_em_ctx_mem_info *ctxp = &tbl_scope_cb->em_ctx_info[dir];
-       struct tf_em_table *tbl;
-       int rc;
+       struct hcapi_cfa_em_ctx_mem_info *ctxp =
+               &tbl_scope_cb->em_ctx_info[dir];
+       struct hcapi_cfa_em_table *tbl;
+       int rc = 0;
        int i;
 
-       for (i = KEY0_TABLE; i < MAX_TABLE; i++) {
+       for (i = TF_KEY0_TABLE; i < TF_MAX_TABLE; i++) {
                tbl = &ctxp->em_tables[i];
 
                if (tbl->num_entries && tbl->entry_size) {
@@ -599,7 +603,7 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,
                                        TF_MEGABYTE) / (key_b + action_b);
 
                if (num_entries < TF_EM_MIN_ENTRIES) {
-                       PMD_DRV_LOG(ERR, "EEM: Insufficient memory requested:"
+                       TFP_DRV_LOG(ERR, "EEM: Insufficient memory requested:"
                                    "%uMB\n",
                                    parms->rx_mem_size_in_mb);
                        return -EINVAL;
@@ -611,7 +615,7 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,
                        cnt *= 2;
 
                if (cnt > TF_EM_MAX_ENTRIES) {
-                       PMD_DRV_LOG(ERR, "EEM: Invalid number of Tx requested: "
+                       TFP_DRV_LOG(ERR, "EEM: Invalid number of Tx requested: "
                                    "%u\n",
                       (parms->tx_num_flows_in_k * TF_KILOBYTE));
                        return -EINVAL;
@@ -623,7 +627,7 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,
                    TF_EM_MIN_ENTRIES ||
                    (parms->rx_num_flows_in_k * TF_KILOBYTE) >
                    tbl_scope_cb->em_caps[TF_DIR_RX].max_entries_supported) {
-                       PMD_DRV_LOG(ERR,
+                       TFP_DRV_LOG(ERR,
                                    "EEM: Invalid number of Rx flows "
                                    "requested:%u max:%u\n",
                                    parms->rx_num_flows_in_k * TF_KILOBYTE,
@@ -640,7 +644,7 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,
                        cnt *= 2;
 
                if (cnt > TF_EM_MAX_ENTRIES) {
-                       PMD_DRV_LOG(ERR,
+                       TFP_DRV_LOG(ERR,
                                    "EEM: Invalid number of Rx requested: %u\n",
                                    (parms->rx_num_flows_in_k * TF_KILOBYTE));
                        return -EINVAL;
@@ -656,7 +660,7 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,
                        (key_b + action_b);
 
                if (num_entries < TF_EM_MIN_ENTRIES) {
-                       PMD_DRV_LOG(ERR,
+                       TFP_DRV_LOG(ERR,
                                    "EEM: Insufficient memory requested:%uMB\n",
                                    parms->rx_mem_size_in_mb);
                        return -EINVAL;
@@ -668,7 +672,7 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,
                        cnt *= 2;
 
                if (cnt > TF_EM_MAX_ENTRIES) {
-                       PMD_DRV_LOG(ERR,
+                       TFP_DRV_LOG(ERR,
                                    "EEM: Invalid number of Tx requested: %u\n",
                       (parms->tx_num_flows_in_k * TF_KILOBYTE));
                        return -EINVAL;
@@ -680,7 +684,7 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,
                    TF_EM_MIN_ENTRIES ||
                    (parms->tx_num_flows_in_k * TF_KILOBYTE) >
                    tbl_scope_cb->em_caps[TF_DIR_TX].max_entries_supported) {
-                       PMD_DRV_LOG(ERR,
+                       TFP_DRV_LOG(ERR,
                                    "EEM: Invalid number of Tx flows "
                                    "requested:%u max:%u\n",
                                    (parms->tx_num_flows_in_k * TF_KILOBYTE),
@@ -694,7 +698,7 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,
                        cnt *= 2;
 
                if (cnt > TF_EM_MAX_ENTRIES) {
-                       PMD_DRV_LOG(ERR,
+                       TFP_DRV_LOG(ERR,
                                    "EEM: Invalid number of Tx requested: %u\n",
                       (parms->tx_num_flows_in_k * TF_KILOBYTE));
                        return -EINVAL;
@@ -703,7 +707,7 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,
 
        if (parms->rx_num_flows_in_k != 0 &&
            (parms->rx_max_key_sz_in_bits / 8 == 0)) {
-               PMD_DRV_LOG(ERR,
+               TFP_DRV_LOG(ERR,
                            "EEM: Rx key size required: %u\n",
                            (parms->rx_max_key_sz_in_bits));
                return -EINVAL;
@@ -711,47 +715,47 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,
 
        if (parms->tx_num_flows_in_k != 0 &&
            (parms->tx_max_key_sz_in_bits / 8 == 0)) {
-               PMD_DRV_LOG(ERR,
+               TFP_DRV_LOG(ERR,
                            "EEM: Tx key size required: %u\n",
                            (parms->tx_max_key_sz_in_bits));
                return -EINVAL;
        }
        /* Rx */
-       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[KEY0_TABLE].num_entries =
+       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[TF_KEY0_TABLE].num_entries =
                parms->rx_num_flows_in_k * TF_KILOBYTE;
-       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[KEY0_TABLE].entry_size =
+       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[TF_KEY0_TABLE].entry_size =
                parms->rx_max_key_sz_in_bits / 8;
 
-       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[KEY1_TABLE].num_entries =
+       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[TF_KEY1_TABLE].num_entries =
                parms->rx_num_flows_in_k * TF_KILOBYTE;
-       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[KEY1_TABLE].entry_size =
+       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[TF_KEY1_TABLE].entry_size =
                parms->rx_max_key_sz_in_bits / 8;
 
-       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[RECORD_TABLE].num_entries =
+       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[TF_RECORD_TABLE].num_entries =
                parms->rx_num_flows_in_k * TF_KILOBYTE;
-       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[RECORD_TABLE].entry_size =
+       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[TF_RECORD_TABLE].entry_size =
                parms->rx_max_action_entry_sz_in_bits / 8;
 
-       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[EFC_TABLE].num_entries =
+       tbl_scope_cb->em_ctx_info[TF_DIR_RX].em_tables[TF_EFC_TABLE].num_entries =
                0;
 
        /* Tx */
-       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[KEY0_TABLE].num_entries =
+       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[TF_KEY0_TABLE].num_entries =
                parms->tx_num_flows_in_k * TF_KILOBYTE;
-       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[KEY0_TABLE].entry_size =
+       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[TF_KEY0_TABLE].entry_size =
                parms->tx_max_key_sz_in_bits / 8;
 
-       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[KEY1_TABLE].num_entries =
+       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[TF_KEY1_TABLE].num_entries =
                parms->tx_num_flows_in_k * TF_KILOBYTE;
-       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[KEY1_TABLE].entry_size =
+       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[TF_KEY1_TABLE].entry_size =
                parms->tx_max_key_sz_in_bits / 8;
 
-       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[RECORD_TABLE].num_entries =
+       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[TF_RECORD_TABLE].num_entries =
                parms->tx_num_flows_in_k * TF_KILOBYTE;
-       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[RECORD_TABLE].entry_size =
+       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[TF_RECORD_TABLE].entry_size =
                parms->tx_max_action_entry_sz_in_bits / 8;
 
-       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[EFC_TABLE].num_entries =
+       tbl_scope_cb->em_ctx_info[TF_DIR_TX].em_tables[TF_EFC_TABLE].num_entries =
                0;
 
        return 0;
@@ -792,10 +796,11 @@ tf_set_tbl_entry_internal(struct tf *tfp,
        index = parms->idx;
 
        if (parms->type != TF_TBL_TYPE_FULL_ACT_RECORD &&
-           parms->type != TF_TBL_TYPE_ACT_SP_SMAC_IPV4) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Type not supported, type:%d\n",
-                           parms->dir,
+           parms->type != TF_TBL_TYPE_ACT_SP_SMAC_IPV4 &&
+           parms->type != TF_TBL_TYPE_ACT_STATS_64) {
+               TFP_DRV_LOG(ERR,
+                           "%s, Type not supported, type:%d\n",
+                           tf_dir_2_str(parms->dir),
                            parms->type);
                return -EOPNOTSUPP;
        }
@@ -813,9 +818,9 @@ tf_set_tbl_entry_internal(struct tf *tfp,
        /* Verify that the entry has been previously allocated */
        id = ba_inuse(session_pool, index);
        if (id != 1) {
-               PMD_DRV_LOG(ERR,
-                  "dir:%d, Invalid or not allocated index, type:%d, idx:%d\n",
-                  parms->dir,
+               TFP_DRV_LOG(ERR,
+                  "%s, Invalid or not allocated index, type:%d, idx:%d\n",
+                  tf_dir_2_str(parms->dir),
                   parms->type,
                   index);
                return -EINVAL;
@@ -829,11 +834,11 @@ tf_set_tbl_entry_internal(struct tf *tfp,
                                  parms->data,
                                  parms->idx);
        if (rc) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Set failed, type:%d, rc:%d\n",
-                           parms->dir,
+               TFP_DRV_LOG(ERR,
+                           "%s, Set failed, type:%d, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
                            parms->type,
-                           rc);
+                           strerror(-rc));
        }
 
        return rc;
@@ -887,9 +892,9 @@ tf_get_tbl_entry_internal(struct tf *tfp,
        /* Verify that the entry has been previously allocated */
        id = ba_inuse(session_pool, index);
        if (id != 1) {
-               PMD_DRV_LOG(ERR,
-                  "dir:%d, Invalid or not allocated index, type:%d, idx:%d\n",
-                  parms->dir,
+               TFP_DRV_LOG(ERR,
+                  "%s, Invalid or not allocated index, type:%d, idx:%d\n",
+                  tf_dir_2_str(parms->dir),
                   parms->type,
                   index);
                return -EINVAL;
@@ -903,11 +908,81 @@ tf_get_tbl_entry_internal(struct tf *tfp,
                                  parms->data,
                                  parms->idx);
        if (rc) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Get failed, type:%d, rc:%d\n",
+               TFP_DRV_LOG(ERR,
+                           "%s, Get failed, type:%d, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           parms->type,
+                           strerror(-rc));
+       }
+
+       return rc;
+}
+
+/**
+ * Internal function to get a Table Entry. Supports all Table Types
+ * except the TF_TBL_TYPE_EXT as that is handled as a table scope.
+ *
+ * [in] tfp
+ *   Pointer to TruFlow handle
+ *
+ * [in] parms
+ *   Pointer to input parameters
+ *
+ * Returns:
+ *   0       - Success
+ *   -EINVAL - Parameter error
+ */
+static int
+tf_bulk_get_tbl_entry_internal(struct tf *tfp,
+                         struct tf_bulk_get_tbl_entry_parms *parms)
+{
+       int rc;
+       int id;
+       uint32_t index;
+       struct bitalloc *session_pool;
+       struct tf_session *tfs = (struct tf_session *)(tfp->session->core_data);
+
+       /* Lookup the pool using the table type of the element */
+       rc = tf_rm_lookup_tbl_type_pool(tfs,
+                                       parms->dir,
+                                       parms->type,
+                                       &session_pool);
+       /* Error logging handled by tf_rm_lookup_tbl_type_pool */
+       if (rc)
+               return rc;
+
+       index = parms->starting_idx;
+
+       /*
+        * Adjust the returned index/offset as there is no guarantee
+        * that the start is 0 at time of RM allocation
+        */
+       tf_rm_convert_index(tfs,
                            parms->dir,
                            parms->type,
-                           rc);
+                           TF_RM_CONVERT_RM_BASE,
+                           parms->starting_idx,
+                           &index);
+
+       /* Verify that the entry has been previously allocated */
+       id = ba_inuse(session_pool, index);
+       if (id != 1) {
+               TFP_DRV_LOG(ERR,
+                  "%s, Invalid or not allocated index, type:%d, starting_idx:%d\n",
+                  tf_dir_2_str(parms->dir),
+                  parms->type,
+                  index);
+               return -EINVAL;
+       }
+
+       /* Get the entry */
+       rc = tf_msg_bulk_get_tbl_entry(tfp, parms);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s, Bulk get failed, type:%d, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           parms->type,
+                           strerror(-rc));
        }
 
        return rc;
@@ -932,10 +1007,9 @@ static int
 tf_alloc_tbl_entry_shadow(struct tf_session *tfs __rte_unused,
                          struct tf_alloc_tbl_entry_parms *parms __rte_unused)
 {
-       PMD_DRV_LOG(ERR,
-                   "dir:%d, Entry Alloc with search not supported\n",
-                   parms->dir);
-
+       TFP_DRV_LOG(ERR,
+                   "%s, Entry Alloc with search not supported\n",
+                   tf_dir_2_str(parms->dir));
 
        return -EOPNOTSUPP;
 }
@@ -958,9 +1032,9 @@ static int
 tf_free_tbl_entry_shadow(struct tf_session *tfs,
                         struct tf_free_tbl_entry_parms *parms)
 {
-       PMD_DRV_LOG(ERR,
-                   "dir:%d, Entry Free with search not supported\n",
-                   parms->dir);
+       TFP_DRV_LOG(ERR,
+                   "%s, Entry Free with search not supported\n",
+                   tf_dir_2_str(parms->dir));
 
        return -EOPNOTSUPP;
 }
@@ -1000,8 +1074,8 @@ tf_create_tbl_pool_external(enum tf_dir dir,
        parms.alignment = 0;
 
        if (tfp_calloc(&parms) != 0) {
-               PMD_DRV_LOG(ERR, "%d: TBL: external pool failure %s\n",
-                           dir, strerror(-ENOMEM));
+               TFP_DRV_LOG(ERR, "%s: TBL: external pool failure %s\n",
+                           tf_dir_2_str(dir), strerror(ENOMEM));
                return -ENOMEM;
        }
 
@@ -1010,8 +1084,8 @@ tf_create_tbl_pool_external(enum tf_dir dir,
        rc = stack_init(num_entries, parms.mem_va, pool);
 
        if (rc != 0) {
-               PMD_DRV_LOG(ERR, "%d: TBL: stack init failure %s\n",
-                           dir, strerror(-rc));
+               TFP_DRV_LOG(ERR, "%s: TBL: stack init failure %s\n",
+                           tf_dir_2_str(dir), strerror(-rc));
                goto cleanup;
        }
 
@@ -1027,13 +1101,13 @@ tf_create_tbl_pool_external(enum tf_dir dir,
        for (i = 0; i < num_entries; i++) {
                rc = stack_push(pool, j);
                if (rc != 0) {
-                       PMD_DRV_LOG(ERR, "%s TBL: stack failure %s\n",
+                       TFP_DRV_LOG(ERR, "%s TBL: stack failure %s\n",
                                    tf_dir_2_str(dir), strerror(-rc));
                        goto cleanup;
                }
 
                if (j < 0) {
-                       PMD_DRV_LOG(ERR, "%d TBL: invalid offset (%d)\n",
+                       TFP_DRV_LOG(ERR, "%d TBL: invalid offset (%d)\n",
                                    dir, j);
                        goto cleanup;
                }
@@ -1042,8 +1116,8 @@ tf_create_tbl_pool_external(enum tf_dir dir,
 
        if (!stack_is_full(pool)) {
                rc = -EINVAL;
-               PMD_DRV_LOG(ERR, "%d TBL: stack failure %s\n",
-                           dir, strerror(-rc));
+               TFP_DRV_LOG(ERR, "%s TBL: stack failure %s\n",
+                           tf_dir_2_str(dir), strerror(-rc));
                goto cleanup;
        }
        return 0;
@@ -1094,18 +1168,7 @@ tf_alloc_tbl_entry_pool_external(struct tf *tfp,
        struct tf_tbl_scope_cb *tbl_scope_cb;
        struct stack *pool;
 
-       /* Check parameters */
-       if (tfp == NULL || parms == NULL) {
-               PMD_DRV_LOG(ERR, "Invalid parameters\n");
-               return -EINVAL;
-       }
-
-       if (tfp->session == NULL || tfp->session->core_data == NULL) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Session info invalid\n",
-                           parms->dir);
-               return -EINVAL;
-       }
+       TF_CHECK_PARMS_SESSION(tfp, parms);
 
        tfs = (struct tf_session *)(tfp->session->core_data);
 
@@ -1114,9 +1177,9 @@ tf_alloc_tbl_entry_pool_external(struct tf *tfp,
        tbl_scope_cb = tbl_scope_cb_find(tfs, parms->tbl_scope_id);
 
        if (tbl_scope_cb == NULL) {
-               PMD_DRV_LOG(ERR,
-                                       "%s, table scope not allocated\n",
-                                       tf_dir_2_str(parms->dir));
+               TFP_DRV_LOG(ERR,
+                           "%s, table scope not allocated\n",
+                           tf_dir_2_str(parms->dir));
                return -EINVAL;
        }
        pool = &tbl_scope_cb->ext_act_pool[parms->dir];
@@ -1126,9 +1189,9 @@ tf_alloc_tbl_entry_pool_external(struct tf *tfp,
        rc = stack_pop(pool, &index);
 
        if (rc != 0) {
-               PMD_DRV_LOG(ERR,
-                  "dir:%d, Allocation failed, type:%d\n",
-                  parms->dir,
+               TFP_DRV_LOG(ERR,
+                  "%s, Allocation failed, type:%d\n",
+                  tf_dir_2_str(parms->dir),
                   parms->type);
                return rc;
        }
@@ -1159,18 +1222,7 @@ tf_alloc_tbl_entry_pool_internal(struct tf *tfp,
        struct bitalloc *session_pool;
        struct tf_session *tfs;
 
-       /* Check parameters */
-       if (tfp == NULL || parms == NULL) {
-               PMD_DRV_LOG(ERR, "Invalid parameters\n");
-               return -EINVAL;
-       }
-
-       if (tfp->session == NULL || tfp->session->core_data == NULL) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Session info invalid\n",
-                           parms->dir);
-               return -EINVAL;
-       }
+       TF_CHECK_PARMS_SESSION(tfp, parms);
 
        tfs = (struct tf_session *)(tfp->session->core_data);
 
@@ -1179,10 +1231,11 @@ tf_alloc_tbl_entry_pool_internal(struct tf *tfp,
            parms->type != TF_TBL_TYPE_ACT_SP_SMAC_IPV4 &&
            parms->type != TF_TBL_TYPE_ACT_ENCAP_8B &&
            parms->type != TF_TBL_TYPE_ACT_ENCAP_16B &&
-           parms->type != TF_TBL_TYPE_ACT_ENCAP_64B) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Type not supported, type:%d\n",
-                           parms->dir,
+           parms->type != TF_TBL_TYPE_ACT_ENCAP_64B &&
+           parms->type != TF_TBL_TYPE_ACT_STATS_64) {
+               TFP_DRV_LOG(ERR,
+                           "%s, Type not supported, type:%d\n",
+                           tf_dir_2_str(parms->dir),
                            parms->type);
                return -EOPNOTSUPP;
        }
@@ -1200,9 +1253,9 @@ tf_alloc_tbl_entry_pool_internal(struct tf *tfp,
        if (id == -1) {
                free_cnt = ba_free_count(session_pool);
 
-               PMD_DRV_LOG(ERR,
-                  "dir:%d, Allocation failed, type:%d, free:%d\n",
-                  parms->dir,
+               TFP_DRV_LOG(ERR,
+                  "%s, Allocation failed, type:%d, free:%d\n",
+                  tf_dir_2_str(parms->dir),
                   parms->type,
                   free_cnt);
                return -ENOMEM;
@@ -1247,18 +1300,7 @@ tf_free_tbl_entry_pool_external(struct tf *tfp,
        struct tf_tbl_scope_cb *tbl_scope_cb;
        struct stack *pool;
 
-       /* Check parameters */
-       if (tfp == NULL || parms == NULL) {
-               PMD_DRV_LOG(ERR, "Invalid parameters\n");
-               return -EINVAL;
-       }
-
-       if (tfp->session == NULL || tfp->session->core_data == NULL) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Session info invalid\n",
-                           parms->dir);
-               return -EINVAL;
-       }
+       TF_CHECK_PARMS_SESSION(tfp, parms);
 
        tfs = (struct tf_session *)(tfp->session->core_data);
 
@@ -1267,9 +1309,9 @@ tf_free_tbl_entry_pool_external(struct tf *tfp,
        tbl_scope_cb = tbl_scope_cb_find(tfs, parms->tbl_scope_id);
 
        if (tbl_scope_cb == NULL) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Session info invalid\n",
-                           parms->dir);
+               TFP_DRV_LOG(ERR,
+                           "%s, table scope error\n",
+                           tf_dir_2_str(parms->dir));
                return -EINVAL;
        }
        pool = &tbl_scope_cb->ext_act_pool[parms->dir];
@@ -1279,9 +1321,9 @@ tf_free_tbl_entry_pool_external(struct tf *tfp,
        rc = stack_push(pool, index);
 
        if (rc != 0) {
-               PMD_DRV_LOG(ERR,
-                  "dir:%d, consistency error, stack full, type:%d, idx:%d\n",
-                  parms->dir,
+               TFP_DRV_LOG(ERR,
+                  "%s, consistency error, stack full, type:%d, idx:%d\n",
+                  tf_dir_2_str(parms->dir),
                   parms->type,
                   index);
        }
@@ -1310,18 +1352,7 @@ tf_free_tbl_entry_pool_internal(struct tf *tfp,
        struct tf_session *tfs;
        uint32_t index;
 
-       /* Check parameters */
-       if (tfp == NULL || parms == NULL) {
-               PMD_DRV_LOG(ERR, "Invalid parameters\n");
-               return -EINVAL;
-       }
-
-       if (tfp->session == NULL || tfp->session->core_data == NULL) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Session info invalid\n",
-                           parms->dir);
-               return -EINVAL;
-       }
+       TF_CHECK_PARMS_SESSION(tfp, parms);
 
        tfs = (struct tf_session *)(tfp->session->core_data);
 
@@ -1330,10 +1361,11 @@ tf_free_tbl_entry_pool_internal(struct tf *tfp,
            parms->type != TF_TBL_TYPE_ACT_SP_SMAC_IPV4 &&
            parms->type != TF_TBL_TYPE_ACT_ENCAP_8B &&
            parms->type != TF_TBL_TYPE_ACT_ENCAP_16B &&
-           parms->type != TF_TBL_TYPE_ACT_ENCAP_64B) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Type not supported, type:%d\n",
-                           parms->dir,
+           parms->type != TF_TBL_TYPE_ACT_ENCAP_64B &&
+           parms->type != TF_TBL_TYPE_ACT_STATS_64) {
+               TFP_DRV_LOG(ERR,
+                           "%s, Type not supported, type:%d\n",
+                           tf_dir_2_str(parms->dir),
                            parms->type);
                return -EOPNOTSUPP;
        }
@@ -1362,9 +1394,9 @@ tf_free_tbl_entry_pool_internal(struct tf *tfp,
        /* Check if element was indeed allocated */
        id = ba_inuse_free(session_pool, index);
        if (id == -1) {
-               PMD_DRV_LOG(ERR,
-                  "dir:%d, Element not previously alloc'ed, type:%d, idx:%d\n",
-                  parms->dir,
+               TFP_DRV_LOG(ERR,
+                  "%s, Element not previously alloc'ed, type:%d, idx:%d\n",
+                  tf_dir_2_str(parms->dir),
                   parms->type,
                   index);
                return -ENOMEM;
@@ -1408,8 +1440,10 @@ tf_free_eem_tbl_scope_cb(struct tf *tfp,
        tbl_scope_cb = tbl_scope_cb_find(session,
                                         parms->tbl_scope_id);
 
-       if (tbl_scope_cb == NULL)
+       if (tbl_scope_cb == NULL) {
+               TFP_DRV_LOG(ERR, "Table scope error\n");
                return -EINVAL;
+       }
 
        /* Free Table control block */
        ba_free(session->tbl_scope_pool_rx, tbl_scope_cb->index);
@@ -1439,23 +1473,17 @@ tf_alloc_eem_tbl_scope(struct tf *tfp,
        int rc;
        enum tf_dir dir;
        struct tf_tbl_scope_cb *tbl_scope_cb;
-       struct tf_em_table *em_tables;
+       struct hcapi_cfa_em_table *em_tables;
        int index;
        struct tf_session *session;
        struct tf_free_tbl_scope_parms free_parms;
 
-       /* check parameters */
-       if (parms == NULL || tfp->session == NULL) {
-               PMD_DRV_LOG(ERR, "TBL: Invalid parameters\n");
-               return -EINVAL;
-       }
-
        session = (struct tf_session *)tfp->session->core_data;
 
        /* Get Table Scope control block from the session pool */
        index = ba_alloc(session->tbl_scope_pool_rx);
        if (index == -1) {
-               PMD_DRV_LOG(ERR, "EEM: Unable to allocate table scope "
+               TFP_DRV_LOG(ERR, "EEM: Unable to allocate table scope "
                            "Control Block\n");
                return -ENOMEM;
        }
@@ -1470,8 +1498,10 @@ tf_alloc_eem_tbl_scope(struct tf *tfp,
                                     dir,
                                     &tbl_scope_cb->em_caps[dir]);
                if (rc) {
-                       PMD_DRV_LOG(ERR,
-                               "EEM: Unable to query for EEM capability\n");
+                       TFP_DRV_LOG(ERR,
+                                   "EEM: Unable to query for EEM capability,"
+                                   " rc:%s\n",
+                                   strerror(-rc));
                        goto cleanup;
                }
        }
@@ -1488,22 +1518,27 @@ tf_alloc_eem_tbl_scope(struct tf *tfp,
                 */
                rc = tf_em_ctx_reg(tfp, tbl_scope_cb, dir);
                if (rc) {
-                       PMD_DRV_LOG(ERR,
-                                   "EEM: Unable to register for EEM ctx\n");
+                       TFP_DRV_LOG(ERR,
+                                   "EEM: Unable to register for EEM ctx,"
+                                   " rc:%s\n",
+                                   strerror(-rc));
                        goto cleanup;
                }
 
                em_tables = tbl_scope_cb->em_ctx_info[dir].em_tables;
                rc = tf_msg_em_cfg(tfp,
-                                  em_tables[KEY0_TABLE].num_entries,
-                                  em_tables[KEY0_TABLE].ctx_id,
-                                  em_tables[KEY1_TABLE].ctx_id,
-                                  em_tables[RECORD_TABLE].ctx_id,
-                                  em_tables[EFC_TABLE].ctx_id,
+                                  em_tables[TF_KEY0_TABLE].num_entries,
+                                  em_tables[TF_KEY0_TABLE].ctx_id,
+                                  em_tables[TF_KEY1_TABLE].ctx_id,
+                                  em_tables[TF_RECORD_TABLE].ctx_id,
+                                  em_tables[TF_EFC_TABLE].ctx_id,
+                                  parms->hw_flow_cache_flush_timer,
                                   dir);
                if (rc) {
-                       PMD_DRV_LOG(ERR,
-                               "TBL: Unable to configure EEM in firmware\n");
+                       TFP_DRV_LOG(ERR,
+                                   "TBL: Unable to configure EEM in firmware"
+                                   " rc:%s\n",
+                                   strerror(-rc));
                        goto cleanup_full;
                }
 
@@ -1512,8 +1547,10 @@ tf_alloc_eem_tbl_scope(struct tf *tfp,
                                  HWRM_TF_EXT_EM_OP_INPUT_OP_EXT_EM_ENABLE);
 
                if (rc) {
-                       PMD_DRV_LOG(ERR,
-                                   "EEM: Unable to enable EEM in firmware\n");
+                       TFP_DRV_LOG(ERR,
+                                   "EEM: Unable to enable EEM in firmware"
+                                   " rc:%s\n",
+                                   strerror(-rc));
                        goto cleanup_full;
                }
 
@@ -1522,13 +1559,13 @@ tf_alloc_eem_tbl_scope(struct tf *tfp,
                 * actions related to a single table scope.
                 */
                rc = tf_create_tbl_pool_external(dir,
-                                           tbl_scope_cb,
-                                           em_tables[RECORD_TABLE].num_entries,
-                                           em_tables[RECORD_TABLE].entry_size);
+                                   tbl_scope_cb,
+                                   em_tables[TF_RECORD_TABLE].num_entries,
+                                   em_tables[TF_RECORD_TABLE].entry_size);
                if (rc) {
-                       PMD_DRV_LOG(ERR,
-                                   "%d TBL: Unable to allocate idx pools %s\n",
-                                   dir,
+                       TFP_DRV_LOG(ERR,
+                                   "%s TBL: Unable to allocate idx pools %s\n",
+                                   tf_dir_2_str(dir),
                                    strerror(-rc));
                        goto cleanup_full;
                }
@@ -1556,13 +1593,12 @@ tf_set_tbl_entry(struct tf *tfp,
        struct tf_tbl_scope_cb *tbl_scope_cb;
        struct tf_session *session;
 
-       if (tfp == NULL || parms == NULL || parms->data == NULL)
-               return -EINVAL;
+       TF_CHECK_PARMS_SESSION(tfp, parms);
 
-       if (tfp->session == NULL || tfp->session->core_data == NULL) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Session info invalid\n",
-                           parms->dir);
+       if (parms->data == NULL) {
+               TFP_DRV_LOG(ERR,
+                           "%s, invalid parms->data\n",
+                           tf_dir_2_str(parms->dir));
                return -EINVAL;
        }
 
@@ -1576,9 +1612,9 @@ tf_set_tbl_entry(struct tf *tfp,
                tbl_scope_id = parms->tbl_scope_id;
 
                if (tbl_scope_id == TF_TBL_SCOPE_INVALID)  {
-                       PMD_DRV_LOG(ERR,
-                                   "dir:%d, Table scope not allocated\n",
-                                   parms->dir);
+                       TFP_DRV_LOG(ERR,
+                                   "%s, Table scope not allocated\n",
+                                   tf_dir_2_str(parms->dir));
                        return -EINVAL;
                }
 
@@ -1587,18 +1623,21 @@ tf_set_tbl_entry(struct tf *tfp,
                 */
                tbl_scope_cb = tbl_scope_cb_find(session, tbl_scope_id);
 
-               if (tbl_scope_cb == NULL)
-                       return -EINVAL;
+               if (tbl_scope_cb == NULL) {
+                       TFP_DRV_LOG(ERR,
+                                   "%s, table scope error\n",
+                                   tf_dir_2_str(parms->dir));
+                               return -EINVAL;
+               }
 
                /* External table, implicitly the Action table */
-               base_addr = tf_em_get_table_page(tbl_scope_cb,
-                                                parms->dir,
-                                                offset,
-                                                RECORD_TABLE);
+               base_addr = (void *)(uintptr_t)
+               hcapi_get_table_page(&tbl_scope_cb->em_ctx_info[parms->dir].em_tables[TF_RECORD_TABLE], offset);
+
                if (base_addr == NULL) {
-                       PMD_DRV_LOG(ERR,
-                                   "dir:%d, Base address lookup failed\n",
-                                   parms->dir);
+                       TFP_DRV_LOG(ERR,
+                                   "%s, Base address lookup failed\n",
+                                   tf_dir_2_str(parms->dir));
                        return -EINVAL;
                }
 
@@ -1610,11 +1649,11 @@ tf_set_tbl_entry(struct tf *tfp,
                /* Internal table type processing */
                rc = tf_set_tbl_entry_internal(tfp, parms);
                if (rc) {
-                       PMD_DRV_LOG(ERR,
-                                   "dir:%d, Set failed, type:%d, rc:%d\n",
-                                   parms->dir,
+                       TFP_DRV_LOG(ERR,
+                                   "%s, Set failed, type:%d, rc:%s\n",
+                                   tf_dir_2_str(parms->dir),
                                    parms->type,
-                                   rc);
+                                   strerror(-rc));
                }
        }
 
@@ -1628,31 +1667,54 @@ tf_get_tbl_entry(struct tf *tfp,
 {
        int rc = 0;
 
-       if (tfp == NULL || parms == NULL)
-               return -EINVAL;
+       TF_CHECK_PARMS_SESSION(tfp, parms);
 
-       if (tfp->session == NULL || tfp->session->core_data == NULL) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Session info invalid\n",
-                           parms->dir);
-               return -EINVAL;
+       if (parms->type == TF_TBL_TYPE_EXT) {
+               /* Not supported, yet */
+               TFP_DRV_LOG(ERR,
+                           "%s, External table type not supported\n",
+                           tf_dir_2_str(parms->dir));
+
+               rc = -EOPNOTSUPP;
+       } else {
+               /* Internal table type processing */
+               rc = tf_get_tbl_entry_internal(tfp, parms);
+               if (rc)
+                       TFP_DRV_LOG(ERR,
+                                   "%s, Get failed, type:%d, rc:%s\n",
+                                   tf_dir_2_str(parms->dir),
+                                   parms->type,
+                                   strerror(-rc));
        }
 
+       return rc;
+}
+
+/* API defined in tf_core.h */
+int
+tf_bulk_get_tbl_entry(struct tf *tfp,
+                struct tf_bulk_get_tbl_entry_parms *parms)
+{
+       int rc = 0;
+
+       TF_CHECK_PARMS_SESSION(tfp, parms);
+
        if (parms->type == TF_TBL_TYPE_EXT) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, External table type not supported\n",
-                           parms->dir);
+               /* Not supported, yet */
+               TFP_DRV_LOG(ERR,
+                           "%s, External table type not supported\n",
+                           tf_dir_2_str(parms->dir));
 
                rc = -EOPNOTSUPP;
        } else {
                /* Internal table type processing */
-               rc = tf_get_tbl_entry_internal(tfp, parms);
+               rc = tf_bulk_get_tbl_entry_internal(tfp, parms);
                if (rc)
-                       PMD_DRV_LOG(ERR,
-                                   "dir:%d, Get failed, type:%d, rc:%d\n",
-                                   parms->dir,
+                       TFP_DRV_LOG(ERR,
+                                   "%s, Bulk get failed, type:%d, rc:%s\n",
+                                   tf_dir_2_str(parms->dir),
                                    parms->type,
-                                   rc);
+                                   strerror(-rc));
        }
 
        return rc;
@@ -1665,11 +1727,7 @@ tf_alloc_tbl_scope(struct tf *tfp,
 {
        int rc;
 
-       /* check parameters */
-       if (parms == NULL || tfp == NULL) {
-               PMD_DRV_LOG(ERR, "TBL: Invalid parameters\n");
-               return -EINVAL;
-       }
+       TF_CHECK_PARMS_SESSION_NO_DIR(tfp, parms);
 
        rc = tf_alloc_eem_tbl_scope(tfp, parms);
 
@@ -1683,11 +1741,7 @@ tf_free_tbl_scope(struct tf *tfp,
 {
        int rc;
 
-       /* check parameters */
-       if (parms == NULL || tfp == NULL) {
-               PMD_DRV_LOG(ERR, "TBL: Invalid parameters\n");
-               return -EINVAL;
-       }
+       TF_CHECK_PARMS_SESSION_NO_DIR(tfp, parms);
 
        /* free table scope and all associated resources */
        rc = tf_free_eem_tbl_scope_cb(tfp, parms);
@@ -1705,11 +1759,7 @@ tf_alloc_tbl_entry(struct tf *tfp,
        struct tf_session *tfs;
 #endif /* TF_SHADOW */
 
-       /* Check parameters */
-       if (parms == NULL || tfp == NULL) {
-               PMD_DRV_LOG(ERR, "TBL: Invalid parameters\n");
-               return -EINVAL;
-       }
+       TF_CHECK_PARMS_SESSION(tfp, parms);
        /*
         * No shadow copy support for external tables, allocate and return
         */
@@ -1719,13 +1769,6 @@ tf_alloc_tbl_entry(struct tf *tfp,
        }
 
 #if (TF_SHADOW == 1)
-       if (tfp->session == NULL || tfp->session->core_data == NULL) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Session info invalid\n",
-                           parms->dir);
-               return -EINVAL;
-       }
-
        tfs = (struct tf_session *)(tfp->session->core_data);
 
        /* Search the Shadow DB for requested element. If not found go
@@ -1741,9 +1784,9 @@ tf_alloc_tbl_entry(struct tf *tfp,
 
        rc = tf_alloc_tbl_entry_pool_internal(tfp, parms);
        if (rc)
-               PMD_DRV_LOG(ERR, "dir%d, Alloc failed, rc:%d\n",
-                           parms->dir,
-                           rc);
+               TFP_DRV_LOG(ERR, "%s, Alloc failed, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
 
        return rc;
 }
@@ -1758,11 +1801,8 @@ tf_free_tbl_entry(struct tf *tfp,
        struct tf_session *tfs;
 #endif /* TF_SHADOW */
 
-       /* Check parameters */
-       if (parms == NULL || tfp == NULL) {
-               PMD_DRV_LOG(ERR, "TBL: Invalid parameters\n");
-               return -EINVAL;
-       }
+       TF_CHECK_PARMS_SESSION(tfp, parms);
+
        /*
         * No shadow of external tables so just free the entry
         */
@@ -1772,13 +1812,6 @@ tf_free_tbl_entry(struct tf *tfp,
        }
 
 #if (TF_SHADOW == 1)
-       if (tfp->session == NULL || tfp->session->core_data == NULL) {
-               PMD_DRV_LOG(ERR,
-                           "dir:%d, Session info invalid\n",
-                           parms->dir);
-               return -EINVAL;
-       }
-
        tfs = (struct tf_session *)(tfp->session->core_data);
 
        /* Search the Shadow DB for requested element. If not found go
@@ -1795,8 +1828,96 @@ tf_free_tbl_entry(struct tf *tfp,
        rc = tf_free_tbl_entry_pool_internal(tfp, parms);
 
        if (rc)
-               PMD_DRV_LOG(ERR, "dir:%d, Alloc failed, rc:%d\n",
-                           parms->dir,
-                           rc);
+               TFP_DRV_LOG(ERR, "%s, Alloc failed, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
        return rc;
 }
+
+
+static void
+tf_dump_link_page_table(struct hcapi_cfa_em_page_tbl *tp,
+                       struct hcapi_cfa_em_page_tbl *tp_next)
+{
+       uint64_t *pg_va;
+       uint32_t i;
+       uint32_t j;
+       uint32_t k = 0;
+
+       printf("pg_count:%d pg_size:0x%x\n",
+              tp->pg_count,
+              tp->pg_size);
+       for (i = 0; i < tp->pg_count; i++) {
+               pg_va = tp->pg_va_tbl[i];
+               printf("\t%p\n", (void *)pg_va);
+               for (j = 0; j < MAX_PAGE_PTRS(tp->pg_size); j++) {
+                       printf("\t\t%p\n", (void *)(uintptr_t)pg_va[j]);
+                       if (((pg_va[j] & 0x7) ==
+                            tfp_cpu_to_le_64(PTU_PTE_LAST |
+                                             PTU_PTE_VALID)))
+                               return;
+
+                       if (!(pg_va[j] & tfp_cpu_to_le_64(PTU_PTE_VALID))) {
+                               printf("** Invalid entry **\n");
+                               return;
+                       }
+
+                       if (++k >= tp_next->pg_count) {
+                               printf("** Shouldn't get here **\n");
+                               return;
+                       }
+               }
+       }
+}
+
+void tf_dump_dma(struct tf *tfp, uint32_t tbl_scope_id);
+
+void tf_dump_dma(struct tf *tfp, uint32_t tbl_scope_id)
+{
+       struct tf_session      *session;
+       struct tf_tbl_scope_cb *tbl_scope_cb;
+       struct hcapi_cfa_em_page_tbl *tp;
+       struct hcapi_cfa_em_page_tbl *tp_next;
+       struct hcapi_cfa_em_table *tbl;
+       int i;
+       int j;
+       int dir;
+
+       printf("called %s\n", __func__);
+
+       /* find session struct */
+       session = (struct tf_session *)tfp->session->core_data;
+
+       /* find control block for table scope */
+       tbl_scope_cb = tbl_scope_cb_find(session,
+                                        tbl_scope_id);
+       if (tbl_scope_cb == NULL)
+               PMD_DRV_LOG(ERR, "No table scope\n");
+
+       for (dir = 0; dir < TF_DIR_MAX; dir++) {
+               printf("Direction %s:\n", (dir == TF_DIR_RX ? "Rx" : "Tx"));
+
+               for (j = TF_KEY0_TABLE; j < TF_MAX_TABLE; j++) {
+                       tbl = &tbl_scope_cb->em_ctx_info[dir].em_tables[j];
+                       printf
+       ("Table: j:%d type:%d num_entries:%d entry_size:0x%x num_lvl:%d ",
+                              j,
+                              tbl->type,
+                              tbl->num_entries,
+                              tbl->entry_size,
+                              tbl->num_lvl);
+                       if (tbl->pg_tbl[0].pg_va_tbl &&
+                           tbl->pg_tbl[0].pg_pa_tbl)
+                               printf("%p %p\n",
+                              tbl->pg_tbl[0].pg_va_tbl[0],
+                              (void *)(uintptr_t)tbl->pg_tbl[0].pg_pa_tbl[0]);
+                       for (i = 0; i < tbl->num_lvl - 1; i++) {
+                               printf("Level:%d\n", i);
+                               tp = &tbl->pg_tbl[i];
+                               tp_next = &tbl->pg_tbl[i + 1];
+                               tf_dump_link_page_table(tp, tp_next);
+                       }
+                       printf("\n");
+               }
+       }
+}