Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/71389/?format=api
{ "id": 71389, "url": "https://patches.dpdk.org/api/patches/71389/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200612125024.15989-35-somnath.kotur@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": "<20200612125024.15989-35-somnath.kotur@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200612125024.15989-35-somnath.kotur@broadcom.com", "date": "2020-06-12T12:50:22", "name": "[34/36] net/bnxt: enable vfr flag processing with mark db opcode", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "54873d41cb0c26b4eb0f37e453d83626fb51cdd2", "submitter": { "id": 908, "url": "https://patches.dpdk.org/api/people/908/?format=api", "name": "Somnath Kotur", "email": "somnath.kotur@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/20200612125024.15989-35-somnath.kotur@broadcom.com/mbox/", "series": [ { "id": 10434, "url": "https://patches.dpdk.org/api/series/10434/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10434", "date": "2020-06-12T12:49:48", "name": "bnxt patches", "version": 3, "mbox": "https://patches.dpdk.org/series/10434/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/71389/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/71389/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 7EA13A00BE;\n\tFri, 12 Jun 2020 15:01:58 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 0896C1BFFF;\n\tFri, 12 Jun 2020 14:55:46 +0200 (CEST)", "from relay.smtp.broadcom.com (relay.smtp.broadcom.com\n [192.19.232.149]) by dpdk.org (Postfix) with ESMTP id 0BB821BFC8\n for <dev@dpdk.org>; Fri, 12 Jun 2020 14:55:40 +0200 (CEST)", "from dhcp-10-123-153-55.dhcp.broadcom.net\n (dhcp-10-123-153-55.dhcp.broadcom.net [10.123.153.55])\n by relay.smtp.broadcom.com (Postfix) with ESMTP id C2F601BD6A1;\n Fri, 12 Jun 2020 05:55:39 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com C2F601BD6A1", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1591966540;\n bh=INB3N3kqXkCiw5CPEAk4ra5rjD+tP/hZHV2SyHLQlHU=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=dYD4J4QDb6/UD18ScHbLODL8t7yHxnFrh3GAlVrSz0ghlbCd9AWXHV/GLobARqUlr\n V8y1pb/EqYKVVJRbumNKhX1yVgK072yG6Fbr3AC0krb9p1zCBIbMSxw5t6mcqoNciG\n YuYaHd1urU7ENppAxsuJgMEXylg3MUqtl0qZN+48=", "From": "Somnath Kotur <somnath.kotur@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com", "Date": "Fri, 12 Jun 2020 18:20:22 +0530", "Message-Id": "<20200612125024.15989-35-somnath.kotur@broadcom.com>", "X-Mailer": "git-send-email 2.10.1.613.g2cc2e70", "In-Reply-To": "<20200612125024.15989-1-somnath.kotur@broadcom.com>", "References": "<20200612125024.15989-1-somnath.kotur@broadcom.com>", "Subject": "[dpdk-dev] [PATCH 34/36] net/bnxt: enable vfr flag processing with\n\tmark db opcode", "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\nRemoved the mark and vfr flags and replaced it with the new\nopcode and added the vfr flag process in mark database\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nReviewed-by: Michael Baucom <michael.baucom@broadcom.com>\nSigned-off-by: Somnath Kotur <somnath.kotur@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/ulp_mapper.c | 74 ++++++++++++++++++++++---\n drivers/net/bnxt/tf_ulp/ulp_template_db_class.c | 45 +++++----------\n drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h | 15 ++---\n drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 3 +-\n 4 files changed, 87 insertions(+), 50 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex 56c1f13..f86cd76 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -899,11 +899,13 @@ ulp_mapper_mark_gfid_process(struct bnxt_ulp_mapper_parms *parms,\n {\n \tstruct ulp_flow_db_res_params fid_parms;\n \tuint32_t mark, gfid, mark_flag;\n+\tenum bnxt_ulp_mark_db_opcode mark_op = tbl->mark_db_opcode;\n \tint32_t rc = 0;\n \n-\tif (!(tbl->mark_enable &&\n-\t (ULP_BITMAP_ISSET(parms->act_bitmap->bits,\n-\t\t\t BNXT_ULP_ACTION_BIT_MARK) || tbl->vfr_flag)))\n+\tif (mark_op == BNXT_ULP_MARK_DB_OPCODE_NOP ||\n+\t !(mark_op == BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION &&\n+\t ULP_BITMAP_ISSET(parms->act_bitmap->bits,\n+\t\t\t BNXT_ULP_ACTION_BIT_MARK)))\n \t\treturn rc; /* no need to perform gfid process */\n \n \t/* Get the mark id details from action property */\n@@ -913,7 +915,7 @@ ulp_mapper_mark_gfid_process(struct bnxt_ulp_mapper_parms *parms,\n \n \tTF_GET_GFID_FROM_FLOW_ID(flow_id, gfid);\n \tmark_flag = BNXT_ULP_MARK_GLOBAL_HW_FID;\n-\tmark_flag |= (tbl->vfr_flag) ? BNXT_ULP_MARK_VFR_ID : 0;\n+\n \trc = ulp_mark_db_mark_add(parms->ulp_ctx, mark_flag,\n \t\t\t\t gfid, mark);\n \tif (rc) {\n@@ -941,11 +943,13 @@ ulp_mapper_mark_act_ptr_process(struct bnxt_ulp_mapper_parms *parms,\n \tstruct ulp_flow_db_res_params fid_parms;\n \tuint32_t act_idx, mark, mark_flag;\n \tuint64_t val64;\n+\tenum bnxt_ulp_mark_db_opcode mark_op = tbl->mark_db_opcode;\n \tint32_t rc = 0;\n \n-\tif (!(tbl->mark_enable &&\n-\t (ULP_BITMAP_ISSET(parms->act_bitmap->bits,\n-\t\t\t\tBNXT_ULP_ACTION_BIT_MARK) || tbl->vfr_flag)))\n+\tif (mark_op == BNXT_ULP_MARK_DB_OPCODE_NOP ||\n+\t !(mark_op == BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION &&\n+\t ULP_BITMAP_ISSET(parms->act_bitmap->bits,\n+\t\t\t BNXT_ULP_ACTION_BIT_MARK)))\n \t\treturn rc; /* no need to perform mark action process */\n \n \t/* Get the mark id details from action property */\n@@ -961,7 +965,55 @@ ulp_mapper_mark_act_ptr_process(struct bnxt_ulp_mapper_parms *parms,\n \t}\n \tact_idx = tfp_be_to_cpu_64(val64);\n \tmark_flag = BNXT_ULP_MARK_LOCAL_HW_FID;\n-\tmark_flag |= (tbl->vfr_flag) ? BNXT_ULP_MARK_VFR_ID : 0;\n+\trc = ulp_mark_db_mark_add(parms->ulp_ctx, mark_flag,\n+\t\t\t\t act_idx, mark);\n+\tif (rc) {\n+\t\tBNXT_TF_DBG(ERR, \"Failed to add mark to flow\\n\");\n+\t\treturn rc;\n+\t}\n+\tfid_parms.direction = tbl->direction;\n+\tfid_parms.resource_func = BNXT_ULP_RESOURCE_FUNC_HW_FID;\n+\tfid_parms.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO;\n+\tfid_parms.resource_type\t= mark_flag;\n+\tfid_parms.resource_hndl\t= act_idx;\n+\trc = ulp_flow_db_resource_add(parms->ulp_ctx,\n+\t\t\t\t parms->tbl_idx,\n+\t\t\t\t parms->fid,\n+\t\t\t\t &fid_parms);\n+\tif (rc)\n+\t\tBNXT_TF_DBG(ERR, \"Fail to link res to flow rc = %d\\n\", rc);\n+\treturn rc;\n+}\n+\n+static int32_t\n+ulp_mapper_mark_vfr_idx_process(struct bnxt_ulp_mapper_parms *parms,\n+\t\t\t\tstruct bnxt_ulp_mapper_tbl_info *tbl)\n+{\n+\tstruct ulp_flow_db_res_params fid_parms;\n+\tuint32_t act_idx, mark, mark_flag;\n+\tuint64_t val64;\n+\tenum bnxt_ulp_mark_db_opcode mark_op = tbl->mark_db_opcode;\n+\tint32_t rc = 0;\n+\n+\tif (mark_op == BNXT_ULP_MARK_DB_OPCODE_NOP ||\n+\t mark_op == BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION)\n+\t\treturn rc; /* no need to perform mark action process */\n+\n+\t/* Get the mark id details from the computed field of dev port id */\n+\tmark = ULP_COMP_FLD_IDX_RD(parms, BNXT_ULP_CF_IDX_DEV_PORT_ID);\n+\n+\t /* Get the main action pointer */\n+\tif (!ulp_regfile_read(parms->regfile,\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+\t}\n+\tact_idx = tfp_be_to_cpu_64(val64);\n+\n+\t/* Set the mark flag to local fid and vfr flag */\n+\tmark_flag = BNXT_ULP_MARK_LOCAL_HW_FID | BNXT_ULP_MARK_VFR_ID;\n+\n \trc = ulp_mark_db_mark_add(parms->ulp_ctx, mark_flag,\n \t\t\t\t act_idx, mark);\n \tif (rc) {\n@@ -1525,6 +1577,12 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\tgoto error;\n \t}\n \n+\t/* Perform the VF rep action */\n+\trc = ulp_mapper_mark_vfr_idx_process(parms, tbl);\n+\tif (rc) {\n+\t\tBNXT_TF_DBG(ERR, \"Failed to add vfr mark rc = %d\\n\", rc);\n+\t\tgoto error;\n+\t}\n \treturn rc;\n error:\n \t/*\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 cc81b31..aa66c7f 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@@ -112,8 +112,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 0,\n \t.ident_nums = 1,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -135,8 +134,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 1,\n \t.ident_nums = 0,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -158,8 +156,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 1,\n \t.ident_nums = 1,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -181,8 +178,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 2,\n \t.ident_nums = 0,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -204,8 +200,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 2,\n \t.ident_nums = 0,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_YES,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -227,8 +222,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 2,\n \t.ident_nums = 1,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -250,8 +244,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 3,\n \t.ident_nums = 0,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -273,8 +266,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 3,\n \t.ident_nums = 1,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -296,8 +288,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 4,\n \t.ident_nums = 0,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -319,8 +310,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 4,\n \t.ident_nums = 0,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_YES,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -342,8 +332,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 4,\n \t.ident_nums = 1,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -365,8 +354,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 5,\n \t.ident_nums = 0,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -388,8 +376,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 5,\n \t.ident_nums = 1,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -411,8 +398,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 6,\n \t.ident_nums = 0,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_NO,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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},\n@@ -434,8 +420,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 6,\n \t.ident_nums = 0,\n-\t.mark_enable = BNXT_ULP_MARK_ENABLE_YES,\n-\t.vfr_flag = BNXT_ULP_VFR_FLAG_NO,\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}\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 7f280fd..5376245 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@@ -151,10 +151,11 @@ enum bnxt_ulp_hdr_type {\n \tBNXT_ULP_HDR_TYPE_LAST = 3\n };\n \n-enum bnxt_ulp_mark_enable {\n-\tBNXT_ULP_MARK_ENABLE_NO = 0,\n-\tBNXT_ULP_MARK_ENABLE_YES = 1,\n-\tBNXT_ULP_MARK_ENABLE_LAST = 2\n+enum bnxt_ulp_mark_db_opcode {\n+\tBNXT_ULP_MARK_DB_OPCODE_NOP = 0,\n+\tBNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION = 1,\n+\tBNXT_ULP_MARK_DB_OPCODE_SET_VFR_FLAG = 2,\n+\tBNXT_ULP_MARK_DB_OPCODE_LAST = 3\n };\n \n enum bnxt_ulp_mapper_opc {\n@@ -214,12 +215,6 @@ enum bnxt_ulp_search_before_alloc {\n \tBNXT_ULP_SEARCH_BEFORE_ALLOC_LAST = 2\n };\n \n-enum bnxt_ulp_vfr_flag {\n-\tBNXT_ULP_VFR_FLAG_NO = 0,\n-\tBNXT_ULP_VFR_FLAG_YES = 1,\n-\tBNXT_ULP_VFR_FLAG_LAST = 2\n-};\n-\n enum bnxt_ulp_fdb_resource_flags {\n \tBNXT_ULP_FDB_RESOURCE_FLAGS_DIR_EGR = 0x01,\n \tBNXT_ULP_FDB_RESOURCE_FLAGS_DIR_INGR = 0x00\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\nindex 8de6c4c..5d11a7e 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n@@ -181,9 +181,8 @@ struct bnxt_ulp_mapper_tbl_info {\n \tuint32_t\tident_start_idx;\n \tuint16_t\tident_nums;\n \n-\tuint8_t\t\tmark_enable;\n \tenum bnxt_ulp_regfile_index\tregfile_idx;\n-\tenum bnxt_ulp_vfr_flag\t\tvfr_flag;\n+\tenum bnxt_ulp_mark_db_opcode\tmark_db_opcode;\n };\n \n struct bnxt_ulp_mapper_class_key_field_info {\n", "prefixes": [ "34/36" ] }