Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/74907/?format=api
{ "id": 74907, "url": "http://patches.dpdk.org/api/patches/74907/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200728063439.23114-9-ajit.khaparde@broadcom.com/", "project": { "id": 1, "url": "http://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": "<20200728063439.23114-9-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200728063439.23114-9-ajit.khaparde@broadcom.com", "date": "2020-07-28T06:34:25", "name": "[v4,08/22] net/bnxt: configure parif for the egress rules", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "534b0121ce847d13c070010b7ea0eab432d3fcb7", "submitter": { "id": 501, "url": "http://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 1766, "url": "http://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200728063439.23114-9-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 11349, "url": "http://patches.dpdk.org/api/series/11349/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11349", "date": "2020-07-28T06:34:17", "name": "bnxt patches", "version": 4, "mbox": "http://patches.dpdk.org/series/11349/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/74907/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/74907/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 4A2AFA0521;\n\tTue, 28 Jul 2020 08:36:32 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 9F93D1C125;\n\tTue, 28 Jul 2020 08:35:36 +0200 (CEST)", "from mail-wm1-f97.google.com (mail-wm1-f97.google.com\n [209.85.128.97]) by dpdk.org (Postfix) with ESMTP id 2514A1C0CE\n for <dev@dpdk.org>; Tue, 28 Jul 2020 08:35:07 +0200 (CEST)", "by mail-wm1-f97.google.com with SMTP id f18so16999131wml.3\n for <dev@dpdk.org>; Mon, 27 Jul 2020 23:35:07 -0700 (PDT)", "from localhost.localdomain ([192.19.223.252])\n by smtp-relay.gmail.com with ESMTPS id r16sm30828wmh.29.2020.07.27.23.35.05\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Mon, 27 Jul 2020 23:35:06 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com;\n s=google;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=bWkP+pjfsRG/8XJj3nVNZBFhYajSYkvhUKx5ouiBN50=;\n b=fa+o1/hxLUe4YwNzAAkuQhTD1EA4Fj+0jvXbCF3Bui4y3Qt3NzqWe1CzHp5Gexmoxq\n Nux4XK+ppsOm1bY6zFdfLFCBlkdfXrHdZcVecUZdWT2QAjwy22FlP2XzS877puyle1/T\n wXQdyQxFHqpkNK2KKgOGfyCNWjpLz8Gic8zlk=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=bWkP+pjfsRG/8XJj3nVNZBFhYajSYkvhUKx5ouiBN50=;\n b=Jg3xjJ8VB/zLdV0qtFMZOlvIzeoqmkHYDE5sZzjv32K3zFj8qWVNyCBPGqPglFyrxp\n CQ75A/DL7crbRGsrR1Vm/rO86nlTa2kshfTKwIxJhhmwraFwGxeWbOZm0jy5NojfylBP\n dwIVTVQIVLagJTB7leEc8B9UK0tEzzlTYXqPMrttP/Naq2vDddVO3Hiw2cZ5GpHfwzp9\n GSdO9cSwYxxLIlKQ66S7AgyR+BfE1+vCs4Nt3BR17x6hzM9OYyN9O2t8DoXxJbs8bETI\n M6d0ZBpPj+l7yrDisciRAMtwS2nn6GGCCQ7eo4FTeSaUr1cWBy9/Vy9S0vkCP+M4lRVU\n lcYw==", "X-Gm-Message-State": "AOAM530Ikb6R0CQVZiLnSxmYh7gs8ASyYfE4YeWDy1+MOF/WMTFRUJwK\n zYsV31pyWbAUirHoGx4ykKGZmPmiFRWJOxjEYrsGoyb/qUx96HitCUyxdi0A0UQCtVKp/6b0+uG\n TLcHBCKgL9noMv3v1Ecj9QjC2VZs4zSJXrgfGT6tWvB7adCGsXWL1blsHVpH1kGINyQ6AENFGhw\n D1jA==", "X-Google-Smtp-Source": "\n ABdhPJybYka6+sjyP7W3IFR/VLJrtzl3HRB7a44FHB1wWzZ2/Dmoe0N0lU7UldrTO3W6vSxQ9pmVRfp2Eqig", "X-Received": "by 2002:a1c:5451:: with SMTP id p17mr2704721wmi.180.1595918106670;\n Mon, 27 Jul 2020 23:35:06 -0700 (PDT)", "X-Relaying-Domain": "broadcom.com", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com,\n Kishore Padmanabha <kishore.padmanabha@broadcom.com>,\n Michael Baucom <michael.baucom@broadcom.com>", "Date": "Mon, 27 Jul 2020 23:34:25 -0700", "Message-Id": "<20200728063439.23114-9-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.21.1 (Apple Git-122.3)", "In-Reply-To": "<20200728063439.23114-1-ajit.khaparde@broadcom.com>", "References": "\n <CACZ4nht+F+XvmJ0_TvYCQTfUEwan3dmCNer9wRuRQsOetFtodQ@mail.gmail.com>\n <20200728063439.23114-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v4 08/22] net/bnxt: configure parif for the\n\tegress rules", "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\nThe parif for the egress rules need to be dynamically\nconfigured based on the port type.\nPARIF is handler to a partition of the physical port.\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nReviewed-by: Michael Baucom <michael.baucom@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/ulp_def_rules.c | 11 ++--\n drivers/net/bnxt/tf_ulp/ulp_mapper.c | 35 ++++++++++++\n drivers/net/bnxt/tf_ulp/ulp_port_db.c | 2 +\n drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 54 +++++++++++++++----\n drivers/net/bnxt/tf_ulp/ulp_template_db_act.c | 16 ++++--\n .../net/bnxt/tf_ulp/ulp_template_db_class.c | 25 +++++++--\n .../net/bnxt/tf_ulp/ulp_template_db_enum.h | 14 ++---\n 7 files changed, 123 insertions(+), 34 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c\nindex d86e4c9ae..ddc6da8a8 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c\n@@ -81,17 +81,12 @@ ulp_set_parif_in_comp_fld(struct bnxt_ulp_context *ulp_ctx,\n \tif (rc)\n \t\treturn rc;\n \n-\tif (parif_type == BNXT_ULP_PHY_PORT_PARIF) {\n+\tif (parif_type == BNXT_ULP_PHY_PORT_PARIF)\n \t\tidx = BNXT_ULP_CF_IDX_PHY_PORT_PARIF;\n-\t\t/* Parif needs to be reset to a free partition */\n-\t\tparif += BNXT_ULP_FREE_PARIF_BASE;\n-\t} else if (parif_type == BNXT_ULP_DRV_FUNC_PARIF) {\n+\telse if (parif_type == BNXT_ULP_DRV_FUNC_PARIF)\n \t\tidx = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF;\n-\t\t/* Parif needs to be reset to a free partition */\n-\t\tparif += BNXT_ULP_FREE_PARIF_BASE;\n-\t} else {\n+\telse\n \t\tidx = BNXT_ULP_CF_IDX_VF_FUNC_PARIF;\n-\t}\n \n \tULP_COMP_FLD_IDX_WR(mapper_params, idx, parif);\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex 2d3373df2..a071c0750 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -998,6 +998,41 @@ ulp_mapper_result_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tbreak;\n+\tcase BNXT_ULP_MAPPER_OPC_IF_COMP_FIELD_THEN_CF_ELSE_CF:\n+\t\tif (!ulp_operand_read(fld->result_operand,\n+\t\t\t\t (uint8_t *)&idx,\n+\t\t\t\t sizeof(uint16_t))) {\n+\t\t\tBNXT_TF_DBG(ERR, \"%s key operand read failed.\\n\", name);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\tidx = tfp_be_to_cpu_16(idx);\n+\t\tif (idx >= BNXT_ULP_CF_IDX_LAST) {\n+\t\t\tBNXT_TF_DBG(ERR, \"%s invalid index %u\\n\", name, idx);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\t/* check if the computed field is set */\n+\t\tif (ULP_COMP_FLD_IDX_RD(parms, idx))\n+\t\t\tval = fld->result_operand_true;\n+\t\telse\n+\t\t\tval = fld->result_operand_false;\n+\n+\t\t/* read the appropriate computed field */\n+\t\tif (!ulp_operand_read(val, (uint8_t *)&idx, sizeof(uint16_t))) {\n+\t\t\tBNXT_TF_DBG(ERR, \"%s val operand read failed\\n\", name);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\tidx = tfp_be_to_cpu_16(idx);\n+\t\tif (idx >= BNXT_ULP_CF_IDX_LAST) {\n+\t\t\tBNXT_TF_DBG(ERR, \"%s invalid index %u\\n\", name, idx);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\tval = ulp_blob_push_32(blob, &parms->comp_fld[idx],\n+\t\t\t\t fld->field_bit_size);\n+\t\tif (!val) {\n+\t\t\tBNXT_TF_DBG(ERR, \"%s push to key blob failed\\n\", name);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\tbreak;\n \tdefault:\n \t\tBNXT_TF_DBG(ERR, \"invalid result mapper opcode 0x%x\\n\",\n \t\t\t fld->result_opcode);\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.c b/drivers/net/bnxt/tf_ulp/ulp_port_db.c\nindex 0fc7c0ab2..30876478d 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.c\n@@ -372,6 +372,8 @@ ulp_port_db_parif_get(struct bnxt_ulp_context *ulp_ctxt,\n \t\tphy_port_id = port_db->ulp_func_id_tbl[func_id].phy_port_id;\n \t\t*parif = port_db->phy_port_list[phy_port_id].port_parif;\n \t}\n+\t/* Parif needs to be reset to a free partition */\n+\t*parif += BNXT_ULP_FREE_PARIF_BASE;\n \n \treturn 0;\n }\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\nindex 39f801b2f..67f9319d6 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n@@ -167,31 +167,63 @@ bnxt_ulp_comp_fld_intf_update(struct ulp_rte_parser_params *params)\n {\n \tuint32_t ifindex;\n \tuint16_t port_id, parif;\n+\tuint32_t mtype;\n \tenum bnxt_ulp_direction_type dir;\n \n \t/* get the direction details */\n \tdir = ULP_COMP_FLD_IDX_RD(params, BNXT_ULP_CF_IDX_DIRECTION);\n \n+\t/* read the port id details */\n+\tport_id = ULP_COMP_FLD_IDX_RD(params,\n+\t\t\t\t BNXT_ULP_CF_IDX_INCOMING_IF);\n+\tif (ulp_port_db_dev_port_to_ulp_index(params->ulp_ctx,\n+\t\t\t\t\t port_id,\n+\t\t\t\t\t &ifindex)) {\n+\t\tBNXT_TF_DBG(ERR, \"ParseErr:Portid is not valid\\n\");\n+\t\treturn;\n+\t}\n+\n \tif (dir == BNXT_ULP_DIR_INGRESS) {\n-\t\t/* read the port id details */\n-\t\tport_id = ULP_COMP_FLD_IDX_RD(params,\n-\t\t\t\t\t BNXT_ULP_CF_IDX_INCOMING_IF);\n-\t\tif (ulp_port_db_dev_port_to_ulp_index(params->ulp_ctx,\n-\t\t\t\t\t\t port_id,\n-\t\t\t\t\t\t &ifindex)) {\n-\t\t\tBNXT_TF_DBG(ERR, \"ParseErr:Portid is not valid\\n\");\n-\t\t\treturn;\n-\t\t}\n \t\t/* Set port PARIF */\n \t\tif (ulp_port_db_parif_get(params->ulp_ctx, ifindex,\n \t\t\t\t\t BNXT_ULP_PHY_PORT_PARIF, &parif)) {\n \t\t\tBNXT_TF_DBG(ERR, \"ParseErr:ifindex is not valid\\n\");\n \t\t\treturn;\n \t\t}\n-\t\t/* Parif needs to be reset to a free partition */\n-\t\tparif += BNXT_ULP_FREE_PARIF_BASE;\n \t\tULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_PHY_PORT_PARIF,\n \t\t\t\t parif);\n+\t} else {\n+\t\t/* Get the match port type */\n+\t\tmtype = ULP_COMP_FLD_IDX_RD(params,\n+\t\t\t\t\t BNXT_ULP_CF_IDX_MATCH_PORT_TYPE);\n+\t\tif (mtype == BNXT_ULP_INTF_TYPE_VF_REP) {\n+\t\t\tULP_COMP_FLD_IDX_WR(params,\n+\t\t\t\t\t BNXT_ULP_CF_IDX_MATCH_PORT_IS_VFREP,\n+\t\t\t\t\t 1);\n+\t\t\t/* Set VF func PARIF */\n+\t\t\tif (ulp_port_db_parif_get(params->ulp_ctx, ifindex,\n+\t\t\t\t\t\t BNXT_ULP_VF_FUNC_PARIF,\n+\t\t\t\t\t\t &parif)) {\n+\t\t\t\tBNXT_TF_DBG(ERR,\n+\t\t\t\t\t \"ParseErr:ifindex is not valid\\n\");\n+\t\t\t\treturn;\n+\t\t\t}\n+\t\t\tULP_COMP_FLD_IDX_WR(params,\n+\t\t\t\t\t BNXT_ULP_CF_IDX_VF_FUNC_PARIF,\n+\t\t\t\t\t parif);\n+\t\t} else {\n+\t\t\t/* Set DRV func PARIF */\n+\t\t\tif (ulp_port_db_parif_get(params->ulp_ctx, ifindex,\n+\t\t\t\t\t\t BNXT_ULP_DRV_FUNC_PARIF,\n+\t\t\t\t\t\t &parif)) {\n+\t\t\t\tBNXT_TF_DBG(ERR,\n+\t\t\t\t\t \"ParseErr:ifindex is not valid\\n\");\n+\t\t\t\treturn;\n+\t\t\t}\n+\t\t\tULP_COMP_FLD_IDX_WR(params,\n+\t\t\t\t\t BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,\n+\t\t\t\t\t parif);\n+\t\t}\n \t}\n }\n \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 31fe90577..58b581cf6 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@@ -1808,11 +1808,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST,\n \t.result_operand = {\n-\t\tBNXT_ULP_SYM_DECAP_FUNC_THRU_TUN,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t\t((uint64_t)BNXT_ULP_ACTION_BIT_VXLAN_DECAP >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_ACTION_BIT_VXLAN_DECAP >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_ACTION_BIT_VXLAN_DECAP >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_ACTION_BIT_VXLAN_DECAP >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_ACTION_BIT_VXLAN_DECAP >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_ACTION_BIT_VXLAN_DECAP >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_ACTION_BIT_VXLAN_DECAP >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_ACTION_BIT_VXLAN_DECAP & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.result_operand_true = {0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\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 9de45cdc4..330c5ecdd 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@@ -5058,7 +5058,9 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n+\t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n@@ -5149,7 +5151,9 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n+\t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n@@ -17054,11 +17058,22 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_IF_COMP_FIELD_THEN_CF_ELSE_CF,\n \t.result_operand = {\n-\t\tBNXT_ULP_SYM_VF_FUNC_PARIF,\n+\t\t(BNXT_ULP_CF_IDX_MATCH_PORT_IS_VFREP >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_MATCH_PORT_IS_VFREP & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.result_operand_true = {\n+\t\t(BNXT_ULP_CF_IDX_VF_FUNC_PARIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_VF_FUNC_PARIF & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.result_operand_false = {\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\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 c9fe1bc47..f08065b28 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@@ -127,11 +127,12 @@ enum bnxt_ulp_cf_idx {\n \tBNXT_ULP_CF_IDX_ACT_PORT_IS_SET = 35,\n \tBNXT_ULP_CF_IDX_ACT_PORT_TYPE = 36,\n \tBNXT_ULP_CF_IDX_MATCH_PORT_TYPE = 37,\n-\tBNXT_ULP_CF_IDX_VF_TO_VF = 38,\n-\tBNXT_ULP_CF_IDX_L3_HDR_CNT = 39,\n-\tBNXT_ULP_CF_IDX_L4_HDR_CNT = 40,\n-\tBNXT_ULP_CF_IDX_VFR_MODE = 41,\n-\tBNXT_ULP_CF_IDX_LAST = 42\n+\tBNXT_ULP_CF_IDX_MATCH_PORT_IS_VFREP = 38,\n+\tBNXT_ULP_CF_IDX_VF_TO_VF = 39,\n+\tBNXT_ULP_CF_IDX_L3_HDR_CNT = 40,\n+\tBNXT_ULP_CF_IDX_L4_HDR_CNT = 41,\n+\tBNXT_ULP_CF_IDX_VFR_MODE = 42,\n+\tBNXT_ULP_CF_IDX_LAST = 43\n };\n \n enum bnxt_ulp_cond_opcode {\n@@ -215,7 +216,8 @@ enum bnxt_ulp_mapper_opc {\n \tBNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ = 8,\n \tBNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_ACT_PROP_ELSE_CONST = 9,\n \tBNXT_ULP_MAPPER_OPC_IF_ACT_BIT_THEN_CONST_ELSE_CONST = 10,\n-\tBNXT_ULP_MAPPER_OPC_LAST = 11\n+\tBNXT_ULP_MAPPER_OPC_IF_COMP_FIELD_THEN_CF_ELSE_CF = 11,\n+\tBNXT_ULP_MAPPER_OPC_LAST = 12\n };\n \n enum bnxt_ulp_mark_db_opcode {\n", "prefixes": [ "v4", "08/22" ] }