Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 81848,
    "url": "https://patches.dpdk.org/api/patches/81848/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20201022220542.84166-11-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": "<20201022220542.84166-11-ajit.khaparde@broadcom.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20201022220542.84166-11-ajit.khaparde@broadcom.com",
    "date": "2020-10-22T22:05:42",
    "name": "[v3,10/11] net/bnxt: add support for VXLAN decap templates",
    "commit_ref": null,
    "pull_url": null,
    "state": "changes-requested",
    "archived": true,
    "hash": "93a5ae2b678620f5ab2fa75bff2b187b97986061",
    "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/20201022220542.84166-11-ajit.khaparde@broadcom.com/mbox/",
    "series": [
        {
            "id": 13240,
            "url": "https://patches.dpdk.org/api/series/13240/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=13240",
            "date": "2020-10-22T22:05:42",
            "name": null,
            "version": 3,
            "mbox": "https://patches.dpdk.org/series/13240/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/81848/comments/",
    "check": "fail",
    "checks": "https://patches.dpdk.org/api/patches/81848/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 6ECD9A04DD;\n\tFri, 23 Oct 2020 00:11:44 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 36C29595E;\n\tFri, 23 Oct 2020 00:07:00 +0200 (CEST)",
            "from mail-pg1-f176.google.com (mail-pg1-f176.google.com\n [209.85.215.176]) by dpdk.org (Postfix) with ESMTP id DF581A90B\n for <dev@dpdk.org>; Fri, 23 Oct 2020 00:06:50 +0200 (CEST)",
            "by mail-pg1-f176.google.com with SMTP id o3so1855098pgr.11\n for <dev@dpdk.org>; Thu, 22 Oct 2020 15:06:50 -0700 (PDT)",
            "from localhost.localdomain ([192.19.228.250])\n by smtp.gmail.com with ESMTPSA id q14sm3214059pjp.43.2020.10.22.15.06.40\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Thu, 22 Oct 2020 15:06:46 -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; bh=Am1ERCCEpPSoNRCVtHcX5DwD4EFQevm/IMDC57rLV0U=;\n b=We0qIqcp8IdZmRYZakCfZukQPLf9FQEC+Z1ePRPAnRdzYY7f2HZnxwFzRwrqCWTqaO\n wkL9HmYL4oC8o7nVljUS/zIWaysRAvkVjarLrOCHx+i3nYgPN5GoZB433QIWrIFqmxn6\n Fg21W02pJX2YnOVzRHjKvA31BsZuZsNiiUJTE=",
        "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;\n bh=Am1ERCCEpPSoNRCVtHcX5DwD4EFQevm/IMDC57rLV0U=;\n b=S/Z+TVJvwtnHK4G79EIGQc3QC6/h1T7fbcUK3wP/zaVkdJBAW5qgIroRLTjymR4IZ/\n VMCZbwMcyPa27U9JYQ5ciRQxmXokVyYpJC6SL9BTzv5GCtCqure53DwOYmXuwBguw2xv\n bG6QhW1u3yWAiH3Bx8geaHVzjbb5fJgSvCy/iQj6w3cdUex2RIVjMRZQfmJe5q9Qnwqp\n jAAbyRd2rQU2vAMozgTGZXBNy+y0IZE+q6VLg/f+38zg60fv5ThGocDNa0AT+YqAS7PP\n KCCGEa//qVLjWw2fcLVC4iFKuM8J6+x+WtW1vMWbRkftnX5oCixQ0Im+fBQbfeJGXLmf\n gUaQ==",
        "X-Gm-Message-State": "AOAM532piQSHeTh+o0vuICUV0BPhtC2XIWQNtHV+SjPWiGoJGDObdL5x\n lOtDo+TMEPkq6/6FmjjkRRPx2Dtzt3hXmLl1lar1p/oMVIzoHh/IewL3OpleduDKs5X881/Da4s\n mpr/Xuqh17LKVoAOO/RraVF9dhPzjnkBNkHPCYwEDNYoHpRzuem2U8ZlyMLSZZ7WVag==",
        "X-Google-Smtp-Source": "\n ABdhPJwz/V5Qm3AB5ikwXZXJ2mDmQlHHC8koGcjzFZUs7cUKkCLvF3foNpht6vz9DFn7YaiTZYSM7w==",
        "X-Received": "by 2002:a62:1a4c:0:b029:152:706d:dabb with SMTP id\n a73-20020a621a4c0000b0290152706ddabbmr4241115pfa.40.1603404407214;\n Thu, 22 Oct 2020 15:06:47 -0700 (PDT)",
        "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>",
        "To": "dev@dpdk.org",
        "Cc": "Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>,\n Mike Baucom <michael.baucom@broadcom.com>",
        "Date": "Thu, 22 Oct 2020 15:05:42 -0700",
        "Message-Id": "<20201022220542.84166-11-ajit.khaparde@broadcom.com>",
        "X-Mailer": "git-send-email 2.21.1 (Apple Git-122.3)",
        "In-Reply-To": "<20201020215538.59242-1-ajit.khaparde@broadcom.com>",
        "References": "<20201020215538.59242-1-ajit.khaparde@broadcom.com>",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain",
        "Content-Transfer-Encoding": "8bit",
        "X-Content-Filtered-By": "Mailman/MimeDel 2.1.15",
        "Subject": "[dpdk-dev] [PATCH v3 10/11] net/bnxt: add support for VXLAN decap\n\ttemplates",
        "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: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\n\nTemplates for outer tunnel & inner tunnel flow are added in this patch.\n\nSigned-off-by: Venkat Duvvuru <venkatkumar.duvvuru@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_rte_parser.c      |   10 +\n drivers/net/bnxt/tf_ulp/ulp_rte_parser.h      |    5 +\n .../net/bnxt/tf_ulp/ulp_template_db_class.c   |  962 ++++---\n .../net/bnxt/tf_ulp/ulp_template_db_enum.h    |   35 +-\n .../net/bnxt/tf_ulp/ulp_template_db_field.h   |  363 ++-\n .../tf_ulp/ulp_template_db_stingray_act.c     |  116 +-\n .../tf_ulp/ulp_template_db_stingray_class.c   | 2493 ++++++++++++++---\n drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c |    9 +-\n .../bnxt/tf_ulp/ulp_template_db_wh_plus_act.c |  116 +-\n .../tf_ulp/ulp_template_db_wh_plus_class.c    | 2489 +++++++++++++---\n 10 files changed, 5127 insertions(+), 1471 deletions(-)",
    "diff": "diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\nindex 770fec55c2..42021ae8d5 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n@@ -2110,3 +2110,13 @@ ulp_rte_dec_ttl_act_handler(const struct rte_flow_action *act __rte_unused,\n \tULP_BITMAP_SET(params->act_bitmap.bits, BNXT_ULP_ACTION_BIT_DEC_TTL);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n+\n+/* Function to handle the parsing of RTE Flow action JUMP */\n+int32_t\n+ulp_rte_jump_act_handler(const struct rte_flow_action *action_item __rte_unused,\n+\t\t\t    struct ulp_rte_parser_params *params)\n+{\n+\t/* Update the act_bitmap with dec ttl */\n+\tULP_BITMAP_SET(params->act_bitmap.bits, BNXT_ULP_ACTION_BIT_JUMP);\n+\treturn BNXT_TF_RC_SUCCESS;\n+}\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h\nindex bb5a8a477e..a71aabe5f0 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h\n@@ -233,4 +233,9 @@ int32_t\n ulp_rte_dec_ttl_act_handler(const struct rte_flow_action *action_item,\n \t\t\t    struct ulp_rte_parser_params *params);\n \n+/* Function to handle the parsing of RTE Flow action JUMP .*/\n+int32_t\n+ulp_rte_jump_act_handler(const struct rte_flow_action *action_item,\n+\t\t\t struct ulp_rte_parser_params *params);\n+\n #endif /* _ULP_RTE_PARSER_H_ */\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 c348abe136..fdb26da3e0 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@@ -157,58 +157,74 @@ uint16_t ulp_class_sig_tbl[BNXT_ULP_CLASS_SIG_TBL_MAX_SZ] = {\n \t[BNXT_ULP_CLASS_HID_05b9] = 146,\n \t[BNXT_ULP_CLASS_HID_0371] = 147,\n \t[BNXT_ULP_CLASS_HID_00e1] = 148,\n-\t[BNXT_ULP_CLASS_HID_048b] = 149,\n-\t[BNXT_ULP_CLASS_HID_0749] = 150,\n-\t[BNXT_ULP_CLASS_HID_05f1] = 151,\n-\t[BNXT_ULP_CLASS_HID_04b7] = 152,\n-\t[BNXT_ULP_CLASS_HID_049b] = 153,\n-\t[BNXT_ULP_CLASS_HID_0759] = 154,\n-\t[BNXT_ULP_CLASS_HID_05e1] = 155,\n-\t[BNXT_ULP_CLASS_HID_04a7] = 156,\n-\t[BNXT_ULP_CLASS_HID_0301] = 157,\n-\t[BNXT_ULP_CLASS_HID_07f9] = 158,\n-\t[BNXT_ULP_CLASS_HID_0397] = 159,\n-\t[BNXT_ULP_CLASS_HID_068f] = 160,\n-\t[BNXT_ULP_CLASS_HID_02f1] = 161,\n-\t[BNXT_ULP_CLASS_HID_0609] = 162,\n-\t[BNXT_ULP_CLASS_HID_0267] = 163,\n-\t[BNXT_ULP_CLASS_HID_077f] = 164,\n-\t[BNXT_ULP_CLASS_HID_01e1] = 165,\n-\t[BNXT_ULP_CLASS_HID_0329] = 166,\n-\t[BNXT_ULP_CLASS_HID_01c1] = 167,\n-\t[BNXT_ULP_CLASS_HID_0309] = 168,\n-\t[BNXT_ULP_CLASS_HID_01d1] = 169,\n-\t[BNXT_ULP_CLASS_HID_0319] = 170,\n-\t[BNXT_ULP_CLASS_HID_01e2] = 171,\n-\t[BNXT_ULP_CLASS_HID_032a] = 172,\n-\t[BNXT_ULP_CLASS_HID_0650] = 173,\n-\t[BNXT_ULP_CLASS_HID_0198] = 174,\n-\t[BNXT_ULP_CLASS_HID_01c2] = 175,\n-\t[BNXT_ULP_CLASS_HID_030a] = 176,\n-\t[BNXT_ULP_CLASS_HID_0670] = 177,\n-\t[BNXT_ULP_CLASS_HID_01b8] = 178,\n-\t[BNXT_ULP_CLASS_HID_01d2] = 179,\n-\t[BNXT_ULP_CLASS_HID_031a] = 180,\n-\t[BNXT_ULP_CLASS_HID_0660] = 181,\n-\t[BNXT_ULP_CLASS_HID_01a8] = 182,\n-\t[BNXT_ULP_CLASS_HID_01dd] = 183,\n-\t[BNXT_ULP_CLASS_HID_0315] = 184,\n-\t[BNXT_ULP_CLASS_HID_003d] = 185,\n-\t[BNXT_ULP_CLASS_HID_02f5] = 186,\n-\t[BNXT_ULP_CLASS_HID_01cd] = 187,\n-\t[BNXT_ULP_CLASS_HID_0305] = 188,\n-\t[BNXT_ULP_CLASS_HID_01de] = 189,\n-\t[BNXT_ULP_CLASS_HID_0316] = 190,\n-\t[BNXT_ULP_CLASS_HID_066c] = 191,\n-\t[BNXT_ULP_CLASS_HID_01a4] = 192,\n-\t[BNXT_ULP_CLASS_HID_003e] = 193,\n-\t[BNXT_ULP_CLASS_HID_02f6] = 194,\n-\t[BNXT_ULP_CLASS_HID_078c] = 195,\n-\t[BNXT_ULP_CLASS_HID_0044] = 196,\n-\t[BNXT_ULP_CLASS_HID_01ce] = 197,\n-\t[BNXT_ULP_CLASS_HID_0306] = 198,\n-\t[BNXT_ULP_CLASS_HID_067c] = 199,\n-\t[BNXT_ULP_CLASS_HID_01b4] = 200\n+\t[BNXT_ULP_CLASS_HID_0000] = 149,\n+\t[BNXT_ULP_CLASS_HID_00ce] = 150,\n+\t[BNXT_ULP_CLASS_HID_01b6] = 151,\n+\t[BNXT_ULP_CLASS_HID_0074] = 152,\n+\t[BNXT_ULP_CLASS_HID_00fe] = 153,\n+\t[BNXT_ULP_CLASS_HID_03bc] = 154,\n+\t[BNXT_ULP_CLASS_HID_0206] = 155,\n+\t[BNXT_ULP_CLASS_HID_02c4] = 156,\n+\t[BNXT_ULP_CLASS_HID_055a] = 157,\n+\t[BNXT_ULP_CLASS_HID_045a] = 158,\n+\t[BNXT_ULP_CLASS_HID_061a] = 159,\n+\t[BNXT_ULP_CLASS_HID_051a] = 160,\n+\t[BNXT_ULP_CLASS_HID_074a] = 161,\n+\t[BNXT_ULP_CLASS_HID_004e] = 162,\n+\t[BNXT_ULP_CLASS_HID_040a] = 163,\n+\t[BNXT_ULP_CLASS_HID_010e] = 164,\n+\t[BNXT_ULP_CLASS_HID_048b] = 165,\n+\t[BNXT_ULP_CLASS_HID_0749] = 166,\n+\t[BNXT_ULP_CLASS_HID_05f1] = 167,\n+\t[BNXT_ULP_CLASS_HID_04b7] = 168,\n+\t[BNXT_ULP_CLASS_HID_049b] = 169,\n+\t[BNXT_ULP_CLASS_HID_0759] = 170,\n+\t[BNXT_ULP_CLASS_HID_05e1] = 171,\n+\t[BNXT_ULP_CLASS_HID_04a7] = 172,\n+\t[BNXT_ULP_CLASS_HID_0301] = 173,\n+\t[BNXT_ULP_CLASS_HID_07f9] = 174,\n+\t[BNXT_ULP_CLASS_HID_0397] = 175,\n+\t[BNXT_ULP_CLASS_HID_068f] = 176,\n+\t[BNXT_ULP_CLASS_HID_02f1] = 177,\n+\t[BNXT_ULP_CLASS_HID_0609] = 178,\n+\t[BNXT_ULP_CLASS_HID_0267] = 179,\n+\t[BNXT_ULP_CLASS_HID_077f] = 180,\n+\t[BNXT_ULP_CLASS_HID_01e1] = 181,\n+\t[BNXT_ULP_CLASS_HID_0329] = 182,\n+\t[BNXT_ULP_CLASS_HID_01c1] = 183,\n+\t[BNXT_ULP_CLASS_HID_0309] = 184,\n+\t[BNXT_ULP_CLASS_HID_01d1] = 185,\n+\t[BNXT_ULP_CLASS_HID_0319] = 186,\n+\t[BNXT_ULP_CLASS_HID_01e2] = 187,\n+\t[BNXT_ULP_CLASS_HID_032a] = 188,\n+\t[BNXT_ULP_CLASS_HID_0650] = 189,\n+\t[BNXT_ULP_CLASS_HID_0198] = 190,\n+\t[BNXT_ULP_CLASS_HID_01c2] = 191,\n+\t[BNXT_ULP_CLASS_HID_030a] = 192,\n+\t[BNXT_ULP_CLASS_HID_0670] = 193,\n+\t[BNXT_ULP_CLASS_HID_01b8] = 194,\n+\t[BNXT_ULP_CLASS_HID_01d2] = 195,\n+\t[BNXT_ULP_CLASS_HID_031a] = 196,\n+\t[BNXT_ULP_CLASS_HID_0660] = 197,\n+\t[BNXT_ULP_CLASS_HID_01a8] = 198,\n+\t[BNXT_ULP_CLASS_HID_01dd] = 199,\n+\t[BNXT_ULP_CLASS_HID_0315] = 200,\n+\t[BNXT_ULP_CLASS_HID_003d] = 201,\n+\t[BNXT_ULP_CLASS_HID_02f5] = 202,\n+\t[BNXT_ULP_CLASS_HID_01cd] = 203,\n+\t[BNXT_ULP_CLASS_HID_0305] = 204,\n+\t[BNXT_ULP_CLASS_HID_01de] = 205,\n+\t[BNXT_ULP_CLASS_HID_0316] = 206,\n+\t[BNXT_ULP_CLASS_HID_066c] = 207,\n+\t[BNXT_ULP_CLASS_HID_01a4] = 208,\n+\t[BNXT_ULP_CLASS_HID_003e] = 209,\n+\t[BNXT_ULP_CLASS_HID_02f6] = 210,\n+\t[BNXT_ULP_CLASS_HID_078c] = 211,\n+\t[BNXT_ULP_CLASS_HID_0044] = 212,\n+\t[BNXT_ULP_CLASS_HID_01ce] = 213,\n+\t[BNXT_ULP_CLASS_HID_0306] = 214,\n+\t[BNXT_ULP_CLASS_HID_067c] = 215,\n+\t[BNXT_ULP_CLASS_HID_01b4] = 216\n };\n \n struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n@@ -2831,305 +2847,617 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t.wc_pri = 23\n \t},\n \t[149] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_048b,\n+\t.class_hid = BNXT_ULP_CLASS_HID_0000,\n \t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_F1 |\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n-\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n \t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_SMAC |\n \t\tBNXT_ULP_HF18_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_SRC_ADDR |\n-\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_DST_ADDR |\n \t\tBNXT_ULP_HF18_BITMASK_O_IPV4_PROTO_ID |\n-\t\tBNXT_ULP_HF18_BITMASK_O_UDP_SRC_PORT |\n+\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_DST_ADDR |\n \t\tBNXT_ULP_HF18_BITMASK_O_UDP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 18,\n \t.wc_pri = 0\n \t},\n \t[150] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_0749,\n+\t.class_hid = BNXT_ULP_CLASS_HID_00ce,\n \t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_F1 |\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n-\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n \t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_SMAC |\n \t\tBNXT_ULP_HF18_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_SRC_ADDR |\n \t\tBNXT_ULP_HF18_BITMASK_O_IPV4_DST_ADDR |\n-\t\tBNXT_ULP_HF18_BITMASK_O_UDP_SRC_PORT |\n \t\tBNXT_ULP_HF18_BITMASK_O_UDP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 18,\n \t.wc_pri = 1\n \t},\n \t[151] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_05f1,\n+\t.class_hid = BNXT_ULP_CLASS_HID_01b6,\n \t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_F1 |\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n-\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_SRC_ADDR |\n-\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_SMAC |\n \t\tBNXT_ULP_HF18_BITMASK_O_IPV4_PROTO_ID |\n-\t\tBNXT_ULP_HF18_BITMASK_O_UDP_SRC_PORT |\n+\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_DST_ADDR |\n \t\tBNXT_ULP_HF18_BITMASK_O_UDP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 18,\n \t.wc_pri = 2\n \t},\n \t[152] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_04b7,\n+\t.class_hid = BNXT_ULP_CLASS_HID_0074,\n \t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_F1 |\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n-\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_SMAC |\n \t\tBNXT_ULP_HF18_BITMASK_O_IPV4_DST_ADDR |\n-\t\tBNXT_ULP_HF18_BITMASK_O_UDP_SRC_PORT |\n \t\tBNXT_ULP_HF18_BITMASK_O_UDP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 18,\n \t.wc_pri = 3\n \t},\n \t[153] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_049b,\n+\t.class_hid = BNXT_ULP_CLASS_HID_00fe,\n \t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_F1 |\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n-\t\tBNXT_ULP_HDR_BIT_O_TCP |\n-\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_PROTO_ID |\n+\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF18_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 18,\n+\t.wc_pri = 4\n+\t},\n+\t[154] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_03bc,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_F1 |\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF18_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 18,\n+\t.wc_pri = 5\n+\t},\n+\t[155] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_0206,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_F1 |\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_PROTO_ID |\n+\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF18_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 18,\n+\t.wc_pri = 6\n+\t},\n+\t[156] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_02c4,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_F1 |\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF18_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF18_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF18_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 18,\n+\t.wc_pri = 7\n+\t},\n+\t[157] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_055a,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_HDR_BIT_I_ETH |\n+\t\tBNXT_ULP_HDR_BIT_I_IPV4 |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF19_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_HF19_BITMASK_O_IPV4_SRC_ADDR |\n \t\tBNXT_ULP_HF19_BITMASK_O_IPV4_DST_ADDR |\n \t\tBNXT_ULP_HF19_BITMASK_O_IPV4_PROTO_ID |\n-\t\tBNXT_ULP_HF19_BITMASK_O_TCP_SRC_PORT |\n-\t\tBNXT_ULP_HF19_BITMASK_O_TCP_DST_PORT |\n+\t\tBNXT_ULP_HF19_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_HF19_BITMASK_T_VXLAN_VNI |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_DMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_SMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 19,\n \t.wc_pri = 0\n \t},\n-\t[154] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_0759,\n+\t[158] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_045a,\n \t.hdr_sig = { .bits =\n-\t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n-\t\tBNXT_ULP_HDR_BIT_O_TCP |\n-\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_HDR_BIT_I_ETH |\n+\t\tBNXT_ULP_HDR_BIT_I_IPV4 |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF19_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_HF19_BITMASK_O_IPV4_SRC_ADDR |\n \t\tBNXT_ULP_HF19_BITMASK_O_IPV4_DST_ADDR |\n-\t\tBNXT_ULP_HF19_BITMASK_O_TCP_SRC_PORT |\n-\t\tBNXT_ULP_HF19_BITMASK_O_TCP_DST_PORT |\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_PROTO_ID |\n+\t\tBNXT_ULP_HF19_BITMASK_T_VXLAN_VNI |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_DMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_SMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 19,\n \t.wc_pri = 1\n \t},\n-\t[155] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_05e1,\n+\t[159] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_061a,\n \t.hdr_sig = { .bits =\n-\t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n-\t\tBNXT_ULP_HDR_BIT_O_TCP |\n-\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_HDR_BIT_I_ETH |\n+\t\tBNXT_ULP_HDR_BIT_I_IPV4 |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n \t.field_sig = { .bits =\n \t\tBNXT_ULP_HF19_BITMASK_O_IPV4_SRC_ADDR |\n \t\tBNXT_ULP_HF19_BITMASK_O_IPV4_DST_ADDR |\n-\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_PROTO_ID |\n-\t\tBNXT_ULP_HF19_BITMASK_O_TCP_SRC_PORT |\n-\t\tBNXT_ULP_HF19_BITMASK_O_TCP_DST_PORT |\n+\t\tBNXT_ULP_HF19_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_HF19_BITMASK_T_VXLAN_VNI |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_DMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_SMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 19,\n \t.wc_pri = 2\n \t},\n-\t[156] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_04a7,\n+\t[160] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_051a,\n \t.hdr_sig = { .bits =\n-\t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n-\t\tBNXT_ULP_HDR_BIT_O_TCP |\n-\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_HDR_BIT_I_ETH |\n+\t\tBNXT_ULP_HDR_BIT_I_IPV4 |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n \t.field_sig = { .bits =\n \t\tBNXT_ULP_HF19_BITMASK_O_IPV4_SRC_ADDR |\n \t\tBNXT_ULP_HF19_BITMASK_O_IPV4_DST_ADDR |\n-\t\tBNXT_ULP_HF19_BITMASK_O_TCP_SRC_PORT |\n-\t\tBNXT_ULP_HF19_BITMASK_O_TCP_DST_PORT |\n+\t\tBNXT_ULP_HF19_BITMASK_T_VXLAN_VNI |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_DMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_SMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 19,\n \t.wc_pri = 3\n \t},\n-\t[157] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_0301,\n+\t[161] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_074a,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_HDR_BIT_I_ETH |\n+\t\tBNXT_ULP_HDR_BIT_I_IPV4 |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_PROTO_ID |\n+\t\tBNXT_ULP_HF19_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_HF19_BITMASK_T_VXLAN_VNI |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_DMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_TYPE |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 19,\n+\t.wc_pri = 4\n+\t},\n+\t[162] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_004e,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_HDR_BIT_I_ETH |\n+\t\tBNXT_ULP_HDR_BIT_I_IPV4 |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_PROTO_ID |\n+\t\tBNXT_ULP_HF19_BITMASK_T_VXLAN_VNI |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_DMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_TYPE |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 19,\n+\t.wc_pri = 5\n+\t},\n+\t[163] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_040a,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_HDR_BIT_I_ETH |\n+\t\tBNXT_ULP_HDR_BIT_I_IPV4 |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF19_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_HF19_BITMASK_T_VXLAN_VNI |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_DMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_TYPE |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 19,\n+\t.wc_pri = 6\n+\t},\n+\t[164] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_010e,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_HDR_BIT_T_VXLAN |\n+\t\tBNXT_ULP_HDR_BIT_I_ETH |\n+\t\tBNXT_ULP_HDR_BIT_I_IPV4 |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_ING },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF19_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF19_BITMASK_T_VXLAN_VNI |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_DMAC |\n+\t\tBNXT_ULP_HF19_BITMASK_I_ETH_TYPE |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 19,\n+\t.wc_pri = 7\n+\t},\n+\t[165] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_048b,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n-\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n \t\tBNXT_ULP_HF20_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF20_BITMASK_O_IPV6_SRC_ADDR |\n-\t\tBNXT_ULP_HF20_BITMASK_O_IPV6_DST_ADDR |\n-\t\tBNXT_ULP_HF20_BITMASK_O_IPV6_PROTO_ID |\n+\t\tBNXT_ULP_HF20_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF20_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF20_BITMASK_O_IPV4_PROTO_ID |\n \t\tBNXT_ULP_HF20_BITMASK_O_UDP_SRC_PORT |\n \t\tBNXT_ULP_HF20_BITMASK_O_UDP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 20,\n \t.wc_pri = 0\n \t},\n-\t[158] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_07f9,\n+\t[166] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_0749,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n-\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n \t\tBNXT_ULP_HF20_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF20_BITMASK_O_IPV6_SRC_ADDR |\n-\t\tBNXT_ULP_HF20_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF20_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF20_BITMASK_O_IPV4_DST_ADDR |\n \t\tBNXT_ULP_HF20_BITMASK_O_UDP_SRC_PORT |\n \t\tBNXT_ULP_HF20_BITMASK_O_UDP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 20,\n \t.wc_pri = 1\n \t},\n-\t[159] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_0397,\n+\t[167] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_05f1,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n-\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF20_BITMASK_O_IPV6_SRC_ADDR |\n-\t\tBNXT_ULP_HF20_BITMASK_O_IPV6_DST_ADDR |\n-\t\tBNXT_ULP_HF20_BITMASK_O_IPV6_PROTO_ID |\n+\t\tBNXT_ULP_HF20_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF20_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF20_BITMASK_O_IPV4_PROTO_ID |\n \t\tBNXT_ULP_HF20_BITMASK_O_UDP_SRC_PORT |\n \t\tBNXT_ULP_HF20_BITMASK_O_UDP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 20,\n \t.wc_pri = 2\n \t},\n-\t[160] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_068f,\n+\t[168] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_04b7,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n-\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF20_BITMASK_O_IPV6_SRC_ADDR |\n-\t\tBNXT_ULP_HF20_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF20_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF20_BITMASK_O_IPV4_DST_ADDR |\n \t\tBNXT_ULP_HF20_BITMASK_O_UDP_SRC_PORT |\n \t\tBNXT_ULP_HF20_BITMASK_O_UDP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 20,\n \t.wc_pri = 3\n \t},\n-\t[161] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_02f1,\n+\t[169] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_049b,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n-\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n \t\tBNXT_ULP_HF21_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF21_BITMASK_O_IPV6_SRC_ADDR |\n-\t\tBNXT_ULP_HF21_BITMASK_O_IPV6_DST_ADDR |\n-\t\tBNXT_ULP_HF21_BITMASK_O_IPV6_PROTO_ID |\n+\t\tBNXT_ULP_HF21_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF21_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF21_BITMASK_O_IPV4_PROTO_ID |\n \t\tBNXT_ULP_HF21_BITMASK_O_TCP_SRC_PORT |\n \t\tBNXT_ULP_HF21_BITMASK_O_TCP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 21,\n \t.wc_pri = 0\n \t},\n-\t[162] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_0609,\n+\t[170] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_0759,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n-\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n \t\tBNXT_ULP_HF21_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF21_BITMASK_O_IPV6_SRC_ADDR |\n-\t\tBNXT_ULP_HF21_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF21_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF21_BITMASK_O_IPV4_DST_ADDR |\n \t\tBNXT_ULP_HF21_BITMASK_O_TCP_SRC_PORT |\n \t\tBNXT_ULP_HF21_BITMASK_O_TCP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 21,\n \t.wc_pri = 1\n \t},\n-\t[163] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_0267,\n+\t[171] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_05e1,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n-\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF21_BITMASK_O_IPV6_SRC_ADDR |\n-\t\tBNXT_ULP_HF21_BITMASK_O_IPV6_DST_ADDR |\n-\t\tBNXT_ULP_HF21_BITMASK_O_IPV6_PROTO_ID |\n+\t\tBNXT_ULP_HF21_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF21_BITMASK_O_IPV4_DST_ADDR |\n+\t\tBNXT_ULP_HF21_BITMASK_O_IPV4_PROTO_ID |\n \t\tBNXT_ULP_HF21_BITMASK_O_TCP_SRC_PORT |\n \t\tBNXT_ULP_HF21_BITMASK_O_TCP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 21,\n \t.wc_pri = 2\n \t},\n-\t[164] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_077f,\n+\t[172] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_04a7,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n-\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF21_BITMASK_O_IPV6_SRC_ADDR |\n-\t\tBNXT_ULP_HF21_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF21_BITMASK_O_IPV4_SRC_ADDR |\n+\t\tBNXT_ULP_HF21_BITMASK_O_IPV4_DST_ADDR |\n \t\tBNXT_ULP_HF21_BITMASK_O_TCP_SRC_PORT |\n \t\tBNXT_ULP_HF21_BITMASK_O_TCP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 21,\n \t.wc_pri = 3\n \t},\n-\t[165] = {\n-\t.class_hid = BNXT_ULP_CLASS_HID_01e1,\n+\t[173] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_0301,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n-\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_HF22_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF22_BITMASK_O_IPV6_SRC_ADDR |\n+\t\tBNXT_ULP_HF22_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF22_BITMASK_O_IPV6_PROTO_ID |\n+\t\tBNXT_ULP_HF22_BITMASK_O_UDP_SRC_PORT |\n+\t\tBNXT_ULP_HF22_BITMASK_O_UDP_DST_PORT |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n \t.class_tid = 22,\n \t.wc_pri = 0\n \t},\n-\t[166] = {\n+\t[174] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_07f9,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF22_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF22_BITMASK_O_IPV6_SRC_ADDR |\n+\t\tBNXT_ULP_HF22_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF22_BITMASK_O_UDP_SRC_PORT |\n+\t\tBNXT_ULP_HF22_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 22,\n+\t.wc_pri = 1\n+\t},\n+\t[175] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_0397,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF22_BITMASK_O_IPV6_SRC_ADDR |\n+\t\tBNXT_ULP_HF22_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF22_BITMASK_O_IPV6_PROTO_ID |\n+\t\tBNXT_ULP_HF22_BITMASK_O_UDP_SRC_PORT |\n+\t\tBNXT_ULP_HF22_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 22,\n+\t.wc_pri = 2\n+\t},\n+\t[176] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_068f,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_UDP |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF22_BITMASK_O_IPV6_SRC_ADDR |\n+\t\tBNXT_ULP_HF22_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF22_BITMASK_O_UDP_SRC_PORT |\n+\t\tBNXT_ULP_HF22_BITMASK_O_UDP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 22,\n+\t.wc_pri = 3\n+\t},\n+\t[177] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_02f1,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_TCP |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF23_BITMASK_O_IPV6_SRC_ADDR |\n+\t\tBNXT_ULP_HF23_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF23_BITMASK_O_IPV6_PROTO_ID |\n+\t\tBNXT_ULP_HF23_BITMASK_O_TCP_SRC_PORT |\n+\t\tBNXT_ULP_HF23_BITMASK_O_TCP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 23,\n+\t.wc_pri = 0\n+\t},\n+\t[178] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_0609,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_TCP |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF23_BITMASK_O_IPV6_SRC_ADDR |\n+\t\tBNXT_ULP_HF23_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF23_BITMASK_O_TCP_SRC_PORT |\n+\t\tBNXT_ULP_HF23_BITMASK_O_TCP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 23,\n+\t.wc_pri = 1\n+\t},\n+\t[179] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_0267,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_TCP |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF23_BITMASK_O_IPV6_SRC_ADDR |\n+\t\tBNXT_ULP_HF23_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF23_BITMASK_O_IPV6_PROTO_ID |\n+\t\tBNXT_ULP_HF23_BITMASK_O_TCP_SRC_PORT |\n+\t\tBNXT_ULP_HF23_BITMASK_O_TCP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 23,\n+\t.wc_pri = 2\n+\t},\n+\t[180] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_077f,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n+\t\tBNXT_ULP_HDR_BIT_O_TCP |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF23_BITMASK_O_IPV6_SRC_ADDR |\n+\t\tBNXT_ULP_HF23_BITMASK_O_IPV6_DST_ADDR |\n+\t\tBNXT_ULP_HF23_BITMASK_O_TCP_SRC_PORT |\n+\t\tBNXT_ULP_HF23_BITMASK_O_TCP_DST_PORT |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 23,\n+\t.wc_pri = 3\n+\t},\n+\t[181] = {\n+\t.class_hid = BNXT_ULP_CLASS_HID_01e1,\n+\t.hdr_sig = { .bits =\n+\t\tBNXT_ULP_HDR_BIT_O_ETH |\n+\t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n+\t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n+\t.field_sig = { .bits =\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n+\t.class_tid = 24,\n+\t.wc_pri = 0\n+\t},\n+\t[182] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0329,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 1\n \t},\n-\t[167] = {\n+\t[183] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01c1,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3137,14 +3465,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 2\n \t},\n-\t[168] = {\n+\t[184] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0309,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3152,13 +3480,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 3\n \t},\n-\t[169] = {\n+\t[185] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01d1,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3166,14 +3494,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 4\n \t},\n-\t[170] = {\n+\t[186] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0319,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3181,13 +3509,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 5\n \t},\n-\t[171] = {\n+\t[187] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01e2,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3195,14 +3523,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 6\n \t},\n-\t[172] = {\n+\t[188] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_032a,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3210,13 +3538,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 7\n \t},\n-\t[173] = {\n+\t[189] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0650,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3224,15 +3552,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF22_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF24_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 8\n \t},\n-\t[174] = {\n+\t[190] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0198,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3240,14 +3568,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_IPV4 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 9\n \t},\n-\t[175] = {\n+\t[191] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01c2,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3256,14 +3584,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 10\n \t},\n-\t[176] = {\n+\t[192] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_030a,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3272,13 +3600,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 11\n \t},\n-\t[177] = {\n+\t[193] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0670,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3287,15 +3615,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF22_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF24_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 12\n \t},\n-\t[178] = {\n+\t[194] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01b8,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3304,14 +3632,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 13\n \t},\n-\t[179] = {\n+\t[195] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01d2,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3320,14 +3648,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 14\n \t},\n-\t[180] = {\n+\t[196] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_031a,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3336,13 +3664,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 15\n \t},\n-\t[181] = {\n+\t[197] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0660,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3351,15 +3679,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF22_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF24_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 16\n \t},\n-\t[182] = {\n+\t[198] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01a8,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3368,41 +3696,41 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF22_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF24_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 22,\n+\t.class_tid = 24,\n \t.wc_pri = 17\n \t},\n-\t[183] = {\n+\t[199] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01dd,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 0\n \t},\n-\t[184] = {\n+\t[200] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0315,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n \t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 1\n \t},\n-\t[185] = {\n+\t[201] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_003d,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3410,14 +3738,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 2\n \t},\n-\t[186] = {\n+\t[202] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_02f5,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3425,13 +3753,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 3\n \t},\n-\t[187] = {\n+\t[203] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01cd,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3439,14 +3767,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 4\n \t},\n-\t[188] = {\n+\t[204] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0305,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3454,13 +3782,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 5\n \t},\n-\t[189] = {\n+\t[205] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01de,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3468,14 +3796,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 6\n \t},\n-\t[190] = {\n+\t[206] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0316,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3483,13 +3811,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 7\n \t},\n-\t[191] = {\n+\t[207] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_066c,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3497,15 +3825,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF23_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF25_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 8\n \t},\n-\t[192] = {\n+\t[208] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01a4,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3513,14 +3841,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_IPV6 |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 9\n \t},\n-\t[193] = {\n+\t[209] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_003e,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3529,14 +3857,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 10\n \t},\n-\t[194] = {\n+\t[210] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_02f6,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3545,13 +3873,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 11\n \t},\n-\t[195] = {\n+\t[211] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_078c,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3560,15 +3888,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF23_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF25_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 12\n \t},\n-\t[196] = {\n+\t[212] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0044,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3577,14 +3905,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_UDP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 13\n \t},\n-\t[197] = {\n+\t[213] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01ce,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3593,14 +3921,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_TYPE |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 14\n \t},\n-\t[198] = {\n+\t[214] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_0306,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3609,13 +3937,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 15\n \t},\n-\t[199] = {\n+\t[215] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_067c,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3624,15 +3952,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_TYPE |\n-\t\tBNXT_ULP_HF23_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_TYPE |\n+\t\tBNXT_ULP_HF25_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 16\n \t},\n-\t[200] = {\n+\t[216] = {\n \t.class_hid = BNXT_ULP_CLASS_HID_01b4,\n \t.hdr_sig = { .bits =\n \t\tBNXT_ULP_HDR_BIT_O_ETH |\n@@ -3641,11 +3969,11 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {\n \t\tBNXT_ULP_HDR_BIT_O_TCP |\n \t\tBNXT_ULP_FLOW_DIR_BITMASK_EGR },\n \t.field_sig = { .bits =\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_SMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_O_ETH_DMAC |\n-\t\tBNXT_ULP_HF23_BITMASK_OO_VLAN_VID |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC |\n+\t\tBNXT_ULP_HF25_BITMASK_OO_VLAN_VID |\n \t\tBNXT_ULP_MATCH_TYPE_BITMASK_EM },\n-\t.class_tid = 23,\n+\t.class_tid = 25,\n \t.wc_pri = 17\n \t}\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 6dade9afdb..10838f5cc2 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@@ -11,7 +11,7 @@\n #define BNXT_ULP_LOG2_MAX_NUM_DEV 2\n #define BNXT_ULP_CACHE_TBL_MAX_SZ 4\n #define BNXT_ULP_CLASS_SIG_TBL_MAX_SZ 2048\n-#define BNXT_ULP_CLASS_MATCH_LIST_MAX_SZ 201\n+#define BNXT_ULP_CLASS_MATCH_LIST_MAX_SZ 217\n #define BNXT_ULP_CLASS_HID_LOW_PRIME 7919\n #define BNXT_ULP_CLASS_HID_HIGH_PRIME 7907\n #define BNXT_ULP_CLASS_HID_SHFTR 32\n@@ -52,7 +52,8 @@ enum bnxt_ulp_action_bit {\n \tBNXT_ULP_ACTION_BIT_SET_TP_SRC       = 0x0000000000100000,\n \tBNXT_ULP_ACTION_BIT_SET_TP_DST       = 0x0000000000200000,\n \tBNXT_ULP_ACTION_BIT_VXLAN_ENCAP      = 0x0000000000400000,\n-\tBNXT_ULP_ACTION_BIT_LAST             = 0x0000000000800000\n+\tBNXT_ULP_ACTION_BIT_JUMP             = 0x0000000000800000,\n+\tBNXT_ULP_ACTION_BIT_LAST             = 0x0000000001000000\n };\n \n enum bnxt_ulp_hdr_bit {\n@@ -72,7 +73,8 @@ enum bnxt_ulp_hdr_bit {\n \tBNXT_ULP_HDR_BIT_I_IPV6              = 0x0000000000002000,\n \tBNXT_ULP_HDR_BIT_I_TCP               = 0x0000000000004000,\n \tBNXT_ULP_HDR_BIT_I_UDP               = 0x0000000000008000,\n-\tBNXT_ULP_HDR_BIT_LAST                = 0x0000000000010000\n+\tBNXT_ULP_HDR_BIT_F1                  = 0x0000000000010000,\n+\tBNXT_ULP_HDR_BIT_LAST                = 0x0000000000020000\n };\n \n enum bnxt_ulp_act_type {\n@@ -341,6 +343,10 @@ enum bnxt_ulp_resource_sub_type {\n enum bnxt_ulp_sym {\n \tBNXT_ULP_SYM_PKT_TYPE_IGNORE = 0,\n \tBNXT_ULP_SYM_PKT_TYPE_L2 = 0,\n+\tBNXT_ULP_SYM_PKT_TYPE_0_IGNORE = 0,\n+\tBNXT_ULP_SYM_PKT_TYPE_0_L2 = 0,\n+\tBNXT_ULP_SYM_PKT_TYPE_1_IGNORE = 0,\n+\tBNXT_ULP_SYM_PKT_TYPE_1_L2 = 0,\n \tBNXT_ULP_SYM_RECYCLE_CNT_IGNORE = 0,\n \tBNXT_ULP_SYM_RECYCLE_CNT_ZERO = 0,\n \tBNXT_ULP_SYM_RECYCLE_CNT_ONE = 1,\n@@ -551,7 +557,8 @@ enum bnxt_ulp_sym {\n \tBNXT_ULP_SYM_IP_PROTO_UDP = 17,\n \tBNXT_ULP_SYM_VF_FUNC_PARIF = 15,\n \tBNXT_ULP_SYM_NO = 0,\n-\tBNXT_ULP_SYM_YES = 1\n+\tBNXT_ULP_SYM_YES = 1,\n+\tBNXT_ULP_SYM_RECYCLE_DST = 0x800\n };\n \n enum bnxt_ulp_wh_plus {\n@@ -600,6 +607,7 @@ enum bnxt_ulp_act_prop_sz {\n \tBNXT_ULP_ACT_PROP_SZ_ENCAP_IP_SRC = 16,\n \tBNXT_ULP_ACT_PROP_SZ_ENCAP_UDP = 4,\n \tBNXT_ULP_ACT_PROP_SZ_ENCAP_TUN = 32,\n+\tBNXT_ULP_ACT_PROP_SZ_JUMP = 4,\n \tBNXT_ULP_ACT_PROP_SZ_LAST = 4\n };\n \n@@ -644,7 +652,8 @@ enum bnxt_ulp_act_prop_idx {\n \tBNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC = 205,\n \tBNXT_ULP_ACT_PROP_IDX_ENCAP_UDP = 221,\n \tBNXT_ULP_ACT_PROP_IDX_ENCAP_TUN = 225,\n-\tBNXT_ULP_ACT_PROP_IDX_LAST = 257\n+\tBNXT_ULP_ACT_PROP_IDX_JUMP = 257,\n+\tBNXT_ULP_ACT_PROP_IDX_LAST = 261\n };\n \n enum bnxt_ulp_class_hid {\n@@ -796,6 +805,22 @@ enum bnxt_ulp_class_hid {\n \tBNXT_ULP_CLASS_HID_05b9 = 0x05b9,\n \tBNXT_ULP_CLASS_HID_0371 = 0x0371,\n \tBNXT_ULP_CLASS_HID_00e1 = 0x00e1,\n+\tBNXT_ULP_CLASS_HID_0000 = 0x0000,\n+\tBNXT_ULP_CLASS_HID_00ce = 0x00ce,\n+\tBNXT_ULP_CLASS_HID_01b6 = 0x01b6,\n+\tBNXT_ULP_CLASS_HID_0074 = 0x0074,\n+\tBNXT_ULP_CLASS_HID_00fe = 0x00fe,\n+\tBNXT_ULP_CLASS_HID_03bc = 0x03bc,\n+\tBNXT_ULP_CLASS_HID_0206 = 0x0206,\n+\tBNXT_ULP_CLASS_HID_02c4 = 0x02c4,\n+\tBNXT_ULP_CLASS_HID_055a = 0x055a,\n+\tBNXT_ULP_CLASS_HID_045a = 0x045a,\n+\tBNXT_ULP_CLASS_HID_061a = 0x061a,\n+\tBNXT_ULP_CLASS_HID_051a = 0x051a,\n+\tBNXT_ULP_CLASS_HID_074a = 0x074a,\n+\tBNXT_ULP_CLASS_HID_004e = 0x004e,\n+\tBNXT_ULP_CLASS_HID_040a = 0x040a,\n+\tBNXT_ULP_CLASS_HID_010e = 0x010e,\n \tBNXT_ULP_CLASS_HID_048b = 0x048b,\n \tBNXT_ULP_CLASS_HID_0749 = 0x0749,\n \tBNXT_ULP_CLASS_HID_05f1 = 0x05f1,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_field.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_field.h\nindex 137b7fd138..516f471c0c 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_field.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_field.h\n@@ -382,7 +382,11 @@ enum bnxt_ulp_hf18 {\n \tBNXT_ULP_HF18_IDX_O_UDP_SRC_PORT         = 20,\n \tBNXT_ULP_HF18_IDX_O_UDP_DST_PORT         = 21,\n \tBNXT_ULP_HF18_IDX_O_UDP_LENGTH           = 22,\n-\tBNXT_ULP_HF18_IDX_O_UDP_CSUM             = 23\n+\tBNXT_ULP_HF18_IDX_O_UDP_CSUM             = 23,\n+\tBNXT_ULP_HF18_IDX_T_VXLAN_FLAGS          = 24,\n+\tBNXT_ULP_HF18_IDX_T_VXLAN_RSVD0          = 25,\n+\tBNXT_ULP_HF18_IDX_T_VXLAN_VNI            = 26,\n+\tBNXT_ULP_HF18_IDX_T_VXLAN_RSVD1          = 27\n };\n \n enum bnxt_ulp_hf19 {\n@@ -406,15 +410,33 @@ enum bnxt_ulp_hf19 {\n \tBNXT_ULP_HF19_IDX_O_IPV4_CSUM            = 17,\n \tBNXT_ULP_HF19_IDX_O_IPV4_SRC_ADDR        = 18,\n \tBNXT_ULP_HF19_IDX_O_IPV4_DST_ADDR        = 19,\n-\tBNXT_ULP_HF19_IDX_O_TCP_SRC_PORT         = 20,\n-\tBNXT_ULP_HF19_IDX_O_TCP_DST_PORT         = 21,\n-\tBNXT_ULP_HF19_IDX_O_TCP_SENT_SEQ         = 22,\n-\tBNXT_ULP_HF19_IDX_O_TCP_RECV_ACK         = 23,\n-\tBNXT_ULP_HF19_IDX_O_TCP_DATA_OFF         = 24,\n-\tBNXT_ULP_HF19_IDX_O_TCP_TCP_FLAGS        = 25,\n-\tBNXT_ULP_HF19_IDX_O_TCP_RX_WIN           = 26,\n-\tBNXT_ULP_HF19_IDX_O_TCP_CSUM             = 27,\n-\tBNXT_ULP_HF19_IDX_O_TCP_URP              = 28\n+\tBNXT_ULP_HF19_IDX_O_UDP_SRC_PORT         = 20,\n+\tBNXT_ULP_HF19_IDX_O_UDP_DST_PORT         = 21,\n+\tBNXT_ULP_HF19_IDX_O_UDP_LENGTH           = 22,\n+\tBNXT_ULP_HF19_IDX_O_UDP_CSUM             = 23,\n+\tBNXT_ULP_HF19_IDX_T_VXLAN_FLAGS          = 24,\n+\tBNXT_ULP_HF19_IDX_T_VXLAN_RSVD0          = 25,\n+\tBNXT_ULP_HF19_IDX_T_VXLAN_VNI            = 26,\n+\tBNXT_ULP_HF19_IDX_T_VXLAN_RSVD1          = 27,\n+\tBNXT_ULP_HF19_IDX_I_ETH_DMAC             = 28,\n+\tBNXT_ULP_HF19_IDX_I_ETH_SMAC             = 29,\n+\tBNXT_ULP_HF19_IDX_I_ETH_TYPE             = 30,\n+\tBNXT_ULP_HF19_IDX_IO_VLAN_CFI_PRI        = 31,\n+\tBNXT_ULP_HF19_IDX_IO_VLAN_VID            = 32,\n+\tBNXT_ULP_HF19_IDX_IO_VLAN_TYPE           = 33,\n+\tBNXT_ULP_HF19_IDX_II_VLAN_CFI_PRI        = 34,\n+\tBNXT_ULP_HF19_IDX_II_VLAN_VID            = 35,\n+\tBNXT_ULP_HF19_IDX_II_VLAN_TYPE           = 36,\n+\tBNXT_ULP_HF19_IDX_I_IPV4_VER             = 37,\n+\tBNXT_ULP_HF19_IDX_I_IPV4_TOS             = 38,\n+\tBNXT_ULP_HF19_IDX_I_IPV4_LEN             = 39,\n+\tBNXT_ULP_HF19_IDX_I_IPV4_FRAG_ID         = 40,\n+\tBNXT_ULP_HF19_IDX_I_IPV4_FRAG_OFF        = 41,\n+\tBNXT_ULP_HF19_IDX_I_IPV4_TTL             = 42,\n+\tBNXT_ULP_HF19_IDX_I_IPV4_PROTO_ID        = 43,\n+\tBNXT_ULP_HF19_IDX_I_IPV4_CSUM            = 44,\n+\tBNXT_ULP_HF19_IDX_I_IPV4_SRC_ADDR        = 45,\n+\tBNXT_ULP_HF19_IDX_I_IPV4_DST_ADDR        = 46\n };\n \n enum bnxt_ulp_hf20 {\n@@ -428,18 +450,20 @@ enum bnxt_ulp_hf20 {\n \tBNXT_ULP_HF20_IDX_OI_VLAN_CFI_PRI        = 7,\n \tBNXT_ULP_HF20_IDX_OI_VLAN_VID            = 8,\n \tBNXT_ULP_HF20_IDX_OI_VLAN_TYPE           = 9,\n-\tBNXT_ULP_HF20_IDX_O_IPV6_VER             = 10,\n-\tBNXT_ULP_HF20_IDX_O_IPV6_TC              = 11,\n-\tBNXT_ULP_HF20_IDX_O_IPV6_FLOW_LABEL      = 12,\n-\tBNXT_ULP_HF20_IDX_O_IPV6_PAYLOAD_LEN     = 13,\n-\tBNXT_ULP_HF20_IDX_O_IPV6_PROTO_ID        = 14,\n-\tBNXT_ULP_HF20_IDX_O_IPV6_TTL             = 15,\n-\tBNXT_ULP_HF20_IDX_O_IPV6_SRC_ADDR        = 16,\n-\tBNXT_ULP_HF20_IDX_O_IPV6_DST_ADDR        = 17,\n-\tBNXT_ULP_HF20_IDX_O_UDP_SRC_PORT         = 18,\n-\tBNXT_ULP_HF20_IDX_O_UDP_DST_PORT         = 19,\n-\tBNXT_ULP_HF20_IDX_O_UDP_LENGTH           = 20,\n-\tBNXT_ULP_HF20_IDX_O_UDP_CSUM             = 21\n+\tBNXT_ULP_HF20_IDX_O_IPV4_VER             = 10,\n+\tBNXT_ULP_HF20_IDX_O_IPV4_TOS             = 11,\n+\tBNXT_ULP_HF20_IDX_O_IPV4_LEN             = 12,\n+\tBNXT_ULP_HF20_IDX_O_IPV4_FRAG_ID         = 13,\n+\tBNXT_ULP_HF20_IDX_O_IPV4_FRAG_OFF        = 14,\n+\tBNXT_ULP_HF20_IDX_O_IPV4_TTL             = 15,\n+\tBNXT_ULP_HF20_IDX_O_IPV4_PROTO_ID        = 16,\n+\tBNXT_ULP_HF20_IDX_O_IPV4_CSUM            = 17,\n+\tBNXT_ULP_HF20_IDX_O_IPV4_SRC_ADDR        = 18,\n+\tBNXT_ULP_HF20_IDX_O_IPV4_DST_ADDR        = 19,\n+\tBNXT_ULP_HF20_IDX_O_UDP_SRC_PORT         = 20,\n+\tBNXT_ULP_HF20_IDX_O_UDP_DST_PORT         = 21,\n+\tBNXT_ULP_HF20_IDX_O_UDP_LENGTH           = 22,\n+\tBNXT_ULP_HF20_IDX_O_UDP_CSUM             = 23\n };\n \n enum bnxt_ulp_hf21 {\n@@ -453,23 +477,25 @@ enum bnxt_ulp_hf21 {\n \tBNXT_ULP_HF21_IDX_OI_VLAN_CFI_PRI        = 7,\n \tBNXT_ULP_HF21_IDX_OI_VLAN_VID            = 8,\n \tBNXT_ULP_HF21_IDX_OI_VLAN_TYPE           = 9,\n-\tBNXT_ULP_HF21_IDX_O_IPV6_VER             = 10,\n-\tBNXT_ULP_HF21_IDX_O_IPV6_TC              = 11,\n-\tBNXT_ULP_HF21_IDX_O_IPV6_FLOW_LABEL      = 12,\n-\tBNXT_ULP_HF21_IDX_O_IPV6_PAYLOAD_LEN     = 13,\n-\tBNXT_ULP_HF21_IDX_O_IPV6_PROTO_ID        = 14,\n-\tBNXT_ULP_HF21_IDX_O_IPV6_TTL             = 15,\n-\tBNXT_ULP_HF21_IDX_O_IPV6_SRC_ADDR        = 16,\n-\tBNXT_ULP_HF21_IDX_O_IPV6_DST_ADDR        = 17,\n-\tBNXT_ULP_HF21_IDX_O_TCP_SRC_PORT         = 18,\n-\tBNXT_ULP_HF21_IDX_O_TCP_DST_PORT         = 19,\n-\tBNXT_ULP_HF21_IDX_O_TCP_SENT_SEQ         = 20,\n-\tBNXT_ULP_HF21_IDX_O_TCP_RECV_ACK         = 21,\n-\tBNXT_ULP_HF21_IDX_O_TCP_DATA_OFF         = 22,\n-\tBNXT_ULP_HF21_IDX_O_TCP_TCP_FLAGS        = 23,\n-\tBNXT_ULP_HF21_IDX_O_TCP_RX_WIN           = 24,\n-\tBNXT_ULP_HF21_IDX_O_TCP_CSUM             = 25,\n-\tBNXT_ULP_HF21_IDX_O_TCP_URP              = 26\n+\tBNXT_ULP_HF21_IDX_O_IPV4_VER             = 10,\n+\tBNXT_ULP_HF21_IDX_O_IPV4_TOS             = 11,\n+\tBNXT_ULP_HF21_IDX_O_IPV4_LEN             = 12,\n+\tBNXT_ULP_HF21_IDX_O_IPV4_FRAG_ID         = 13,\n+\tBNXT_ULP_HF21_IDX_O_IPV4_FRAG_OFF        = 14,\n+\tBNXT_ULP_HF21_IDX_O_IPV4_TTL             = 15,\n+\tBNXT_ULP_HF21_IDX_O_IPV4_PROTO_ID        = 16,\n+\tBNXT_ULP_HF21_IDX_O_IPV4_CSUM            = 17,\n+\tBNXT_ULP_HF21_IDX_O_IPV4_SRC_ADDR        = 18,\n+\tBNXT_ULP_HF21_IDX_O_IPV4_DST_ADDR        = 19,\n+\tBNXT_ULP_HF21_IDX_O_TCP_SRC_PORT         = 20,\n+\tBNXT_ULP_HF21_IDX_O_TCP_DST_PORT         = 21,\n+\tBNXT_ULP_HF21_IDX_O_TCP_SENT_SEQ         = 22,\n+\tBNXT_ULP_HF21_IDX_O_TCP_RECV_ACK         = 23,\n+\tBNXT_ULP_HF21_IDX_O_TCP_DATA_OFF         = 24,\n+\tBNXT_ULP_HF21_IDX_O_TCP_TCP_FLAGS        = 25,\n+\tBNXT_ULP_HF21_IDX_O_TCP_RX_WIN           = 26,\n+\tBNXT_ULP_HF21_IDX_O_TCP_CSUM             = 27,\n+\tBNXT_ULP_HF21_IDX_O_TCP_URP              = 28\n };\n \n enum bnxt_ulp_hf22 {\n@@ -483,16 +509,18 @@ enum bnxt_ulp_hf22 {\n \tBNXT_ULP_HF22_IDX_OI_VLAN_CFI_PRI        = 7,\n \tBNXT_ULP_HF22_IDX_OI_VLAN_VID            = 8,\n \tBNXT_ULP_HF22_IDX_OI_VLAN_TYPE           = 9,\n-\tBNXT_ULP_HF22_IDX_O_IPV4_VER             = 10,\n-\tBNXT_ULP_HF22_IDX_O_IPV4_TOS             = 11,\n-\tBNXT_ULP_HF22_IDX_O_IPV4_LEN             = 12,\n-\tBNXT_ULP_HF22_IDX_O_IPV4_FRAG_ID         = 13,\n-\tBNXT_ULP_HF22_IDX_O_IPV4_FRAG_OFF        = 14,\n-\tBNXT_ULP_HF22_IDX_O_IPV4_TTL             = 15,\n-\tBNXT_ULP_HF22_IDX_O_IPV4_PROTO_ID        = 16,\n-\tBNXT_ULP_HF22_IDX_O_IPV4_CSUM            = 17,\n-\tBNXT_ULP_HF22_IDX_O_IPV4_SRC_ADDR        = 18,\n-\tBNXT_ULP_HF22_IDX_O_IPV4_DST_ADDR        = 19\n+\tBNXT_ULP_HF22_IDX_O_IPV6_VER             = 10,\n+\tBNXT_ULP_HF22_IDX_O_IPV6_TC              = 11,\n+\tBNXT_ULP_HF22_IDX_O_IPV6_FLOW_LABEL      = 12,\n+\tBNXT_ULP_HF22_IDX_O_IPV6_PAYLOAD_LEN     = 13,\n+\tBNXT_ULP_HF22_IDX_O_IPV6_PROTO_ID        = 14,\n+\tBNXT_ULP_HF22_IDX_O_IPV6_TTL             = 15,\n+\tBNXT_ULP_HF22_IDX_O_IPV6_SRC_ADDR        = 16,\n+\tBNXT_ULP_HF22_IDX_O_IPV6_DST_ADDR        = 17,\n+\tBNXT_ULP_HF22_IDX_O_UDP_SRC_PORT         = 18,\n+\tBNXT_ULP_HF22_IDX_O_UDP_DST_PORT         = 19,\n+\tBNXT_ULP_HF22_IDX_O_UDP_LENGTH           = 20,\n+\tBNXT_ULP_HF22_IDX_O_UDP_CSUM             = 21\n };\n \n enum bnxt_ulp_hf23 {\n@@ -513,7 +541,60 @@ enum bnxt_ulp_hf23 {\n \tBNXT_ULP_HF23_IDX_O_IPV6_PROTO_ID        = 14,\n \tBNXT_ULP_HF23_IDX_O_IPV6_TTL             = 15,\n \tBNXT_ULP_HF23_IDX_O_IPV6_SRC_ADDR        = 16,\n-\tBNXT_ULP_HF23_IDX_O_IPV6_DST_ADDR        = 17\n+\tBNXT_ULP_HF23_IDX_O_IPV6_DST_ADDR        = 17,\n+\tBNXT_ULP_HF23_IDX_O_TCP_SRC_PORT         = 18,\n+\tBNXT_ULP_HF23_IDX_O_TCP_DST_PORT         = 19,\n+\tBNXT_ULP_HF23_IDX_O_TCP_SENT_SEQ         = 20,\n+\tBNXT_ULP_HF23_IDX_O_TCP_RECV_ACK         = 21,\n+\tBNXT_ULP_HF23_IDX_O_TCP_DATA_OFF         = 22,\n+\tBNXT_ULP_HF23_IDX_O_TCP_TCP_FLAGS        = 23,\n+\tBNXT_ULP_HF23_IDX_O_TCP_RX_WIN           = 24,\n+\tBNXT_ULP_HF23_IDX_O_TCP_CSUM             = 25,\n+\tBNXT_ULP_HF23_IDX_O_TCP_URP              = 26\n+};\n+\n+enum bnxt_ulp_hf24 {\n+\tBNXT_ULP_HF24_IDX_SVIF_INDEX             = 0,\n+\tBNXT_ULP_HF24_IDX_O_ETH_DMAC             = 1,\n+\tBNXT_ULP_HF24_IDX_O_ETH_SMAC             = 2,\n+\tBNXT_ULP_HF24_IDX_O_ETH_TYPE             = 3,\n+\tBNXT_ULP_HF24_IDX_OO_VLAN_CFI_PRI        = 4,\n+\tBNXT_ULP_HF24_IDX_OO_VLAN_VID            = 5,\n+\tBNXT_ULP_HF24_IDX_OO_VLAN_TYPE           = 6,\n+\tBNXT_ULP_HF24_IDX_OI_VLAN_CFI_PRI        = 7,\n+\tBNXT_ULP_HF24_IDX_OI_VLAN_VID            = 8,\n+\tBNXT_ULP_HF24_IDX_OI_VLAN_TYPE           = 9,\n+\tBNXT_ULP_HF24_IDX_O_IPV4_VER             = 10,\n+\tBNXT_ULP_HF24_IDX_O_IPV4_TOS             = 11,\n+\tBNXT_ULP_HF24_IDX_O_IPV4_LEN             = 12,\n+\tBNXT_ULP_HF24_IDX_O_IPV4_FRAG_ID         = 13,\n+\tBNXT_ULP_HF24_IDX_O_IPV4_FRAG_OFF        = 14,\n+\tBNXT_ULP_HF24_IDX_O_IPV4_TTL             = 15,\n+\tBNXT_ULP_HF24_IDX_O_IPV4_PROTO_ID        = 16,\n+\tBNXT_ULP_HF24_IDX_O_IPV4_CSUM            = 17,\n+\tBNXT_ULP_HF24_IDX_O_IPV4_SRC_ADDR        = 18,\n+\tBNXT_ULP_HF24_IDX_O_IPV4_DST_ADDR        = 19\n+};\n+\n+enum bnxt_ulp_hf25 {\n+\tBNXT_ULP_HF25_IDX_SVIF_INDEX             = 0,\n+\tBNXT_ULP_HF25_IDX_O_ETH_DMAC             = 1,\n+\tBNXT_ULP_HF25_IDX_O_ETH_SMAC             = 2,\n+\tBNXT_ULP_HF25_IDX_O_ETH_TYPE             = 3,\n+\tBNXT_ULP_HF25_IDX_OO_VLAN_CFI_PRI        = 4,\n+\tBNXT_ULP_HF25_IDX_OO_VLAN_VID            = 5,\n+\tBNXT_ULP_HF25_IDX_OO_VLAN_TYPE           = 6,\n+\tBNXT_ULP_HF25_IDX_OI_VLAN_CFI_PRI        = 7,\n+\tBNXT_ULP_HF25_IDX_OI_VLAN_VID            = 8,\n+\tBNXT_ULP_HF25_IDX_OI_VLAN_TYPE           = 9,\n+\tBNXT_ULP_HF25_IDX_O_IPV6_VER             = 10,\n+\tBNXT_ULP_HF25_IDX_O_IPV6_TC              = 11,\n+\tBNXT_ULP_HF25_IDX_O_IPV6_FLOW_LABEL      = 12,\n+\tBNXT_ULP_HF25_IDX_O_IPV6_PAYLOAD_LEN     = 13,\n+\tBNXT_ULP_HF25_IDX_O_IPV6_PROTO_ID        = 14,\n+\tBNXT_ULP_HF25_IDX_O_IPV6_TTL             = 15,\n+\tBNXT_ULP_HF25_IDX_O_IPV6_SRC_ADDR        = 16,\n+\tBNXT_ULP_HF25_IDX_O_IPV6_DST_ADDR        = 17\n };\n \n enum bnxt_ulp_hf_bitmask1 {\n@@ -892,7 +973,11 @@ enum bnxt_ulp_hf_bitmask18 {\n \tBNXT_ULP_HF18_BITMASK_O_UDP_SRC_PORT     = 0x0000080000000000,\n \tBNXT_ULP_HF18_BITMASK_O_UDP_DST_PORT     = 0x0000040000000000,\n \tBNXT_ULP_HF18_BITMASK_O_UDP_LENGTH       = 0x0000020000000000,\n-\tBNXT_ULP_HF18_BITMASK_O_UDP_CSUM         = 0x0000010000000000\n+\tBNXT_ULP_HF18_BITMASK_O_UDP_CSUM         = 0x0000010000000000,\n+\tBNXT_ULP_HF18_BITMASK_T_VXLAN_FLAGS      = 0x0000008000000000,\n+\tBNXT_ULP_HF18_BITMASK_T_VXLAN_RSVD0      = 0x0000004000000000,\n+\tBNXT_ULP_HF18_BITMASK_T_VXLAN_VNI        = 0x0000002000000000,\n+\tBNXT_ULP_HF18_BITMASK_T_VXLAN_RSVD1      = 0x0000001000000000\n };\n \n enum bnxt_ulp_hf_bitmask19 {\n@@ -916,15 +1001,33 @@ enum bnxt_ulp_hf_bitmask19 {\n \tBNXT_ULP_HF19_BITMASK_O_IPV4_CSUM        = 0x0000400000000000,\n \tBNXT_ULP_HF19_BITMASK_O_IPV4_SRC_ADDR    = 0x0000200000000000,\n \tBNXT_ULP_HF19_BITMASK_O_IPV4_DST_ADDR    = 0x0000100000000000,\n-\tBNXT_ULP_HF19_BITMASK_O_TCP_SRC_PORT     = 0x0000080000000000,\n-\tBNXT_ULP_HF19_BITMASK_O_TCP_DST_PORT     = 0x0000040000000000,\n-\tBNXT_ULP_HF19_BITMASK_O_TCP_SENT_SEQ     = 0x0000020000000000,\n-\tBNXT_ULP_HF19_BITMASK_O_TCP_RECV_ACK     = 0x0000010000000000,\n-\tBNXT_ULP_HF19_BITMASK_O_TCP_DATA_OFF     = 0x0000008000000000,\n-\tBNXT_ULP_HF19_BITMASK_O_TCP_TCP_FLAGS    = 0x0000004000000000,\n-\tBNXT_ULP_HF19_BITMASK_O_TCP_RX_WIN       = 0x0000002000000000,\n-\tBNXT_ULP_HF19_BITMASK_O_TCP_CSUM         = 0x0000001000000000,\n-\tBNXT_ULP_HF19_BITMASK_O_TCP_URP          = 0x0000000800000000\n+\tBNXT_ULP_HF19_BITMASK_O_UDP_SRC_PORT     = 0x0000080000000000,\n+\tBNXT_ULP_HF19_BITMASK_O_UDP_DST_PORT     = 0x0000040000000000,\n+\tBNXT_ULP_HF19_BITMASK_O_UDP_LENGTH       = 0x0000020000000000,\n+\tBNXT_ULP_HF19_BITMASK_O_UDP_CSUM         = 0x0000010000000000,\n+\tBNXT_ULP_HF19_BITMASK_T_VXLAN_FLAGS      = 0x0000008000000000,\n+\tBNXT_ULP_HF19_BITMASK_T_VXLAN_RSVD0      = 0x0000004000000000,\n+\tBNXT_ULP_HF19_BITMASK_T_VXLAN_VNI        = 0x0000002000000000,\n+\tBNXT_ULP_HF19_BITMASK_T_VXLAN_RSVD1      = 0x0000001000000000,\n+\tBNXT_ULP_HF19_BITMASK_I_ETH_DMAC         = 0x0000000800000000,\n+\tBNXT_ULP_HF19_BITMASK_I_ETH_SMAC         = 0x0000000400000000,\n+\tBNXT_ULP_HF19_BITMASK_I_ETH_TYPE         = 0x0000000200000000,\n+\tBNXT_ULP_HF19_BITMASK_IO_VLAN_CFI_PRI    = 0x0000000100000000,\n+\tBNXT_ULP_HF19_BITMASK_IO_VLAN_VID        = 0x0000000080000000,\n+\tBNXT_ULP_HF19_BITMASK_IO_VLAN_TYPE       = 0x0000000040000000,\n+\tBNXT_ULP_HF19_BITMASK_II_VLAN_CFI_PRI    = 0x0000000020000000,\n+\tBNXT_ULP_HF19_BITMASK_II_VLAN_VID        = 0x0000000010000000,\n+\tBNXT_ULP_HF19_BITMASK_II_VLAN_TYPE       = 0x0000000008000000,\n+\tBNXT_ULP_HF19_BITMASK_I_IPV4_VER         = 0x0000000004000000,\n+\tBNXT_ULP_HF19_BITMASK_I_IPV4_TOS         = 0x0000000002000000,\n+\tBNXT_ULP_HF19_BITMASK_I_IPV4_LEN         = 0x0000000001000000,\n+\tBNXT_ULP_HF19_BITMASK_I_IPV4_FRAG_ID     = 0x0000000000800000,\n+\tBNXT_ULP_HF19_BITMASK_I_IPV4_FRAG_OFF    = 0x0000000000400000,\n+\tBNXT_ULP_HF19_BITMASK_I_IPV4_TTL         = 0x0000000000200000,\n+\tBNXT_ULP_HF19_BITMASK_I_IPV4_PROTO_ID    = 0x0000000000100000,\n+\tBNXT_ULP_HF19_BITMASK_I_IPV4_CSUM        = 0x0000000000080000,\n+\tBNXT_ULP_HF19_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000000040000,\n+\tBNXT_ULP_HF19_BITMASK_I_IPV4_DST_ADDR    = 0x0000000000020000\n };\n \n enum bnxt_ulp_hf_bitmask20 {\n@@ -938,18 +1041,20 @@ enum bnxt_ulp_hf_bitmask20 {\n \tBNXT_ULP_HF20_BITMASK_OI_VLAN_CFI_PRI    = 0x0100000000000000,\n \tBNXT_ULP_HF20_BITMASK_OI_VLAN_VID        = 0x0080000000000000,\n \tBNXT_ULP_HF20_BITMASK_OI_VLAN_TYPE       = 0x0040000000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_IPV6_VER         = 0x0020000000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_IPV6_TC          = 0x0010000000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_IPV6_FLOW_LABEL  = 0x0008000000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0004000000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_IPV6_PROTO_ID    = 0x0002000000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_IPV6_TTL         = 0x0001000000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_IPV6_SRC_ADDR    = 0x0000800000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_IPV6_DST_ADDR    = 0x0000400000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_UDP_SRC_PORT     = 0x0000200000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_UDP_DST_PORT     = 0x0000100000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_UDP_LENGTH       = 0x0000080000000000,\n-\tBNXT_ULP_HF20_BITMASK_O_UDP_CSUM         = 0x0000040000000000\n+\tBNXT_ULP_HF20_BITMASK_O_IPV4_VER         = 0x0020000000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_IPV4_TOS         = 0x0010000000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_IPV4_LEN         = 0x0008000000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_IPV4_FRAG_ID     = 0x0004000000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_IPV4_FRAG_OFF    = 0x0002000000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_IPV4_TTL         = 0x0001000000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_IPV4_PROTO_ID    = 0x0000800000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_IPV4_CSUM        = 0x0000400000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_IPV4_SRC_ADDR    = 0x0000200000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_IPV4_DST_ADDR    = 0x0000100000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_UDP_SRC_PORT     = 0x0000080000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_UDP_DST_PORT     = 0x0000040000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_UDP_LENGTH       = 0x0000020000000000,\n+\tBNXT_ULP_HF20_BITMASK_O_UDP_CSUM         = 0x0000010000000000\n };\n \n enum bnxt_ulp_hf_bitmask21 {\n@@ -963,23 +1068,25 @@ enum bnxt_ulp_hf_bitmask21 {\n \tBNXT_ULP_HF21_BITMASK_OI_VLAN_CFI_PRI    = 0x0100000000000000,\n \tBNXT_ULP_HF21_BITMASK_OI_VLAN_VID        = 0x0080000000000000,\n \tBNXT_ULP_HF21_BITMASK_OI_VLAN_TYPE       = 0x0040000000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_IPV6_VER         = 0x0020000000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_IPV6_TC          = 0x0010000000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_IPV6_FLOW_LABEL  = 0x0008000000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0004000000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_IPV6_PROTO_ID    = 0x0002000000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_IPV6_TTL         = 0x0001000000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_IPV6_SRC_ADDR    = 0x0000800000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_IPV6_DST_ADDR    = 0x0000400000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_TCP_SRC_PORT     = 0x0000200000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_TCP_DST_PORT     = 0x0000100000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_TCP_SENT_SEQ     = 0x0000080000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_TCP_RECV_ACK     = 0x0000040000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_TCP_DATA_OFF     = 0x0000020000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_TCP_TCP_FLAGS    = 0x0000010000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_TCP_RX_WIN       = 0x0000008000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_TCP_CSUM         = 0x0000004000000000,\n-\tBNXT_ULP_HF21_BITMASK_O_TCP_URP          = 0x0000002000000000\n+\tBNXT_ULP_HF21_BITMASK_O_IPV4_VER         = 0x0020000000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_IPV4_TOS         = 0x0010000000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_IPV4_LEN         = 0x0008000000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_IPV4_FRAG_ID     = 0x0004000000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_IPV4_FRAG_OFF    = 0x0002000000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_IPV4_TTL         = 0x0001000000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_IPV4_PROTO_ID    = 0x0000800000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_IPV4_CSUM        = 0x0000400000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_IPV4_SRC_ADDR    = 0x0000200000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_IPV4_DST_ADDR    = 0x0000100000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_TCP_SRC_PORT     = 0x0000080000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_TCP_DST_PORT     = 0x0000040000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_TCP_SENT_SEQ     = 0x0000020000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_TCP_RECV_ACK     = 0x0000010000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_TCP_DATA_OFF     = 0x0000008000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_TCP_TCP_FLAGS    = 0x0000004000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_TCP_RX_WIN       = 0x0000002000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_TCP_CSUM         = 0x0000001000000000,\n+\tBNXT_ULP_HF21_BITMASK_O_TCP_URP          = 0x0000000800000000\n };\n \n enum bnxt_ulp_hf_bitmask22 {\n@@ -993,16 +1100,18 @@ enum bnxt_ulp_hf_bitmask22 {\n \tBNXT_ULP_HF22_BITMASK_OI_VLAN_CFI_PRI    = 0x0100000000000000,\n \tBNXT_ULP_HF22_BITMASK_OI_VLAN_VID        = 0x0080000000000000,\n \tBNXT_ULP_HF22_BITMASK_OI_VLAN_TYPE       = 0x0040000000000000,\n-\tBNXT_ULP_HF22_BITMASK_O_IPV4_VER         = 0x0020000000000000,\n-\tBNXT_ULP_HF22_BITMASK_O_IPV4_TOS         = 0x0010000000000000,\n-\tBNXT_ULP_HF22_BITMASK_O_IPV4_LEN         = 0x0008000000000000,\n-\tBNXT_ULP_HF22_BITMASK_O_IPV4_FRAG_ID     = 0x0004000000000000,\n-\tBNXT_ULP_HF22_BITMASK_O_IPV4_FRAG_OFF    = 0x0002000000000000,\n-\tBNXT_ULP_HF22_BITMASK_O_IPV4_TTL         = 0x0001000000000000,\n-\tBNXT_ULP_HF22_BITMASK_O_IPV4_PROTO_ID    = 0x0000800000000000,\n-\tBNXT_ULP_HF22_BITMASK_O_IPV4_CSUM        = 0x0000400000000000,\n-\tBNXT_ULP_HF22_BITMASK_O_IPV4_SRC_ADDR    = 0x0000200000000000,\n-\tBNXT_ULP_HF22_BITMASK_O_IPV4_DST_ADDR    = 0x0000100000000000\n+\tBNXT_ULP_HF22_BITMASK_O_IPV6_VER         = 0x0020000000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_IPV6_TC          = 0x0010000000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_IPV6_FLOW_LABEL  = 0x0008000000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0004000000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_IPV6_PROTO_ID    = 0x0002000000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_IPV6_TTL         = 0x0001000000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_IPV6_SRC_ADDR    = 0x0000800000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_IPV6_DST_ADDR    = 0x0000400000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_UDP_SRC_PORT     = 0x0000200000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_UDP_DST_PORT     = 0x0000100000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_UDP_LENGTH       = 0x0000080000000000,\n+\tBNXT_ULP_HF22_BITMASK_O_UDP_CSUM         = 0x0000040000000000\n };\n \n enum bnxt_ulp_hf_bitmask23 {\n@@ -1023,6 +1132,60 @@ enum bnxt_ulp_hf_bitmask23 {\n \tBNXT_ULP_HF23_BITMASK_O_IPV6_PROTO_ID    = 0x0002000000000000,\n \tBNXT_ULP_HF23_BITMASK_O_IPV6_TTL         = 0x0001000000000000,\n \tBNXT_ULP_HF23_BITMASK_O_IPV6_SRC_ADDR    = 0x0000800000000000,\n-\tBNXT_ULP_HF23_BITMASK_O_IPV6_DST_ADDR    = 0x0000400000000000\n+\tBNXT_ULP_HF23_BITMASK_O_IPV6_DST_ADDR    = 0x0000400000000000,\n+\tBNXT_ULP_HF23_BITMASK_O_TCP_SRC_PORT     = 0x0000200000000000,\n+\tBNXT_ULP_HF23_BITMASK_O_TCP_DST_PORT     = 0x0000100000000000,\n+\tBNXT_ULP_HF23_BITMASK_O_TCP_SENT_SEQ     = 0x0000080000000000,\n+\tBNXT_ULP_HF23_BITMASK_O_TCP_RECV_ACK     = 0x0000040000000000,\n+\tBNXT_ULP_HF23_BITMASK_O_TCP_DATA_OFF     = 0x0000020000000000,\n+\tBNXT_ULP_HF23_BITMASK_O_TCP_TCP_FLAGS    = 0x0000010000000000,\n+\tBNXT_ULP_HF23_BITMASK_O_TCP_RX_WIN       = 0x0000008000000000,\n+\tBNXT_ULP_HF23_BITMASK_O_TCP_CSUM         = 0x0000004000000000,\n+\tBNXT_ULP_HF23_BITMASK_O_TCP_URP          = 0x0000002000000000\n };\n+\n+enum bnxt_ulp_hf_bitmask24 {\n+\tBNXT_ULP_HF24_BITMASK_SVIF_INDEX         = 0x8000000000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_ETH_DMAC         = 0x4000000000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_ETH_SMAC         = 0x2000000000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_ETH_TYPE         = 0x1000000000000000,\n+\tBNXT_ULP_HF24_BITMASK_OO_VLAN_CFI_PRI    = 0x0800000000000000,\n+\tBNXT_ULP_HF24_BITMASK_OO_VLAN_VID        = 0x0400000000000000,\n+\tBNXT_ULP_HF24_BITMASK_OO_VLAN_TYPE       = 0x0200000000000000,\n+\tBNXT_ULP_HF24_BITMASK_OI_VLAN_CFI_PRI    = 0x0100000000000000,\n+\tBNXT_ULP_HF24_BITMASK_OI_VLAN_VID        = 0x0080000000000000,\n+\tBNXT_ULP_HF24_BITMASK_OI_VLAN_TYPE       = 0x0040000000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_IPV4_VER         = 0x0020000000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_IPV4_TOS         = 0x0010000000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_IPV4_LEN         = 0x0008000000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_IPV4_FRAG_ID     = 0x0004000000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_IPV4_FRAG_OFF    = 0x0002000000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_IPV4_TTL         = 0x0001000000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_IPV4_PROTO_ID    = 0x0000800000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_IPV4_CSUM        = 0x0000400000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_IPV4_SRC_ADDR    = 0x0000200000000000,\n+\tBNXT_ULP_HF24_BITMASK_O_IPV4_DST_ADDR    = 0x0000100000000000\n+};\n+\n+enum bnxt_ulp_hf_bitmask25 {\n+\tBNXT_ULP_HF25_BITMASK_SVIF_INDEX         = 0x8000000000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_ETH_DMAC         = 0x4000000000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_ETH_SMAC         = 0x2000000000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_ETH_TYPE         = 0x1000000000000000,\n+\tBNXT_ULP_HF25_BITMASK_OO_VLAN_CFI_PRI    = 0x0800000000000000,\n+\tBNXT_ULP_HF25_BITMASK_OO_VLAN_VID        = 0x0400000000000000,\n+\tBNXT_ULP_HF25_BITMASK_OO_VLAN_TYPE       = 0x0200000000000000,\n+\tBNXT_ULP_HF25_BITMASK_OI_VLAN_CFI_PRI    = 0x0100000000000000,\n+\tBNXT_ULP_HF25_BITMASK_OI_VLAN_VID        = 0x0080000000000000,\n+\tBNXT_ULP_HF25_BITMASK_OI_VLAN_TYPE       = 0x0040000000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_IPV6_VER         = 0x0020000000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_IPV6_TC          = 0x0010000000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_IPV6_FLOW_LABEL  = 0x0008000000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0004000000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_IPV6_PROTO_ID    = 0x0002000000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_IPV6_TTL         = 0x0001000000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_IPV6_SRC_ADDR    = 0x0000800000000000,\n+\tBNXT_ULP_HF25_BITMASK_O_IPV6_DST_ADDR    = 0x0000400000000000\n+};\n+\n #endif\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c\nindex 2237ffb942..7a4d492850 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c\n@@ -55,9 +55,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -72,9 +72,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 32,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -89,9 +89,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 32,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -105,9 +105,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 12,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_GLOBAL,\n-\t.index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -121,9 +121,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -137,9 +137,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -154,9 +154,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -170,9 +170,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -186,9 +186,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -203,9 +203,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -219,9 +219,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -235,9 +235,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -252,9 +252,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -269,9 +269,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 3,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -286,9 +286,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 3,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -301,9 +301,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 12,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -317,9 +317,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 12,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -333,9 +333,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -350,9 +350,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -367,9 +367,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 32,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -384,9 +384,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 32,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -400,9 +400,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 12,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_GLOBAL,\n-\t.index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -416,9 +416,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -432,9 +432,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 11,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -449,9 +449,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -467,9 +467,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 12,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -483,9 +483,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -501,9 +501,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -519,9 +519,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 11,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t}\n };\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c\nindex 62b940daa4..346e15581d 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c\n@@ -96,33 +96,43 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_class_tmpl_list[] = {\n \t},\n \t[18] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,\n-\t.num_tbls = 6,\n+\t.num_tbls = 5,\n \t.start_tbl_idx = 92\n \t},\n \t[19] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,\n-\t.num_tbls = 6,\n-\t.start_tbl_idx = 98\n+\t.num_tbls = 5,\n+\t.start_tbl_idx = 97\n \t},\n \t[20] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,\n \t.num_tbls = 6,\n-\t.start_tbl_idx = 104\n+\t.start_tbl_idx = 102\n \t},\n \t[21] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,\n \t.num_tbls = 6,\n-\t.start_tbl_idx = 110\n+\t.start_tbl_idx = 108\n \t},\n \t[22] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,\n-\t.num_tbls = 5,\n-\t.start_tbl_idx = 116\n+\t.num_tbls = 6,\n+\t.start_tbl_idx = 114\n \t},\n \t[23] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,\n+\t.num_tbls = 6,\n+\t.start_tbl_idx = 120\n+\t},\n+\t[24] = {\n+\t.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,\n+\t.num_tbls = 5,\n+\t.start_tbl_idx = 126\n+\t},\n+\t[25] = {\n+\t.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,\n \t.num_tbls = 5,\n-\t.start_tbl_idx = 121\n+\t.start_tbl_idx = 131\n \t}\n };\n \n@@ -133,6 +143,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\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@@ -162,8 +173,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 1,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -216,6 +227,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION,\n \t.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 43,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n@@ -230,8 +242,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD_IS_SET,\n \t.cond_operand = BNXT_ULP_CF_IDX_VFR_MODE,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 14,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -270,8 +282,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD_NOT_SET,\n \t.cond_operand = BNXT_ULP_CF_IDX_VFR_MODE,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 28,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -324,6 +336,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,\n \t.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 99,\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n@@ -338,6 +351,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION,\n \t.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 111,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n@@ -367,8 +381,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 42,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -388,6 +402,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\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 = 150,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n@@ -400,8 +415,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 55,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -419,8 +434,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 68,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -455,8 +470,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 82,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -509,6 +524,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\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 = 219,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n@@ -521,8 +537,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 95,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -542,6 +558,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION,\n \t.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 258,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n@@ -554,8 +571,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 108,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -590,8 +607,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_1,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_1,\n \t.key_start_idx = 124,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -645,8 +662,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 189,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -681,8 +698,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_1,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_1,\n \t.key_start_idx = 205,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -753,8 +770,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 271,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -789,8 +806,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 287,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -861,8 +878,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 353,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -897,8 +914,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 369,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -969,8 +986,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 435,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -1005,8 +1022,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 451,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1077,8 +1094,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 517,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -1113,8 +1130,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 533,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1168,8 +1185,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 598,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -1204,8 +1221,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 614,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1259,8 +1276,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 679,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -1295,8 +1312,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 695,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1350,8 +1367,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 760,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -1386,8 +1403,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 776,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1441,8 +1458,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 841,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -1477,8 +1494,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 857,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1532,8 +1549,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 922,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -1568,8 +1585,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 938,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1623,8 +1640,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 1003,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n@@ -1659,8 +1676,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 1019,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1711,29 +1728,29 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n \t},\n \t{\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n \t.resource_sub_type =\n-\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n-\t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1084,\n-\t.blob_key_bit_size = 12,\n-\t.key_bit_size = 12,\n-\t.key_num_fields = 1,\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT_ACC,\n+\t.cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,\n+\t.cond_operand = BNXT_ULP_ACTION_BIT_COUNT,\n+\t.direction = TF_DIR_RX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 768,\n-\t.result_bit_size = 10,\n+\t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 27,\n-\t.ident_nums = 1\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n+\t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\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_LOW,\n-\t.direction = TF_DIR_TX,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n+\t.direction = TF_DIR_RX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n \t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n-\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1085,\n+\t.key_start_idx = 1084,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n \t.key_num_fields = 13,\n@@ -1741,8 +1758,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 28,\n-\t.ident_nums = 0,\n+\t.ident_start_idx = 27,\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},\n@@ -1751,71 +1768,145 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n-\t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1098,\n+\t.direction = TF_DIR_RX,\n+\t.key_start_idx = 1097,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n \t.result_start_idx = 782,\n-\t.result_bit_size = 10,\n-\t.result_num_fields = 1,\n+\t.result_bit_size = 20,\n+\t.result_num_fields = 2,\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 28,\n-\t.ident_nums = 1\n+\t.ident_nums = 2\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.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.direction = TF_DIR_RX,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1101,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1100,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 783,\n+\t.result_start_idx = 784,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 29,\n+\t.ident_start_idx = 30,\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},\n \t{\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE,\n-\t.resource_type = TF_MEM_EXTERNAL,\n-\t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n-\t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1144,\n-\t.blob_key_bit_size = 448,\n-\t.key_bit_size = 448,\n-\t.key_num_fields = 11,\n-\t.result_start_idx = 791,\n-\t.result_bit_size = 64,\n-\t.result_num_fields = 9,\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n+\t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n+\t.direction = TF_DIR_RX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1143,\n+\t.blob_key_bit_size = 192,\n+\t.key_bit_size = 160,\n+\t.key_num_fields = 5,\n+\t.result_start_idx = 792,\n+\t.result_bit_size = 19,\n+\t.result_num_fields = 3,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 29,\n+\t.ident_start_idx = 30,\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},\n \t{\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n+\t.direction = TF_DIR_RX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1148,\n+\t.blob_key_bit_size = 171,\n+\t.key_bit_size = 171,\n+\t.key_num_fields = 13,\n+\t.result_start_idx = 795,\n+\t.result_bit_size = 64,\n+\t.result_num_fields = 13,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 30,\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},\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 =\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n+\t.direction = TF_DIR_RX,\n+\t.key_start_idx = 1161,\n+\t.blob_key_bit_size = 16,\n+\t.key_bit_size = 16,\n+\t.key_num_fields = 3,\n+\t.result_start_idx = 808,\n+\t.result_bit_size = 20,\n+\t.result_num_fields = 2,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 31,\n+\t.ident_nums = 2\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.direction = TF_DIR_RX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1164,\n+\t.blob_key_bit_size = 81,\n+\t.key_bit_size = 81,\n+\t.key_num_fields = 43,\n+\t.result_start_idx = 810,\n+\t.result_bit_size = 38,\n+\t.result_num_fields = 8,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 33,\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},\n+\t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE,\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n-\t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1155,\n-\t.blob_key_bit_size = 200,\n-\t.key_bit_size = 200,\n-\t.key_num_fields = 11,\n-\t.result_start_idx = 800,\n+\t.direction = TF_DIR_RX,\n+\t.key_start_idx = 1207,\n+\t.blob_key_bit_size = 112,\n+\t.key_bit_size = 112,\n+\t.key_num_fields = 8,\n+\t.result_start_idx = 818,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 29,\n+\t.ident_start_idx = 33,\n \t.ident_nums = 0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n+\t},\n+\t{\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE,\n+\t.resource_type = TF_MEM_EXTERNAL,\n+\t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n+\t.direction = TF_DIR_RX,\n+\t.key_start_idx = 1215,\n+\t.blob_key_bit_size = 448,\n+\t.key_bit_size = 448,\n+\t.key_num_fields = 8,\n+\t.result_start_idx = 827,\n+\t.result_bit_size = 64,\n+\t.result_num_fields = 9,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 33,\n+\t.ident_nums = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n \t},\n \t{\n@@ -1824,32 +1915,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1166,\n+\t.key_start_idx = 1223,\n \t.blob_key_bit_size = 12,\n \t.key_bit_size = 12,\n \t.key_num_fields = 1,\n-\t.result_start_idx = 809,\n+\t.result_start_idx = 836,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 29,\n+\t.ident_start_idx = 33,\n \t.ident_nums = 1\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_LOW,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1167,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1224,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n \t.key_num_fields = 13,\n-\t.result_start_idx = 810,\n+\t.result_start_idx = 837,\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 30,\n+\t.ident_start_idx = 34,\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@@ -1860,32 +1951,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1180,\n+\t.key_start_idx = 1237,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n-\t.result_start_idx = 823,\n+\t.result_start_idx = 850,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 30,\n+\t.ident_start_idx = 34,\n \t.ident_nums = 1\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.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1183,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1240,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 824,\n+\t.result_start_idx = 851,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 31,\n+\t.ident_start_idx = 35,\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@@ -1895,15 +1986,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_MEM_EXTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1226,\n+\t.key_start_idx = 1283,\n \t.blob_key_bit_size = 448,\n \t.key_bit_size = 448,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 832,\n+\t.result_start_idx = 859,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 31,\n+\t.ident_start_idx = 35,\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@@ -1913,15 +2004,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1237,\n+\t.key_start_idx = 1294,\n \t.blob_key_bit_size = 200,\n \t.key_bit_size = 200,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 841,\n+\t.result_start_idx = 868,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 31,\n+\t.ident_start_idx = 35,\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@@ -1932,32 +2023,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1248,\n+\t.key_start_idx = 1305,\n \t.blob_key_bit_size = 12,\n \t.key_bit_size = 12,\n \t.key_num_fields = 1,\n-\t.result_start_idx = 850,\n+\t.result_start_idx = 877,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 31,\n+\t.ident_start_idx = 35,\n \t.ident_nums = 1\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_LOW,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1249,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1306,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n \t.key_num_fields = 13,\n-\t.result_start_idx = 851,\n+\t.result_start_idx = 878,\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 32,\n+\t.ident_start_idx = 36,\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@@ -1968,32 +2059,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1262,\n+\t.key_start_idx = 1319,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n-\t.result_start_idx = 864,\n+\t.result_start_idx = 891,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 32,\n+\t.ident_start_idx = 36,\n \t.ident_nums = 1\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.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1265,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1322,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 865,\n+\t.result_start_idx = 892,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 33,\n+\t.ident_start_idx = 37,\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@@ -2003,15 +2094,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_MEM_EXTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1308,\n+\t.key_start_idx = 1365,\n \t.blob_key_bit_size = 448,\n \t.key_bit_size = 448,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 873,\n+\t.result_start_idx = 900,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 33,\n+\t.ident_start_idx = 37,\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@@ -2021,15 +2112,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1319,\n-\t.blob_key_bit_size = 392,\n-\t.key_bit_size = 392,\n+\t.key_start_idx = 1376,\n+\t.blob_key_bit_size = 200,\n+\t.key_bit_size = 200,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 882,\n+\t.result_start_idx = 909,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 33,\n+\t.ident_start_idx = 37,\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@@ -2040,32 +2131,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1330,\n+\t.key_start_idx = 1387,\n \t.blob_key_bit_size = 12,\n \t.key_bit_size = 12,\n \t.key_num_fields = 1,\n-\t.result_start_idx = 891,\n+\t.result_start_idx = 918,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 33,\n+\t.ident_start_idx = 37,\n \t.ident_nums = 1\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_LOW,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1331,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1388,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n \t.key_num_fields = 13,\n-\t.result_start_idx = 892,\n+\t.result_start_idx = 919,\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 34,\n+\t.ident_start_idx = 38,\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@@ -2076,32 +2167,140 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1344,\n+\t.key_start_idx = 1401,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n-\t.result_start_idx = 905,\n+\t.result_start_idx = 932,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 34,\n+\t.ident_start_idx = 38,\n \t.ident_nums = 1\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.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1404,\n+\t.blob_key_bit_size = 81,\n+\t.key_bit_size = 81,\n+\t.key_num_fields = 43,\n+\t.result_start_idx = 933,\n+\t.result_bit_size = 38,\n+\t.result_num_fields = 8,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 39,\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},\n+\t{\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE,\n+\t.resource_type = TF_MEM_EXTERNAL,\n+\t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n+\t.direction = TF_DIR_TX,\n+\t.key_start_idx = 1447,\n+\t.blob_key_bit_size = 448,\n+\t.key_bit_size = 448,\n+\t.key_num_fields = 11,\n+\t.result_start_idx = 941,\n+\t.result_bit_size = 64,\n+\t.result_num_fields = 9,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 39,\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},\n+\t{\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE,\n+\t.resource_type = TF_MEM_INTERNAL,\n+\t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n+\t.direction = TF_DIR_TX,\n+\t.key_start_idx = 1458,\n+\t.blob_key_bit_size = 392,\n+\t.key_bit_size = 392,\n+\t.key_num_fields = 11,\n+\t.result_start_idx = 950,\n+\t.result_bit_size = 64,\n+\t.result_num_fields = 9,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 39,\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},\n+\t{\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n+\t.resource_sub_type =\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n+\t.direction = TF_DIR_TX,\n+\t.key_start_idx = 1469,\n+\t.blob_key_bit_size = 12,\n+\t.key_bit_size = 12,\n+\t.key_num_fields = 1,\n+\t.result_start_idx = 959,\n+\t.result_bit_size = 10,\n+\t.result_num_fields = 1,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 39,\n+\t.ident_nums = 1\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_LOW,\n+\t.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1470,\n+\t.blob_key_bit_size = 171,\n+\t.key_bit_size = 171,\n+\t.key_num_fields = 13,\n+\t.result_start_idx = 960,\n+\t.result_bit_size = 64,\n+\t.result_num_fields = 13,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 40,\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},\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 =\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n+\t.direction = TF_DIR_TX,\n+\t.key_start_idx = 1483,\n+\t.blob_key_bit_size = 16,\n+\t.key_bit_size = 16,\n+\t.key_num_fields = 3,\n+\t.result_start_idx = 973,\n+\t.result_bit_size = 10,\n+\t.result_num_fields = 1,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 40,\n+\t.ident_nums = 1\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.direction = TF_DIR_TX,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1347,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1486,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 906,\n+\t.result_start_idx = 974,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 35,\n+\t.ident_start_idx = 41,\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@@ -2111,15 +2310,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_MEM_EXTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1390,\n+\t.key_start_idx = 1529,\n \t.blob_key_bit_size = 448,\n \t.key_bit_size = 448,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 914,\n+\t.result_start_idx = 982,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 35,\n+\t.ident_start_idx = 41,\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@@ -2129,15 +2328,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1401,\n+\t.key_start_idx = 1540,\n \t.blob_key_bit_size = 392,\n \t.key_bit_size = 392,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 923,\n+\t.result_start_idx = 991,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 35,\n+\t.ident_start_idx = 41,\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@@ -2146,17 +2345,17 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_UPDATE,\n-\t.key_start_idx = 1412,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1551,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n \t.key_num_fields = 13,\n-\t.result_start_idx = 932,\n+\t.result_start_idx = 1000,\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 35,\n+\t.ident_start_idx = 41,\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@@ -2167,32 +2366,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1425,\n+\t.key_start_idx = 1564,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n-\t.result_start_idx = 945,\n+\t.result_start_idx = 1013,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 36,\n+\t.ident_start_idx = 42,\n \t.ident_nums = 1\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.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1428,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1567,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 946,\n+\t.result_start_idx = 1014,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 37,\n+\t.ident_start_idx = 43,\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@@ -2202,15 +2401,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_MEM_EXTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1471,\n+\t.key_start_idx = 1610,\n \t.blob_key_bit_size = 448,\n \t.key_bit_size = 448,\n \t.key_num_fields = 7,\n-\t.result_start_idx = 954,\n+\t.result_start_idx = 1022,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 37,\n+\t.ident_start_idx = 43,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n@@ -2220,15 +2419,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1478,\n+\t.key_start_idx = 1617,\n \t.blob_key_bit_size = 104,\n \t.key_bit_size = 104,\n \t.key_num_fields = 7,\n-\t.result_start_idx = 963,\n+\t.result_start_idx = 1031,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 37,\n+\t.ident_start_idx = 43,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n@@ -2237,17 +2436,17 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_UPDATE,\n-\t.key_start_idx = 1485,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1624,\n \t.blob_key_bit_size = 171,\n \t.key_bit_size = 171,\n \t.key_num_fields = 13,\n-\t.result_start_idx = 972,\n+\t.result_start_idx = 1040,\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 37,\n+\t.ident_start_idx = 43,\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@@ -2258,32 +2457,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1498,\n+\t.key_start_idx = 1637,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n-\t.result_start_idx = 985,\n+\t.result_start_idx = 1053,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 38,\n+\t.ident_start_idx = 44,\n \t.ident_nums = 1\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.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1501,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1640,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 986,\n+\t.result_start_idx = 1054,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 39,\n+\t.ident_start_idx = 45,\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@@ -2293,15 +2492,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_MEM_EXTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1544,\n+\t.key_start_idx = 1683,\n \t.blob_key_bit_size = 448,\n \t.key_bit_size = 448,\n \t.key_num_fields = 7,\n-\t.result_start_idx = 994,\n+\t.result_start_idx = 1062,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 39,\n+\t.ident_start_idx = 45,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n@@ -2311,15 +2510,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1551,\n+\t.key_start_idx = 1690,\n \t.blob_key_bit_size = 104,\n \t.key_bit_size = 104,\n \t.key_num_fields = 7,\n-\t.result_start_idx = 1003,\n+\t.result_start_idx = 1071,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 39,\n+\t.ident_start_idx = 45,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n@@ -9156,68 +9355,1047 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.spec_operand = {\n+\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 32,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF16_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF16_IDX_O_IPV4_DST_ADDR & 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 = 32,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 24,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\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_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_O_ETH_DMAC & 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 = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.mask_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_SVIF_INDEX & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_SVIF_INDEX & 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 = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.mask_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_OO_VLAN_VID & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_OO_VLAN_VID & 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 = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_COMP_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_CF_IDX_O_VTAG_NUM >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_VTAG_NUM & 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 = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 7,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_CLASS_TID >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_CLASS_TID & 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 = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TUN_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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 = {\n+\t\tBNXT_ULP_SYM_TL4_HDR_TYPE_UDP,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL4_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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 = {\n+\t\tBNXT_ULP_SYM_TL3_HDR_TYPE_IPV6,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL3_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL2_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 9,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 7,\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_GLB_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 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 = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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+\t},\n+\t{\n+\t.field_bit_size = 59,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.spec_operand = {\n+\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 128,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR & 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 = 128,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 24,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.spec_operand = {\n+\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 128,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR & 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 = 128,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 24,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\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_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF18_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF18_IDX_O_ETH_DMAC & 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 = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.mask_operand = {\n+\t\t(BNXT_ULP_HF18_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF18_IDX_SVIF_INDEX & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF18_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF18_IDX_SVIF_INDEX & 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 = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 7,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TUN_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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 = {\n+\t\tBNXT_ULP_SYM_TL4_HDR_TYPE_UDP,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL4_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL3_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL2_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 9,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 7,\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_GLB_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 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 = 3,\n+\t.field_bit_size = 1,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.field_bit_size = 2,\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_ZERO\n \t},\n \t{\n-\t.field_bit_size = 16,\n+\t.field_bit_size = 2,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 16,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.field_bit_size = 2,\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_ZERO\n \t},\n \t{\n-\t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.field_bit_size = 1,\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 = {\n-\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.spec_operand = {0x01, 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 = 32,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.field_bit_size = 8,\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_REGFILE,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF16_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF16_IDX_O_IPV4_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 & 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 = 32,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 24,\n+\t.field_bit_size = 10,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 10,\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_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n@@ -9226,14 +10404,16 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n-\t.field_bit_size = 8,\n+\t.field_bit_size = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 128,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n-\t.spec_operand = {\n-\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 12,\n@@ -9252,8 +10432,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_O_ETH_DMAC & 0xff,\n+\t\t(BNXT_ULP_HF19_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_O_ETH_DMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -9261,31 +10441,26 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF19_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF19_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_SVIF_INDEX & 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 = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n-\t.mask_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_OO_VLAN_VID & 0xff,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n-\t.spec_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_OO_VLAN_VID & 0xff,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 12,\n@@ -9307,12 +10482,7 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\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_COMP_FIELD,\n-\t.spec_operand = {\n-\t\t(BNXT_ULP_CF_IDX_O_VTAG_NUM >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_O_VTAG_NUM & 0xff,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 4,\n@@ -9327,11 +10497,6 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n \t.field_bit_size = 1,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n@@ -9358,12 +10523,7 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t{\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n-\t.spec_operand = {\n-\t\t(BNXT_ULP_REGFILE_INDEX_CLASS_TID >> 8) & 0xff,\n-\t\tBNXT_ULP_REGFILE_INDEX_CLASS_TID & 0xff,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 1,\n@@ -9529,11 +10689,7 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\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 = {\n-\t\tBNXT_ULP_SYM_TL3_HDR_TYPE_IPV6,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 1,\n@@ -9644,56 +10800,42 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n-\t.field_bit_size = 59,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n \t.field_bit_size = 3,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 16,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 16,\n+\t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 8,\n+\t.field_bit_size = 48,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n+\t\t(BNXT_ULP_HF19_IDX_I_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_I_ETH_DMAC & 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},\n \t{\n-\t.field_bit_size = 128,\n+\t.field_bit_size = 24,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF19_IDX_T_VXLAN_VNI >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_T_VXLAN_VNI & 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 = 128,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 48,\n+\t.field_bit_size = 3,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 24,\n+\t.field_bit_size = 4,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n@@ -9718,56 +10860,42 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n-\t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 16,\n+\t.field_bit_size = 339,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 16,\n+\t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 8,\n+\t.field_bit_size = 48,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n+\t\t(BNXT_ULP_HF19_IDX_I_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_I_ETH_DMAC & 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},\n \t{\n-\t.field_bit_size = 128,\n+\t.field_bit_size = 24,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF19_IDX_T_VXLAN_VNI >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_T_VXLAN_VNI & 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 = 128,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 48,\n+\t.field_bit_size = 3,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 24,\n+\t.field_bit_size = 4,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n@@ -9796,8 +10924,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -9820,14 +10948,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10190,8 +11318,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_UDP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_UDP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10200,8 +11328,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_UDP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_UDP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10219,8 +11347,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_IPV4_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_IPV4_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10229,8 +11357,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_IPV4_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_IPV4_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10279,8 +11407,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_UDP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_UDP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10289,8 +11417,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_UDP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_UDP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10308,8 +11436,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_IPV4_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_IPV4_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10318,8 +11446,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_IPV4_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_IPV4_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10358,8 +11486,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10382,14 +11510,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10748,8 +11876,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_TCP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_TCP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10758,8 +11886,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_TCP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_TCP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10777,8 +11905,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_IPV4_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_IPV4_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10787,8 +11915,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_IPV4_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_IPV4_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10837,8 +11965,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_TCP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_TCP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10847,8 +11975,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_TCP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_TCP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10866,8 +11994,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_IPV4_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_IPV4_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10876,8 +12004,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_IPV4_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_IPV4_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10916,8 +12044,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10940,14 +12068,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11314,8 +12442,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_UDP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_UDP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11324,8 +12452,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_UDP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_UDP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11343,8 +12471,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_IPV6_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11353,8 +12481,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_IPV6_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_IPV6_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11403,8 +12531,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_UDP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_UDP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11413,8 +12541,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_UDP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_UDP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11432,8 +12560,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_IPV6_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11442,8 +12570,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_IPV6_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_IPV6_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11481,9 +12609,9 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n-\t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF23_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11506,14 +12634,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11876,8 +13004,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_TCP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_TCP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11886,8 +13014,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_TCP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_TCP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11905,8 +13033,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_IPV6_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11915,8 +13043,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_IPV6_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_IPV6_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11965,8 +13093,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_TCP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_TCP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11975,8 +13103,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_TCP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_TCP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11994,8 +13122,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_IPV6_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12004,8 +13132,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_IPV6_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_IPV6_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12043,14 +13171,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_OO_VLAN_VID & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_OO_VLAN_VID & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_OO_VLAN_VID & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_OO_VLAN_VID & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12063,14 +13191,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 48,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_O_ETH_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_O_ETH_SMAC & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_O_ETH_SMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_O_ETH_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_O_ETH_SMAC & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_O_ETH_SMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12078,14 +13206,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12465,8 +13593,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_O_ETH_DMAC & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_O_ETH_DMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12515,8 +13643,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_O_ETH_DMAC & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_O_ETH_DMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12544,14 +13672,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_OO_VLAN_VID & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_OO_VLAN_VID & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_OO_VLAN_VID & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_OO_VLAN_VID & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12564,14 +13692,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 48,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_O_ETH_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_O_ETH_SMAC & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_O_ETH_SMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_O_ETH_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_O_ETH_SMAC & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_O_ETH_SMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12579,14 +13707,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12970,8 +14098,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_O_ETH_DMAC & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_O_ETH_DMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -13020,8 +14148,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_O_ETH_DMAC & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_O_ETH_DMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -15685,7 +16813,239 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t{\n \t.field_bit_size = 5,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {0x19, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t.result_operand = {0x19, 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 = 8,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 33,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(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+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 5,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x02, 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 = 9,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 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 = 11,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x03, 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 33,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(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+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 5,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x02, 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 = 9,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 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 = 11,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x03, 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 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 = 7,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_L2_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_L2_PROF_FUNC_ID & 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_PHY_PORT_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,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 6,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 4,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {\n+\t\t(0x00f9 >> 8) & 0xff,\n+\t\t0x00f9 & 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 = 5,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x15, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n@@ -15736,8 +17096,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x00c5 >> 8) & 0xff,\n+\t\t0x00c5 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -15790,8 +17150,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x00c5 >> 8) & 0xff,\n+\t\t0x00c5 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16149,7 +17509,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t{\n \t.field_bit_size = 5,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {0x15, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t.result_operand = {0x19, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n@@ -16200,8 +17560,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x00c5 >> 8) & 0xff,\n-\t\t0x00c5 & 0xff,\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16254,8 +17614,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x00c5 >> 8) & 0xff,\n-\t\t0x00c5 & 0xff,\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16524,8 +17884,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 7,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.result_operand = {\n-\t\t(BNXT_ULP_GLB_REGFILE_INDEX_L2_PROF_FUNC_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_REGFILE_INDEX_L2_PROF_FUNC_ID & 0xff,\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16605,15 +17965,15 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 10,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x00f9 >> 8) & 0xff,\n-\t\t0x00f9 & 0xff,\n+\t\t(0x0031 >> 8) & 0xff,\n+\t\t0x0031 & 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 = 5,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {0x19, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t.result_operand = {0x14, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n@@ -16664,8 +18024,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x00c5 >> 8) & 0xff,\n+\t\t0x00c5 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16718,8 +18078,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x00c5 >> 8) & 0xff,\n+\t\t0x00c5 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16845,7 +18205,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t{\n \t.field_bit_size = 5,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {0x14, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t.result_operand = {0x18, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n@@ -16896,8 +18256,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x00c5 >> 8) & 0xff,\n-\t\t0x00c5 & 0xff,\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16950,8 +18310,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x00c5 >> 8) & 0xff,\n-\t\t0x00c5 & 0xff,\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16976,6 +18336,10 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n+\t.field_bit_size = 64,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n \t.field_bit_size = 10,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n@@ -17054,30 +18418,46 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n+\t.field_bit_size = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 & 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 = 4,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 & 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 = 1,\n-\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 10,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0031 >> 8) & 0xff,\n-\t\t0x0031 & 0xff,\n+\t\t(0x001b >> 8) & 0xff,\n+\t\t0x001b & 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 = 5,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {0x18, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t.result_operand = {0x08, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n@@ -17100,6 +18480,146 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n+\t.field_bit_size = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x03, 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 = 16,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(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+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 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 = 7,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_PHY_PORT_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,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 6,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 & 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 = 4,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 5,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n \t.field_bit_size = 33,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n@@ -17128,8 +18648,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x006d >> 8) & 0xff,\n+\t\t0x006d & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -17182,8 +18702,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[]\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x006d >> 8) & 0xff,\n+\t\t0x006d & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -18933,6 +20453,48 @@ struct bnxt_ulp_mapper_ident_info ulp_stingray_class_ident_list[] = {\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_idx = BNXT_ULP_REGFILE_INDEX_WC_PROFILE_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_L2_CTXT_HIGH,\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_idx = BNXT_ULP_REGFILE_INDEX_EM_PROFILE_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_idx = BNXT_ULP_REGFILE_INDEX_WC_PROFILE_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_L2_CTXT_HIGH,\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_idx = BNXT_ULP_REGFILE_INDEX_EM_PROFILE_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_L2_CTXT_HIGH,\n \t.regfile_idx = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0,\n \t.ident_bit_size = 10,\n@@ -19002,4 +20564,3 @@ struct bnxt_ulp_mapper_ident_info ulp_stingray_class_ident_list[] = {\n \t.ident_bit_pos = 0\n \t}\n };\n-\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c\nindex 7f5a316804..c5f340d7bb 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c\n@@ -90,6 +90,8 @@ uint32_t ulp_act_prop_map_table[] = {\n \t\tBNXT_ULP_ACT_PROP_SZ_ENCAP_UDP,\n \t[BNXT_ULP_ACT_PROP_IDX_ENCAP_TUN] =\n \t\tBNXT_ULP_ACT_PROP_SZ_ENCAP_TUN,\n+\t[BNXT_ULP_ACT_PROP_IDX_JUMP] =\n+\t\tBNXT_ULP_ACT_PROP_SZ_JUMP,\n \t[BNXT_ULP_ACT_PROP_IDX_LAST] =\n \t\tBNXT_ULP_ACT_PROP_SZ_LAST\n };\n@@ -108,8 +110,8 @@ struct bnxt_ulp_rte_act_info ulp_act_info[] = {\n \t.proto_act_func          = NULL\n \t},\n \t[RTE_FLOW_ACTION_TYPE_JUMP] = {\n-\t.act_type                = BNXT_ULP_ACT_TYPE_NOT_SUPPORTED,\n-\t.proto_act_func          = NULL\n+\t.act_type                = BNXT_ULP_ACT_TYPE_SUPPORTED,\n+\t.proto_act_func          = ulp_rte_jump_act_handler\n \t},\n \t[RTE_FLOW_ACTION_TYPE_MARK] = {\n \t.act_type                = BNXT_ULP_ACT_TYPE_SUPPORTED,\n@@ -369,6 +371,7 @@ struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {\n \t.mark_db_lfid_entries    = 65536,\n \t.mark_db_gfid_entries    = 65536,\n \t.flow_count_db_entries   = 16384,\n+\t.fdb_parent_flow_entries = 2,\n \t.num_resources_per_flow  = 8,\n \t.num_phy_ports           = 2,\n \t.ext_cntr_table_type     = 0,\n@@ -414,7 +417,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t[5] = {\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n-\t.glb_regfile_index = BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID,\n \t.direction               = TF_DIR_RX\n \t},\n \t[6] = {\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c\nindex 39e8ec40b7..33e758555f 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c\n@@ -55,9 +55,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -72,9 +72,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 32,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -89,9 +89,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 32,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -104,9 +104,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 12,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_GLOBAL,\n-\t.index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -120,9 +120,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -136,9 +136,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -153,9 +153,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -169,9 +169,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -185,9 +185,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -202,9 +202,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -218,9 +218,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -234,9 +234,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -251,9 +251,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -268,9 +268,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 3,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -285,9 +285,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 3,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_SP_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -300,9 +300,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 12,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -316,9 +316,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 12,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -332,9 +332,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -349,9 +349,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -366,9 +366,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 32,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_SRC_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -383,9 +383,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 32,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_MODIFY_IPV4_DST_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -399,9 +399,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 12,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_GLOBAL,\n-\t.index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_GLB_REGFILE_INDEX_ENCAP_MAC_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -415,9 +415,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -431,9 +431,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 11,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -448,9 +448,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -466,9 +466,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n \t.encap_num_fields = 12,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n-\t.index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_ENCAP_PTR_0\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -482,9 +482,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -500,9 +500,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n@@ -518,9 +518,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n \t.encap_num_fields = 11,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\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.index_operand = BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR\n \t}\n };\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c\nindex 470d91ce22..2270691571 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c\n@@ -96,33 +96,43 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_class_tmpl_list[] = {\n \t},\n \t[18] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.num_tbls = 6,\n+\t.num_tbls = 5,\n \t.start_tbl_idx = 92\n \t},\n \t[19] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.num_tbls = 6,\n-\t.start_tbl_idx = 98\n+\t.num_tbls = 5,\n+\t.start_tbl_idx = 97\n \t},\n \t[20] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.num_tbls = 6,\n-\t.start_tbl_idx = 104\n+\t.start_tbl_idx = 102\n \t},\n \t[21] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.num_tbls = 6,\n-\t.start_tbl_idx = 110\n+\t.start_tbl_idx = 108\n \t},\n \t[22] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.num_tbls = 5,\n-\t.start_tbl_idx = 116\n+\t.num_tbls = 6,\n+\t.start_tbl_idx = 114\n \t},\n \t[23] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.num_tbls = 6,\n+\t.start_tbl_idx = 120\n+\t},\n+\t[24] = {\n+\t.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.num_tbls = 5,\n+\t.start_tbl_idx = 126\n+\t},\n+\t[25] = {\n+\t.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.num_tbls = 5,\n-\t.start_tbl_idx = 121\n+\t.start_tbl_idx = 131\n \t}\n };\n \n@@ -133,6 +143,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\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@@ -162,8 +173,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 1,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -216,6 +227,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION,\n \t.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 43,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n@@ -230,8 +242,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD_IS_SET,\n \t.cond_operand = BNXT_ULP_CF_IDX_VFR_MODE,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 14,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -270,8 +282,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD_NOT_SET,\n \t.cond_operand = BNXT_ULP_CF_IDX_VFR_MODE,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 28,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -324,6 +336,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL,\n \t.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 99,\n \t.result_bit_size = 0,\n \t.result_num_fields = 0,\n@@ -338,6 +351,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION,\n \t.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 111,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n@@ -367,8 +381,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 42,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -388,6 +402,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\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 = 150,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n@@ -400,8 +415,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 55,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -419,8 +434,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 68,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -455,8 +470,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 82,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -509,6 +524,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\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 = 219,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n@@ -521,8 +537,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 95,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -542,6 +558,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_VFR_CFA_ACTION,\n \t.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 258,\n \t.result_bit_size = 128,\n \t.result_num_fields = 26,\n@@ -554,8 +571,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 108,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -590,8 +607,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_1,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_1,\n \t.key_start_idx = 124,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -645,8 +662,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 189,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -681,8 +698,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_1,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_1,\n \t.key_start_idx = 205,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -753,8 +770,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 271,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -789,8 +806,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 287,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -861,8 +878,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 353,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -897,8 +914,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 369,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -969,8 +986,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 435,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -1005,8 +1022,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 451,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1077,8 +1094,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 517,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -1113,8 +1130,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 533,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1168,8 +1185,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 598,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -1204,8 +1221,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 614,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1259,8 +1276,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 679,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -1295,8 +1312,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 695,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1350,8 +1367,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 760,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -1386,8 +1403,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 776,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1441,8 +1458,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 841,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -1477,8 +1494,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 857,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1532,8 +1549,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 922,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -1568,8 +1585,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 938,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1623,8 +1640,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_RX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 1003,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n@@ -1659,8 +1676,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_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+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.key_start_idx = 1019,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n@@ -1711,29 +1728,29 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n \t},\n \t{\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n \t.resource_sub_type =\n-\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n-\t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1084,\n-\t.blob_key_bit_size = 8,\n-\t.key_bit_size = 8,\n-\t.key_num_fields = 1,\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT_ACC,\n+\t.cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET,\n+\t.cond_operand = BNXT_ULP_ACTION_BIT_COUNT,\n+\t.direction = TF_DIR_RX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.result_start_idx = 768,\n-\t.result_bit_size = 10,\n+\t.result_bit_size = 64,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 27,\n-\t.ident_nums = 1\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n+\t.index_opcode = BNXT_ULP_INDEX_OPCODE_ALLOCATE,\n+\t.index_operand = BNXT_ULP_REGFILE_INDEX_FLOW_CNTR_PTR_0\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_LOW,\n-\t.direction = TF_DIR_TX,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n+\t.direction = TF_DIR_RX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n \t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n-\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1085,\n+\t.key_start_idx = 1084,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n \t.key_num_fields = 13,\n@@ -1741,8 +1758,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 28,\n-\t.ident_nums = 0,\n+\t.ident_start_idx = 27,\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},\n@@ -1751,71 +1768,145 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n-\t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1098,\n+\t.direction = TF_DIR_RX,\n+\t.key_start_idx = 1097,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n \t.result_start_idx = 782,\n-\t.result_bit_size = 10,\n-\t.result_num_fields = 1,\n+\t.result_bit_size = 20,\n+\t.result_num_fields = 2,\n \t.encap_num_fields = 0,\n \t.ident_start_idx = 28,\n-\t.ident_nums = 1\n+\t.ident_nums = 2\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.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.direction = TF_DIR_RX,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1101,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1100,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 783,\n+\t.result_start_idx = 784,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 29,\n+\t.ident_start_idx = 30,\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},\n \t{\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE,\n-\t.resource_type = TF_MEM_EXTERNAL,\n-\t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n-\t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1144,\n-\t.blob_key_bit_size = 448,\n-\t.key_bit_size = 448,\n-\t.key_num_fields = 11,\n-\t.result_start_idx = 791,\n-\t.result_bit_size = 64,\n-\t.result_num_fields = 9,\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n+\t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n+\t.direction = TF_DIR_RX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1143,\n+\t.blob_key_bit_size = 192,\n+\t.key_bit_size = 160,\n+\t.key_num_fields = 5,\n+\t.result_start_idx = 792,\n+\t.result_bit_size = 19,\n+\t.result_num_fields = 3,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 29,\n+\t.ident_start_idx = 30,\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},\n \t{\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n+\t.direction = TF_DIR_RX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_SKIP,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1148,\n+\t.blob_key_bit_size = 167,\n+\t.key_bit_size = 167,\n+\t.key_num_fields = 13,\n+\t.result_start_idx = 795,\n+\t.result_bit_size = 64,\n+\t.result_num_fields = 13,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 30,\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},\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 =\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n+\t.direction = TF_DIR_RX,\n+\t.key_start_idx = 1161,\n+\t.blob_key_bit_size = 16,\n+\t.key_bit_size = 16,\n+\t.key_num_fields = 3,\n+\t.result_start_idx = 808,\n+\t.result_bit_size = 20,\n+\t.result_num_fields = 2,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 31,\n+\t.ident_nums = 2\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.direction = TF_DIR_RX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1164,\n+\t.blob_key_bit_size = 81,\n+\t.key_bit_size = 81,\n+\t.key_num_fields = 43,\n+\t.result_start_idx = 810,\n+\t.result_bit_size = 38,\n+\t.result_num_fields = 8,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 33,\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},\n+\t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE,\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n-\t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1155,\n-\t.blob_key_bit_size = 200,\n-\t.key_bit_size = 200,\n-\t.key_num_fields = 11,\n-\t.result_start_idx = 800,\n+\t.direction = TF_DIR_RX,\n+\t.key_start_idx = 1207,\n+\t.blob_key_bit_size = 112,\n+\t.key_bit_size = 112,\n+\t.key_num_fields = 8,\n+\t.result_start_idx = 818,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 29,\n+\t.ident_start_idx = 33,\n \t.ident_nums = 0,\n-\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_SET_IF_MARK_ACTION,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n+\t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n+\t},\n+\t{\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE,\n+\t.resource_type = TF_MEM_EXTERNAL,\n+\t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n+\t.direction = TF_DIR_RX,\n+\t.key_start_idx = 1215,\n+\t.blob_key_bit_size = 448,\n+\t.key_bit_size = 448,\n+\t.key_num_fields = 8,\n+\t.result_start_idx = 827,\n+\t.result_bit_size = 64,\n+\t.result_num_fields = 9,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 33,\n+\t.ident_nums = 0,\n+\t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n \t},\n \t{\n@@ -1824,32 +1915,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1166,\n+\t.key_start_idx = 1223,\n \t.blob_key_bit_size = 8,\n \t.key_bit_size = 8,\n \t.key_num_fields = 1,\n-\t.result_start_idx = 809,\n+\t.result_start_idx = 836,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 29,\n+\t.ident_start_idx = 33,\n \t.ident_nums = 1\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_LOW,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1167,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1224,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n \t.key_num_fields = 13,\n-\t.result_start_idx = 810,\n+\t.result_start_idx = 837,\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 30,\n+\t.ident_start_idx = 34,\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@@ -1860,32 +1951,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1180,\n+\t.key_start_idx = 1237,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n-\t.result_start_idx = 823,\n+\t.result_start_idx = 850,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 30,\n+\t.ident_start_idx = 34,\n \t.ident_nums = 1\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.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1183,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1240,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 824,\n+\t.result_start_idx = 851,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 31,\n+\t.ident_start_idx = 35,\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@@ -1895,15 +1986,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_MEM_EXTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1226,\n+\t.key_start_idx = 1283,\n \t.blob_key_bit_size = 448,\n \t.key_bit_size = 448,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 832,\n+\t.result_start_idx = 859,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 31,\n+\t.ident_start_idx = 35,\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@@ -1913,15 +2004,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1237,\n+\t.key_start_idx = 1294,\n \t.blob_key_bit_size = 200,\n \t.key_bit_size = 200,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 841,\n+\t.result_start_idx = 868,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 31,\n+\t.ident_start_idx = 35,\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@@ -1932,32 +2023,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1248,\n+\t.key_start_idx = 1305,\n \t.blob_key_bit_size = 8,\n \t.key_bit_size = 8,\n \t.key_num_fields = 1,\n-\t.result_start_idx = 850,\n+\t.result_start_idx = 877,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 31,\n+\t.ident_start_idx = 35,\n \t.ident_nums = 1\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_LOW,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1249,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1306,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n \t.key_num_fields = 13,\n-\t.result_start_idx = 851,\n+\t.result_start_idx = 878,\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 32,\n+\t.ident_start_idx = 36,\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@@ -1968,32 +2059,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1262,\n+\t.key_start_idx = 1319,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n-\t.result_start_idx = 864,\n+\t.result_start_idx = 891,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 32,\n+\t.ident_start_idx = 36,\n \t.ident_nums = 1\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.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1265,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1322,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 865,\n+\t.result_start_idx = 892,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 33,\n+\t.ident_start_idx = 37,\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@@ -2003,15 +2094,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_MEM_EXTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1308,\n+\t.key_start_idx = 1365,\n \t.blob_key_bit_size = 448,\n \t.key_bit_size = 448,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 873,\n+\t.result_start_idx = 900,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 33,\n+\t.ident_start_idx = 37,\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@@ -2021,15 +2112,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1319,\n-\t.blob_key_bit_size = 392,\n-\t.key_bit_size = 392,\n+\t.key_start_idx = 1376,\n+\t.blob_key_bit_size = 200,\n+\t.key_bit_size = 200,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 882,\n+\t.result_start_idx = 909,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 33,\n+\t.ident_start_idx = 37,\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@@ -2040,32 +2131,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1330,\n+\t.key_start_idx = 1387,\n \t.blob_key_bit_size = 8,\n \t.key_bit_size = 8,\n \t.key_num_fields = 1,\n-\t.result_start_idx = 891,\n+\t.result_start_idx = 918,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 33,\n+\t.ident_start_idx = 37,\n \t.ident_nums = 1\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_LOW,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1331,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1388,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n \t.key_num_fields = 13,\n-\t.result_start_idx = 892,\n+\t.result_start_idx = 919,\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 34,\n+\t.ident_start_idx = 38,\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@@ -2076,32 +2167,140 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1344,\n+\t.key_start_idx = 1401,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n-\t.result_start_idx = 905,\n+\t.result_start_idx = 932,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 34,\n+\t.ident_start_idx = 38,\n \t.ident_nums = 1\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.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1404,\n+\t.blob_key_bit_size = 81,\n+\t.key_bit_size = 81,\n+\t.key_num_fields = 43,\n+\t.result_start_idx = 933,\n+\t.result_bit_size = 38,\n+\t.result_num_fields = 8,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 39,\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},\n+\t{\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_EXT_EM_TABLE,\n+\t.resource_type = TF_MEM_EXTERNAL,\n+\t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n+\t.direction = TF_DIR_TX,\n+\t.key_start_idx = 1447,\n+\t.blob_key_bit_size = 448,\n+\t.key_bit_size = 448,\n+\t.key_num_fields = 11,\n+\t.result_start_idx = 941,\n+\t.result_bit_size = 64,\n+\t.result_num_fields = 9,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 39,\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},\n+\t{\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INT_EM_TABLE,\n+\t.resource_type = TF_MEM_INTERNAL,\n+\t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n+\t.direction = TF_DIR_TX,\n+\t.key_start_idx = 1458,\n+\t.blob_key_bit_size = 392,\n+\t.key_bit_size = 392,\n+\t.key_num_fields = 11,\n+\t.result_start_idx = 950,\n+\t.result_bit_size = 64,\n+\t.result_num_fields = 9,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 39,\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},\n+\t{\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_CACHE_TABLE,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n+\t.resource_sub_type =\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n+\t.direction = TF_DIR_TX,\n+\t.key_start_idx = 1469,\n+\t.blob_key_bit_size = 8,\n+\t.key_bit_size = 8,\n+\t.key_num_fields = 1,\n+\t.result_start_idx = 959,\n+\t.result_bit_size = 10,\n+\t.result_num_fields = 1,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 39,\n+\t.ident_nums = 1\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_LOW,\n+\t.direction = TF_DIR_TX,\n+\t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n \t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1470,\n+\t.blob_key_bit_size = 167,\n+\t.key_bit_size = 167,\n+\t.key_num_fields = 13,\n+\t.result_start_idx = 960,\n+\t.result_bit_size = 64,\n+\t.result_num_fields = 13,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 40,\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},\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 =\n+\t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n+\t.direction = TF_DIR_TX,\n+\t.key_start_idx = 1483,\n+\t.blob_key_bit_size = 16,\n+\t.key_bit_size = 16,\n+\t.key_num_fields = 3,\n+\t.result_start_idx = 973,\n+\t.result_bit_size = 10,\n+\t.result_num_fields = 1,\n+\t.encap_num_fields = 0,\n+\t.ident_start_idx = 40,\n+\t.ident_nums = 1\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.direction = TF_DIR_TX,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1347,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1486,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 906,\n+\t.result_start_idx = 974,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 35,\n+\t.ident_start_idx = 41,\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@@ -2111,15 +2310,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_MEM_EXTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1390,\n+\t.key_start_idx = 1529,\n \t.blob_key_bit_size = 448,\n \t.key_bit_size = 448,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 914,\n+\t.result_start_idx = 982,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 35,\n+\t.ident_start_idx = 41,\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@@ -2129,15 +2328,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1401,\n+\t.key_start_idx = 1540,\n \t.blob_key_bit_size = 392,\n \t.key_bit_size = 392,\n \t.key_num_fields = 11,\n-\t.result_start_idx = 923,\n+\t.result_start_idx = 991,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 35,\n+\t.ident_start_idx = 41,\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@@ -2146,17 +2345,17 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_UPDATE,\n-\t.key_start_idx = 1412,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1551,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n \t.key_num_fields = 13,\n-\t.result_start_idx = 932,\n+\t.result_start_idx = 1000,\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 35,\n+\t.ident_start_idx = 41,\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@@ -2167,32 +2366,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1425,\n+\t.key_start_idx = 1564,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n-\t.result_start_idx = 945,\n+\t.result_start_idx = 1013,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 36,\n+\t.ident_start_idx = 42,\n \t.ident_nums = 1\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.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1428,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1567,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 946,\n+\t.result_start_idx = 1014,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 37,\n+\t.ident_start_idx = 43,\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@@ -2202,15 +2401,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_MEM_EXTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1471,\n+\t.key_start_idx = 1610,\n \t.blob_key_bit_size = 448,\n \t.key_bit_size = 448,\n \t.key_num_fields = 7,\n-\t.result_start_idx = 954,\n+\t.result_start_idx = 1022,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 37,\n+\t.ident_start_idx = 43,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n@@ -2220,15 +2419,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1478,\n+\t.key_start_idx = 1617,\n \t.blob_key_bit_size = 104,\n \t.key_bit_size = 104,\n \t.key_num_fields = 7,\n-\t.result_start_idx = 963,\n+\t.result_start_idx = 1031,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 37,\n+\t.ident_start_idx = 43,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n@@ -2237,17 +2436,17 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_SEARCH_IF_HIT_UPDATE,\n-\t.key_start_idx = 1485,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1624,\n \t.blob_key_bit_size = 167,\n \t.key_bit_size = 167,\n \t.key_num_fields = 13,\n-\t.result_start_idx = 972,\n+\t.result_start_idx = 1040,\n \t.result_bit_size = 64,\n \t.result_num_fields = 13,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 37,\n+\t.ident_start_idx = 43,\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@@ -2258,32 +2457,32 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_PROFILE_TCAM,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1498,\n+\t.key_start_idx = 1637,\n \t.blob_key_bit_size = 16,\n \t.key_bit_size = 16,\n \t.key_num_fields = 3,\n-\t.result_start_idx = 985,\n+\t.result_start_idx = 1053,\n \t.result_bit_size = 10,\n \t.result_num_fields = 1,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 38,\n+\t.ident_start_idx = 44,\n \t.ident_nums = 1\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.direction = TF_DIR_TX,\n-\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n \t.srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO,\n-\t.key_start_idx = 1501,\n+\t.priority = BNXT_ULP_PRIORITY_LEVEL_0,\n+\t.key_start_idx = 1640,\n \t.blob_key_bit_size = 81,\n \t.key_bit_size = 81,\n \t.key_num_fields = 43,\n-\t.result_start_idx = 986,\n+\t.result_start_idx = 1054,\n \t.result_bit_size = 38,\n \t.result_num_fields = 8,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 39,\n+\t.ident_start_idx = 45,\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@@ -2293,15 +2492,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_MEM_EXTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_EXT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1544,\n+\t.key_start_idx = 1683,\n \t.blob_key_bit_size = 448,\n \t.key_bit_size = 448,\n \t.key_num_fields = 7,\n-\t.result_start_idx = 994,\n+\t.result_start_idx = 1062,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 39,\n+\t.ident_start_idx = 45,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n@@ -2311,15 +2510,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t.resource_type = TF_MEM_INTERNAL,\n \t.mem_type_opcode = BNXT_ULP_MEM_TYPE_OPCODE_EXECUTE_IF_INT,\n \t.direction = TF_DIR_TX,\n-\t.key_start_idx = 1551,\n+\t.key_start_idx = 1690,\n \t.blob_key_bit_size = 104,\n \t.key_bit_size = 104,\n \t.key_num_fields = 7,\n-\t.result_start_idx = 1003,\n+\t.result_start_idx = 1071,\n \t.result_bit_size = 64,\n \t.result_num_fields = 9,\n \t.encap_num_fields = 0,\n-\t.ident_start_idx = 39,\n+\t.ident_start_idx = 45,\n \t.ident_nums = 0,\n \t.mark_db_opcode = BNXT_ULP_MARK_DB_OPCODE_NOP,\n \t.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES\n@@ -9152,72 +9351,1051 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n-\t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.field_bit_size = 8,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.spec_operand = {\n+\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 32,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF16_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF16_IDX_O_IPV4_DST_ADDR & 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 = 32,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 24,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\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_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_O_ETH_DMAC & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.mask_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_SVIF_INDEX & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_SVIF_INDEX & 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 = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.mask_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_OO_VLAN_VID & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_OO_VLAN_VID & 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 = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_COMP_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_CF_IDX_O_VTAG_NUM >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_VTAG_NUM & 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 = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 7,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_CLASS_TID >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_CLASS_TID & 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 = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TUN_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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 = {\n+\t\tBNXT_ULP_SYM_TL4_HDR_TYPE_UDP,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL4_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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 = {\n+\t\tBNXT_ULP_SYM_TL3_HDR_TYPE_IPV6,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL3_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL2_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 9,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 7,\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_GLB_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 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 = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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+\t},\n+\t{\n+\t.field_bit_size = 59,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.spec_operand = {\n+\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 128,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR & 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 = 128,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 24,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.spec_operand = {\n+\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 128,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR & 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 = 128,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 24,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\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_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF18_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF18_IDX_O_ETH_DMAC & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.mask_operand = {\n+\t\t(BNXT_ULP_HF18_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF18_IDX_SVIF_INDEX & 0xff,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF18_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF18_IDX_SVIF_INDEX & 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 = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 12,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 48,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 7,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 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,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TUN_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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 = {\n+\t\tBNXT_ULP_SYM_TL4_HDR_TYPE_UDP,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL4_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL3_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\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 = {\n+\t\tBNXT_ULP_SYM_TL2_HDR_VALID_YES,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 9,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 7,\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_GLB_REGFILE,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 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 = 3,\n+\t.field_bit_size = 1,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.field_bit_size = 2,\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_ZERO\n \t},\n \t{\n-\t.field_bit_size = 16,\n+\t.field_bit_size = 2,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 16,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.field_bit_size = 2,\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_ZERO\n \t},\n \t{\n-\t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.field_bit_size = 1,\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 = {\n-\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.spec_operand = {0x01, 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 = 32,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n+\t.field_bit_size = 8,\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_REGFILE,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF16_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF16_IDX_O_IPV4_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 & 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 = 32,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 24,\n+\t.field_bit_size = 10,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 10,\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_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n@@ -9226,14 +10404,16 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n-\t.field_bit_size = 8,\n+\t.field_bit_size = 4,\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_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 128,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n-\t.spec_operand = {\n-\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 12,\n@@ -9252,8 +10432,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_O_ETH_DMAC & 0xff,\n+\t\t(BNXT_ULP_HF19_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_O_ETH_DMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -9261,14 +10441,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF19_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF19_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -9279,18 +10459,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n-\t.mask_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_OO_VLAN_VID & 0xff,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n-\t.spec_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_OO_VLAN_VID & 0xff,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 12,\n@@ -9312,12 +10482,7 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\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_COMP_FIELD,\n-\t.spec_operand = {\n-\t\t(BNXT_ULP_CF_IDX_O_VTAG_NUM >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_O_VTAG_NUM & 0xff,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 4,\n@@ -9358,12 +10523,7 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t{\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n-\t.spec_operand = {\n-\t\t(BNXT_ULP_REGFILE_INDEX_CLASS_TID >> 8) & 0xff,\n-\t\tBNXT_ULP_REGFILE_INDEX_CLASS_TID & 0xff,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 1,\n@@ -9529,11 +10689,7 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\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 = {\n-\t\tBNXT_ULP_SYM_TL3_HDR_TYPE_IPV6,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 1,\n@@ -9644,56 +10800,42 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n-\t.field_bit_size = 59,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n \t.field_bit_size = 3,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 16,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 16,\n+\t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 8,\n+\t.field_bit_size = 48,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n+\t\t(BNXT_ULP_HF19_IDX_I_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_I_ETH_DMAC & 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},\n \t{\n-\t.field_bit_size = 128,\n+\t.field_bit_size = 24,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF19_IDX_T_VXLAN_VNI >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_T_VXLAN_VNI & 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 = 128,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 48,\n+\t.field_bit_size = 3,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 24,\n+\t.field_bit_size = 4,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n@@ -9718,56 +10860,42 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n-\t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 16,\n+\t.field_bit_size = 339,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 16,\n+\t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 8,\n+\t.field_bit_size = 48,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n+\t\t(BNXT_ULP_HF19_IDX_I_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_I_ETH_DMAC & 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},\n \t{\n-\t.field_bit_size = 128,\n+\t.field_bit_size = 24,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF17_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF19_IDX_T_VXLAN_VNI >> 8) & 0xff,\n+\t\tBNXT_ULP_HF19_IDX_T_VXLAN_VNI & 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 = 128,\n-\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n-\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n-\t},\n-\t{\n-\t.field_bit_size = 48,\n+\t.field_bit_size = 3,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n-\t.field_bit_size = 24,\n+\t.field_bit_size = 4,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n@@ -9796,8 +10924,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -9820,14 +10948,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10190,8 +11318,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_UDP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_UDP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10200,8 +11328,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_UDP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_UDP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10219,8 +11347,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_IPV4_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_IPV4_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10229,8 +11357,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_IPV4_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_IPV4_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10279,8 +11407,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_UDP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_UDP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10289,8 +11417,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_UDP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_UDP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10308,8 +11436,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_IPV4_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_IPV4_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10318,8 +11446,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF18_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF18_IDX_O_IPV4_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF20_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF20_IDX_O_IPV4_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10358,8 +11486,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10382,14 +11510,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10748,8 +11876,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_TCP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_TCP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10758,8 +11886,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_TCP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_TCP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10777,8 +11905,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_IPV4_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_IPV4_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10787,8 +11915,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_IPV4_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_IPV4_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10837,8 +11965,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_TCP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_TCP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10847,8 +11975,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_TCP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_TCP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10866,8 +11994,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_IPV4_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_IPV4_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10876,8 +12004,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF19_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF19_IDX_O_IPV4_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF21_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF21_IDX_O_IPV4_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10916,8 +12044,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -10940,14 +12068,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11314,8 +12442,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_UDP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_UDP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11324,8 +12452,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_UDP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_UDP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11343,8 +12471,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_IPV6_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11353,8 +12481,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_IPV6_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_IPV6_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11403,8 +12531,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_UDP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_UDP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11413,8 +12541,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_UDP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_UDP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11432,8 +12560,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_IPV6_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11442,8 +12570,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF20_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF20_IDX_O_IPV6_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF22_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF22_IDX_O_IPV6_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11481,9 +12609,9 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n-\t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n+\t.spec_operand = {\n+\t\t(BNXT_ULP_HF23_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11506,14 +12634,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11876,8 +13004,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_TCP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_TCP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11886,8 +13014,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_TCP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_TCP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11905,8 +13033,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_IPV6_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11915,8 +13043,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_IPV6_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_IPV6_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11965,8 +13093,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_TCP_DST_PORT & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_TCP_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_TCP_DST_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11975,8 +13103,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_TCP_SRC_PORT & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_TCP_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_TCP_SRC_PORT & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -11994,8 +13122,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_IPV6_DST_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_IPV6_DST_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12004,8 +13132,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF21_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_HF21_IDX_O_IPV6_SRC_ADDR & 0xff,\n+\t\t(BNXT_ULP_HF23_IDX_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_HF23_IDX_O_IPV6_SRC_ADDR & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12043,14 +13171,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_OO_VLAN_VID & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_OO_VLAN_VID & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_OO_VLAN_VID & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_OO_VLAN_VID & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12063,14 +13191,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 48,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_O_ETH_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_O_ETH_SMAC & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_O_ETH_SMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_O_ETH_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_O_ETH_SMAC & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_O_ETH_SMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12078,14 +13206,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12465,8 +13593,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_O_ETH_DMAC & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_O_ETH_DMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12515,8 +13643,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF22_IDX_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF22_IDX_O_ETH_DMAC & 0xff,\n+\t\t(BNXT_ULP_HF24_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF24_IDX_O_ETH_DMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12544,14 +13672,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_OO_VLAN_VID & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_OO_VLAN_VID & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_OO_VLAN_VID & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_OO_VLAN_VID & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12564,14 +13692,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 48,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_O_ETH_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_O_ETH_SMAC & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_O_ETH_SMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_O_ETH_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_O_ETH_SMAC & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_O_ETH_SMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12579,14 +13707,14 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_SVIF_INDEX >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_SVIF_INDEX & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -12970,8 +14098,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_O_ETH_DMAC & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_O_ETH_DMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -13020,8 +14148,8 @@ struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n \t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n-\t\t(BNXT_ULP_HF23_IDX_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_HF23_IDX_O_ETH_DMAC & 0xff,\n+\t\t(BNXT_ULP_HF25_IDX_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_HF25_IDX_O_ETH_DMAC & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -15685,7 +16813,239 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t{\n \t.field_bit_size = 5,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {0x19, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t.result_operand = {0x19, 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 = 8,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 33,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(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+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 5,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x02, 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 = 9,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 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 = 11,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x03, 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 33,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(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+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 5,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x02, 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 = 9,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 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 = 11,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x03, 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 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 = 7,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_L2_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_L2_PROF_FUNC_ID & 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_PHY_PORT_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,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 6,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 4,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {\n+\t\t(0x00f9 >> 8) & 0xff,\n+\t\t0x00f9 & 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 = 5,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x15, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n@@ -15736,8 +17096,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x00c5 >> 8) & 0xff,\n+\t\t0x00c5 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -15790,8 +17150,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x00c5 >> 8) & 0xff,\n+\t\t0x00c5 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16149,7 +17509,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t{\n \t.field_bit_size = 5,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {0x15, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t.result_operand = {0x19, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n@@ -16200,8 +17560,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x00c5 >> 8) & 0xff,\n-\t\t0x00c5 & 0xff,\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16254,8 +17614,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x00c5 >> 8) & 0xff,\n-\t\t0x00c5 & 0xff,\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16524,8 +17884,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 7,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.result_operand = {\n-\t\t(BNXT_ULP_GLB_REGFILE_INDEX_L2_PROF_FUNC_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_REGFILE_INDEX_L2_PROF_FUNC_ID & 0xff,\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16605,15 +17965,15 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 10,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x00f9 >> 8) & 0xff,\n-\t\t0x00f9 & 0xff,\n+\t\t(0x0031 >> 8) & 0xff,\n+\t\t0x0031 & 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 = 5,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {0x19, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t.result_operand = {0x14, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n@@ -16664,8 +18024,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x00c5 >> 8) & 0xff,\n+\t\t0x00c5 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16718,8 +18078,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x00c5 >> 8) & 0xff,\n+\t\t0x00c5 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16845,7 +18205,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t{\n \t.field_bit_size = 5,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {0x14, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t.result_operand = {0x18, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n@@ -16896,8 +18256,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x00c5 >> 8) & 0xff,\n-\t\t0x00c5 & 0xff,\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16950,8 +18310,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x00c5 >> 8) & 0xff,\n-\t\t0x00c5 & 0xff,\n+\t\t(0x0185 >> 8) & 0xff,\n+\t\t0x0185 & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -16976,6 +18336,10 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n+\t.field_bit_size = 64,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n \t.field_bit_size = 10,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n@@ -17054,30 +18418,46 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n+\t.field_bit_size = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 & 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 = 4,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 & 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 = 1,\n-\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 10,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0031 >> 8) & 0xff,\n-\t\t0x0031 & 0xff,\n+\t\t(0x001b >> 8) & 0xff,\n+\t\t0x001b & 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 = 5,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n-\t.result_operand = {0x18, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t.result_operand = {0x08, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n@@ -17100,6 +18480,146 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n \t},\n \t{\n+\t.field_bit_size = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x03, 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 = 16,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(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+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 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 = 7,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_REGFILE_INDEX_VXLAN_PROF_FUNC_ID & 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 = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 4,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_PHY_PORT_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,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 6,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 3,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 16,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n+\t.result_operand = {0x01, 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 = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 2,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 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 = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n+\t.result_operand = {\n+\t\t(BNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_REGFILE_INDEX_WC_PROFILE_ID_0 & 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 = 4,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 10,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 5,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 8,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n+\t.field_bit_size = 1,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n+\t},\n+\t{\n \t.field_bit_size = 33,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n@@ -17128,8 +18648,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x006d >> 8) & 0xff,\n+\t\t0x006d & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -17182,8 +18702,8 @@ struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] =\n \t.field_bit_size = 9,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n-\t\t(0x0185 >> 8) & 0xff,\n-\t\t0x0185 & 0xff,\n+\t\t(0x006d >> 8) & 0xff,\n+\t\t0x006d & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n@@ -18933,6 +20453,48 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {\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_idx = BNXT_ULP_REGFILE_INDEX_WC_PROFILE_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_L2_CTXT_HIGH,\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_idx = BNXT_ULP_REGFILE_INDEX_EM_PROFILE_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_idx = BNXT_ULP_REGFILE_INDEX_WC_PROFILE_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_L2_CTXT_HIGH,\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_idx = BNXT_ULP_REGFILE_INDEX_EM_PROFILE_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_L2_CTXT_HIGH,\n \t.regfile_idx = BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0,\n \t.ident_bit_size = 10,\n@@ -19002,4 +20564,3 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {\n \t.ident_bit_pos = 0\n \t}\n };\n-\n",
    "prefixes": [
        "v3",
        "10/11"
    ]
}