net/bnxt: support Thor template
[dpdk.git] / drivers / net / bnxt / tf_ulp / ulp_flow_db.c
index 3be7489..ab6013f 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2020 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -11,6 +11,7 @@
 #include "ulp_mapper.h"
 #include "ulp_flow_db.h"
 #include "ulp_fc_mgr.h"
+#include "ulp_tun.h"
 
 #define ULP_FLOW_DB_RES_DIR_BIT                31
 #define ULP_FLOW_DB_RES_DIR_MASK       0x80000000
@@ -47,17 +48,21 @@ ulp_flow_db_active_flows_bit_set(struct bnxt_ulp_flow_db *flow_db,
        uint32_t a_idx = idx / ULP_INDEX_BITMAP_SIZE;
 
        if (flag) {
-               if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR)
+               if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR || flow_type ==
+                   BNXT_ULP_FDB_TYPE_RID)
                        ULP_INDEX_BITMAP_SET(f_tbl->active_reg_flows[a_idx],
                                             idx);
-               else
+               if (flow_type == BNXT_ULP_FDB_TYPE_DEFAULT || flow_type ==
+                   BNXT_ULP_FDB_TYPE_RID)
                        ULP_INDEX_BITMAP_SET(f_tbl->active_dflt_flows[a_idx],
                                             idx);
        } else {
-               if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR)
+               if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR || flow_type ==
+                   BNXT_ULP_FDB_TYPE_RID)
                        ULP_INDEX_BITMAP_RESET(f_tbl->active_reg_flows[a_idx],
                                               idx);
-               else
+               if (flow_type == BNXT_ULP_FDB_TYPE_DEFAULT || flow_type ==
+                   BNXT_ULP_FDB_TYPE_RID)
                        ULP_INDEX_BITMAP_RESET(f_tbl->active_dflt_flows[a_idx],
                                               idx);
        }
@@ -80,13 +85,21 @@ ulp_flow_db_active_flows_bit_is_set(struct bnxt_ulp_flow_db *flow_db,
 {
        struct bnxt_ulp_flow_tbl *f_tbl = &flow_db->flow_tbl;
        uint32_t a_idx = idx / ULP_INDEX_BITMAP_SIZE;
-
-       if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR)
-               return ULP_INDEX_BITMAP_GET(f_tbl->active_reg_flows[a_idx],
-                                           idx);
-       else
-               return ULP_INDEX_BITMAP_GET(f_tbl->active_dflt_flows[a_idx],
-                                           idx);
+       uint32_t reg, dflt;
+
+       reg = ULP_INDEX_BITMAP_GET(f_tbl->active_reg_flows[a_idx], idx);
+       dflt = ULP_INDEX_BITMAP_GET(f_tbl->active_dflt_flows[a_idx], idx);
+
+       switch (flow_type) {
+       case BNXT_ULP_FDB_TYPE_REGULAR:
+               return (reg && !dflt);
+       case BNXT_ULP_FDB_TYPE_DEFAULT:
+               return (!reg && dflt);
+       case BNXT_ULP_FDB_TYPE_RID:
+               return (reg && dflt);
+       default:
+               return 0;
+       }
 }
 
 static inline enum tf_dir
@@ -103,7 +116,7 @@ ulp_flow_db_resource_func_get(struct ulp_fdb_resource_info *res_info)
 
        func = (((res_info->nxt_resource_idx & ULP_FLOW_DB_RES_FUNC_MASK) >>
                 ULP_FLOW_DB_RES_FUNC_BITS) << ULP_FLOW_DB_RES_FUNC_UPPER);
-       /* The reource func is split into upper and lower */
+       /* The resource func is split into upper and lower */
        if (func & ULP_FLOW_DB_RES_FUNC_NEED_LOWER)
                return (func | res_info->resource_func_lower);
        return func;
@@ -139,12 +152,11 @@ ulp_flow_db_res_params_to_info(struct ulp_fdb_resource_info *resource_info,
        }
 
        /* Store the handle as 64bit only for EM table entries */
-       if (params->resource_func != BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE &&
-           params->resource_func != BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE) {
+       if (params->resource_func != BNXT_ULP_RESOURCE_FUNC_EM_TABLE) {
                resource_info->resource_hndl = (uint32_t)params->resource_hndl;
                resource_info->resource_type = params->resource_type;
                resource_info->resource_sub_type = params->resource_sub_type;
-               resource_info->reserved = params->reserved;
+               resource_info->fdb_flags = params->fdb_flags;
        } else {
                resource_info->resource_em_handle = params->resource_hndl;
        }
@@ -169,14 +181,13 @@ ulp_flow_db_res_info_to_params(struct ulp_fdb_resource_info *resource_info,
        params->direction = ulp_flow_db_resource_dir_get(resource_info);
        params->resource_func = ulp_flow_db_resource_func_get(resource_info);
 
-       if (params->resource_func == BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE ||
-           params->resource_func == BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE) {
+       if (params->resource_func == BNXT_ULP_RESOURCE_FUNC_EM_TABLE) {
                params->resource_hndl = resource_info->resource_em_handle;
        } else if (params->resource_func & ULP_FLOW_DB_RES_FUNC_NEED_LOWER) {
                params->resource_hndl = resource_info->resource_hndl;
                params->resource_type = resource_info->resource_type;
                params->resource_sub_type = resource_info->resource_sub_type;
-               params->reserved = resource_info->reserved;
+               params->fdb_flags = resource_info->fdb_flags;
        }
 }
 
@@ -212,7 +223,7 @@ ulp_flow_db_alloc_resource(struct bnxt_ulp_flow_db *flow_db)
                return -ENOMEM;
        }
        size = (flow_tbl->num_flows / sizeof(uint64_t)) + 1;
-       size =  ULP_BYTE_ROUND_OFF_8(size);
+       size = ULP_BYTE_ROUND_OFF_8(size);
        flow_tbl->active_reg_flows = rte_zmalloc("active reg flows", size,
                                                 ULP_BUFFER_ALIGN_64_BYTE);
        if (!flow_tbl->active_reg_flows) {
@@ -375,6 +386,101 @@ ulp_flow_db_parent_tbl_deinit(struct bnxt_ulp_flow_db *flow_db)
        }
 }
 
