net/bnxt: add core changes for EM and EEM lookups
[dpdk.git] / drivers / net / bnxt / tf_core / tf_core.c
index 7b027f7..648d0d1 100644 (file)
 #include <stdio.h>
 
 #include "tf_core.h"
+#include "tf_util.h"
 #include "tf_session.h"
+#include "tf_tbl.h"
+#include "tf_em.h"
 #include "tf_rm.h"
 #include "tf_msg.h"
 #include "tfp.h"
 #include "bitalloc.h"
 #include "bnxt.h"
 #include "rand.h"
+#include "tf_common.h"
+#include "hwrm_tf.h"
 
-static inline uint32_t SWAP_WORDS32(uint32_t val32)
+static int tf_check_tcam_entry(enum tf_tcam_tbl_type tcam_tbl_type,
+                              enum tf_device_type device,
+                              uint16_t key_sz_in_bits,
+                              uint16_t *num_slice_per_row)
 {
-       return (((val32 & 0x0000ffff) << 16) |
-               ((val32 & 0xffff0000) >> 16));
+       uint16_t key_bytes;
+       uint16_t slice_sz = 0;
+
+#define CFA_P4_WC_TCAM_SLICES_PER_ROW 2
+#define CFA_P4_WC_TCAM_SLICE_SIZE     12
+
+       if (tcam_tbl_type == TF_TCAM_TBL_TYPE_WC_TCAM) {
+               key_bytes = TF_BITS2BYTES_WORD_ALIGN(key_sz_in_bits);
+               if (device == TF_DEVICE_TYPE_WH) {
+                       slice_sz = CFA_P4_WC_TCAM_SLICE_SIZE;
+                       *num_slice_per_row = CFA_P4_WC_TCAM_SLICES_PER_ROW;
+               } else {
+                       TFP_DRV_LOG(ERR,
+                                   "Unsupported device type %d\n",
+                                   device);
+                       return -ENOTSUP;
+               }
+
+               if (key_bytes > *num_slice_per_row * slice_sz) {
+                       TFP_DRV_LOG(ERR,
+                                   "%s: Key size %d is not supported\n",
+                                   tf_tcam_tbl_2_str(tcam_tbl_type),
+                                   key_bytes);
+                       return -ENOTSUP;
+               }
+       } else { /* for other type of tcam */
+               *num_slice_per_row = 1;
+       }
+
+       return 0;
 }
 
