Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/72331/?format=api
{ "id": 72331, "url": "https://patches.dpdk.org/api/patches/72331/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200627100050.19688-14-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-14-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200627100050.19688-14-ajit.khaparde@broadcom.com", "date": "2020-06-27T10:00:38", "name": "[v4,13/25] net/bnxt: refactor and rename some fields and enums", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "ceb8a4fa89d14269c8383c45a01e89de310bb64f", "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-14-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/72331/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/72331/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 ED845A0522;\n\tSat, 27 Jun 2020 12:03:29 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 207DE1C06A;\n\tSat, 27 Jun 2020 12:01:32 +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 264EA1BF82\n for <dev@dpdk.org>; Sat, 27 Jun 2020 12:01:00 +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 6DE5230C0FA;\n Sat, 27 Jun 2020 03:00:59 -0700 (PDT)", "from localhost.localdomain (unknown [10.230.185.215])\n by mail-irv-17.broadcom.com (Postfix) with ESMTP id D903914008C;\n Sat, 27 Jun 2020 03:00:58 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 6DE5230C0FA", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1593252059;\n bh=htz0NFVc9F7OR5KVQ4x1sfy7unXjmD1OS3cXu2l0lt4=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=dJ1xCxjyFbapDXDn8pZ+2f0Zc5sh4X5gRPYBeSXNiJ2t9Yv+7NP19sBzVnbIeX/8e\n vLW2LolsTwLI+XK4mzE2tq7WQwsQZkbhJ8Kp7+hqB+hdcWaZjTv4EUJRKajYeR8m+y\n i1Re6ganwUsDHxY9nnbcLYaAeQApg++wQ1l5FiTc=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "Kishore Padmanabha <kishore.padmanabha@broadcom.com>,\n Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>,\n Mike Baucom <michael.baucom@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>", "Date": "Sat, 27 Jun 2020 03:00:38 -0700", "Message-Id": "<20200627100050.19688-14-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 13/25] net/bnxt: refactor and rename some\n\tfields and enums", "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\n- rename regfile_wr_idx to regfile_idx\n The regfile index shall be used for both write and read operations.\n Hence the field is renamed.\n- remove the unsed enum BNXT_ULP_REGFILE_INDEX_CACHE_ENTRY_PTR\n- rename the enums in the bnxt_ulp_resource_sub_type\n The enums in the bnxt_ulp_resource_sub_type are renamed to reflect\n the table types explicitly.\n- rename an enum in the regfile index\n The BNXT_ULP_REGFILE_INDEX_ACTION_PTR_MAIN is renamed to\n BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR since it is the main\n action pointer.\n- remove cache_tbl_id enums\n The bnxt_ulp_cache_tbl_id enums are not required any longer\n since the index is now calculated using resource sub type\n and direction.\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nReviewed-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\nReviewed-by: Mike Baucom <michael.baucom@broadcom.com>\nSigned-off-by: Somnath Kotur <somnath.kotur@broadcom.com>\nReviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/ulp_mapper.c | 10 ++--\n drivers/net/bnxt/tf_ulp/ulp_template_db.c | 50 ++++++++-----------\n drivers/net/bnxt/tf_ulp/ulp_template_db.h | 31 ++++--------\n drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 3 +-\n 4 files changed, 40 insertions(+), 54 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex 5ce7202cf..ab33f36e7 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -540,7 +540,7 @@ ulp_mapper_ident_process(struct bnxt_ulp_mapper_parms *parms,\n \t\treturn -EINVAL;\n \t}\n \n-\tidx = ident->regfile_wr_idx;\n+\tidx = ident->regfile_idx;\n \n \tiparms.ident_type = ident->ident_type;\n \tiparms.dir = tbl->direction;\n@@ -956,7 +956,7 @@ ulp_mapper_mark_act_ptr_process(struct bnxt_ulp_mapper_parms *parms,\n \tmark = tfp_be_to_cpu_32(mark);\n \n \tif (!ulp_regfile_read(parms->regfile,\n-\t\t\t BNXT_ULP_REGFILE_INDEX_ACTION_PTR_MAIN,\n+\t\t\t BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,\n \t\t\t &val64)) {\n \t\tBNXT_TF_DBG(ERR, \"read action ptr main failed\\n\");\n \t\treturn -EINVAL;\n@@ -1465,10 +1465,10 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \n \t/* Always storing values in Regfile in BE */\n \tidx = tfp_cpu_to_be_64(idx);\n-\trc = ulp_regfile_write(parms->regfile, tbl->regfile_wr_idx, idx);\n+\trc = ulp_regfile_write(parms->regfile, tbl->regfile_idx, idx);\n \tif (!rc) {\n \t\tBNXT_TF_DBG(ERR, \"Write regfile[%d] failed\\n\",\n-\t\t\t tbl->regfile_wr_idx);\n+\t\t\t tbl->regfile_idx);\n \t\tgoto error;\n \t}\n \n@@ -1624,7 +1624,7 @@ ulp_mapper_cache_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\tfor (i = 0; i < num_idents; i++) {\n \t\t\tregval = (uint64_t)cache_entry->idents[i];\n \t\t\tif (!ulp_regfile_write(parms->regfile,\n-\t\t\t\t\t idents[i].regfile_wr_idx,\n+\t\t\t\t\t idents[i].regfile_idx,\n \t\t\t\t\t tfp_cpu_to_be_64(regval))) {\n \t\t\t\tBNXT_TF_DBG(ERR,\n \t\t\t\t\t \"Failed to write to regfile\\n\");\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db.c b/drivers/net/bnxt/tf_ulp/ulp_template_db.c\nindex 5bc6b25e4..809bc7538 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db.c\n@@ -294,18 +294,6 @@ struct bnxt_ulp_rte_act_info ulp_act_info[] = {\n };\n \n struct bnxt_ulp_cache_tbl_params ulp_cache_tbl_params[] = {\n-\t[BNXT_ULP_CACHE_TBL_ID_L2_CNTXT_TCAM_INGRESS] = {\n-\t\t.num_entries = 16384\n-\t},\n-\t[BNXT_ULP_CACHE_TBL_ID_L2_CNTXT_TCAM_EGRESS] = {\n-\t\t.num_entries = 16384\n-\t},\n-\t[BNXT_ULP_CACHE_TBL_ID_PROFILE_TCAM_INGRESS] = {\n-\t\t.num_entries = 16384\n-\t},\n-\t[BNXT_ULP_CACHE_TBL_ID_PROFILE_TCAM_EGRESS] = {\n-\t\t.num_entries = 16384\n-\t}\n };\n \n struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {\n@@ -591,7 +579,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\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.resource_sub_type =\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\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@@ -607,12 +596,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_nums = 1,\n \t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_wr_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\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.resource_sub_type =\n+\t\tBNXT_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@@ -628,12 +618,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_nums = 0,\n \t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_wr_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\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.resource_sub_type =\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\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@@ -649,12 +640,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_nums = 1,\n \t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_wr_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\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.resource_sub_type =\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\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,12 +662,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_nums = 0,\n \t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_wr_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n \t.resource_type = TF_MEM_EXTERNAL,\n-\t.resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_NOT_USED,\n+\t.resource_sub_type =\n+\t\tBNXT_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@@ -691,7 +684,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_nums = 0,\n \t.mark_enable = BNXT_ULP_MARK_ENABLE_YES,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,\n-\t.regfile_wr_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n \t}\n };\n \n@@ -1532,8 +1525,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t{\n \t.field_bit_size = 33,\n \t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n-\t.result_operand = {(BNXT_ULP_REGFILE_INDEX_ACTION_PTR_MAIN >> 8) & 0xff,\n-\t\tBNXT_ULP_REGFILE_INDEX_ACTION_PTR_MAIN & 0xff,\n+\t.result_operand = {(BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -1593,14 +1586,14 @@ struct bnxt_ulp_mapper_ident_info ulp_ident_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.ident_type = TF_IDENT_TYPE_L2_CTXT,\n-\t.regfile_wr_idx = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0,\n+\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0,\n \t.ident_bit_size = 10,\n \t.ident_bit_pos = 0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.ident_type = TF_IDENT_TYPE_EM_PROF,\n-\t.regfile_wr_idx = BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0,\n+\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0,\n \t.ident_bit_size = 10,\n \t.ident_bit_pos = 0\n \t}\n@@ -1619,14 +1612,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_EXT,\n-\t.resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_IT_NORMAL,\n+\t.resource_sub_type =\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,\n \t.direction = TF_DIR_RX,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 0,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n-\t.regfile_wr_idx = BNXT_ULP_REGFILE_INDEX_ACTION_PTR_MAIN\n+\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t}\n };\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db.h b/drivers/net/bnxt/tf_ulp/ulp_template_db.h\nindex dd0c42a03..8acf76ec9 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db.h\n@@ -7,7 +7,7 @@\n #ifndef ULP_TEMPLATE_DB_H_\n #define ULP_TEMPLATE_DB_H_\n \n-#define BNXT_ULP_REGFILE_MAX_SZ 16\n+#define BNXT_ULP_REGFILE_MAX_SZ 15\n #define BNXT_ULP_MAX_NUM_DEVICES 4\n #define BNXT_ULP_LOG2_MAX_NUM_DEV 2\n #define BNXT_ULP_CACHE_TBL_MAX_SZ 4\n@@ -88,14 +88,6 @@ enum bnxt_ulp_byte_order {\n \tBNXT_ULP_BYTE_ORDER_LAST = 2\n };\n \n-enum bnxt_ulp_cache_tbl_id {\n-\tBNXT_ULP_CACHE_TBL_ID_L2_CNTXT_TCAM_INGRESS = 0,\n-\tBNXT_ULP_CACHE_TBL_ID_L2_CNTXT_TCAM_EGRESS = 1,\n-\tBNXT_ULP_CACHE_TBL_ID_PROFILE_TCAM_INGRESS = 2,\n-\tBNXT_ULP_CACHE_TBL_ID_PROFILE_TCAM_EGRESS = 3,\n-\tBNXT_ULP_CACHE_TBL_ID_LAST = 4\n-};\n-\n enum bnxt_ulp_cf_idx {\n \tBNXT_ULP_CF_IDX_MPLS_TAG_NUM = 0,\n \tBNXT_ULP_CF_IDX_O_VTAG_NUM = 1,\n@@ -205,14 +197,13 @@ enum bnxt_ulp_regfile_index {\n \tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_1 = 6,\n \tBNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 = 7,\n \tBNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_1 = 8,\n-\tBNXT_ULP_REGFILE_INDEX_ACTION_PTR_MAIN = 9,\n+\tBNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR = 9,\n \tBNXT_ULP_REGFILE_INDEX_ACTION_PTR_0 = 10,\n \tBNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0 = 11,\n \tBNXT_ULP_REGFILE_INDEX_ENCAP_PTR_1 = 12,\n \tBNXT_ULP_REGFILE_INDEX_CRITICAL_RESOURCE = 13,\n-\tBNXT_ULP_REGFILE_INDEX_CACHE_ENTRY_PTR = 14,\n-\tBNXT_ULP_REGFILE_INDEX_NOT_USED = 15,\n-\tBNXT_ULP_REGFILE_INDEX_LAST = 16\n+\tBNXT_ULP_REGFILE_INDEX_NOT_USED = 14,\n+\tBNXT_ULP_REGFILE_INDEX_LAST = 15\n };\n \n enum bnxt_ulp_result_opc {\n@@ -295,13 +286,13 @@ enum bnxt_ulp_resource_func {\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+\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM = 0,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM = 1,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_EXT_CNT_IDX = 3,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_CNT_IDX = 2,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL = 0,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_ACT_IDX = 1,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_NOT_USED = 0\n };\n \n enum bnxt_ulp_sym {\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\nindex 86a0e5c71..4ca60497e 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n@@ -183,6 +183,7 @@ struct bnxt_ulp_mapper_tbl_info {\n \n \tuint8_t\t\tmark_enable;\n \tenum bnxt_ulp_regfile_index\tregfile_wr_idx;\n+\tenum bnxt_ulp_regfile_index\tregfile_idx;\n };\n \n struct bnxt_ulp_mapper_class_key_field_info {\n@@ -208,7 +209,7 @@ struct bnxt_ulp_mapper_ident_info {\n \tuint16_t\tident_type;\n \tuint16_t\tident_bit_size;\n \tuint16_t\tident_bit_pos;\n-\tenum bnxt_ulp_regfile_index\tregfile_wr_idx;\n+\tenum bnxt_ulp_regfile_index\tregfile_idx;\n };\n \n struct bnxt_ulp_glb_resource_info {\n", "prefixes": [ "v4", "13/25" ] }