+/* internal validation function for parent flow tbl */
+static struct bnxt_ulp_flow_db *
+ulp_flow_db_parent_arg_validation(struct bnxt_ulp_context *ulp_ctxt,
+                                 uint32_t fid)
+{
+       struct bnxt_ulp_flow_db *flow_db;
+
+       flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
+       if (!flow_db) {
+               BNXT_TF_DBG(ERR, "Invalid Arguments\n");
+               return NULL;
+       }
+
+       /* check for max flows */
+       if (fid >= flow_db->flow_tbl.num_flows || !fid) {
+               BNXT_TF_DBG(ERR, "Invalid flow index\n");
+               return NULL;
+       }
+
+       /* No support for parent child db then just exit */
+       if (!flow_db->parent_child_db.entries_count) {
+               BNXT_TF_DBG(ERR, "parent child db not supported\n");
+               return NULL;
+       }
+
+       return flow_db;
+}
+
+/*
+ * Set the tunnel index in the parent flow
+ *
+ * ulp_ctxt [in] Ptr to ulp_context
+ * parent_idx [in] The parent index of the parent flow entry
+ *
+ * returns index on success and negative on failure.
+ */
+static int32_t
+ulp_flow_db_parent_tun_idx_set(struct bnxt_ulp_context *ulp_ctxt,
+                              uint32_t parent_idx, uint8_t tun_idx)
+{
+       struct bnxt_ulp_flow_db *flow_db;
+       struct ulp_fdb_parent_child_db *p_pdb;
+
+       flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
+       if (!flow_db) {
+               BNXT_TF_DBG(ERR, "Invalid Arguments\n");
+               return -EINVAL;
+       }
+
+       /* check for parent idx validity */
+       p_pdb = &flow_db->parent_child_db;
+       if (parent_idx >= p_pdb->entries_count ||
+           !p_pdb->parent_flow_tbl[parent_idx].parent_fid) {
+               BNXT_TF_DBG(ERR, "Invalid parent flow index %x\n", parent_idx);
+               return -EINVAL;
+       }
+
+       p_pdb->parent_flow_tbl[parent_idx].tun_idx = tun_idx;
+       return 0;
+}
+
+/*
+ * Get the tunnel index from the parent flow
+ *
+ * ulp_ctxt [in] Ptr to ulp_context
+ * parent_fid [in] The flow id of the parent flow entry
+ *
+ * returns 0 if counter accum is set else -1.
+ */
+static int32_t
+ulp_flow_db_parent_tun_idx_get(struct bnxt_ulp_context *ulp_ctxt,
+                              uint32_t parent_fid, uint8_t *tun_idx)
+{
+       struct bnxt_ulp_flow_db *flow_db;
+       struct ulp_fdb_parent_child_db *p_pdb;
+       uint32_t idx;
+
+       /* validate the arguments */
+       flow_db = ulp_flow_db_parent_arg_validation(ulp_ctxt, parent_fid);
+       if (!flow_db) {
+               BNXT_TF_DBG(ERR, "parent child db validation failed\n");
+               return -EINVAL;
+       }
+
+       p_pdb = &flow_db->parent_child_db;
+       for (idx = 0; idx < p_pdb->entries_count; idx++) {
+               if (p_pdb->parent_flow_tbl[idx].parent_fid == parent_fid) {
+                       *tun_idx = p_pdb->parent_flow_tbl[idx].tun_idx;
+                       return 0;
+               }
+       }
+
+       return -EINVAL;
+}
+
 /*
  * Initialize the flow database. Memory is allocated in this
  * call and assigned to the flow database.
@@ -416,7 +522,9 @@ ulp_flow_db_init(struct bnxt_ulp_context *ulp_ctxt)
        bnxt_ulp_cntxt_ptr2_flow_db_set(ulp_ctxt, flow_db);
 
        /* Determine the number of flows based on EM type */
-       bnxt_ulp_cntxt_mem_type_get(ulp_ctxt, &mtype);
+       if (bnxt_ulp_cntxt_mem_type_get(ulp_ctxt, &mtype))
+               goto error_free;
+
        if (mtype == BNXT_ULP_FLOW_MEM_TYPE_INT)
                num_flows = dparms->int_flow_db_num_entries;
        else
@@ -521,7 +629,7 @@ ulp_flow_db_fid_alloc(struct bnxt_ulp_context *ulp_ctxt,
                return -EINVAL;
        }
 