-static void tf_seeds_init(struct tf_session *session)
+/**
+ * Create EM Tbl pool of memory indexes.
+ *
+ * [in] session
+ *   Pointer to session
+ * [in] dir
+ *   direction
+ * [in] num_entries
+ *   number of entries to write
+ *
+ * Return:
+ *  0       - Success, entry allocated - no search support
+ *  -ENOMEM -EINVAL -EOPNOTSUPP
+ *          - Failure, entry not allocated, out of resources
+ */
+static int
+tf_create_em_pool(struct tf_session *session,
+                 enum tf_dir dir,
+                 uint32_t num_entries)
 {
-       int i;
-       uint32_t r;
+       struct tfp_calloc_parms parms;
+       uint32_t i, j;
+       int rc = 0;
+       struct stack *pool = &session->em_pool[dir];
 
-       /* Initialize the lfsr */
-       rand_init();
+       parms.nitems = num_entries;
+       parms.size = sizeof(uint32_t);
+       parms.alignment = 0;
 
-       /* RX and TX use the same seed values */
-       session->lkup_lkup3_init_cfg[TF_DIR_RX] =
-               session->lkup_lkup3_init_cfg[TF_DIR_TX] =
-                                               SWAP_WORDS32(rand32());
+       if (tfp_calloc(&parms) != 0) {
+               TFP_DRV_LOG(ERR, "EM pool allocation failure %s\n",
+                           strerror(-ENOMEM));
+               return -ENOMEM;
+       }
+
+       /* Create empty stack
+        */
+       rc = stack_init(num_entries, (uint32_t *)parms.mem_va, pool);
+
+       if (rc != 0) {
+               TFP_DRV_LOG(ERR, "EM pool stack init failure %s\n",
+                           strerror(-rc));
+               goto cleanup;
+       }
+
+       /* Fill pool with indexes
+        */
+       j = num_entries - 1;
+
+       for (i = 0; i < num_entries; i++) {
+               rc = stack_push(pool, j);
+               if (rc != 0) {
+                       TFP_DRV_LOG(ERR, "EM pool stack push failure %s\n",
+                                   strerror(-rc));
+                       goto cleanup;
+               }
+               j--;
+       }
 
-       for (i = 0; i < TF_LKUP_SEED_MEM_SIZE / 2; i++) {
-               r = SWAP_WORDS32(rand32());
-               session->lkup_em_seed_mem[TF_DIR_RX][i * 2] = r;
-               session->lkup_em_seed_mem[TF_DIR_TX][i * 2] = r;
-               r = SWAP_WORDS32(rand32());
-               session->lkup_em_seed_mem[TF_DIR_RX][i * 2 + 1] = (r & 0x1);
-               session->lkup_em_seed_mem[TF_DIR_TX][i * 2 + 1] = (r & 0x1);
+       if (!stack_is_full(pool)) {
+               rc = -EINVAL;
+               TFP_DRV_LOG(ERR, "EM pool stack failure %s\n",
+                           strerror(-rc));
+               goto cleanup;
        }
+
+       return 0;
+cleanup:
+       tfp_free((void *)parms.mem_va);
+       return rc;
+}
+
+/**
+ * Create EM Tbl pool of memory indexes.
+ *
+ * [in] session
+ *   Pointer to session
+ * [in] dir
+ *   direction
+ *
+ * Return:
+ */
+static void
+tf_free_em_pool(struct tf_session *session,
+               enum tf_dir dir)
+{
+       struct stack *pool = &session->em_pool[dir];
+       uint32_t *ptr;
+
+       ptr = stack_items(pool);
+
+       tfp_free(ptr);
 }
 
 int
@@ -52,16 +159,20 @@ tf_open_session(struct tf                    *tfp,
        struct tfp_calloc_parms alloc_parms;
        unsigned int domain, bus, slot, device;
        uint8_t fw_session_id;
+       int dir;
 
-       if (tfp == NULL || parms == NULL)
-               return -EINVAL;
+       TF_CHECK_PARMS(tfp, parms);
 
        /* Filter out any non-supported device types on the Core
         * side. It is assumed that the Firmware will be supported if
         * firmware open session succeeds.
         */
-       if (parms->device_type != TF_DEVICE_TYPE_WH)
+       if (parms->device_type != TF_DEVICE_TYPE_WH) {
+               TFP_DRV_LOG(ERR,
+                           "Unsupported device type %d\n",
+                           parms->device_type);
                return -ENOTSUP;
+       }
 
        /* Build the beginning of session_id */
        rc = sscanf(parms->ctrl_chan_name,
@@ -71,7 +182,7 @@ tf_open_session(struct tf                    *tfp,
                    &slot,
                    &device);
        if (rc != 4) {
-               PMD_DRV_LOG(ERR,
+               TFP_DRV_LOG(ERR,
                            "Failed to scan device ctrl_chan_name\n");
                return -EINVAL;
        }
@@ -83,13 +194,13 @@ tf_open_session(struct tf                    *tfp,
        if (rc) {
                /* Log error */
                if (rc == -EEXIST)
-                       PMD_DRV_LOG(ERR,
-                                   "Session is already open, rc:%d\n",
-                                   rc);
+                       TFP_DRV_LOG(ERR,
+                                   "Session is already open, rc:%s\n",
+                                   strerror(-rc));
                else
-                       PMD_DRV_LOG(ERR,
-                                   "Open message send failed, rc:%d\n",
-                                   rc);
+                       TFP_DRV_LOG(ERR,
+                                   "Open message send failed, rc:%s\n",
+                                   strerror(-rc));
 
                parms->session_id.id = TF_FW_SESSION_ID_INVALID;
                return rc;
@@ -102,9 +213,9 @@ tf_open_session(struct tf                    *tfp,
        rc = tfp_calloc(&alloc_parms);
        if (rc) {
                /* Log error */
-               PMD_DRV_LOG(ERR,
-                           "Failed to allocate session info, rc:%d\n",
-                           rc);
+               TFP_DRV_LOG(ERR,
+                           "Failed to allocate session info, rc:%s\n",
+                           strerror(-rc));
                goto cleanup;
        }
 
@@ -117,9 +228,9 @@ tf_open_session(struct tf                    *tfp,
        rc = tfp_calloc(&alloc_parms);
        if (rc) {
                /* Log error */
-               PMD_DRV_LOG(ERR,
-                           "Failed to allocate session data, rc:%d\n",
-                           rc);
+               TFP_DRV_LOG(ERR,
+                           "Failed to allocate session data, rc:%s\n",
+                           strerror(-rc));
                goto cleanup;
        }
 
@@ -131,7 +242,7 @@ tf_open_session(struct tf                    *tfp,
                   TF_SESSION_NAME_MAX);
 
        /* Initialize Session */
-       session->device_type = parms->device_type;
+       session->dev = NULL;
        tf_rm_init(tfp);
 
        /* Construct the Session ID */
@@ -140,12 +251,13 @@ tf_open_session(struct tf                    *tfp,
        session->session_id.internal.device = device;
        session->session_id.internal.fw_session_id = fw_session_id;
 
+       /* Query for Session Config
+        */
        rc = tf_msg_session_qcfg(tfp);
        if (rc) {
-               /* Log error */
-               PMD_DRV_LOG(ERR,
-                           "Query config message send failed, rc:%d\n",
-                           rc);
+               TFP_DRV_LOG(ERR,
+                           "Query config message send failed, rc:%s\n",
+                           strerror(-rc));
                goto cleanup_close;
        }
 
@@ -156,9 +268,9 @@ tf_open_session(struct tf                    *tfp,
 #if (TF_SHADOW == 1)
                rc = tf_rm_shadow_db_init(tfs);
                if (rc)
-                       PMD_DRV_LOG(ERR,
-                                   "Shadow DB Initialization failed\n, rc:%d",
-                                   rc);
+                       TFP_DRV_LOG(ERR,
+                                   "Shadow DB Initialization failed\n, rc:%s",
+                                   strerror(-rc));
                /* Add additional processing */
 #endif /* TF_SHADOW */
        }
@@ -166,23 +278,34 @@ tf_open_session(struct tf                    *tfp,
        /* Adjust the Session with what firmware allowed us to get */
        rc = tf_rm_allocate_validate(tfp);
        if (rc) {
-               /* Log error */
+               TFP_DRV_LOG(ERR,
+                           "Rm allocate validate failed, rc:%s\n",
+                           strerror(-rc));
                goto cleanup_close;
        }
 
-       /* Setup hash seeds */
-       tf_seeds_init(session);
+       /* Initialize EM pool */
+       for (dir = 0; dir < TF_DIR_MAX; dir++) {
+               rc = tf_create_em_pool(session,
+                                      (enum tf_dir)dir,
+                                      TF_SESSION_EM_POOL_SIZE);
+               if (rc) {
+                       TFP_DRV_LOG(ERR,
+                                   "EM Pool initialization failed\n");
+                       goto cleanup_close;
+               }
+       }
 
        session->ref_count++;
 
        /* Return session ID */
        parms->session_id = session->session_id;
 
-       PMD_DRV_LOG(INFO,
+       TFP_DRV_LOG(INFO,
                    "Session created, session_id:%d\n",
                    parms->session_id.id);
 
-       PMD_DRV_LOG(INFO,
+       TFP_DRV_LOG(INFO,
                    "domain:%d, bus:%d, device:%d, fw_session_id:%d\n",
                    parms->session_id.internal.domain,
                    parms->session_id.internal.bus,
@@ -202,6 +325,64 @@ tf_open_session(struct tf                    *tfp,
        return -EINVAL;
 }
 
+int
+tf_open_session_new(struct tf *tfp,
+                   struct tf_open_session_parms *parms)
+{
+       int rc;
+       unsigned int domain, bus, slot, device;
+       struct tf_session_open_session_parms oparms;
+
+       TF_CHECK_PARMS(tfp, parms);
+
+       /* Filter out any non-supported device types on the Core
+        * side. It is assumed that the Firmware will be supported if
+        * firmware open session succeeds.
+        */
+       if (parms->device_type != TF_DEVICE_TYPE_WH) {
+               TFP_DRV_LOG(ERR,
+                           "Unsupported device type %d\n",
+                           parms->device_type);
+               return -ENOTSUP;
+       }
+
+       /* Verify control channel and build the beginning of session_id */
+       rc = sscanf(parms->ctrl_chan_name,
+                   "%x:%x:%x.%d",
+                   &domain,
+                   &bus,
+                   &slot,
+                   &device);
+       if (rc != 4) {
+               TFP_DRV_LOG(ERR,
+                           "Failed to scan device ctrl_chan_name\n");
+               return -EINVAL;
+       }
+
+       parms->session_id.internal.domain = domain;
+       parms->session_id.internal.bus = bus;
+       parms->session_id.internal.device = device;
+       oparms.open_cfg = parms;
+
+       rc = tf_session_open_session(tfp, &oparms);
+       /* Logging handled by tf_session_open_session */
+       if (rc)
+               return rc;
+
+       TFP_DRV_LOG(INFO,
+                   "Session created, session_id:%d\n",
+                   parms->session_id.id);
+
+       TFP_DRV_LOG(INFO,
+                   "domain:%d, bus:%d, device:%d, fw_session_id:%d\n",
+                   parms->session_id.internal.domain,
+                   parms->session_id.internal.bus,
+                   parms->session_id.internal.device,
+                   parms->session_id.internal.fw_session_id);
+
+       return 0;
+}
+
 int
 tf_attach_session(struct tf *tfp __rte_unused,
                  struct tf_attach_session_parms *parms __rte_unused)
@@ -209,8 +390,7 @@ tf_attach_session(struct tf *tfp __rte_unused,
 #if (TF_SHARED == 1)
        int rc;
 
-       if (tfp == NULL)
-               return -EINVAL;
+       TF_CHECK_PARMS_SESSION(tfp, parms);
 
        /* - Open the shared memory for the attach_chan_name
         * - Point to the shared session for this Device instance
@@ -219,17 +399,78 @@ tf_attach_session(struct tf *tfp __rte_unused,
         *   than one client of the session.
         */
 
-       if (tfp->session) {
-               if (tfp->session->session_id.id != TF_SESSION_ID_INVALID) {
-                       rc = tf_msg_session_attach(tfp,
-                                                  parms->ctrl_chan_name,
-                                                  parms->session_id);
-               }
+       if (tfp->session->session_id.id != TF_SESSION_ID_INVALID) {
+               rc = tf_msg_session_attach(tfp,
+                                          parms->ctrl_chan_name,
+                                          parms->session_id);
        }
 #endif /* TF_SHARED */
        return -1;
 }
 
+int
+tf_attach_session_new(struct tf *tfp,
+                     struct tf_attach_session_parms *parms)
+{
+       int rc;
+       unsigned int domain, bus, slot, device;
+       struct tf_session_attach_session_parms aparms;
+
+       TF_CHECK_PARMS2(tfp, parms);
+
+       /* Verify control channel */
+       rc = sscanf(parms->ctrl_chan_name,
+                   "%x:%x:%x.%d",
+                   &domain,
+                   &bus,
+                   &slot,
+                   &device);
+       if (rc != 4) {
+               TFP_DRV_LOG(ERR,
+                           "Failed to scan device ctrl_chan_name\n");
+               return -EINVAL;
+       }
+
+       /* Verify 'attach' channel */
+       rc = sscanf(parms->attach_chan_name,
+                   "%x:%x:%x.%d",
+                   &domain,
+                   &bus,
+                   &slot,
+                   &device);
+       if (rc != 4) {
+               TFP_DRV_LOG(ERR,
+                           "Failed to scan device attach_chan_name\n");
+               return -EINVAL;
+       }
+
+       /* Prepare return value of session_id, using ctrl_chan_name
+        * device values as it becomes the session id.
+        */
+       parms->session_id.internal.domain = domain;
+       parms->session_id.internal.bus = bus;
+       parms->session_id.internal.device = device;
+       aparms.attach_cfg = parms;
+       rc = tf_session_attach_session(tfp,
+                                      &aparms);
+       /* Logging handled by dev_bind */
+       if (rc)
+               return rc;
+
+       TFP_DRV_LOG(INFO,
+                   "Attached to session, session_id:%d\n",
+                   parms->session_id.id);
+
+       TFP_DRV_LOG(INFO,
+                   "domain:%d, bus:%d, device:%d, fw_session_id:%d\n",
+                   parms->session_id.internal.domain,
+                   parms->session_id.internal.bus,
+                   parms->session_id.internal.device,
+                   parms->session_id.internal.fw_session_id);
+
+       return rc;
+}
+
 int
 tf_close_session(struct tf *tfp)
 {
@@ -237,9 +478,9 @@ tf_close_session(struct tf *tfp)
        int rc_close = 0;
        struct tf_session *tfs;
        union tf_session_id session_id;
+       int dir;
 
-       if (tfp == NULL || tfp->session == NULL)
-               return -EINVAL;
+       TF_CHECK_TFP_SESSION(tfp);
 
        tfs = (struct tf_session *)(tfp->session->core_data);
 
@@ -253,9 +494,9 @@ tf_close_session(struct tf *tfp)
                rc = tf_msg_session_close(tfp);
                if (rc) {
                        /* Log error */
-                       PMD_DRV_LOG(ERR,
-                                   "Message send failed, rc:%d\n",
-                                   rc);
+                       TFP_DRV_LOG(ERR,
+                                   "Message send failed, rc:%s\n",
+                                   strerror(-rc));
                }
 
                /* Update the ref_count */
@@ -266,16 +507,20 @@ tf_close_session(struct tf *tfp)
 
        /* Final cleanup as we're last user of the session */
        if (tfs->ref_count == 0) {
+               /* Free EM pool */
+               for (dir = 0; dir < TF_DIR_MAX; dir++)
+                       tf_free_em_pool(tfs, (enum tf_dir)dir);
+
                tfp_free(tfp->session->core_data);
                tfp_free(tfp->session);
                tfp->session = NULL;
        }
 
-       PMD_DRV_LOG(INFO,
+       TFP_DRV_LOG(INFO,
                    "Session closed, session_id:%d\n",
                    session_id.id);
 
-       PMD_DRV_LOG(INFO,
+       TFP_DRV_LOG(INFO,
                    "domain:%d, bus:%d, device:%d, fw_session_id:%d\n",
                    session_id.internal.domain,
                    session_id.internal.bus,
@@ -285,10 +530,133 @@ tf_close_session(struct tf *tfp)
        return rc_close;
 }
 
-/** allocate identifier resource
+int
+tf_close_session_new(struct tf *tfp)
+{
+       int rc;
+       struct tf_session_close_session_parms cparms = { 0 };
+       union tf_session_id session_id = { 0 };
+       uint8_t ref_count;
+
+       TF_CHECK_PARMS1(tfp);
+
+       cparms.ref_count = &ref_count;
+       cparms.session_id = &session_id;
+       rc = tf_session_close_session(tfp,
+                                     &cparms);
+       /* Logging handled by tf_session_close_session */
+       if (rc)
+               return rc;
+
+       TFP_DRV_LOG(INFO,
+                   "Closed session, session_id:%d, ref_count:%d\n",
+                   cparms.session_id->id,
+                   *cparms.ref_count);
+
+       TFP_DRV_LOG(INFO,
+                   "domain:%d, bus:%d, device:%d, fw_session_id:%d\n",
+                   cparms.session_id->internal.domain,
+                   cparms.session_id->internal.bus,
+                   cparms.session_id->internal.device,
+                   cparms.session_id->internal.fw_session_id);
+
+       return rc;
+}
+
+/** insert EM hash entry API
  *
- * Returns success or failure code.
+ *    returns:
+ *    0       - Success
+ *    -EINVAL - Error
  */
+int tf_insert_em_entry(struct tf *tfp,
+                      struct tf_insert_em_entry_parms *parms)
+{
+       struct tf_session      *tfs;
+       struct tf_dev_info     *dev;
+       int rc;
+
+       TF_CHECK_PARMS_SESSION(tfp, parms);
+
+       /* 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(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* Retrieve the device information */
+       rc = tf_session_get_device(tfs, &dev);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup device, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       rc = dev->ops->tf_dev_insert_em_entry(tfp, parms);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: EM insert failed, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       return -EINVAL;
+}
+
+/** Delete EM hash entry API
+ *
+ *    returns:
+ *    0       - Success
+ *    -EINVAL - Error
+ */
+int tf_delete_em_entry(struct tf *tfp,
+                      struct tf_delete_em_entry_parms *parms)
+{
+       struct tf_session      *tfs;
+       struct tf_dev_info     *dev;
+       int rc;
+
+       TF_CHECK_PARMS_SESSION(tfp, parms);
+
+       /* 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(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* Retrieve the device information */
+       rc = tf_session_get_device(tfs, &dev);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup device, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       rc = dev->ops->tf_dev_delete_em_entry(tfp, parms);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: EM delete failed, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       return rc;
+}
+
 int tf_alloc_identifier(struct tf *tfp,
                        struct tf_alloc_identifier_parms *parms)
 {
@@ -297,14 +665,7 @@ int tf_alloc_identifier(struct tf *tfp,
        int id;
        int rc;
 
-       if (parms == NULL || tfp == NULL)
-               return -EINVAL;
-
-       if (tfp->session == NULL || tfp->session->core_data == NULL) {
-               PMD_DRV_LOG(ERR, "%s: session error\n",
-                           tf_dir_2_str(parms->dir));
-               return -EINVAL;
-       }
+       TF_CHECK_PARMS_SESSION(tfp, parms);
 
        tfs = (struct tf_session *)(tfp->session->core_data);
 
@@ -330,30 +691,31 @@ int tf_alloc_identifier(struct tf *tfp,
                                rc);
                break;
        case TF_IDENT_TYPE_L2_FUNC:
-               PMD_DRV_LOG(ERR, "%s: unsupported %s\n",
+               TFP_DRV_LOG(ERR, "%s: unsupported %s\n",
                            tf_dir_2_str(parms->dir),
                            tf_ident_2_str(parms->ident_type));
                rc = -EOPNOTSUPP;
                break;
        default:
-               PMD_DRV_LOG(ERR, "%s: %s\n",
+               TFP_DRV_LOG(ERR, "%s: %s\n",
                            tf_dir_2_str(parms->dir),
                            tf_ident_2_str(parms->ident_type));
-               rc = -EINVAL;
+               rc = -EOPNOTSUPP;
                break;
        }
 
        if (rc) {
-               PMD_DRV_LOG(ERR, "%s: identifier pool %s failure\n",
+               TFP_DRV_LOG(ERR, "%s: identifier pool %s failure, rc:%s\n",
                            tf_dir_2_str(parms->dir),
-                           tf_ident_2_str(parms->ident_type));
+                           tf_ident_2_str(parms->ident_type),
+                           strerror(-rc));
                return rc;
        }
 
        id = ba_alloc(session_pool);
 
        if (id == BA_FAIL) {
-               PMD_DRV_LOG(ERR, "%s: %s: No resource available\n",
+               TFP_DRV_LOG(ERR, "%s: %s: No resource available\n",
                            tf_dir_2_str(parms->dir),
                            tf_ident_2_str(parms->ident_type));
                return -ENOMEM;
@@ -362,10 +724,67 @@ int tf_alloc_identifier(struct tf *tfp,
        return 0;
 }
 
-/** free identifier resource
- *
- * Returns success or failure code.
- */
+int
+tf_alloc_identifier_new(struct tf *tfp,
+                       struct tf_alloc_identifier_parms *parms)
+{
+       int rc;
+       struct tf_session *tfs;
+       struct tf_dev_info *dev;
+       struct tf_ident_alloc_parms aparms;
+       uint16_t id;
+
+       TF_CHECK_PARMS2(tfp, parms);
+
+       /* Can't do static initialization due to UT enum check */
+       memset(&aparms, 0, sizeof(struct tf_ident_alloc_parms));
+
+       /* 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(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* Retrieve the device information */
+       rc = tf_session_get_device(tfs, &dev);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup device, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       if (dev->ops->tf_dev_alloc_ident == NULL) {
+               rc = -EOPNOTSUPP;
+               TFP_DRV_LOG(ERR,
+                           "%s: Operation not supported, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return -EOPNOTSUPP;
+       }
+
+       aparms.dir = parms->dir;
+       aparms.ident_type = parms->ident_type;
+       aparms.id = &id;
+       rc = dev->ops->tf_dev_alloc_ident(tfp, &aparms);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Identifier allocation failed, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       parms->id = id;
+
+       return 0;
+}
+
 int tf_free_identifier(struct tf *tfp,
                       struct tf_free_identifier_parms *parms)
 {
@@ -374,14 +793,7 @@ int tf_free_identifier(struct tf *tfp,
        int ba_rc;
        struct tf_session *tfs;
 
-       if (parms == NULL || tfp == NULL)
-               return -EINVAL;
-
-       if (tfp->session == NULL || tfp->session->core_data == NULL) {
-               PMD_DRV_LOG(ERR, "%s: Session error\n",
-                           tf_dir_2_str(parms->dir));
-               return -EINVAL;
-       }
+       TF_CHECK_PARMS_SESSION(tfp, parms);
 
        tfs = (struct tf_session *)(tfp->session->core_data);
 
@@ -407,29 +819,31 @@ int tf_free_identifier(struct tf *tfp,
                                rc);
                break;
        case TF_IDENT_TYPE_L2_FUNC:
-               PMD_DRV_LOG(ERR, "%s: unsupported %s\n",
+               TFP_DRV_LOG(ERR, "%s: unsupported %s\n",
                            tf_dir_2_str(parms->dir),
                            tf_ident_2_str(parms->ident_type));
                rc = -EOPNOTSUPP;
                break;
        default:
-               PMD_DRV_LOG(ERR, "%s: invalid %s\n",
+               TFP_DRV_LOG(ERR, "%s: invalid %s\n",
                            tf_dir_2_str(parms->dir),
                            tf_ident_2_str(parms->ident_type));
-               rc = -EINVAL;
+               rc = -EOPNOTSUPP;
                break;
        }
        if (rc) {
-               PMD_DRV_LOG(ERR, "%s: %s Identifier pool access failed\n",
+               TFP_DRV_LOG(ERR,
+                           "%s: %s Identifier pool access failed, rc:%s\n",
                            tf_dir_2_str(parms->dir),
-                           tf_ident_2_str(parms->ident_type));
+                           tf_ident_2_str(parms->ident_type),
+                           strerror(-rc));
                return rc;
        }
 
        ba_rc = ba_inuse(session_pool, (int)parms->id);
 
        if (ba_rc == BA_FAIL || ba_rc == BA_ENTRY_FREE) {
-               PMD_DRV_LOG(ERR, "%s: %s: Entry %d already free",
+               TFP_DRV_LOG(ERR, "%s: %s: Entry %d already free",
                            tf_dir_2_str(parms->dir),
                            tf_ident_2_str(parms->ident_type),
                            parms->id);
@@ -440,3 +854,238 @@ int tf_free_identifier(struct tf *tfp,
 
        return 0;
 }
+
+int
+tf_free_identifier_new(struct tf *tfp,
+                      struct tf_free_identifier_parms *parms)
+{
+       int rc;
+       struct tf_session *tfs;
+       struct tf_dev_info *dev;
+       struct tf_ident_free_parms fparms;
+
+       TF_CHECK_PARMS2(tfp, parms);
+
+       /* Can't do static initialization due to UT enum check */
+       memset(&fparms, 0, sizeof(struct tf_ident_free_parms));
+
+       /* 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(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* Retrieve the device information */
+       rc = tf_session_get_device(tfs, &dev);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup device, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       if (dev->ops->tf_dev_free_ident == NULL) {
+               rc = -EOPNOTSUPP;
+               TFP_DRV_LOG(ERR,
+                           "%s: Operation not supported, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return -EOPNOTSUPP;
+       }
+
+       fparms.dir = parms->dir;
+       fparms.ident_type = parms->ident_type;
+       fparms.id = parms->id;
+       rc = dev->ops->tf_dev_free_ident(tfp, &fparms);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Identifier allocation failed, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       return 0;
+}
+
+int
+tf_alloc_tcam_entry(struct tf *tfp,
+                   struct tf_alloc_tcam_entry_parms *parms)
+{
+       int rc;
+       int index;
+       struct tf_session *tfs;
+       struct bitalloc *session_pool;
+       uint16_t num_slice_per_row;
+
+       /* TEMP, due to device design. When tcam is modularized device
+        * should be retrieved from the session
+        */
+       enum tf_device_type device_type;
+       /* TEMP */
+       device_type = TF_DEVICE_TYPE_WH;
+
+       TF_CHECK_PARMS_SESSION(tfp, parms);
+
+       tfs = (struct tf_session *)(tfp->session->core_data);
+
+       rc = tf_check_tcam_entry(parms->tcam_tbl_type,
+                                device_type,
+                                parms->key_sz_in_bits,
+                                &num_slice_per_row);
+       /* Error logging handled by tf_check_tcam_entry */
+       if (rc)
+               return rc;
+
+       rc = tf_rm_lookup_tcam_type_pool(tfs,
+                                        parms->dir,
+                                        parms->tcam_tbl_type,
+                                        &session_pool);
+       /* Error logging handled by tf_rm_lookup_tcam_type_pool */
+       if (rc)
+               return rc;
+
+       index = ba_alloc(session_pool);
+       if (index == BA_FAIL) {
+               TFP_DRV_LOG(ERR, "%s: %s: No resource available\n",
+                           tf_dir_2_str(parms->dir),
+                           tf_tcam_tbl_2_str(parms->tcam_tbl_type));
+               return -ENOMEM;
+       }
+
+       index *= num_slice_per_row;
+
+       parms->idx = index;
+       return 0;
+}
+
+int
+tf_set_tcam_entry(struct tf *tfp,
+                 struct tf_set_tcam_entry_parms *parms)
+{
+       int rc;
+       int id;
+       int index;
+       struct tf_session *tfs;
+       struct bitalloc *session_pool;
+       uint16_t num_slice_per_row;
+
+       /* TEMP, due to device design. When tcam is modularized device
+        * should be retrieved from the session
+        */
+       enum tf_device_type device_type;
+       /* TEMP */
+       device_type = TF_DEVICE_TYPE_WH;
+
+       TF_CHECK_PARMS_SESSION(tfp, parms);
+
+       tfs = (struct tf_session *)(tfp->session->core_data);
+
+       rc = tf_check_tcam_entry(parms->tcam_tbl_type,
+                                device_type,
+                                parms->key_sz_in_bits,
+                                &num_slice_per_row);
+       /* Error logging handled by tf_check_tcam_entry */
+       if (rc)
+               return rc;
+
+       rc = tf_rm_lookup_tcam_type_pool(tfs,
+                                        parms->dir,
+                                        parms->tcam_tbl_type,
+                                        &session_pool);
+       /* Error logging handled by tf_rm_lookup_tcam_type_pool */
+       if (rc)
+               return rc;
+
+       /* Verify that the entry has been previously allocated */
+       index = parms->idx / num_slice_per_row;
+
+       id = ba_inuse(session_pool, index);
+       if (id != 1) {
+               TFP_DRV_LOG(ERR,
+                  "%s: %s: Invalid or not allocated index, idx:%d\n",
+                  tf_dir_2_str(parms->dir),
+                  tf_tcam_tbl_2_str(parms->tcam_tbl_type),
+                  parms->idx);
+               return -EINVAL;
+       }
+
+       rc = tf_msg_tcam_entry_set(tfp, parms);
+
+       return rc;
+}
+
+int
+tf_get_tcam_entry(struct tf *tfp __rte_unused,
+                 struct tf_get_tcam_entry_parms *parms __rte_unused)
+{
+       TF_CHECK_PARMS_SESSION(tfp, parms);
+       return -EOPNOTSUPP;
+}
+
+int
+tf_free_tcam_entry(struct tf *tfp,
+                  struct tf_free_tcam_entry_parms *parms)
+{
+       int rc;
+       int index;
+       struct tf_session *tfs;
+       struct bitalloc *session_pool;
+       uint16_t num_slice_per_row = 1;
+
+       /* TEMP, due to device design. When tcam is modularized device
+        * should be retrieved from the session
+        */
+       enum tf_device_type device_type;
+       /* TEMP */
+       device_type = TF_DEVICE_TYPE_WH;
+
+       TF_CHECK_PARMS_SESSION(tfp, parms);
+       tfs = (struct tf_session *)(tfp->session->core_data);
+
+       rc = tf_check_tcam_entry(parms->tcam_tbl_type,
+                                device_type,
+                                0,
+                                &num_slice_per_row);
+       /* Error logging handled by tf_check_tcam_entry */
+       if (rc)
+               return rc;
+
+       rc = tf_rm_lookup_tcam_type_pool(tfs,
+                                        parms->dir,
+                                        parms->tcam_tbl_type,
+                                        &session_pool);
+       /* Error logging handled by tf_rm_lookup_tcam_type_pool */
+       if (rc)
+               return rc;
+
+       index = parms->idx / num_slice_per_row;
+
+       rc = ba_inuse(session_pool, index);
+       if (rc == BA_FAIL || rc == BA_ENTRY_FREE) {
+               TFP_DRV_LOG(ERR, "%s: %s: Entry %d already free",
+                           tf_dir_2_str(parms->dir),
+                           tf_tcam_tbl_2_str(parms->tcam_tbl_type),
+                           index);
+               return -EINVAL;
+       }
+
+       ba_free(session_pool, index);
+
+       rc = tf_msg_tcam_entry_free(tfp, parms);
+       if (rc) {
+               /* Log error */
+               TFP_DRV_LOG(ERR, "%s: %s: Entry %d free failed with err %s",
+                           tf_dir_2_str(parms->dir),
+                           tf_tcam_tbl_2_str(parms->tcam_tbl_type),
+                           parms->idx,
+                           strerror(-rc));
+       }
+
+       return rc;
+}