Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/72324/?format=api
{ "id": 72324, "url": "https://patches.dpdk.org/api/patches/72324/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200627100050.19688-8-ajit.khaparde@broadcom.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200627100050.19688-8-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200627100050.19688-8-ajit.khaparde@broadcom.com", "date": "2020-06-27T10:00:32", "name": "[v4,07/25] net/bnxt: add resource sub type to class and action tables", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "3a5982c2551346017234c274d88a4013b26ab025", "submitter": { "id": 501, "url": "https://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 1766, "url": "https://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200627100050.19688-8-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 10645, "url": "https://patches.dpdk.org/api/series/10645/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10645", "date": "2020-06-27T10:00:25", "name": "bnxt patches", "version": 4, "mbox": "https://patches.dpdk.org/series/10645/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/72324/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/72324/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id B55D1A0520;\n\tSat, 27 Jun 2020 12:02:03 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 892461BFF0;\n\tSat, 27 Jun 2020 12:01:22 +0200 (CEST)", "from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com\n [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 16F5C1BF80\n for <dev@dpdk.org>; Sat, 27 Jun 2020 12:00:59 +0200 (CEST)", "from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net\n [10.75.242.48])\n by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 196CF30C0EA;\n Sat, 27 Jun 2020 03:00:58 -0700 (PDT)", "from localhost.localdomain (unknown [10.230.185.215])\n by mail-irv-17.broadcom.com (Postfix) with ESMTP id 7EC9D14008B;\n Sat, 27 Jun 2020 03:00:57 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 196CF30C0EA", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1593252058;\n bh=TqJRonvuoGQ3dVlq3NcEjuhi+C8rgL8NVXEq3UVK/qM=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=eqf12CAVKhr+xFBWiVNp5lQV/yFsNUAKZ4BIr18yNULTAyU8YhKoAn5bIQ+2OFOb0\n LYDh6BMlmzNrogVBijkFTN7qa60Z11hnzvVmmEoiAQdOpJRBJvW7i15AFB+ynVJsww\n 6TRt3AgkmcQVSaW7XLt0yYQ07vkF8UfdK1KjEPNI=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "Kishore Padmanabha <kishore.padmanabha@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>,\n Mike Baucom <michael.baucom@broadcom.com>", "Date": "Sat, 27 Jun 2020 03:00:32 -0700", "Message-Id": "<20200627100050.19688-8-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.21.1 (Apple Git-122.3)", "In-Reply-To": "<20200627100050.19688-1-ajit.khaparde@broadcom.com>", "References": "<20200612125024.15989-1-somnath.kotur@broadcom.com>\n <20200627100050.19688-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v4 07/25] net/bnxt: add resource sub type to\n\tclass and action tables", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\n\nAdded support for resource sub type to class and action tables\nrenamed table id to resource type.\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nSigned-off-by: Somnath Kotur <somnath.kotur@broadcom.com>\nReviewed-by: Mike Baucom <michael.baucom@broadcom.com>\nReviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/ulp_mapper.c | 94 ++++++-------------\n drivers/net/bnxt/tf_ulp/ulp_template_db.c | 18 ++--\n drivers/net/bnxt/tf_ulp/ulp_template_db.h | 36 ++++---\n drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 6 +-\n 4 files changed, 66 insertions(+), 88 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex 4e31fc990..c323d80e4 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -889,7 +889,7 @@ ulp_mapper_action_alloc_and_set(struct bnxt_ulp_mapper_parms *parms,\n \n \t/* Set the allocation parameters for the table*/\n \talloc_parms.dir = atbls->direction;\n-\talloc_parms.type = atbls->table_type;\n+\talloc_parms.type = atbls->resource_type;\n \talloc_parms.search_enable = atbls->srch_b4_alloc;\n \talloc_parms.result = ulp_blob_data_get(blob,\n \t\t\t\t\t &alloc_parms.result_sz_in_bytes);\n@@ -910,7 +910,7 @@ ulp_mapper_action_alloc_and_set(struct bnxt_ulp_mapper_parms *parms,\n \t/* Need to calculate the idx for the result record */\n \tuint64_t tmpidx = alloc_parms.idx;\n \n-\tif (atbls->table_type == TF_TBL_TYPE_EXT)\n+\tif (atbls->resource_type == TF_TBL_TYPE_EXT)\n \t\ttmpidx = TF_ACT_REC_OFFSET_2_PTR(alloc_parms.idx);\n \telse\n \t\ttmpidx = alloc_parms.idx;\n@@ -935,7 +935,7 @@ ulp_mapper_action_alloc_and_set(struct bnxt_ulp_mapper_parms *parms,\n \t\tuint16_t\tlength;\n \n \t\tset_parm.dir\t= atbls->direction;\n-\t\tset_parm.type\t= atbls->table_type;\n+\t\tset_parm.type\t= atbls->resource_type;\n \t\tset_parm.idx\t= alloc_parms.idx;\n \t\tset_parm.data\t= ulp_blob_data_get(blob, &length);\n \t\tset_parm.data_sz_in_bytes = length / 8;\n@@ -958,7 +958,7 @@ ulp_mapper_action_alloc_and_set(struct bnxt_ulp_mapper_parms *parms,\n \tmemset(&fid_parms, 0, sizeof(fid_parms));\n \tfid_parms.direction\t\t= atbls->direction;\n \tfid_parms.resource_func\t\t= atbls->resource_func;\n-\tfid_parms.resource_type\t\t= atbls->table_type;\n+\tfid_parms.resource_type\t\t= atbls->resource_type;\n \tfid_parms.resource_hndl\t\t= alloc_parms.idx;\n \tfid_parms.critical_resource\t= 0;\n \n@@ -1114,7 +1114,7 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t}\n \n \taparms.dir\t\t= tbl->direction;\n-\taparms.tcam_tbl_type\t= tbl->table_type;\n+\taparms.tcam_tbl_type\t= tbl->resource_type;\n \taparms.search_enable\t= tbl->srch_b4_alloc;\n \taparms.key_sz_in_bits\t= tbl->key_bit_size;\n \taparms.key\t\t= ulp_blob_data_get(&key, &tmplen);\n@@ -1239,7 +1239,7 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tif (parms->tcam_tbl_opc == BNXT_ULP_MAPPER_TCAM_TBL_OPC_NORMAL) {\n \t\tfid_parms.direction = tbl->direction;\n \t\tfid_parms.resource_func\t= tbl->resource_func;\n-\t\tfid_parms.resource_type\t= tbl->table_type;\n+\t\tfid_parms.resource_type\t= tbl->resource_type;\n \t\tfid_parms.critical_resource = tbl->critical_resource;\n \t\tfid_parms.resource_hndl\t= aparms.idx;\n \t\trc = ulp_flow_db_resource_add(parms->ulp_ctx,\n@@ -1266,12 +1266,12 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n error:\n \tparms->tcam_tbl_opc = BNXT_ULP_MAPPER_TCAM_TBL_OPC_NORMAL;\n \tfree_parms.dir\t\t\t= tbl->direction;\n-\tfree_parms.tcam_tbl_type\t= tbl->table_type;\n+\tfree_parms.tcam_tbl_type\t= tbl->resource_type;\n \tfree_parms.idx\t\t\t= aparms.idx;\n \ttrc = tf_free_tcam_entry(tfp, &free_parms);\n \tif (trc)\n \t\tBNXT_TF_DBG(ERR, \"Failed to free tcam[%d][%d][%d] on failure\\n\",\n-\t\t\t tbl->table_type, tbl->direction, aparms.idx);\n+\t\t\t tbl->resource_type, tbl->direction, aparms.idx);\n \n \treturn rc;\n }\n@@ -1359,7 +1359,7 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t */\n \tiparms.dup_check\t\t= 0;\n \tiparms.dir\t\t\t= tbl->direction;\n-\tiparms.mem\t\t\t= tbl->table_type;\n+\tiparms.mem\t\t\t= tbl->resource_type;\n \tiparms.key\t\t\t= ulp_blob_data_get(&key, &tmplen);\n \tiparms.key_sz_in_bits\t\t= tbl->key_bit_size;\n \tiparms.em_record\t\t= ulp_blob_data_get(&data, &tmplen);\n@@ -1371,63 +1371,23 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\treturn rc;\n \t}\n \n-\tif (tbl->mark_enable &&\n-\t ULP_BITMAP_ISSET(parms->act_bitmap->bits,\n-\t\t\t BNXT_ULP_ACTION_BIT_MARK)) {\n-\t\tuint32_t val, mark, gfid, flag;\n-\t\t/* TBD: Need to determine if GFID is enabled globally */\n-\t\tif (sizeof(val) != BNXT_ULP_ACT_PROP_SZ_MARK) {\n-\t\t\tBNXT_TF_DBG(ERR, \"Mark size (%d) != expected (%zu)\\n\",\n-\t\t\t\t BNXT_ULP_ACT_PROP_SZ_MARK, sizeof(val));\n-\t\t\trc = -EINVAL;\n-\t\t\tgoto error;\n-\t\t}\n-\n-\t\tmemcpy(&val,\n-\t\t &a_prop->act_details[BNXT_ULP_ACT_PROP_IDX_MARK],\n-\t\t sizeof(val));\n-\n-\t\tmark = tfp_be_to_cpu_32(val);\n-\n-\t\tTF_GET_GFID_FROM_FLOW_ID(iparms.flow_id, gfid);\n-\t\tflag = BNXT_ULP_MARK_GLOBAL_HW_FID;\n-\t\trc = ulp_mark_db_mark_add(parms->ulp_ctx,\n-\t\t\t\t\t flag,\n-\t\t\t\t\t gfid,\n-\t\t\t\t\t mark);\n-\t\tif (rc) {\n-\t\t\tBNXT_TF_DBG(ERR, \"Failed to add mark to flow\\n\");\n-\t\t\tgoto error;\n-\t\t}\n-\n-\t\t/*\n-\t\t * Link the mark resource to the flow in the flow db\n-\t\t * The mark is never the critical resource, so it is 0.\n-\t\t */\n-\t\tmemset(&fid_parms, 0, sizeof(fid_parms));\n-\t\tfid_parms.direction\t= tbl->direction;\n-\t\tfid_parms.resource_func\t= BNXT_ULP_RESOURCE_FUNC_HW_FID;\n-\t\tfid_parms.resource_type\t= flag;\n-\t\tfid_parms.resource_hndl\t= gfid;\n-\t\tfid_parms.critical_resource = 0;\n-\n-\t\trc = ulp_flow_db_resource_add(parms->ulp_ctx,\n-\t\t\t\t\t parms->tbl_idx,\n-\t\t\t\t\t parms->fid,\n-\t\t\t\t\t &fid_parms);\n-\t\tif (rc) {\n-\t\t\tBNXT_TF_DBG(ERR, \"Fail to link res to flow rc = %d\\n\",\n-\t\t\t\t rc);\n-\t\t\t/* Need to free the identifier, so goto error */\n-\t\t\tgoto error;\n-\t\t}\n+\t/* Mark action process */\n+\tif (parms->device_params->global_fid_enable &&\n+\t tbl->resource_type == TF_MEM_EXTERNAL)\n+\t\trc = ulp_mapper_mark_gfid_process(parms, tbl, iparms.flow_id);\n+\telse if (!parms->device_params->global_fid_enable &&\n+\t\t tbl->resource_type == TF_MEM_INTERNAL)\n+\t\trc = ulp_mapper_mark_act_ptr_process(parms, tbl);\n+\tif (rc) {\n+\t\tBNXT_TF_DBG(ERR, \"Failed to add mark to flow\\n\");\n+\t\tgoto error;\n \t}\n \n \t/* Link the EM resource to the flow in the flow db */\n \tmemset(&fid_parms, 0, sizeof(fid_parms));\n \tfid_parms.direction\t\t= tbl->direction;\n \tfid_parms.resource_func\t\t= tbl->resource_func;\n-\tfid_parms.resource_type\t\t= tbl->table_type;\n+\tfid_parms.resource_type\t\t= tbl->resource_type;\n \tfid_parms.critical_resource\t= tbl->critical_resource;\n \tfid_parms.resource_hndl\t\t= iparms.flow_handle;\n \n@@ -1499,7 +1459,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t}\n \n \taparms.dir\t\t= tbl->direction;\n-\taparms.type\t\t= tbl->table_type;\n+\taparms.type\t\t= tbl->resource_type;\n \taparms.search_enable\t= tbl->srch_b4_alloc;\n \taparms.result\t\t= ulp_blob_data_get(&data, &tmplen);\n \taparms.result_sz_in_bytes = ULP_SZ_BITS2BYTES(tbl->result_bit_size);\n@@ -1509,7 +1469,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \trc = tf_alloc_tbl_entry(tfp, &aparms);\n \tif (rc) {\n \t\tBNXT_TF_DBG(ERR, \"Alloc table[%d][%s] failed rc=%d\\n\",\n-\t\t\t tbl->table_type,\n+\t\t\t tbl->resource_type,\n \t\t\t (tbl->direction == TF_DIR_RX) ? \"RX\" : \"TX\",\n \t\t\t rc);\n \t\treturn rc;\n@@ -1526,7 +1486,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \n \tif (!tbl->srch_b4_alloc) {\n \t\tsparms.dir\t\t= tbl->direction;\n-\t\tsparms.type\t\t= tbl->table_type;\n+\t\tsparms.type\t\t= tbl->resource_type;\n \t\tsparms.data\t\t= ulp_blob_data_get(&data, &tmplen);\n \t\tsparms.data_sz_in_bytes =\n \t\t\tULP_SZ_BITS2BYTES(tbl->result_bit_size);\n@@ -1536,7 +1496,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\trc = tf_set_tbl_entry(tfp, &sparms);\n \t\tif (rc) {\n \t\t\tBNXT_TF_DBG(ERR, \"Set table[%d][%s][%d] failed rc=%d\\n\",\n-\t\t\t\t tbl->table_type,\n+\t\t\t\t tbl->resource_type,\n \t\t\t\t (tbl->direction == TF_DIR_RX) ? \"RX\" : \"TX\",\n \t\t\t\t sparms.idx,\n \t\t\t\t rc);\n@@ -1549,7 +1509,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tmemset(&fid_parms, 0, sizeof(fid_parms));\n \tfid_parms.direction\t= tbl->direction;\n \tfid_parms.resource_func\t= tbl->resource_func;\n-\tfid_parms.resource_type\t= tbl->table_type;\n+\tfid_parms.resource_type\t= tbl->resource_type;\n \tfid_parms.resource_hndl\t= aparms.idx;\n \tfid_parms.critical_resource\t= 0;\n \n@@ -1570,7 +1530,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t * write to the entry or link the flow\n \t */\n \tfree_parms.dir\t= tbl->direction;\n-\tfree_parms.type\t= tbl->table_type;\n+\tfree_parms.type\t= tbl->resource_type;\n \tfree_parms.idx\t= aparms.idx;\n \tfree_parms.tbl_scope_id = tbl_scope_id;\n \n@@ -1697,7 +1657,7 @@ ulp_mapper_cache_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t * need to set it appropriately via setter.\n \t */\n \tulp_mapper_cache_res_type_set(&fid_parms,\n-\t\t\t\t tbl->table_type,\n+\t\t\t\t tbl->resource_type,\n \t\t\t\t tbl->cache_tbl_id);\n \tfid_parms.resource_hndl\t= (uint64_t)*ckey;\n \tfid_parms.critical_resource = tbl->critical_resource;\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db.c b/drivers/net/bnxt/tf_ulp/ulp_template_db.c\nindex c6b1b9bc8..9b793a274 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db.c\n@@ -590,7 +590,8 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_class_tmpl_list[] = {\n struct bnxt_ulp_mapper_class_tbl_info ulp_class_tbl_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n-\t.table_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_TT_L2_CNTXT_TCAM_CACHE,\n \t.direction = TF_DIR_RX,\n \t.priority = BNXT_ULP_PRIORITY_NOT_USED,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n@@ -610,7 +611,8 @@ struct bnxt_ulp_mapper_class_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.table_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_NOT_USED,\n \t.direction = TF_DIR_RX,\n \t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n@@ -630,7 +632,8 @@ struct bnxt_ulp_mapper_class_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n-\t.table_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n+\t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n+\t.resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_TT_PROFILE_TCAM_CACHE,\n \t.direction = TF_DIR_RX,\n \t.priority = BNXT_ULP_PRIORITY_NOT_USED,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n@@ -650,7 +653,8 @@ struct bnxt_ulp_mapper_class_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.table_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n+\t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n+\t.resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_TT_PROFILE_TCAM_CACHE,\n \t.direction = TF_DIR_RX,\n \t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n@@ -670,7 +674,8 @@ struct bnxt_ulp_mapper_class_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n-\t.table_type = TF_MEM_EXTERNAL,\n+\t.resource_type = TF_MEM_EXTERNAL,\n+\t.resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_NOT_USED,\n \t.direction = TF_DIR_RX,\n \t.priority = BNXT_ULP_PRIORITY_NOT_USED,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n@@ -1613,7 +1618,8 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_act_tmpl_list[] = {\n struct bnxt_ulp_mapper_act_tbl_info ulp_act_tbl_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.table_type = TF_TBL_TYPE_EXT,\n+\t.resource_type = TF_TBL_TYPE_EXT,\n+\t.resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_IT_NORMAL,\n \t.direction = TF_DIR_RX,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 0,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db.h b/drivers/net/bnxt/tf_ulp/ulp_template_db.h\nindex 8c527bc5a..a2cb11dcf 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db.h\n@@ -209,19 +209,6 @@ enum bnxt_ulp_regfile_index {\n \tBNXT_ULP_REGFILE_INDEX_LAST = 16\n };\n \n-enum bnxt_ulp_resource_func {\n-\tBNXT_ULP_RESOURCE_FUNC_INVALID = 0x00,\n-\tBNXT_ULP_RESOURCE_FUNC_EM_TABLE = 0x20,\n-\tBNXT_ULP_RESOURCE_FUNC_RSVD1 = 0x40,\n-\tBNXT_ULP_RESOURCE_FUNC_RSVD2 = 0x60,\n-\tBNXT_ULP_RESOURCE_FUNC_TCAM_TABLE = 0x80,\n-\tBNXT_ULP_RESOURCE_FUNC_INDEX_TABLE = 0x81,\n-\tBNXT_ULP_RESOURCE_FUNC_CACHE_TABLE = 0x82,\n-\tBNXT_ULP_RESOURCE_FUNC_IDENTIFIER = 0x83,\n-\tBNXT_ULP_RESOURCE_FUNC_IF_TABLE = 0x84,\n-\tBNXT_ULP_RESOURCE_FUNC_HW_FID = 0x85\n-};\n-\n enum bnxt_ulp_result_opc {\n \tBNXT_ULP_RESULT_OPC_SET_TO_CONSTANT = 0,\n \tBNXT_ULP_RESULT_OPC_SET_TO_ACT_PROP = 1,\n@@ -287,6 +274,29 @@ enum bnxt_ulp_match_type_bitmask {\n \tBNXT_ULP_MATCH_TYPE_BITMASK_WM = 0x0000000000000001\n };\n \n+enum bnxt_ulp_resource_func {\n+\tBNXT_ULP_RESOURCE_FUNC_INVALID = 0x00,\n+\tBNXT_ULP_RESOURCE_FUNC_EM_TABLE = 0x20,\n+\tBNXT_ULP_RESOURCE_FUNC_RSVD1 = 0x40,\n+\tBNXT_ULP_RESOURCE_FUNC_RSVD2 = 0x60,\n+\tBNXT_ULP_RESOURCE_FUNC_TCAM_TABLE = 0x80,\n+\tBNXT_ULP_RESOURCE_FUNC_INDEX_TABLE = 0x81,\n+\tBNXT_ULP_RESOURCE_FUNC_CACHE_TABLE = 0x82,\n+\tBNXT_ULP_RESOURCE_FUNC_IDENTIFIER = 0x83,\n+\tBNXT_ULP_RESOURCE_FUNC_IF_TABLE = 0x84,\n+\tBNXT_ULP_RESOURCE_FUNC_HW_FID = 0x85\n+};\n+\n+enum bnxt_ulp_resource_sub_type {\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_NOT_USED = 0,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_IT_NORMAL = 0,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_IT_VFR_ACT_IDX = 1,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_IT_INT_CNT_IDX = 2,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_IT_EXT_CNT_IDX = 3,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_TT_L2_CNTXT_TCAM_CACHE = 0,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_TT_PROFILE_TCAM_CACHE = 1\n+};\n+\n enum bnxt_ulp_sym {\n \tBNXT_ULP_SYM_BIG_ENDIAN = 0,\n \tBNXT_ULP_SYM_DECAP_FUNC_NONE = 0,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\nindex 3cbed2429..ce449d04e 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n@@ -157,7 +157,8 @@ struct bnxt_ulp_mapper_tbl_list_info {\n \n struct bnxt_ulp_mapper_class_tbl_info {\n \tenum bnxt_ulp_resource_func\tresource_func;\n-\tuint32_t\ttable_type;\n+\tuint32_t\t\t\tresource_type; /* TF_ enum type */\n+\tenum bnxt_ulp_resource_sub_type\tresource_sub_type;\n \tuint8_t\t\tdirection;\n \tuint32_t\tpriority;\n \tuint8_t\t\tsrch_b4_alloc;\n@@ -187,7 +188,8 @@ struct bnxt_ulp_mapper_class_tbl_info {\n \n struct bnxt_ulp_mapper_act_tbl_info {\n \tenum bnxt_ulp_resource_func\tresource_func;\n-\tenum tf_tbl_type table_type;\n+\tuint32_t\t\t\tresource_type; /* TF_ enum type */\n+\tenum bnxt_ulp_resource_sub_type\tresource_sub_type;\n \tuint8_t\t\tdirection;\n \tuint8_t\t\tsrch_b4_alloc;\n \tuint32_t\tresult_start_idx;\n", "prefixes": [ "v4", "07/25" ] }