-       if (flow_type > BNXT_ULP_FDB_TYPE_DEFAULT) {
+       if (flow_type >= BNXT_ULP_FDB_TYPE_LAST) {
                BNXT_TF_DBG(ERR, "Invalid flow type\n");
                return -EINVAL;
        }
@@ -570,6 +678,7 @@ ulp_flow_db_resource_add(struct bnxt_ulp_context *ulp_ctxt,
        struct bnxt_ulp_flow_db *flow_db;
        struct bnxt_ulp_flow_tbl *flow_tbl;
        struct ulp_fdb_resource_info *resource, *fid_resource;
+       struct bnxt_ulp_fc_info *ulp_fc_info;
        uint32_t idx;
 
        flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
@@ -578,7 +687,7 @@ ulp_flow_db_resource_add(struct bnxt_ulp_context *ulp_ctxt,
                return -EINVAL;
        }
 
-       if (flow_type > BNXT_ULP_FDB_TYPE_DEFAULT) {
+       if (flow_type >= BNXT_ULP_FDB_TYPE_LAST) {
                BNXT_TF_DBG(ERR, "Invalid flow type\n");
                return -EINVAL;
        }
@@ -592,7 +701,7 @@ ulp_flow_db_resource_add(struct bnxt_ulp_context *ulp_ctxt,
 
        /* check if the flow is active or not */
        if (!ulp_flow_db_active_flows_bit_is_set(flow_db, flow_type, fid)) {
-               BNXT_TF_DBG(ERR, "flow does not exist\n");
+               BNXT_TF_DBG(ERR, "flow does not exist %x:%x\n", flow_type, fid);
                return -EINVAL;
        }
 
@@ -603,6 +712,12 @@ ulp_flow_db_resource_add(struct bnxt_ulp_context *ulp_ctxt,
        }
        fid_resource = &flow_tbl->flow_resources[fid];
 
+       if (params->critical_resource && fid_resource->resource_em_handle) {
+               BNXT_TF_DBG(DEBUG, "Ignore multiple critical resources\n");
+               /* Ignore the multiple critical resources */
+               params->critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO;
+       }
+
        if (!params->critical_resource) {
                /* Not the critical_resource so allocate a resource */
                idx = flow_tbl->flow_tbl_stack[flow_tbl->tail_index];
@@ -622,9 +737,11 @@ ulp_flow_db_resource_add(struct bnxt_ulp_context *ulp_ctxt,
                ulp_flow_db_res_params_to_info(fid_resource, params);
        }
 
+       ulp_fc_info = bnxt_ulp_cntxt_ptr2_fc_info_get(ulp_ctxt);
        if (params->resource_type == TF_TBL_TYPE_ACT_STATS_64 &&
            params->resource_sub_type ==
-           BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT) {
+           BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT &&
+           ulp_fc_info && ulp_fc_info->num_counters) {
                /* Store the first HW counter ID for this table */
                if (!ulp_fc_mgr_start_idx_isset(ulp_ctxt, params->direction))
                        ulp_fc_mgr_start_idx_set(ulp_ctxt, params->direction,
@@ -649,7 +766,7 @@ ulp_flow_db_resource_add(struct bnxt_ulp_context *ulp_ctxt,
  * flow_type [in] Specify it is regular or default flow
  * fid [in] The index to the flow entry
  * params [in/out] The contents to be copied into params.
- * Onlythe critical_resource needs to be set by the caller.
+ * Only the critical_resource needs to be set by the caller.
  *
  * Returns 0 on success and negative on failure.
  */
@@ -663,6 +780,9 @@ ulp_flow_db_resource_del(struct bnxt_ulp_context *ulp_ctxt,
        struct bnxt_ulp_flow_tbl *flow_tbl;
        struct ulp_fdb_resource_info *nxt_resource, *fid_resource;
        uint32_t nxt_idx = 0;
+       struct bnxt_tun_cache_entry *tun_tbl;
+       uint8_t tun_idx = 0;
+       int rc;
 
        flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
        if (!flow_db) {
@@ -670,7 +790,7 @@ ulp_flow_db_resource_del(struct bnxt_ulp_context *ulp_ctxt,
                return -EINVAL;
        }
 
-       if (flow_type > BNXT_ULP_FDB_TYPE_DEFAULT) {
+       if (flow_type >= BNXT_ULP_FDB_TYPE_LAST) {
                BNXT_TF_DBG(ERR, "Invalid flow type\n");
                return -EINVAL;
        }
@@ -684,7 +804,7 @@ ulp_flow_db_resource_del(struct bnxt_ulp_context *ulp_ctxt,
 
        /* check if the flow is active or not */
        if (!ulp_flow_db_active_flows_bit_is_set(flow_db, flow_type, fid)) {
-               BNXT_TF_DBG(ERR, "flow does not exist\n");
+               BNXT_TF_DBG(ERR, "flow does not exist %x:%x\n", flow_type, fid);
                return -EINVAL;
        }
 
@@ -734,11 +854,23 @@ ulp_flow_db_resource_del(struct bnxt_ulp_context *ulp_ctxt,
         */
        if (params->resource_type == TF_TBL_TYPE_ACT_STATS_64 &&
            params->resource_sub_type ==
-           BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT) {
+           BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT) {
                ulp_fc_mgr_cntr_reset(ulp_ctxt, params->direction,
                                      params->resource_hndl);
        }
 
+       if (params->resource_func == BNXT_ULP_RESOURCE_FUNC_PARENT_FLOW) {
+               tun_tbl = bnxt_ulp_cntxt_ptr2_tun_tbl_get(ulp_ctxt);
+               if (!tun_tbl)
+                       return -EINVAL;
+
+               rc = ulp_flow_db_parent_tun_idx_get(ulp_ctxt, fid, &tun_idx);
+               if (rc)
+                       return rc;
+
+               ulp_clear_tun_entry(tun_tbl, tun_idx);
+       }
+
        /* all good, return success */
        return 0;
 }
@@ -757,8 +889,9 @@ ulp_flow_db_fid_free(struct bnxt_ulp_context *ulp_ctxt,
                     enum bnxt_ulp_fdb_type flow_type,
                     uint32_t fid)
 {
-       struct bnxt_ulp_flow_db *flow_db;
+       struct bnxt_tun_cache_entry *tun_tbl;
        struct bnxt_ulp_flow_tbl *flow_tbl;
+       struct bnxt_ulp_flow_db *flow_db;
 
        flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
        if (!flow_db) {
@@ -766,7 +899,7 @@ ulp_flow_db_fid_free(struct bnxt_ulp_context *ulp_ctxt,
                return -EINVAL;
        }
 
-       if (flow_type > BNXT_ULP_FDB_TYPE_DEFAULT) {
+       if (flow_type >= BNXT_ULP_FDB_TYPE_LAST) {
                BNXT_TF_DBG(ERR, "Invalid flow type\n");
                return -EINVAL;
        }
@@ -781,7 +914,7 @@ ulp_flow_db_fid_free(struct bnxt_ulp_context *ulp_ctxt,
 
        /* check if the flow is active or not */
        if (!ulp_flow_db_active_flows_bit_is_set(flow_db, flow_type, fid)) {
-               BNXT_TF_DBG(ERR, "flow does not exist\n");
+               BNXT_TF_DBG(ERR, "flow does not exist %x:%x\n", flow_type, fid);
                return -EINVAL;
        }
        flow_tbl->head_index--;
@@ -789,6 +922,7 @@ ulp_flow_db_fid_free(struct bnxt_ulp_context *ulp_ctxt,
                BNXT_TF_DBG(ERR, "FlowDB: Head Ptr is zero\n");
                return -ENOENT;
        }
+
        flow_tbl->flow_tbl_stack[flow_tbl->head_index] = fid;
 
        /* Clear the flows bitmap */
@@ -797,12 +931,18 @@ ulp_flow_db_fid_free(struct bnxt_ulp_context *ulp_ctxt,
        if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR)
                ulp_flow_db_func_id_set(flow_db, fid, 0);
 
+       tun_tbl = bnxt_ulp_cntxt_ptr2_tun_tbl_get(ulp_ctxt);
+       if (!tun_tbl)
+               return -EINVAL;
+
+       ulp_clear_tun_inner_entry(tun_tbl, fid);
+
        /* all good, return success */
        return 0;
 }
 
 /*
- * Get the flow database entry details
+ *Get the flow database entry details
  *
  * ulp_ctxt [in] Ptr to ulp_context
  * flow_type [in] - specify default or regular
@@ -829,7 +969,7 @@ ulp_flow_db_resource_get(struct bnxt_ulp_context *ulp_ctxt,
                return -EINVAL;
        }
 
-       if (flow_type > BNXT_ULP_FDB_TYPE_DEFAULT) {
+       if (flow_type >= BNXT_ULP_FDB_TYPE_LAST) {
                BNXT_TF_DBG(ERR, "Invalid flow type\n");
                return -EINVAL;
        }
@@ -885,10 +1025,14 @@ ulp_flow_db_next_entry_get(struct bnxt_ulp_flow_db *flow_db,
        uint64_t *active_flows;
        struct bnxt_ulp_flow_tbl *flowtbl = &flow_db->flow_tbl;
 
-       if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR)
+       if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR) {
                active_flows = flowtbl->active_reg_flows;
-       else
+       } else if (flow_type == BNXT_ULP_FDB_TYPE_DEFAULT) {
                active_flows = flowtbl->active_dflt_flows;
+       } else {
+               BNXT_TF_DBG(ERR, "Invalid flow type %x\n", flow_type);
+                       return -EINVAL;
+       }
 
        do {
                /* increment the flow id to find the next valid flow id */
@@ -1058,12 +1202,12 @@ ulp_flow_db_validate_flow_func(struct bnxt_ulp_context *ulp_ctx,
  * the first match.
  */
 static int32_t
-ulp_flow_db_resource_hndl_get(struct bnxt_ulp_context *ulp_ctx,
-                             enum bnxt_ulp_fdb_type flow_type,
-                             uint32_t flow_id,
-                             uint32_t resource_func,
-                             uint32_t res_subtype,
-                             uint64_t *res_hndl)
+ulp_flow_db_resource_params_get(struct bnxt_ulp_context *ulp_ctx,
+                               enum bnxt_ulp_fdb_type flow_type,
+                               uint32_t flow_id,
+                               uint32_t resource_func,
+                               uint32_t res_subtype,
+                               struct ulp_flow_db_res_params *params)
 {
        struct bnxt_ulp_flow_db *flow_db;
        struct bnxt_ulp_flow_tbl *flow_tbl;
@@ -1076,7 +1220,12 @@ ulp_flow_db_resource_hndl_get(struct bnxt_ulp_context *ulp_ctx,
                return -EINVAL;
        }
 
-       if (flow_type > BNXT_ULP_FDB_TYPE_DEFAULT) {
+       if (!params) {
+               BNXT_TF_DBG(ERR, "invalid argument\n");
+               return -EINVAL;
+       }
+
+       if (flow_type >= BNXT_ULP_FDB_TYPE_LAST) {
                BNXT_TF_DBG(ERR, "Invalid flow type\n");
                return -EINVAL;
        }
@@ -1096,20 +1245,21 @@ ulp_flow_db_resource_hndl_get(struct bnxt_ulp_context *ulp_ctx,
        }
        /* Iterate the resource to get the resource handle */
        res_id =  flow_id;
+       memset(params, 0, sizeof(struct ulp_flow_db_res_params));
        while (res_id) {
                fid_res = &flow_tbl->flow_resources[res_id];
                if (ulp_flow_db_resource_func_get(fid_res) == resource_func) {
                        if (resource_func & ULP_FLOW_DB_RES_FUNC_NEED_LOWER) {
                                if (res_subtype == fid_res->resource_sub_type) {
-                                       *res_hndl = fid_res->resource_hndl;
+                                       ulp_flow_db_res_info_to_params(fid_res,
+                                                                      params);
                                        return 0;
                                }
 
                        } else if (resource_func ==
-                                  BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE ||
-                                  resource_func ==
-                                  BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE) {
-                               *res_hndl = fid_res->resource_em_handle;
+                                  BNXT_ULP_RESOURCE_FUNC_EM_TABLE) {
+                               ulp_flow_db_res_info_to_params(fid_res,
+                                                              params);
                                return 0;
                        }
                }
@@ -1133,21 +1283,21 @@ ulp_default_flow_db_cfa_action_get(struct bnxt_ulp_context *ulp_ctx,
                                   uint32_t flow_id,
                                   uint16_t *cfa_action)
 {
-       uint8_t sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION;
-       uint64_t hndl;
+       uint8_t sub_typ = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION;
+       struct ulp_flow_db_res_params params;
        int32_t rc;
 
-       rc = ulp_flow_db_resource_hndl_get(ulp_ctx,
-                                          BNXT_ULP_FDB_TYPE_DEFAULT,
-                                          flow_id,
-                                          BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-                                          sub_type, &hndl);
+       rc = ulp_flow_db_resource_params_get(ulp_ctx,
+                                            BNXT_ULP_FDB_TYPE_DEFAULT,
+                                            flow_id,
+                                            BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+                                            sub_typ, &params);
        if (rc) {
-               BNXT_TF_DBG(ERR, "CFA Action ptr not found for flow id %u\n",
+               BNXT_TF_DBG(INFO, "CFA Action ptr not found for flow id %u\n",
                            flow_id);
                return -ENOENT;
        }
-       *cfa_action = hndl;
+       *cfa_action = params.resource_hndl;
        return 0;
 }
 
@@ -1167,26 +1317,15 @@ ulp_flow_db_parent_flow_alloc(struct bnxt_ulp_context *ulp_ctxt,
        struct ulp_fdb_parent_child_db *p_pdb;
        uint32_t idx, free_idx = 0;
 
-       flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
+       /* validate the arguments */
+       flow_db = ulp_flow_db_parent_arg_validation(ulp_ctxt, fid);
        if (!flow_db) {
-               BNXT_TF_DBG(ERR, "Invalid Arguments\n");
-               return -EINVAL;
-       }
-
-       /* check for max flows */
-       if (fid >= flow_db->flow_tbl.num_flows || !fid) {
-               BNXT_TF_DBG(ERR, "Invalid flow index\n");
-               return -EINVAL;
-       }
-
-       /* No support for parent child db then just exit */
-       if (!flow_db->parent_child_db.entries_count) {
-               BNXT_TF_DBG(ERR, "parent child db not supported\n");
+               BNXT_TF_DBG(ERR, "parent child db validation failed\n");
                return -EINVAL;
        }
 
        p_pdb = &flow_db->parent_child_db;
-       for (idx = 0; idx <= p_pdb->entries_count; idx++) {
+       for (idx = 0; idx < p_pdb->entries_count; idx++) {
                if (p_pdb->parent_flow_tbl[idx].parent_fid == fid) {
                        BNXT_TF_DBG(ERR, "fid is already allocated\n");
                        return -EINVAL;
@@ -1222,26 +1361,15 @@ ulp_flow_db_parent_flow_free(struct bnxt_ulp_context *ulp_ctxt,
        struct ulp_fdb_parent_child_db *p_pdb;
        uint32_t idx;
 
-       flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
+       /* validate the arguments */
+       flow_db = ulp_flow_db_parent_arg_validation(ulp_ctxt, fid);
        if (!flow_db) {
-               BNXT_TF_DBG(ERR, "Invalid Arguments\n");
-               return -EINVAL;
-       }
-
-       /* check for max flows */
-       if (fid >= flow_db->flow_tbl.num_flows || !fid) {
-               BNXT_TF_DBG(ERR, "Invalid flow index\n");
-               return -EINVAL;
-       }
-
-       /* No support for parent child db then just exit */
-       if (!flow_db->parent_child_db.entries_count) {
-               BNXT_TF_DBG(ERR, "parent child db not supported\n");
+               BNXT_TF_DBG(ERR, "parent child db validation failed\n");
                return -EINVAL;
        }
 
        p_pdb = &flow_db->parent_child_db;
-       for (idx = 0; idx <= p_pdb->entries_count; idx++) {
+       for (idx = 0; idx < p_pdb->entries_count; idx++) {
                if (p_pdb->parent_flow_tbl[idx].parent_fid == fid) {
                        /* free the contents */
                        p_pdb->parent_flow_tbl[idx].parent_fid = 0;
@@ -1275,15 +1403,10 @@ ulp_flow_db_parent_child_flow_set(struct bnxt_ulp_context *ulp_ctxt,
        uint32_t idx, a_idx;
        uint64_t *t;
 
-       flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
+       /* validate the arguments */
+       flow_db = ulp_flow_db_parent_arg_validation(ulp_ctxt, parent_fid);
        if (!flow_db) {
-               BNXT_TF_DBG(ERR, "Invalid Arguments\n");
-               return -EINVAL;
-       }
-
-       /* check for fid validity */
-       if (parent_fid >= flow_db->flow_tbl.num_flows || !parent_fid) {
-               BNXT_TF_DBG(ERR, "Invalid parent flow index %x\n", parent_fid);
+               BNXT_TF_DBG(ERR, "parent child db validation failed\n");
                return -EINVAL;
        }
 
@@ -1293,15 +1416,9 @@ ulp_flow_db_parent_child_flow_set(struct bnxt_ulp_context *ulp_ctxt,
                return -EINVAL;
        }
 
-       /* No support for parent child db then just exit */
-       if (!flow_db->parent_child_db.entries_count) {
-               BNXT_TF_DBG(ERR, "parent child db not supported\n");
-               return -EINVAL;
-       }
-
        p_pdb = &flow_db->parent_child_db;
        a_idx = child_fid / ULP_INDEX_BITMAP_SIZE;
-       for (idx = 0; idx <= p_pdb->entries_count; idx++) {
+       for (idx = 0; idx < p_pdb->entries_count; idx++) {
                if (p_pdb->parent_flow_tbl[idx].parent_fid == parent_fid) {
                        t = p_pdb->parent_flow_tbl[idx].child_fid_bitset;
                        if (set_flag)
@@ -1334,26 +1451,15 @@ ulp_flow_db_parent_flow_idx_get(struct bnxt_ulp_context *ulp_ctxt,
        struct ulp_fdb_parent_child_db *p_pdb;
        uint32_t idx;
 
-       flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
+       /* validate the arguments */
+       flow_db = ulp_flow_db_parent_arg_validation(ulp_ctxt, parent_fid);
        if (!flow_db) {
-               BNXT_TF_DBG(ERR, "Invalid Arguments\n");
-               return -EINVAL;
-       }
-
-       /* check for fid validity */
-       if (parent_fid >= flow_db->flow_tbl.num_flows || !parent_fid) {
-               BNXT_TF_DBG(ERR, "Invalid parent flow index %x\n", parent_fid);
-               return -EINVAL;
-       }
-
-       /* No support for parent child db then just exit */
-       if (!flow_db->parent_child_db.entries_count) {
-               BNXT_TF_DBG(ERR, "parent child db not supported\n");
+               BNXT_TF_DBG(ERR, "parent child db validation failed\n");
                return -EINVAL;
        }
 
        p_pdb = &flow_db->parent_child_db;
-       for (idx = 0; idx <= p_pdb->entries_count; idx++) {
+       for (idx = 0; idx < p_pdb->entries_count; idx++) {
                if (p_pdb->parent_flow_tbl[idx].parent_fid == parent_fid) {
                        *parent_idx = idx;
                        return 0;
@@ -1425,6 +1531,73 @@ ulp_flow_db_parent_child_flow_next_entry_get(struct bnxt_ulp_flow_db *flow_db,
        return 0;
 }
 
+/*
+ * Set the counter accumulation in the parent flow
+ *
+ * ulp_ctxt [in] Ptr to ulp_context
+ * parent_idx [in] The parent index of the parent flow entry
+ *
+ * returns index on success and negative on failure.
+ */
+static int32_t
+ulp_flow_db_parent_flow_count_accum_set(struct bnxt_ulp_context *ulp_ctxt,
+                                       uint32_t parent_idx)
+{
+       struct bnxt_ulp_flow_db *flow_db;
+       struct ulp_fdb_parent_child_db *p_pdb;
+
+       flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctxt);
+       if (!flow_db) {
+               BNXT_TF_DBG(ERR, "Invalid Arguments\n");
+               return -EINVAL;
+       }
+
+       /* check for parent idx validity */
+       p_pdb = &flow_db->parent_child_db;
+       if (parent_idx >= p_pdb->entries_count ||
+           !p_pdb->parent_flow_tbl[parent_idx].parent_fid) {
+               BNXT_TF_DBG(ERR, "Invalid parent flow index %x\n", parent_idx);
+               return -EINVAL;
+       }
+
+       p_pdb->parent_flow_tbl[parent_idx].counter_acc = 1;
+       return 0;
+}
+
+/*
+ * Get the counter accumulation in the parent flow
+ *
+ * ulp_ctxt [in] Ptr to ulp_context
+ * parent_fid [in] The flow id of the parent flow entry
+ *
+ * returns 0 if counter accum is set else -1.
+ */
+static int32_t
+ulp_flow_db_parent_flow_count_accum_get(struct bnxt_ulp_context *ulp_ctxt,
+                                       uint32_t parent_fid)
+{
+       struct bnxt_ulp_flow_db *flow_db;
+       struct ulp_fdb_parent_child_db *p_pdb;
+       uint32_t idx;
+
+       /* validate the arguments */
+       flow_db = ulp_flow_db_parent_arg_validation(ulp_ctxt, parent_fid);
+       if (!flow_db) {
+               BNXT_TF_DBG(ERR, "parent child db validation failed\n");
+               return -EINVAL;
+       }
+
+       p_pdb = &flow_db->parent_child_db;
+       for (idx = 0; idx < p_pdb->entries_count; idx++) {
+               if (p_pdb->parent_flow_tbl[idx].parent_fid == parent_fid) {
+                       if (p_pdb->parent_flow_tbl[idx].counter_acc)
+                               return 0;
+                       break;
+               }
+       }
+       return -1;
+}
+
 /*
  * Orphan the child flow entry
  * This is called only for child flows that have
@@ -1452,7 +1625,7 @@ ulp_flow_db_child_flow_reset(struct bnxt_ulp_context *ulp_ctxt,
                return -EINVAL;
        }
 
-       if (flow_type > BNXT_ULP_FDB_TYPE_DEFAULT) {
+       if (flow_type >= BNXT_ULP_FDB_TYPE_LAST) {
                BNXT_TF_DBG(ERR, "Invalid flow type\n");
                return -EINVAL;
        }
@@ -1498,7 +1671,9 @@ int32_t
 ulp_flow_db_parent_flow_create(struct bnxt_ulp_mapper_parms *parms)
 {
        struct ulp_flow_db_res_params fid_parms;
-       int32_t fid_idx;
+       uint32_t sub_typ = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT_ACC;
+       struct ulp_flow_db_res_params res_params;
+       int32_t fid_idx, rc;
 
        /* create the child flow entry in parent flow table */
        fid_idx = ulp_flow_db_parent_flow_alloc(parms->ulp_ctx, parms->fid);
@@ -1519,6 +1694,30 @@ ulp_flow_db_parent_flow_create(struct bnxt_ulp_mapper_parms *parms)
                            parms->fid);
                return -1;
        }
+
+       /* check of the flow has internal counter accumulation enabled */
+       if (!ulp_flow_db_resource_params_get(parms->ulp_ctx,
+                                            BNXT_ULP_FDB_TYPE_REGULAR,
+                                            parms->fid,
+                                            BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+                                            sub_typ,
+                                            &res_params)) {
+               /* Enable the counter accumulation in parent entry */
+               if (ulp_flow_db_parent_flow_count_accum_set(parms->ulp_ctx,
+                                                           fid_idx)) {
+                       BNXT_TF_DBG(ERR, "Error in setting counter acc %x\n",
+                                   parms->fid);
+                       return -1;
+               }
+       }
+
+       rc  = ulp_flow_db_parent_tun_idx_set(parms->ulp_ctx, fid_idx,
+                                            parms->tun_idx);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Error setting tun_idx in the parent flow\n");
+               return rc;
+       }
+
        return 0;
 }
 
@@ -1533,6 +1732,10 @@ int32_t
 ulp_flow_db_child_flow_create(struct bnxt_ulp_mapper_parms *parms)
 {
        struct ulp_flow_db_res_params fid_parms;
+       uint32_t sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT;
+       enum bnxt_ulp_resource_func res_fun;
+       struct ulp_flow_db_res_params res_p;
+       uint32_t parent_fid = parms->parent_fid;
        int32_t rc;
 
        /* create the parent flow entry in parent flow table */
@@ -1541,7 +1744,7 @@ ulp_flow_db_child_flow_create(struct bnxt_ulp_mapper_parms *parms)
                                               parms->fid, 1);
        if (rc) {
                BNXT_TF_DBG(ERR, "Error in setting child fid %x\n", parms->fid);
-               return -1;
+               return rc;
        }
 
        /* Add the parent details in the resource list of the flow */
@@ -1549,11 +1752,172 @@ ulp_flow_db_child_flow_create(struct bnxt_ulp_mapper_parms *parms)
        fid_parms.resource_func = BNXT_ULP_RESOURCE_FUNC_CHILD_FLOW;
        fid_parms.resource_hndl = parms->parent_fid;
        fid_parms.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO;
-       if (ulp_flow_db_resource_add(parms->ulp_ctx, BNXT_ULP_FDB_TYPE_REGULAR,
-                                    parms->fid, &fid_parms)) {
+       rc  = ulp_flow_db_resource_add(parms->ulp_ctx,
+                                      BNXT_ULP_FDB_TYPE_REGULAR,
+                                      parms->fid, &fid_parms);
+       if (rc) {
                BNXT_TF_DBG(ERR, "Error in adding flow res for fid %x\n",
                            parms->fid);
-               return -1;
+               return rc;
+       }
+
+       /* check if accumulation count is set for parent flow */
+       rc = ulp_flow_db_parent_flow_count_accum_get(parms->ulp_ctx,
+                                                    parms->parent_fid);
+       if (!rc) {
+               /* check if internal count action included for this flow.*/
+               res_fun = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE;
+               rc = ulp_flow_db_resource_params_get(parms->ulp_ctx,
+                                                    BNXT_ULP_FDB_TYPE_REGULAR,
+                                                    parms->fid,
+                                                    res_fun,
+                                                    sub_type,
+                                                    &res_p);
+               if (!rc) {
+                       /* update the counter manager to include parent fid */
+                       if (ulp_fc_mgr_cntr_parent_flow_set(parms->ulp_ctx,
+                                                           res_p.direction,
+                                                           res_p.resource_hndl,
+                                                           parent_fid)) {
+                               BNXT_TF_DBG(ERR, "Error in setting child %x\n",
+                                           parms->fid);
+                               return -1;
+                       }
+               }
        }
+       /* return success */
        return 0;
 }
+
+/*
+ * Update the parent counters
+ *
+ * ulp_ctxt [in] Ptr to ulp_context
+ * parent_fid [in] The flow id of the parent flow entry
+ * packet_count [in] - packet count
+ * byte_count [in] - byte count
+ *
+ * returns 0 on success
+ */
+int32_t
+ulp_flow_db_parent_flow_count_update(struct bnxt_ulp_context *ulp_ctxt,
+                                    uint32_t parent_fid,
+                                    uint64_t packet_count,
+                                    uint64_t byte_count)
+{
+       struct bnxt_ulp_flow_db *flow_db;
+       struct ulp_fdb_parent_child_db *p_pdb;
+       uint32_t idx;
+
+       /* validate the arguments */
+       flow_db = ulp_flow_db_parent_arg_validation(ulp_ctxt, parent_fid);
+       if (!flow_db) {
+               BNXT_TF_DBG(ERR, "parent child db validation failed\n");
+               return -EINVAL;
+       }
+
+       p_pdb = &flow_db->parent_child_db;
+       for (idx = 0; idx < p_pdb->entries_count; idx++) {
+               if (p_pdb->parent_flow_tbl[idx].parent_fid == parent_fid) {
+                       if (p_pdb->parent_flow_tbl[idx].counter_acc) {
+                               p_pdb->parent_flow_tbl[idx].pkt_count +=
+                                       packet_count;
+                               p_pdb->parent_flow_tbl[idx].byte_count +=
+                                       byte_count;
+                       }
+                       return 0;
+               }
+       }
+       return -ENOENT;
+}
+
+/*
+ * Get the parent accumulation counters
+ *
+ * ulp_ctxt [in] Ptr to ulp_context
+ * parent_fid [in] The flow id of the parent flow entry
+ * packet_count [out] - packet count
+ * byte_count [out] - byte count
+ *
+ * returns 0 on success
+ */
+int32_t
+ulp_flow_db_parent_flow_count_get(struct bnxt_ulp_context *ulp_ctxt,
+                                 uint32_t parent_fid, uint64_t *packet_count,
+                                 uint64_t *byte_count, uint8_t count_reset)
+{
+       struct bnxt_ulp_flow_db *flow_db;
+       struct ulp_fdb_parent_child_db *p_pdb;
+       uint32_t idx;
+
+       /* validate the arguments */
+       flow_db = ulp_flow_db_parent_arg_validation(ulp_ctxt, parent_fid);
+       if (!flow_db) {
+               BNXT_TF_DBG(ERR, "parent child db validation failed\n");
+               return -EINVAL;
+       }
+
+       p_pdb = &flow_db->parent_child_db;
+       for (idx = 0; idx < p_pdb->entries_count; idx++) {
+               if (p_pdb->parent_flow_tbl[idx].parent_fid == parent_fid) {
+                       if (p_pdb->parent_flow_tbl[idx].counter_acc) {
+                               *packet_count =
+                                       p_pdb->parent_flow_tbl[idx].pkt_count;
+                               *byte_count =
+                                       p_pdb->parent_flow_tbl[idx].byte_count;
+                               if (count_reset) {
+                                       p_pdb->parent_flow_tbl[idx].pkt_count = 0;
+                                       p_pdb->parent_flow_tbl[idx].byte_count = 0;
+                               }
+                       }
+                       return 0;
+               }
+       }
+       return -ENOENT;
+}
+
+/*
+ * reset the parent accumulation counters
+ *
+ * ulp_ctxt [in] Ptr to ulp_context
+ *
+ * returns none
+ */
+void
+ulp_flow_db_parent_flow_count_reset(struct bnxt_ulp_context *ulp_ctxt)
+{
+       struct bnxt_ulp_flow_db *flow_db;
+       struct ulp_fdb_parent_child_db *p_pdb;
+       uint32_t idx;
+
+       /* validate the arguments */
+       flow_db = ulp_flow_db_parent_arg_validation(ulp_ctxt, 1);
+       if (!flow_db) {
+               BNXT_TF_DBG(ERR, "parent child db validation failed\n");
+               return;
+       }
+
+       p_pdb = &flow_db->parent_child_db;
+       for (idx = 0; idx < p_pdb->entries_count; idx++) {
+               if (p_pdb->parent_flow_tbl[idx].parent_fid &&
+                   p_pdb->parent_flow_tbl[idx].counter_acc) {
+                       p_pdb->parent_flow_tbl[idx].pkt_count = 0;
+                       p_pdb->parent_flow_tbl[idx].byte_count = 0;
+               }
+       }
+}
+
+/*
+ * Set the shared bit for the flow db entry
+ *
+ * res [in] Ptr to fdb entry
+ * shared [in] shared flag
+ *
+ * returns none
+ */
+void ulp_flow_db_shared_session_set(struct ulp_flow_db_res_params *res,
+                                   enum bnxt_ulp_shared_session shared)
+{
+       if (res && (shared & BNXT_ULP_SHARED_SESSION_YES))
+               res->fdb_flags |= ULP_FDB_FLAG_SHARED_SESSION;
+}