Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/74402/?format=api
{ "id": 74402, "url": "http://patches.dpdk.org/api/patches/74402/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200718072515.62969-2-ajit.khaparde@broadcom.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200718072515.62969-2-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200718072515.62969-2-ajit.khaparde@broadcom.com", "date": "2020-07-18T07:25:02", "name": "[v3,01/14] net/bnxt: modify resource management scheme", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "f20ca258cbf0bb4a6b8ccadb3d0de6da12e85df3", "submitter": { "id": 501, "url": "http://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 1766, "url": "http://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200718072515.62969-2-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 11142, "url": "http://patches.dpdk.org/api/series/11142/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11142", "date": "2020-07-18T07:25:01", "name": "bnxt patches", "version": 3, "mbox": "http://patches.dpdk.org/series/11142/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/74402/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/74402/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 3FEB1A0527;\n\tSat, 18 Jul 2020 09:25:40 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 603661BFAD;\n\tSat, 18 Jul 2020 09:25:32 +0200 (CEST)", "from mail-wm1-f98.google.com (mail-wm1-f98.google.com\n [209.85.128.98]) by dpdk.org (Postfix) with ESMTP id 446261BFA6\n for <dev@dpdk.org>; Sat, 18 Jul 2020 09:25:30 +0200 (CEST)", "by mail-wm1-f98.google.com with SMTP id a6so8436759wmm.0\n for <dev@dpdk.org>; Sat, 18 Jul 2020 00:25:30 -0700 (PDT)", "from localhost.localdomain ([192.19.223.252])\n by smtp-relay.gmail.com with ESMTPS id g14sm34554wrb.16.2020.07.18.00.25.27\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Sat, 18 Jul 2020 00:25:29 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com;\n s=google;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=F/MXsjiLu/naNiVls/fG3wF7JPEIaHftmdoLN28ZDvE=;\n b=e7BQVW64b7qwmWfLWxYvMfxrkumy7hppESsEDnmfWeNUFPgaD10xz3Di4/qDzr21na\n X9mehP6/L+vvkYk5JcE9GMS7hVP+W1u6Wt0Dy3Mwn2zz7eKY08J6G0Z5NldJlwXRyTNE\n Y/zF9br5VQhXVO8RBjEESd7eE1NZAv/TTo/6U=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=F/MXsjiLu/naNiVls/fG3wF7JPEIaHftmdoLN28ZDvE=;\n b=Rrgv2J12/XOf17VAFLoVESAw4gKIfAojlfdfPWSWHYi6LZ6+s23X3ovNZJ1ZWlBAFX\n 4vL5Uzbpytm3ZV+A//iyh6YRhfH9/MlKftIY7nqaXA7F2hBM5TG718hhAe9eYFMdHj92\n ZSDsB7TNKw//qUJUC7na1kQKAkicY5yzUEPwPYxlXz9QqNPp758skcOaQZBWOiO5gpSt\n 0gIqw7gBPqXQU35rFe+XEfbAWwqzs+2RqNN67DV12qc9CD5MQj8fO9wPnkKfjhKngFZC\n uOhyHUc7U0716nFsA6wATnHM6aANzGNXY28glOBOQ7uZNrpwgrIwCYa981Cf4u1498xu\n U/eQ==", "X-Gm-Message-State": "AOAM531ZasQB+vhToTvCyAvN6iDRKk60l32WNwLoVPgvXNiGq73Jxykp\n 0WBUoFRGECLl/o2uk90v3pp5vSWf4Px5Sb+KsZkn/iPHFELbByzskcY6SWYJGTM1J0yfOBg2e1t\n 2yDp73DDp611JFkGdrvr91fTR3x65XiW3KQqZN1UcWVe4eMjW7RYd+ojmqb1lCZIYRkC8ry38gu\n Nl7A==", "X-Google-Smtp-Source": "\n ABdhPJwI2TsFWGXkV6luhNUTkyM2/KHJW4iWKjrhLpPIehb2b8wzA4ug8ctT88EI2mdRgWjZtdkOcyxLHdr3", "X-Received": "by 2002:a1c:408b:: with SMTP id\n n133mr12573368wma.88.1595057129558;\n Sat, 18 Jul 2020 00:25:29 -0700 (PDT)", "X-Relaying-Domain": "broadcom.com", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "Peter Spreadborough <peter.spreadborough@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>,\n Farah Smith <farah.smith@broadcom.com>", "Date": "Sat, 18 Jul 2020 00:25:02 -0700", "Message-Id": "<20200718072515.62969-2-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.21.1 (Apple Git-122.3)", "In-Reply-To": "<20200718072515.62969-1-ajit.khaparde@broadcom.com>", "References": "<20200717141451.11705-1-somnath.kotur@broadcom.com>\n <20200718072515.62969-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 01/14] net/bnxt: modify resource management\n\tscheme", "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: Peter Spreadborough <peter.spreadborough@broadcom.com>\n\nAdd support for new resource manager to manage CFA resources.\nTCAM is split into high and low regions now and CFA resource types\nare being updated accordingly.\n\nSigned-off-by: Peter Spreadborough <peter.spreadborough@broadcom.com>\nSigned-off-by: Somnath Kotur <somnath.kotur@broadcom.com>\nReviewed-by: Farah Smith <farah.smith@broadcom.com>\nReviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/tf_core/cfa_resource_types.h | 194 +++++++++---------\n drivers/net/bnxt/tf_core/tf_core.h | 12 +-\n drivers/net/bnxt/tf_core/tf_device_p4.h | 14 +-\n drivers/net/bnxt/tf_core/tf_util.c | 12 +-\n drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 10 +-\n .../net/bnxt/tf_ulp/ulp_template_db_class.c | 38 ++--\n drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c | 4 +-\n 7 files changed, 152 insertions(+), 132 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_core/cfa_resource_types.h b/drivers/net/bnxt/tf_core/cfa_resource_types.h\nindex 6d6651fde..45b26b236 100644\n--- a/drivers/net/bnxt/tf_core/cfa_resource_types.h\n+++ b/drivers/net/bnxt/tf_core/cfa_resource_types.h\n@@ -18,53 +18,57 @@\n */\n #define CFA_RESOURCE_TYPE_INVALID 65535\n \n-/* L2 Context TCAM */\n-#define CFA_RESOURCE_TYPE_P59_L2_CTXT_TCAM 0x0UL\n-/* L2 Context REMAP */\n-#define CFA_RESOURCE_TYPE_P59_L2_CTXT_REMAP 0x1UL\n+/* L2 Context TCAM High priority entries */\n+#define CFA_RESOURCE_TYPE_P59_L2_CTXT_TCAM_HIGH 0x0UL\n+/* L2 Context TCAM Low priority entries */\n+#define CFA_RESOURCE_TYPE_P59_L2_CTXT_TCAM_LOW 0x1UL\n+/* L2 Context REMAP high priority entries */\n+#define CFA_RESOURCE_TYPE_P59_L2_CTXT_REMAP_HIGH 0x2UL\n+/* L2 Context REMAP Low priority entries */\n+#define CFA_RESOURCE_TYPE_P59_L2_CTXT_REMAP_LOW 0x3UL\n /* Profile Func */\n-#define CFA_RESOURCE_TYPE_P59_PROF_FUNC 0x2UL\n+#define CFA_RESOURCE_TYPE_P59_PROF_FUNC 0x4UL\n /* Profile TCAM */\n-#define CFA_RESOURCE_TYPE_P59_PROF_TCAM 0x3UL\n+#define CFA_RESOURCE_TYPE_P59_PROF_TCAM 0x5UL\n /* Exact Match Profile Id */\n-#define CFA_RESOURCE_TYPE_P59_EM_PROF_ID 0x4UL\n+#define CFA_RESOURCE_TYPE_P59_EM_PROF_ID 0x6UL\n /* Wildcard TCAM Profile Id */\n-#define CFA_RESOURCE_TYPE_P59_WC_TCAM_PROF_ID 0x5UL\n+#define CFA_RESOURCE_TYPE_P59_WC_TCAM_PROF_ID 0x7UL\n /* Wildcard TCAM */\n-#define CFA_RESOURCE_TYPE_P59_WC_TCAM 0x6UL\n+#define CFA_RESOURCE_TYPE_P59_WC_TCAM 0x8UL\n /* Meter Profile */\n-#define CFA_RESOURCE_TYPE_P59_METER_PROF 0x7UL\n+#define CFA_RESOURCE_TYPE_P59_METER_PROF 0x9UL\n /* Meter */\n-#define CFA_RESOURCE_TYPE_P59_METER 0x8UL\n+#define CFA_RESOURCE_TYPE_P59_METER 0xaUL\n /* Meter */\n-#define CFA_RESOURCE_TYPE_P59_MIRROR 0x9UL\n+#define CFA_RESOURCE_TYPE_P59_MIRROR 0xbUL\n /* Source Properties TCAM */\n-#define CFA_RESOURCE_TYPE_P59_SP_TCAM 0xaUL\n+#define CFA_RESOURCE_TYPE_P59_SP_TCAM 0xcUL\n /* Exact Match Flexible Key Builder */\n-#define CFA_RESOURCE_TYPE_P59_EM_FKB 0xbUL\n+#define CFA_RESOURCE_TYPE_P59_EM_FKB 0xdUL\n /* Wildcard Flexible Key Builder */\n-#define CFA_RESOURCE_TYPE_P59_WC_FKB 0xcUL\n+#define CFA_RESOURCE_TYPE_P59_WC_FKB 0xeUL\n /* Table Scope */\n-#define CFA_RESOURCE_TYPE_P59_TBL_SCOPE 0xdUL\n+#define CFA_RESOURCE_TYPE_P59_TBL_SCOPE 0xfUL\n /* L2 Func */\n-#define CFA_RESOURCE_TYPE_P59_L2_FUNC 0xeUL\n+#define CFA_RESOURCE_TYPE_P59_L2_FUNC 0x10UL\n /* EPOCH 0 */\n-#define CFA_RESOURCE_TYPE_P59_EPOCH0 0xfUL\n+#define CFA_RESOURCE_TYPE_P59_EPOCH0 0x11UL\n /* EPOCH 1 */\n-#define CFA_RESOURCE_TYPE_P59_EPOCH1 0x10UL\n+#define CFA_RESOURCE_TYPE_P59_EPOCH1 0x12UL\n /* Metadata */\n-#define CFA_RESOURCE_TYPE_P59_METADATA 0x11UL\n+#define CFA_RESOURCE_TYPE_P59_METADATA 0x13UL\n /* Connection Tracking Rule TCAM */\n-#define CFA_RESOURCE_TYPE_P59_CT_RULE_TCAM 0x12UL\n+#define CFA_RESOURCE_TYPE_P59_CT_RULE_TCAM 0x14UL\n /* Range Profile */\n-#define CFA_RESOURCE_TYPE_P59_RANGE_PROF 0x13UL\n+#define CFA_RESOURCE_TYPE_P59_RANGE_PROF 0x15UL\n /* Range */\n-#define CFA_RESOURCE_TYPE_P59_RANGE 0x14UL\n+#define CFA_RESOURCE_TYPE_P59_RANGE 0x16UL\n /* Link Aggrigation */\n-#define CFA_RESOURCE_TYPE_P59_LAG 0x15UL\n+#define CFA_RESOURCE_TYPE_P59_LAG 0x17UL\n /* VEB TCAM */\n-#define CFA_RESOURCE_TYPE_P59_VEB_TCAM 0x16UL\n-#define CFA_RESOURCE_TYPE_P59_LAST CFA_RESOURCE_TYPE_P59_VEB_TCAM\n+#define CFA_RESOURCE_TYPE_P59_VEB_TCAM 0x18UL\n+#define CFA_RESOURCE_TYPE_P59_LAST CFA_RESOURCE_TYPE_P59_VEB_TCAM\n \n \n /* Multicast Group */\n@@ -81,40 +85,40 @@\n #define CFA_RESOURCE_TYPE_P58_SP_MAC_IPV4 0x5UL\n /* Source Property MAC and IPv6 */\n #define CFA_RESOURCE_TYPE_P58_SP_MAC_IPV6 0x6UL\n-/* Network Address Translation Source Port */\n-#define CFA_RESOURCE_TYPE_P58_NAT_SPORT 0x7UL\n-/* Network Address Translation Destination Port */\n-#define CFA_RESOURCE_TYPE_P58_NAT_DPORT 0x8UL\n-/* Network Address Translation Source IPv4 address */\n-#define CFA_RESOURCE_TYPE_P58_NAT_S_IPV4 0x9UL\n-/* Network Address Translation Destination IPv4 address */\n-#define CFA_RESOURCE_TYPE_P58_NAT_D_IPV4 0xaUL\n+/* Network Address Translation Port */\n+#define CFA_RESOURCE_TYPE_P58_NAT_PORT 0x7UL\n+/* Network Address Translation IPv4 address */\n+#define CFA_RESOURCE_TYPE_P58_NAT_IPV4 0x8UL\n /* Meter */\n-#define CFA_RESOURCE_TYPE_P58_METER 0xbUL\n+#define CFA_RESOURCE_TYPE_P58_METER 0x9UL\n /* Flow State */\n-#define CFA_RESOURCE_TYPE_P58_FLOW_STATE 0xcUL\n+#define CFA_RESOURCE_TYPE_P58_FLOW_STATE 0xaUL\n /* Full Action Records */\n-#define CFA_RESOURCE_TYPE_P58_FULL_ACTION 0xdUL\n+#define CFA_RESOURCE_TYPE_P58_FULL_ACTION 0xbUL\n /* Action Record Format 0 */\n-#define CFA_RESOURCE_TYPE_P58_FORMAT_0_ACTION 0xeUL\n+#define CFA_RESOURCE_TYPE_P58_FORMAT_0_ACTION 0xcUL\n /* Action Record Ext Format 0 */\n-#define CFA_RESOURCE_TYPE_P58_EXT_FORMAT_0_ACTION 0xfUL\n+#define CFA_RESOURCE_TYPE_P58_EXT_FORMAT_0_ACTION 0xdUL\n /* Action Record Format 1 */\n-#define CFA_RESOURCE_TYPE_P58_FORMAT_1_ACTION 0x10UL\n+#define CFA_RESOURCE_TYPE_P58_FORMAT_1_ACTION 0xeUL\n /* Action Record Format 2 */\n-#define CFA_RESOURCE_TYPE_P58_FORMAT_2_ACTION 0x11UL\n+#define CFA_RESOURCE_TYPE_P58_FORMAT_2_ACTION 0xfUL\n /* Action Record Format 3 */\n-#define CFA_RESOURCE_TYPE_P58_FORMAT_3_ACTION 0x12UL\n+#define CFA_RESOURCE_TYPE_P58_FORMAT_3_ACTION 0x10UL\n /* Action Record Format 4 */\n-#define CFA_RESOURCE_TYPE_P58_FORMAT_4_ACTION 0x13UL\n+#define CFA_RESOURCE_TYPE_P58_FORMAT_4_ACTION 0x11UL\n /* Action Record Format 5 */\n-#define CFA_RESOURCE_TYPE_P58_FORMAT_5_ACTION 0x14UL\n+#define CFA_RESOURCE_TYPE_P58_FORMAT_5_ACTION 0x12UL\n /* Action Record Format 6 */\n-#define CFA_RESOURCE_TYPE_P58_FORMAT_6_ACTION 0x15UL\n-/* L2 Context TCAM */\n-#define CFA_RESOURCE_TYPE_P58_L2_CTXT_TCAM 0x16UL\n-/* L2 Context REMAP */\n-#define CFA_RESOURCE_TYPE_P58_L2_CTXT_REMAP 0x17UL\n+#define CFA_RESOURCE_TYPE_P58_FORMAT_6_ACTION 0x13UL\n+/* L2 Context TCAM High priority entries */\n+#define CFA_RESOURCE_TYPE_P58_L2_CTXT_TCAM_HIGH 0x14UL\n+/* L2 Context TCAM Low priority entries */\n+#define CFA_RESOURCE_TYPE_P58_L2_CTXT_TCAM_LOW 0x15UL\n+/* L2 Context REMAP high priority entries */\n+#define CFA_RESOURCE_TYPE_P58_L2_CTXT_REMAP_HIGH 0x16UL\n+/* L2 Context REMAP Low priority entries */\n+#define CFA_RESOURCE_TYPE_P58_L2_CTXT_REMAP_LOW 0x17UL\n /* Profile Func */\n #define CFA_RESOURCE_TYPE_P58_PROF_FUNC 0x18UL\n /* Profile TCAM */\n@@ -158,40 +162,40 @@\n #define CFA_RESOURCE_TYPE_P45_SP_MAC_IPV6 0x6UL\n /* 64B Counters */\n #define CFA_RESOURCE_TYPE_P45_COUNTER_64B 0x7UL\n-/* Network Address Translation Source Port */\n-#define CFA_RESOURCE_TYPE_P45_NAT_SPORT 0x8UL\n-/* Network Address Translation Destination Port */\n-#define CFA_RESOURCE_TYPE_P45_NAT_DPORT 0x9UL\n-/* Network Address Translation Source IPv4 address */\n-#define CFA_RESOURCE_TYPE_P45_NAT_S_IPV4 0xaUL\n-/* Network Address Translation Destination IPv4 address */\n-#define CFA_RESOURCE_TYPE_P45_NAT_D_IPV4 0xbUL\n+/* Network Address Translation Port */\n+#define CFA_RESOURCE_TYPE_P45_NAT_PORT 0x8UL\n+/* Network Address Translation IPv4 address */\n+#define CFA_RESOURCE_TYPE_P45_NAT_IPV4 0x9UL\n /* Meter */\n-#define CFA_RESOURCE_TYPE_P45_METER 0xcUL\n+#define CFA_RESOURCE_TYPE_P45_METER 0xaUL\n /* Flow State */\n-#define CFA_RESOURCE_TYPE_P45_FLOW_STATE 0xdUL\n+#define CFA_RESOURCE_TYPE_P45_FLOW_STATE 0xbUL\n /* Full Action Records */\n-#define CFA_RESOURCE_TYPE_P45_FULL_ACTION 0xeUL\n+#define CFA_RESOURCE_TYPE_P45_FULL_ACTION 0xcUL\n /* Action Record Format 0 */\n-#define CFA_RESOURCE_TYPE_P45_FORMAT_0_ACTION 0xfUL\n+#define CFA_RESOURCE_TYPE_P45_FORMAT_0_ACTION 0xdUL\n /* Action Record Ext Format 0 */\n-#define CFA_RESOURCE_TYPE_P45_EXT_FORMAT_0_ACTION 0x10UL\n+#define CFA_RESOURCE_TYPE_P45_EXT_FORMAT_0_ACTION 0xeUL\n /* Action Record Format 1 */\n-#define CFA_RESOURCE_TYPE_P45_FORMAT_1_ACTION 0x11UL\n+#define CFA_RESOURCE_TYPE_P45_FORMAT_1_ACTION 0xfUL\n /* Action Record Format 2 */\n-#define CFA_RESOURCE_TYPE_P45_FORMAT_2_ACTION 0x12UL\n+#define CFA_RESOURCE_TYPE_P45_FORMAT_2_ACTION 0x10UL\n /* Action Record Format 3 */\n-#define CFA_RESOURCE_TYPE_P45_FORMAT_3_ACTION 0x13UL\n+#define CFA_RESOURCE_TYPE_P45_FORMAT_3_ACTION 0x11UL\n /* Action Record Format 4 */\n-#define CFA_RESOURCE_TYPE_P45_FORMAT_4_ACTION 0x14UL\n+#define CFA_RESOURCE_TYPE_P45_FORMAT_4_ACTION 0x12UL\n /* Action Record Format 5 */\n-#define CFA_RESOURCE_TYPE_P45_FORMAT_5_ACTION 0x15UL\n+#define CFA_RESOURCE_TYPE_P45_FORMAT_5_ACTION 0x13UL\n /* Action Record Format 6 */\n-#define CFA_RESOURCE_TYPE_P45_FORMAT_6_ACTION 0x16UL\n-/* L2 Context TCAM */\n-#define CFA_RESOURCE_TYPE_P45_L2_CTXT_TCAM 0x17UL\n-/* L2 Context REMAP */\n-#define CFA_RESOURCE_TYPE_P45_L2_CTXT_REMAP 0x18UL\n+#define CFA_RESOURCE_TYPE_P45_FORMAT_6_ACTION 0x14UL\n+/* L2 Context TCAM High priority entries */\n+#define CFA_RESOURCE_TYPE_P45_L2_CTXT_TCAM_HIGH 0x15UL\n+/* L2 Context TCAM Low priority entries */\n+#define CFA_RESOURCE_TYPE_P45_L2_CTXT_TCAM_LOW 0x16UL\n+/* L2 Context REMAP high priority entries */\n+#define CFA_RESOURCE_TYPE_P45_L2_CTXT_REMAP_HIGH 0x17UL\n+/* L2 Context REMAP Low priority entries */\n+#define CFA_RESOURCE_TYPE_P45_L2_CTXT_REMAP_LOW 0x18UL\n /* Profile Func */\n #define CFA_RESOURCE_TYPE_P45_PROF_FUNC 0x19UL\n /* Profile TCAM */\n@@ -233,40 +237,40 @@\n #define CFA_RESOURCE_TYPE_P4_SP_MAC_IPV6 0x6UL\n /* 64B Counters */\n #define CFA_RESOURCE_TYPE_P4_COUNTER_64B 0x7UL\n-/* Network Address Translation Source Port */\n-#define CFA_RESOURCE_TYPE_P4_NAT_SPORT 0x8UL\n-/* Network Address Translation Destination Port */\n-#define CFA_RESOURCE_TYPE_P4_NAT_DPORT 0x9UL\n-/* Network Address Translation Source IPv4 address */\n-#define CFA_RESOURCE_TYPE_P4_NAT_S_IPV4 0xaUL\n-/* Network Address Translation Destination IPv4 address */\n-#define CFA_RESOURCE_TYPE_P4_NAT_D_IPV4 0xbUL\n+/* Network Address Translation Port */\n+#define CFA_RESOURCE_TYPE_P4_NAT_PORT 0x8UL\n+/* Network Address Translation IPv4 address */\n+#define CFA_RESOURCE_TYPE_P4_NAT_IPV4 0x9UL\n /* Meter */\n-#define CFA_RESOURCE_TYPE_P4_METER 0xcUL\n+#define CFA_RESOURCE_TYPE_P4_METER 0xaUL\n /* Flow State */\n-#define CFA_RESOURCE_TYPE_P4_FLOW_STATE 0xdUL\n+#define CFA_RESOURCE_TYPE_P4_FLOW_STATE 0xbUL\n /* Full Action Records */\n-#define CFA_RESOURCE_TYPE_P4_FULL_ACTION 0xeUL\n+#define CFA_RESOURCE_TYPE_P4_FULL_ACTION 0xcUL\n /* Action Record Format 0 */\n-#define CFA_RESOURCE_TYPE_P4_FORMAT_0_ACTION 0xfUL\n+#define CFA_RESOURCE_TYPE_P4_FORMAT_0_ACTION 0xdUL\n /* Action Record Ext Format 0 */\n-#define CFA_RESOURCE_TYPE_P4_EXT_FORMAT_0_ACTION 0x10UL\n+#define CFA_RESOURCE_TYPE_P4_EXT_FORMAT_0_ACTION 0xeUL\n /* Action Record Format 1 */\n-#define CFA_RESOURCE_TYPE_P4_FORMAT_1_ACTION 0x11UL\n+#define CFA_RESOURCE_TYPE_P4_FORMAT_1_ACTION 0xfUL\n /* Action Record Format 2 */\n-#define CFA_RESOURCE_TYPE_P4_FORMAT_2_ACTION 0x12UL\n+#define CFA_RESOURCE_TYPE_P4_FORMAT_2_ACTION 0x10UL\n /* Action Record Format 3 */\n-#define CFA_RESOURCE_TYPE_P4_FORMAT_3_ACTION 0x13UL\n+#define CFA_RESOURCE_TYPE_P4_FORMAT_3_ACTION 0x11UL\n /* Action Record Format 4 */\n-#define CFA_RESOURCE_TYPE_P4_FORMAT_4_ACTION 0x14UL\n+#define CFA_RESOURCE_TYPE_P4_FORMAT_4_ACTION 0x12UL\n /* Action Record Format 5 */\n-#define CFA_RESOURCE_TYPE_P4_FORMAT_5_ACTION 0x15UL\n+#define CFA_RESOURCE_TYPE_P4_FORMAT_5_ACTION 0x13UL\n /* Action Record Format 6 */\n-#define CFA_RESOURCE_TYPE_P4_FORMAT_6_ACTION 0x16UL\n-/* L2 Context TCAM */\n-#define CFA_RESOURCE_TYPE_P4_L2_CTXT_TCAM 0x17UL\n-/* L2 Context REMAP */\n-#define CFA_RESOURCE_TYPE_P4_L2_CTXT_REMAP 0x18UL\n+#define CFA_RESOURCE_TYPE_P4_FORMAT_6_ACTION 0x14UL\n+/* L2 Context TCAM High priority entries */\n+#define CFA_RESOURCE_TYPE_P4_L2_CTXT_TCAM_HIGH 0x15UL\n+/* L2 Context TCAM Low priority entries */\n+#define CFA_RESOURCE_TYPE_P4_L2_CTXT_TCAM_LOW 0x16UL\n+/* L2 Context REMAP high priority entries */\n+#define CFA_RESOURCE_TYPE_P4_L2_CTXT_REMAP_HIGH 0x17UL\n+/* L2 Context REMAP Low priority entries */\n+#define CFA_RESOURCE_TYPE_P4_L2_CTXT_REMAP_LOW 0x18UL\n /* Profile Func */\n #define CFA_RESOURCE_TYPE_P4_PROF_FUNC 0x19UL\n /* Profile TCAM */\ndiff --git a/drivers/net/bnxt/tf_core/tf_core.h b/drivers/net/bnxt/tf_core/tf_core.h\nindex 758685e46..8fa734ace 100644\n--- a/drivers/net/bnxt/tf_core/tf_core.h\n+++ b/drivers/net/bnxt/tf_core/tf_core.h\n@@ -162,7 +162,13 @@ enum tf_identifier_type {\n \t * and can be used in WC TCAM or EM keys to virtualize further\n \t * lookups.\n \t */\n-\tTF_IDENT_TYPE_L2_CTXT,\n+\tTF_IDENT_TYPE_L2_CTXT_HIGH,\n+\t/**\n+\t * The L2 Context is returned from the L2 Ctxt TCAM lookup\n+\t * and can be used in WC TCAM or EM keys to virtualize further\n+\t * lookups.\n+\t */\n+\tTF_IDENT_TYPE_L2_CTXT_LOW,\n \t/**\n \t * The WC profile func is returned from the L2 Ctxt TCAM lookup\n \t * to enable virtualization of the profile TCAM.\n@@ -270,7 +276,9 @@ enum tf_tbl_type {\n */\n enum tf_tcam_tbl_type {\n \t/** L2 Context TCAM */\n-\tTF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\tTF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n+\t/** L2 Context TCAM */\n+\tTF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n \t/** Profile TCAM */\n \tTF_TCAM_TBL_TYPE_PROF_TCAM,\n \t/** Wildcard TCAM */\ndiff --git a/drivers/net/bnxt/tf_core/tf_device_p4.h b/drivers/net/bnxt/tf_core/tf_device_p4.h\nindex 7fabb4ba8..06c3ecf75 100644\n--- a/drivers/net/bnxt/tf_core/tf_device_p4.h\n+++ b/drivers/net/bnxt/tf_core/tf_device_p4.h\n@@ -14,7 +14,8 @@\n #include \"tf_global_cfg.h\"\n \n struct tf_rm_element_cfg tf_ident_p4[TF_IDENT_TYPE_MAX] = {\n-\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_L2_CTXT_REMAP },\n+\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_L2_CTXT_REMAP_HIGH },\n+\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_L2_CTXT_REMAP_LOW },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_PROF_FUNC },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_WC_TCAM_PROF_ID },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_EM_PROF_ID },\n@@ -23,7 +24,8 @@ struct tf_rm_element_cfg tf_ident_p4[TF_IDENT_TYPE_MAX] = {\n };\n \n struct tf_rm_element_cfg tf_tcam_p4[TF_TCAM_TBL_TYPE_MAX] = {\n-\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_L2_CTXT_TCAM },\n+\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_L2_CTXT_TCAM_HIGH },\n+\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_L2_CTXT_TCAM_LOW },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_PROF_TCAM },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_WC_TCAM },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_SP_TCAM },\n@@ -45,10 +47,10 @@ struct tf_rm_element_cfg tf_tbl_p4[TF_TBL_TYPE_MAX] = {\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_SP_MAC_IPV4 },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_SP_MAC_IPV6 },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_COUNTER_64B },\n-\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_SPORT },\n-\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_DPORT },\n-\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_S_IPV4 },\n-\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_D_IPV4 },\n+\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_PORT },\n+\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_PORT },\n+\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_IPV4 },\n+\t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_IPV4 },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_METER_PROF },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_METER },\n \t{ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_MIRROR },\ndiff --git a/drivers/net/bnxt/tf_core/tf_util.c b/drivers/net/bnxt/tf_core/tf_util.c\nindex aeee3b306..bf6a6a363 100644\n--- a/drivers/net/bnxt/tf_core/tf_util.c\n+++ b/drivers/net/bnxt/tf_core/tf_util.c\n@@ -24,8 +24,10 @@ const char *\n tf_ident_2_str(enum tf_identifier_type id_type)\n {\n \tswitch (id_type) {\n-\tcase TF_IDENT_TYPE_L2_CTXT:\n-\t\treturn \"l2_ctxt_remap\";\n+\tcase TF_IDENT_TYPE_L2_CTXT_HIGH:\n+\t\treturn \"l2_ctxt_remap_high\";\n+\tcase TF_IDENT_TYPE_L2_CTXT_LOW:\n+\t\treturn \"l2_ctxt_remap_low\";\n \tcase TF_IDENT_TYPE_PROF_FUNC:\n \t\treturn \"prof_func\";\n \tcase TF_IDENT_TYPE_WC_PROF:\n@@ -43,8 +45,10 @@ const char *\n tf_tcam_tbl_2_str(enum tf_tcam_tbl_type tcam_type)\n {\n \tswitch (tcam_type) {\n-\tcase TF_TCAM_TBL_TYPE_L2_CTXT_TCAM:\n-\t\treturn \"l2_ctxt_tcam\";\n+\tcase TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH:\n+\t\treturn \"l2_ctxt_tcam_high\";\n+\tcase TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW:\n+\t\treturn \"l2_ctxt_tcam_low\";\n \tcase TF_TCAM_TBL_TYPE_PROF_TCAM:\n \t\treturn \"prof_tcam\";\n \tcase TF_TCAM_TBL_TYPE_WC_TCAM:\ndiff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\nindex 6b0a403c9..c4ce00329 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n@@ -86,7 +86,7 @@ ulp_ctx_session_open(struct bnxt *bp,\n \tresources = ¶ms.resources;\n \t/** RX **/\n \t/* Identifiers */\n-\tresources->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_L2_CTXT] = 16;\n+\tresources->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_L2_CTXT_HIGH] = 16;\n \tresources->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_WC_PROF] = 8;\n \tresources->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_PROF_FUNC] = 8;\n \tresources->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_EM_PROF] = 8;\n@@ -96,7 +96,8 @@ ulp_ctx_session_open(struct bnxt *bp,\n \tresources->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_ACT_STATS_64] = 720;\n \n \t/* TCAMs */\n-\tresources->tcam_cnt[TF_DIR_RX].cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM] = 16;\n+\tresources->tcam_cnt[TF_DIR_RX].cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH] =\n+\t\t\t\t\t\t\t\t\t16;\n \tresources->tcam_cnt[TF_DIR_RX].cnt[TF_TCAM_TBL_TYPE_PROF_TCAM] = 8;\n \tresources->tcam_cnt[TF_DIR_RX].cnt[TF_TCAM_TBL_TYPE_WC_TCAM] = 416;\n \n@@ -108,7 +109,7 @@ ulp_ctx_session_open(struct bnxt *bp,\n \n \t/** TX **/\n \t/* Identifiers */\n-\tresources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_L2_CTXT] = 8;\n+\tresources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_L2_CTXT_HIGH] = 8;\n \tresources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_WC_PROF] = 8;\n \tresources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_PROF_FUNC] = 8;\n \tresources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_EM_PROF] = 8;\n@@ -122,7 +123,8 @@ ulp_ctx_session_open(struct bnxt *bp,\n \tresources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_ENCAP_16B] = 16;\n \n \t/* TCAMs */\n-\tresources->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM] = 8;\n+\tresources->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH] =\n+\t\t\t\t\t\t\t\t\t8;\n \tresources->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_PROF_TCAM] = 8;\n \tresources->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_WC_TCAM] = 8;\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c\nindex feac30af2..1fd5ab4f4 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@@ -162,7 +162,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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@@ -217,7 +217,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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_NO,\n@@ -264,7 +264,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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_NO,\n@@ -297,7 +297,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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@@ -316,7 +316,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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@@ -335,7 +335,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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_NO,\n@@ -390,7 +390,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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@@ -437,7 +437,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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_NO,\n@@ -470,7 +470,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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@@ -489,7 +489,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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@@ -522,7 +522,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\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,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n \t.direction = TF_DIR_RX,\n@@ -539,7 +539,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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@@ -611,7 +611,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\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,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n \t.direction = TF_DIR_RX,\n@@ -628,7 +628,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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@@ -700,7 +700,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\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,\n+\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n \t.resource_sub_type =\n \t\tBNXT_ULP_RESOURCE_SUB_TYPE_CACHE_TYPE_L2_CNTXT_TCAM,\n \t.direction = TF_DIR_TX,\n@@ -717,7 +717,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n-\t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM,\n+\t.resource_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_NO,\n@@ -5295,7 +5295,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n struct bnxt_ulp_mapper_ident_info ulp_ident_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n-\t.ident_type = TF_IDENT_TYPE_L2_CTXT,\n+\t.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@@ -5309,7 +5309,7 @@ struct bnxt_ulp_mapper_ident_info ulp_ident_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n-\t.ident_type = TF_IDENT_TYPE_L2_CTXT,\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@@ -5323,7 +5323,7 @@ struct bnxt_ulp_mapper_ident_info ulp_ident_list[] = {\n \t},\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n-\t.ident_type = TF_IDENT_TYPE_L2_CTXT,\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\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 9a27cbf04..24bde57a6 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@@ -345,13 +345,13 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t},\n \t[2] = {\n \t\t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n-\t\t.resource_type = TF_IDENT_TYPE_L2_CTXT,\n+\t\t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n \t\t.glb_regfile_index = BNXT_ULP_GLB_REGFILE_INDEX_GLB_L2_CNTXT_ID,\n \t\t.direction = TF_DIR_RX\n \t},\n \t[3] = {\n \t\t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n-\t\t.resource_type = TF_IDENT_TYPE_L2_CTXT,\n+\t\t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n \t\t.glb_regfile_index = BNXT_ULP_GLB_REGFILE_INDEX_GLB_L2_CNTXT_ID,\n \t\t.direction = TF_DIR_TX\n \t},\n", "prefixes": [ "v3", "01/14" ] }