Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/72559/?format=api
{ "id": 72559, "url": "https://patches.dpdk.org/api/patches/72559/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200701065212.41391-37-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": "<20200701065212.41391-37-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200701065212.41391-37-ajit.khaparde@broadcom.com", "date": "2020-07-01T06:51:57", "name": "[v2,36/51] net/bnxt: add index opcode and operand to mapper table", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "1f7c1965aba731d5ccb1cb40f6ff5514d922e5e0", "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/20200701065212.41391-37-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 10703, "url": "https://patches.dpdk.org/api/series/10703/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10703", "date": "2020-07-01T06:51:22", "name": "add features for host-based flow management", "version": 2, "mbox": "https://patches.dpdk.org/series/10703/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/72559/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/72559/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 06C1FA0350;\n\tWed, 1 Jul 2020 09:00:58 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id CC9B81D501;\n\tWed, 1 Jul 2020 08:53:08 +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 D9FAE1C195\n for <dev@dpdk.org>; Wed, 1 Jul 2020 08:52:28 +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 2CA3D30C342;\n Tue, 30 Jun 2020 23:52:28 -0700 (PDT)", "from localhost.localdomain (unknown [10.230.185.215])\n by mail-irv-17.broadcom.com (Postfix) with ESMTP id ED78014008B;\n Tue, 30 Jun 2020 23:52:27 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 2CA3D30C342", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1593586348;\n bh=qPm4qDIF2Nqja/qAACYlcZw2HOxP7c1O+EC/6/+BKwM=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=eBifS4/r3jHdUqn9hRGDdk3+TjuB5T990bs6DYMJLg4hLBGwkCjJ/pBA1lbUim7DT\n rAHV+tAcPudOAUZpiS8RH01Ml3C4lSiboVzIkOcGK9Sm87bD4Y6zW9xOD+GJ+qXqrS\n w4pczbwIJwlGgZdXo7uXZL4s0QVx1+fjBOSaXoi0=", "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 Somnath Kotur <somnath.kotur@broadcom.com>", "Date": "Tue, 30 Jun 2020 23:51:57 -0700", "Message-Id": "<20200701065212.41391-37-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.21.1 (Apple Git-122.3)", "In-Reply-To": "<20200701065212.41391-1-ajit.khaparde@broadcom.com>", "References": "<20200612132934.16488-1-somnath.kotur@broadcom.com>\n <20200701065212.41391-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 36/51] net/bnxt: add index opcode and operand\n\tto mapper table", "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\nExtended the regfile and computed field operations to a common\nindex opcode operation and added globlal resource operations are\nalso part of the index opcode operation.\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nSigned-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\nReviewed-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 | 56 ++++++++++++++++---\n drivers/net/bnxt/tf_ulp/ulp_template_db_act.c | 9 ++-\n .../net/bnxt/tf_ulp/ulp_template_db_class.c | 45 +++++----------\n .../net/bnxt/tf_ulp/ulp_template_db_enum.h | 8 +++\n drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 4 +-\n 5 files changed, 80 insertions(+), 42 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex 42bb98557..7b3b3d698 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -1443,7 +1443,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tstruct bnxt_ulp_mapper_result_field_info *flds;\n \tstruct ulp_flow_db_res_params\tfid_parms;\n \tstruct ulp_blob\tdata;\n-\tuint64_t idx;\n+\tuint64_t idx = 0;\n \tuint16_t tmplen;\n \tuint32_t i, num_flds;\n \tint32_t rc = 0, trc = 0;\n@@ -1516,6 +1516,42 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n #endif\n \t}\n \n+\t/*\n+\t * Check for index opcode, if it is Global then\n+\t * no need to allocate the table, just set the table\n+\t * and exit since it is not maintained in the flow db.\n+\t */\n+\tif (tbl->index_opcode == BNXT_ULP_INDEX_OPCODE_GLOBAL) {\n+\t\t/* get the index from index operand */\n+\t\tif (tbl->index_operand < BNXT_ULP_GLB_REGFILE_INDEX_LAST &&\n+\t\t ulp_mapper_glb_resource_read(parms->mapper_data,\n+\t\t\t\t\t\t tbl->direction,\n+\t\t\t\t\t\t tbl->index_operand,\n+\t\t\t\t\t\t &idx)) {\n+\t\t\tBNXT_TF_DBG(ERR, \"Glbl regfile[%d] read failed.\\n\",\n+\t\t\t\t tbl->index_operand);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\t/* set the Tf index table */\n+\t\tsparms.dir\t\t= tbl->direction;\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 = ULP_BITS_2_BYTE(tmplen);\n+\t\tsparms.idx\t\t= tfp_be_to_cpu_64(idx);\n+\t\tsparms.tbl_scope_id\t= tbl_scope_id;\n+\n+\t\trc = tf_set_tbl_entry(tfp, &sparms);\n+\t\tif (rc) {\n+\t\t\tBNXT_TF_DBG(ERR,\n+\t\t\t\t \"Glbl Set table[%d][%s][%d] failed rc=%d\\n\",\n+\t\t\t\t sparms.type,\n+\t\t\t\t (sparms.dir == TF_DIR_RX) ? \"RX\" : \"TX\",\n+\t\t\t\t sparms.idx,\n+\t\t\t\t rc);\n+\t\t\treturn rc;\n+\t\t}\n+\t\treturn 0; /* success */\n+\t}\n \t/* Perform the tf table allocation by filling the alloc params */\n \taparms.dir\t\t= tbl->direction;\n \taparms.type\t\t= tbl->resource_type;\n@@ -1546,11 +1582,13 @@ 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_idx, idx);\n-\tif (!rc) {\n-\t\tBNXT_TF_DBG(ERR, \"Write regfile[%d] failed\\n\",\n-\t\t\t tbl->regfile_idx);\n-\t\tgoto error;\n+\tif (tbl->index_opcode == BNXT_ULP_INDEX_OPCODE_ALLOCATE) {\n+\t\trc = ulp_regfile_write(parms->regfile, tbl->index_operand, idx);\n+\t\tif (!rc) {\n+\t\t\tBNXT_TF_DBG(ERR, \"Write regfile[%d] failed\\n\",\n+\t\t\t\t tbl->index_operand);\n+\t\t\tgoto error;\n+\t\t}\n \t}\n \n \t/* Perform the tf table set by filling the set params */\n@@ -1815,7 +1853,11 @@ ulp_mapper_if_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t}\n \n \t/* Get the index details from computed field */\n-\tidx = ULP_COMP_FLD_IDX_RD(parms, tbl->comp_field_idx);\n+\tif (tbl->index_opcode != BNXT_ULP_INDEX_OPCODE_COMP_FIELD) {\n+\t\tBNXT_TF_DBG(ERR, \"Invalid tbl index opcode\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\tidx = ULP_COMP_FLD_IDX_RD(parms, tbl->index_operand);\n \n \t/* Perform the tf table set by filling the set params */\n \tiftbl_params.dir = tbl->direction;\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c\nindex 8af23eff1..9b14fa0bd 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c\n@@ -76,7 +76,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,\n+\t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n \t},\n \t{\n@@ -90,7 +91,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,\n+\t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n \t},\n \t{\n@@ -104,7 +106,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 12,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,\n+\t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n \t}\n };\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c\nindex e773afd60..d4c7bfa4d 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c\n@@ -113,8 +113,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 0,\n \t.ident_nums = 1,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -135,8 +134,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 1,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n@@ -157,8 +155,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 1,\n \t.ident_nums = 1,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -179,8 +176,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 2,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n@@ -201,8 +197,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 2,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n@@ -223,8 +218,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 2,\n \t.ident_nums = 1,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -245,8 +239,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 3,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n@@ -267,8 +260,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 3,\n \t.ident_nums = 1,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -289,8 +281,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 4,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n@@ -311,8 +302,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 4,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n@@ -333,8 +323,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 4,\n \t.ident_nums = 1,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -355,8 +344,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 5,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n@@ -377,8 +365,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 5,\n \t.ident_nums = 1,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -399,8 +386,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 6,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n@@ -421,8 +407,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.ident_start_idx = 6,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION,\n-\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,\n-\t.regfile_idx = BNXT_ULP_REGFILE_INDEX_NOT_USED\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n \t}\n };\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\nindex 66343b918..0215a5dde 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\n@@ -161,6 +161,14 @@ enum bnxt_ulp_hdr_type {\n \tBNXT_ULP_HDR_TYPE_LAST = 3\n };\n \n+enum bnxt_ulp_index_opcode {\n+\tBNXT_ULP_INDEX_OPCODE_NOT_USED = 0,\n+\tBNXT_ULP_INDEX_OPCODE_ALLOCATE = 1,\n+\tBNXT_ULP_INDEX_OPCODE_GLOBAL = 2,\n+\tBNXT_ULP_INDEX_OPCODE_COMP_FIELD = 3,\n+\tBNXT_ULP_INDEX_OPCODE_LAST = 4\n+};\n+\n enum bnxt_ulp_mapper_opc {\n \tBNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT = 0,\n \tBNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD = 1,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\nindex 1188223aa..a3ddd33fd 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n@@ -182,9 +182,9 @@ struct bnxt_ulp_mapper_tbl_info {\n \tuint32_t\tident_start_idx;\n \tuint16_t\tident_nums;\n \n-\tenum bnxt_ulp_regfile_index\tregfile_idx;\n \tenum bnxt_ulp_mark_db_opcode\tmark_db_opcode;\n-\tuint32_t\t\t\tcomp_field_idx;\n+\tenum bnxt_ulp_index_opcode\tindex_opcode;\n+\tuint32_t\t\t\tindex_operand;\n };\n \n struct bnxt_ulp_mapper_class_key_field_info {\n", "prefixes": [ "v2", "36/51" ] }