Patch Detail

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

{
    "id": 94106,
    "url": "https://patches.dpdk.org/api/patches/94106/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210613000652.28191-12-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": "<20210613000652.28191-12-ajit.khaparde@broadcom.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20210613000652.28191-12-ajit.khaparde@broadcom.com",
    "date": "2021-06-13T00:06:05",
    "name": "[v2,11/58] net/bnxt: add hashing changes for Thor",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "b53f2821b7bea6a076fd83137b8f702837402634",
    "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/20210613000652.28191-12-ajit.khaparde@broadcom.com/mbox/",
    "series": [
        {
            "id": 17305,
            "url": "https://patches.dpdk.org/api/series/17305/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17305",
            "date": "2021-06-13T00:05:54",
            "name": "enhancements to host based flow table management",
            "version": 2,
            "mbox": "https://patches.dpdk.org/series/17305/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/94106/comments/",
    "check": "warning",
    "checks": "https://patches.dpdk.org/api/patches/94106/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 44723A0C41;\n\tSun, 13 Jun 2021 02:08:42 +0200 (CEST)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C1FC64116E;\n\tSun, 13 Jun 2021 02:07:17 +0200 (CEST)",
            "from mail-pg1-f179.google.com (mail-pg1-f179.google.com\n [209.85.215.179])\n by mails.dpdk.org (Postfix) with ESMTP id DF9424111B\n for <dev@dpdk.org>; Sun, 13 Jun 2021 02:07:13 +0200 (CEST)",
            "by mail-pg1-f179.google.com with SMTP id l184so5615181pgd.8\n for <dev@dpdk.org>; Sat, 12 Jun 2021 17:07:13 -0700 (PDT)",
            "from localhost.localdomain ([192.19.223.252])\n by smtp.gmail.com with ESMTPSA id gg22sm12774609pjb.17.2021.06.12.17.07.11\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Sat, 12 Jun 2021 17:07:11 -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=JNRIssKlnXF/BcRT0o4UGt3z/7KQCs+67zll16VgZwY=;\n b=QLruJDUKSQyBemKRO4urEEGXWgag+QSDTR+YaEdTTRaDe4o6rigKCmhsAQr/u0SAul\n Ym5SAY/5EMKsxkyFsclhEq3sK182tGEPAF0RE4xWHhdTKYx8asMAqD5FddD4JN6vafWW\n 1LIvxfd9JPNvFAcdSZ63Le/LHN1M69iEbIu5Y=",
        "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=JNRIssKlnXF/BcRT0o4UGt3z/7KQCs+67zll16VgZwY=;\n b=ijkwx4a3qLuLy94d/7RLZ2NDyIiN2STemfgJ9LVPvU10CoprTXQtua+hKreQ9Ivb8q\n 7nO/r8lgYDlGF1p5daD45wuRk5hW95fCnmmYqnckHDIyrd1QXUHreI14e5nP/SxBIU3O\n DdgLGxOYLLVtTNzfhEnezhBmExkixZ7PGwEhp7JaBS/bqgJesqtoj3AmOBbx6qK+00FA\n mF9sGvatNVl1+UWOvadPU1kWGAOsaf6riXenBdi+XRsa4v29aybfZA/C0EtFjXsVGG8S\n Bc5DIdUqLZj/sP7LzWgDQCU8YQtvl2yotpgCLfIM+b30BUfDjSCtJh7QQ/VEmZ6T7Akl\n vzKg==",
        "X-Gm-Message-State": "AOAM530NuWFvcw+LL0JtbezcZpzEO0XWc7WT0uhSC5nEB2H/Ude0M8YG\n GWa1Kws/eukbfDKW0hVxpx+JOETdzH/6juEE/fFelF4hkdTvGIUFy/Npzl1K11N2TkV9XLqT+X4\n JCYDTNkEfYdbaQchAep0ONsissuuXSwRJtoqSIRQhd1httKgc8cQVP4QbpppV2mY=",
        "X-Google-Smtp-Source": "\n ABdhPJzSU/PmJnvAW/TTi5/FK2bAg6mj84g5kUY6Lf3diJ9hiofNq1T95DJTAbWCGMl4g679rjgDUw==",
        "X-Received": "by 2002:a63:5f8b:: with SMTP id\n t133mr10320680pgb.411.1623542832219;\n Sat, 12 Jun 2021 17:07:12 -0700 (PDT)",
        "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>",
        "To": "dev@dpdk.org",
        "Cc": "Peter Spreadborough <peter.spreadborough@broadcom.com>,\n Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>,\n Randy Schacher <stuart.schacher@broadcom.com>,\n Farah Smith <farah.smith@broadcom.com>",
        "Date": "Sat, 12 Jun 2021 17:06:05 -0700",
        "Message-Id": "<20210613000652.28191-12-ajit.khaparde@broadcom.com>",
        "X-Mailer": "git-send-email 2.21.1 (Apple Git-122.3)",
        "In-Reply-To": "<20210613000652.28191-1-ajit.khaparde@broadcom.com>",
        "References": "<20210530085929.29695-1-venkatkumar.duvvuru@broadcom.com>\n <20210613000652.28191-1-ajit.khaparde@broadcom.com>",
        "MIME-Version": "1.0",
        "Content-Type": "multipart/signed; protocol=\"application/pkcs7-signature\";\n micalg=sha-256; boundary=\"000000000000d4d23a05c49a85b6\"",
        "X-Content-Filtered-By": "Mailman/MimeDel 2.1.29",
        "Subject": "[dpdk-dev] [PATCH v2 11/58] net/bnxt: add hashing changes for Thor",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.29",
        "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\n- Move HCAPI hashing code to common file and add Thor support.\n- Change DPDK EM insert for FKB to use limited size Type 3 key.\n- Update FKB builder to be able to tell between EM and WC keys\n  during transform.\nFKB is the Flexible Key Builder in Thor used while inserting flows.\n\nSigned-off-by: Peter Spreadborough <peter.spreadborough@broadcom.com>\nSigned-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\nReviewed-by: Randy Schacher <stuart.schacher@broadcom.com>\nReviewed-by: Farah Smith <farah.smith@broadcom.com>\nReviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/hcapi/cfa/hcapi_cfa.h        |  72 ++++++++++-\n drivers/net/bnxt/hcapi/cfa/hcapi_cfa_common.c |  85 +++++++++++++\n drivers/net/bnxt/hcapi/cfa/hcapi_cfa_defs.h   |  15 +++\n drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p4.c     | 107 +---------------\n drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p58.c    | 120 ++++++++++++++++++\n drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p58.h    |   6 +\n drivers/net/bnxt/hcapi/cfa/meson.build        |   4 +-\n drivers/net/bnxt/tf_core/tf_device.h          |  15 +++\n drivers/net/bnxt/tf_core/tf_device_p4.c       |   1 +\n drivers/net/bnxt/tf_core/tf_device_p58.c      |   1 +\n drivers/net/bnxt/tf_core/tf_em.h              |   8 +-\n drivers/net/bnxt/tf_core/tf_em_common.c       |  42 ++++--\n .../net/bnxt/tf_core/tf_em_hash_internal.c    |  22 +++-\n 13 files changed, 373 insertions(+), 125 deletions(-)\n create mode 100644 drivers/net/bnxt/hcapi/cfa/hcapi_cfa_common.c\n create mode 100644 drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p58.c",
    "diff": "diff --git a/drivers/net/bnxt/hcapi/cfa/hcapi_cfa.h b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa.h\nindex c67aa29ad0..0580e07c45 100644\n--- a/drivers/net/bnxt/hcapi/cfa/hcapi_cfa.h\n+++ b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa.h\n@@ -63,10 +63,74 @@ struct hcapi_cfa_devops {\n \t */\n \tuint64_t (*hcapi_cfa_key_hash)(uint64_t *key_data, uint16_t bitlen);\n \n-\t/** hardware operation on the CFA EM key\n-\t *\n-\t * This API provides the functionality to program the exact match and\n-\t * key data to exact match record memory.\n+int hcapi_cfa_action_hw_op(struct hcapi_cfa_hwop *op,\n+\t\t\t   uint8_t *act_tbl,\n+\t\t\t   struct hcapi_cfa_data *act_obj);\n+int hcapi_cfa_dev_hw_op(struct hcapi_cfa_hwop *op, uint16_t tbl_id,\n+\t\t\tstruct hcapi_cfa_data *obj_data);\n+int hcapi_cfa_rm_register_client(hcapi_cfa_rm_data_t *data,\n+\t\t\t\t const char *client_name,\n+\t\t\t\t int *client_id);\n+int hcapi_cfa_rm_unregister_client(hcapi_cfa_rm_data_t *data,\n+\t\t\t\t   int client_id);\n+int hcapi_cfa_rm_query_resources(hcapi_cfa_rm_data_t *data,\n+\t\t\t\t int client_id,\n+\t\t\t\t uint16_t chnl_id,\n+\t\t\t\t struct hcapi_cfa_resc_req_db *req_db);\n+int hcapi_cfa_rm_query_resources_one(hcapi_cfa_rm_data_t *data,\n+\t\t\t\t     int clien_id,\n+\t\t\t\t     struct hcapi_cfa_resc_db *resc_db);\n+int hcapi_cfa_rm_reserve_resources(hcapi_cfa_rm_data_t *data,\n+\t\t\t\t   int client_id,\n+\t\t\t\t   struct hcapi_cfa_resc_req_db *resc_req,\n+\t\t\t\t   struct hcapi_cfa_resc_db *resc_db);\n+int hcapi_cfa_rm_release_resources(hcapi_cfa_rm_data_t *data,\n+\t\t\t\t   int client_id,\n+\t\t\t\t   struct hcapi_cfa_resc_req_db *resc_req,\n+\t\t\t\t   struct hcapi_cfa_resc_db *resc_db);\n+int hcapi_cfa_rm_initialize(hcapi_cfa_rm_data_t *data);\n+\n+#if SUPPORT_CFA_HW_P4\n+\n+int hcapi_cfa_p4_dev_hw_op(struct hcapi_cfa_hwop *op, uint16_t tbl_id,\n+\t\t\t    struct hcapi_cfa_data *obj_data);\n+int hcapi_cfa_p4_prof_l2ctxt_hwop(struct hcapi_cfa_hwop *op,\n+\t\t\t\t   struct hcapi_cfa_data *obj_data);\n+int hcapi_cfa_p4_prof_l2ctxtrmp_hwop(struct hcapi_cfa_hwop *op,\n+\t\t\t\t      struct hcapi_cfa_data *obj_data);\n+int hcapi_cfa_p4_prof_tcam_hwop(struct hcapi_cfa_hwop *op,\n+\t\t\t\t struct hcapi_cfa_data *obj_data);\n+int hcapi_cfa_p4_prof_tcamrmp_hwop(struct hcapi_cfa_hwop *op,\n+\t\t\t\t    struct hcapi_cfa_data *obj_data);\n+int hcapi_cfa_p4_wc_tcam_hwop(struct hcapi_cfa_hwop *op,\n+\t\t\t       struct hcapi_cfa_data *obj_data);\n+int hcapi_cfa_p4_wc_tcam_rec_hwop(struct hcapi_cfa_hwop *op,\n+\t\t\t\t   struct hcapi_cfa_data *obj_data);\n+int hcapi_cfa_p4_mirror_hwop(struct hcapi_cfa_hwop *op,\n+\t\t\t     struct hcapi_cfa_data *mirror);\n+int hcapi_cfa_p4_global_cfg_hwop(struct hcapi_cfa_hwop *op,\n+\t\t\t\t uint32_t type,\n+\t\t\t\t struct hcapi_cfa_data *config);\n+/* SUPPORT_CFA_HW_P4 */\n+#elif SUPPORT_CFA_HW_P45\n+int hcapi_cfa_p45_mirror_hwop(struct hcapi_cfa_hwop *op,\n+\t\t\t      struct hcapi_cfa_data *mirror);\n+int hcapi_cfa_p45_global_cfg_hwop(struct hcapi_cfa_hwop *op,\n+\t\t\t\t  uint32_t type,\n+\t\t\t\t  struct hcapi_cfa_data *config);\n+/* SUPPORT_CFA_HW_P45 */\n+#endif\n+\n+/**\n+ *  HCAPI CFA device HW operation function callback definition\n+ *  This is standardized function callback hook to install different\n+ *  CFA HW table programming function callback.\n+ */\n+\n+struct hcapi_cfa_tbl_cb {\n+\t/**\n+\t * This function callback provides the functionality to read/write\n+\t * HW table entry from a HW table.\n \t *\n \t * @param[in] op\n \t *   A pointer to the Hardware operation parameter\ndiff --git a/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_common.c b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_common.c\nnew file mode 100644\nindex 0000000000..fc96e3bff7\n--- /dev/null\n+++ b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_common.c\n@@ -0,0 +1,85 @@\n+/*\n+ *   Copyright(c) 2019-2021 Broadcom Limited.\n+ *   All rights reserved.\n+ */\n+\n+#include \"hcapi_cfa_defs.h\"\n+#include <errno.h>\n+#include \"assert.h\"\n+\n+const uint32_t crc32tbl[] = {\t/* CRC polynomial 0xedb88320 */\n+0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,\n+0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,\n+0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,\n+0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,\n+0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,\n+0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,\n+0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,\n+0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,\n+0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,\n+0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,\n+0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,\n+0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,\n+0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,\n+0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,\n+0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,\n+0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,\n+0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,\n+0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,\n+0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,\n+0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,\n+0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,\n+0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,\n+0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,\n+0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,\n+0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,\n+0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,\n+0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,\n+0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,\n+0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,\n+0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,\n+0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,\n+0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,\n+0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,\n+0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,\n+0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,\n+0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,\n+0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,\n+0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,\n+0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,\n+0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,\n+0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,\n+0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,\n+0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,\n+0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,\n+0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,\n+0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,\n+0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,\n+0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,\n+0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,\n+0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,\n+0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,\n+0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,\n+0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,\n+0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,\n+0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,\n+0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,\n+0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,\n+0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,\n+0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,\n+0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,\n+0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,\n+0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,\n+0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,\n+0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d\n+};\n+\n+uint32_t hcapi_cfa_crc32i(uint32_t crc, const uint8_t *buf, size_t len)\n+{\n+\tint l;\n+\n+\tfor (l = (len - 1); l >= 0; l--)\n+\t\tcrc = ucrc32(buf[l], crc);\n+\n+\treturn ~crc;\n+}\ndiff --git a/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_defs.h b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_defs.h\nindex 8e5095a6ef..579f1d5693 100644\n--- a/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_defs.h\n+++ b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_defs.h\n@@ -54,6 +54,16 @@ enum hcapi_cfa_dir {\n \tHCAPI_CFA_DIR_MAX = 2\n };\n \n+/*\n+ * Hashing defines\n+ */\n+#define HCAPI_CFA_LKUP_SEED_MEM_SIZE 512\n+\n+/* CRC32i support for Key0 hash */\n+#define ucrc32(ch, crc) (crc32tbl[((crc) ^ (ch)) & 0xff] ^ ((crc) >> 8))\n+#define crc32(x, y) crc32i(~0, x, y)\n+\n+\n /**\n  * CFA HW OPCODE definition\n  */\n@@ -282,4 +292,9 @@ int hcapi_cfa_key_hw_op(struct hcapi_cfa_hwop *op,\n \n uint64_t hcapi_get_table_page(struct hcapi_cfa_em_table *mem,\n \t\t\t      uint32_t page);\n+uint32_t hcapi_cfa_crc32i(uint32_t crc, const uint8_t *buf, size_t len);\n+uint64_t hcapi_cfa_p4_key_hash(uint64_t *key_data,\n+\t\t\t       uint16_t bitlen);\n+uint64_t hcapi_cfa_p58_key_hash(uint64_t *key_data,\n+\t\t\t\tuint16_t bitlen);\n #endif /* HCAPI_CFA_DEFS_H_ */\ndiff --git a/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p4.c b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p4.c\nindex 3a0476a33d..f097be9dfb 100644\n--- a/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p4.c\n+++ b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p4.c\n@@ -12,10 +12,9 @@\n \n #include \"hcapi_cfa_defs.h\"\n \n-#define HCAPI_CFA_LKUP_SEED_MEM_SIZE 512\n-uint32_t hcapi_cfa_lkup_lkup3_init_cfg;\n-uint32_t hcapi_cfa_lkup_em_seed_mem[HCAPI_CFA_LKUP_SEED_MEM_SIZE];\n-bool hcapi_cfa_lkup_init;\n+static uint32_t hcapi_cfa_lkup_lkup3_init_cfg;\n+static uint32_t hcapi_cfa_lkup_em_seed_mem[HCAPI_CFA_LKUP_SEED_MEM_SIZE];\n+static bool hcapi_cfa_lkup_init;\n \n static inline uint32_t SWAP_WORDS32(uint32_t val32)\n {\n@@ -47,102 +46,6 @@ static void hcapi_cfa_seeds_init(void)\n \t}\n }\n \n-/* CRC32i support for Key0 hash */\n-#define ucrc32(ch, crc) (crc32tbl[((crc) ^ (ch)) & 0xff] ^ ((crc) >> 8))\n-#define crc32(x, y) crc32i(~0, x, y)\n-\n-static const uint32_t crc32tbl[] = {\t/* CRC polynomial 0xedb88320 */\n-0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,\n-0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,\n-0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,\n-0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,\n-0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,\n-0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,\n-0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,\n-0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,\n-0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,\n-0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,\n-0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,\n-0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,\n-0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,\n-0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,\n-0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,\n-0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,\n-0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,\n-0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,\n-0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,\n-0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,\n-0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,\n-0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,\n-0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,\n-0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,\n-0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,\n-0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,\n-0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,\n-0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,\n-0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,\n-0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,\n-0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,\n-0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,\n-0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,\n-0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,\n-0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,\n-0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,\n-0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,\n-0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,\n-0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,\n-0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,\n-0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,\n-0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,\n-0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,\n-0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,\n-0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,\n-0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,\n-0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,\n-0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,\n-0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,\n-0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,\n-0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,\n-0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,\n-0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,\n-0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,\n-0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,\n-0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,\n-0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,\n-0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,\n-0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,\n-0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,\n-0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,\n-0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,\n-0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,\n-0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d\n-};\n-\n-static uint32_t hcapi_cfa_crc32i(uint32_t crc, const uint8_t *buf, size_t len)\n-{\n-\tint l;\n-\n-#ifdef TF_EEM_DEBUG\n-\tTFP_DRV_LOG(DEBUG, \"CRC2:\");\n-#endif\n-\tfor (l = (len - 1); l >= 0; l--) {\n-\t\tcrc = ucrc32(buf[l], crc);\n-#ifdef TF_EEM_DEBUG\n-\t\tTFP_DRV_LOG(DEBUG,\n-\t\t\t    \"%02X %08X %08X\\n\",\n-\t\t\t    (buf[l] & 0xff),\n-\t\t\t    crc,\n-\t\t\t    ~crc);\n-#endif\n-\t}\n-\n-#ifdef TF_EEM_DEBUG\n-\tTFP_DRV_LOG(DEBUG, \"\\n\");\n-#endif\n-\n-\treturn ~crc;\n-}\n-\n static uint32_t hcapi_cfa_crc32_hash(uint8_t *key)\n {\n \tint i;\n@@ -221,8 +124,8 @@ uint64_t hcapi_get_table_page(struct hcapi_cfa_em_table *mem,\n  * Return:\n  *\n  */\n-uint64_t hcapi_cfa_key_hash(uint64_t *key_data,\n-\t\t\t    uint16_t bitlen)\n+uint64_t hcapi_cfa_p4_key_hash(uint64_t *key_data,\n+\t\t\t       uint16_t bitlen)\n {\n \tuint32_t key0_hash;\n \tuint32_t key1_hash;\ndiff --git a/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p58.c b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p58.c\nnew file mode 100644\nindex 0000000000..15cbdc6eba\n--- /dev/null\n+++ b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p58.c\n@@ -0,0 +1,120 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2019-2021 Broadcom\n+ * All rights reserved.\n+ */\n+\n+#include <stdint.h>\n+#include <stdlib.h>\n+#include <stdbool.h>\n+#include <string.h>\n+#include \"lookup3.h\"\n+#include \"rand.h\"\n+\n+#include \"hcapi_cfa_defs.h\"\n+\n+static uint32_t hcapi_cfa_lkup_lkup3_init_cfg;\n+static uint32_t hcapi_cfa_lkup_em_seed_mem[HCAPI_CFA_LKUP_SEED_MEM_SIZE];\n+static bool hcapi_cfa_lkup_init;\n+\n+static void hcapi_cfa_seeds_init(void)\n+{\n+\tint i;\n+\tuint32_t r;\n+\n+\tif (hcapi_cfa_lkup_init)\n+\t\treturn;\n+\n+\thcapi_cfa_lkup_init = true;\n+\n+\t/* Initialize the lfsr */\n+\trand_init();\n+\n+\t/* RX and TX use the same seed values */\n+\thcapi_cfa_lkup_lkup3_init_cfg = rand32();\n+\n+\tfor (i = 0; i < HCAPI_CFA_LKUP_SEED_MEM_SIZE / 2; i++) {\n+\t\tr = rand32();\n+\t\thcapi_cfa_lkup_em_seed_mem[i * 2] = r;\n+\t\tr = rand32();\n+\t\thcapi_cfa_lkup_em_seed_mem[i * 2 + 1] = (r & 0x1);\n+\t}\n+}\n+\n+static uint32_t hcapi_cfa_crc32_hash(uint8_t *key)\n+{\n+\tint i;\n+\tuint32_t index;\n+\tuint32_t val1, val2;\n+\tuint8_t temp[4];\n+\tuint8_t *kptr = key;\n+\n+\t/* Do byte-wise XOR of the 52-byte HASH key first. */\n+\tindex = *key;\n+\tkptr--;\n+\n+\tfor (i = CFA_P58_EEM_KEY_MAX_SIZE - 2; i >= 0; i--) {\n+\t\tindex = index ^ *kptr;\n+\t\tkptr--;\n+\t}\n+\n+\t/* Get seeds */\n+\tval1 = hcapi_cfa_lkup_em_seed_mem[index * 2];\n+\tval2 = hcapi_cfa_lkup_em_seed_mem[index * 2 + 1];\n+\n+\ttemp[3] = (uint8_t)(val1 >> 24);\n+\ttemp[2] = (uint8_t)(val1 >> 16);\n+\ttemp[1] = (uint8_t)(val1 >> 8);\n+\ttemp[0] = (uint8_t)(val1 & 0xff);\n+\tval1 = 0;\n+\n+\t/* Start with seed */\n+\tif (!(val2 & 0x1))\n+\t\tval1 = hcapi_cfa_crc32i(~val1, temp, 4);\n+\n+\tval1 = hcapi_cfa_crc32i(~val1,\n+\t\t      (key - (CFA_P58_EEM_KEY_MAX_SIZE - 1)),\n+\t\t      CFA_P58_EEM_KEY_MAX_SIZE);\n+\n+\t/* End with seed */\n+\tif (val2 & 0x1)\n+\t\tval1 = hcapi_cfa_crc32i(~val1, temp, 4);\n+\n+\treturn val1;\n+}\n+\n+static uint32_t hcapi_cfa_lookup3_hash(uint8_t *in_key)\n+{\n+\tuint32_t val1;\n+\n+\tval1 = hashword(((uint32_t *)in_key) + 1,\n+\t\t\t CFA_P58_EEM_KEY_MAX_SIZE / (sizeof(uint32_t)),\n+\t\t\t hcapi_cfa_lkup_lkup3_init_cfg);\n+\n+\treturn val1;\n+}\n+\n+\n+/** Approximation of HCAPI hcapi_cfa_key_hash()\n+ *\n+ * Return:\n+ *\n+ */\n+uint64_t hcapi_cfa_p58_key_hash(uint64_t *key_data,\n+\t\t\t\tuint16_t bitlen)\n+{\n+\tuint32_t key0_hash;\n+\tuint32_t key1_hash;\n+\n+\t/*\n+\t * Init the seeds if needed\n+\t */\n+\tif (!hcapi_cfa_lkup_init)\n+\t\thcapi_cfa_seeds_init();\n+\n+\tkey0_hash = hcapi_cfa_crc32_hash(((uint8_t *)key_data) +\n+\t\t\t\t\t      (bitlen / 8) - 1);\n+\n+\tkey1_hash = hcapi_cfa_lookup3_hash((uint8_t *)key_data);\n+\n+\treturn ((uint64_t)key0_hash) << 32 | (uint64_t)key1_hash;\n+}\ndiff --git a/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p58.h b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p58.h\nindex b2535098d2..27796b1b2f 100644\n--- a/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p58.h\n+++ b/drivers/net/bnxt/hcapi/cfa/hcapi_cfa_p58.h\n@@ -6,6 +6,12 @@\n #ifndef _HCAPI_CFA_P58_H_\n #define _HCAPI_CFA_P58_H_\n \n+/**\n+ * EEM Key entry sizes\n+ */\n+#define CFA_P58_EEM_KEY_MAX_SIZE 80\n+#define CFA_P58_EEM_KEY_RECORD_SIZE 80\n+\n /** CFA phase 5.8 fix formatted table(layout) ID definition\n  *\n  */\ndiff --git a/drivers/net/bnxt/hcapi/cfa/meson.build b/drivers/net/bnxt/hcapi/cfa/meson.build\nindex 8b70d273f4..5cdb1862f3 100644\n--- a/drivers/net/bnxt/hcapi/cfa/meson.build\n+++ b/drivers/net/bnxt/hcapi/cfa/meson.build\n@@ -7,4 +7,6 @@ includes += include_directories('.')\n \n #Add the source files\n sources += files(\n-        'hcapi_cfa_p4.c')\n+\t'hcapi_cfa_p4.c',\n+\t'hcapi_cfa_p58.c',\n+\t'hcapi_cfa_common.c')\ndiff --git a/drivers/net/bnxt/tf_core/tf_device.h b/drivers/net/bnxt/tf_core/tf_device.h\nindex a18d59660b..3f2c24a0c6 100644\n--- a/drivers/net/bnxt/tf_core/tf_device.h\n+++ b/drivers/net/bnxt/tf_core/tf_device.h\n@@ -752,6 +752,21 @@ struct tf_dev_ops {\n \t *   Size in byte\n \t */\n \tint (*tf_dev_word_align)(uint16_t size);\n+\n+\t/**\n+\t * Hash key using crc32 and lookup3\n+\t *\n+\t * [in] key_data\n+\t *   Pointer to key\n+\t *\n+\t * [in] bitlen\n+\t *   Number of key bits\n+\t *\n+\t * Returns\n+\t *   Hashes\n+\t */\n+\tuint64_t (*tf_dev_cfa_key_hash)(uint64_t *key_data,\n+\t\t\t\t\t  uint16_t bitlen);\n };\n \n /**\ndiff --git a/drivers/net/bnxt/tf_core/tf_device_p4.c b/drivers/net/bnxt/tf_core/tf_device_p4.c\nindex 8274978bfe..8797afa100 100644\n--- a/drivers/net/bnxt/tf_core/tf_device_p4.c\n+++ b/drivers/net/bnxt/tf_core/tf_device_p4.c\n@@ -276,4 +276,5 @@ const struct tf_dev_ops tf_dev_ops_p4 = {\n \t.tf_dev_get_global_cfg = tf_global_cfg_get,\n \t.tf_dev_get_mailbox = tf_dev_p4_get_mailbox,\n \t.tf_dev_word_align = tf_dev_p4_word_align,\n+\t.tf_dev_cfa_key_hash = hcapi_cfa_p4_key_hash\n };\ndiff --git a/drivers/net/bnxt/tf_core/tf_device_p58.c b/drivers/net/bnxt/tf_core/tf_device_p58.c\nindex b61c58e41b..b44648d216 100644\n--- a/drivers/net/bnxt/tf_core/tf_device_p58.c\n+++ b/drivers/net/bnxt/tf_core/tf_device_p58.c\n@@ -297,4 +297,5 @@ const struct tf_dev_ops tf_dev_ops_p58 = {\n \t.tf_dev_get_global_cfg = tf_global_cfg_get,\n \t.tf_dev_get_mailbox = tf_dev_p58_get_mailbox,\n \t.tf_dev_word_align = tf_dev_p58_word_align,\n+\t.tf_dev_cfa_key_hash = hcapi_cfa_p58_key_hash\n };\ndiff --git a/drivers/net/bnxt/tf_core/tf_em.h b/drivers/net/bnxt/tf_core/tf_em.h\nindex 5a67ca3509..4de9e42cbc 100644\n--- a/drivers/net/bnxt/tf_core/tf_em.h\n+++ b/drivers/net/bnxt/tf_core/tf_em.h\n@@ -14,8 +14,10 @@\n #define TF_EM_MIN_ENTRIES     (1 << 15) /* 32K */\n #define TF_EM_MAX_ENTRIES     (1 << 27) /* 128M */\n \n-#define TF_HW_EM_KEY_MAX_SIZE 52\n-#define TF_EM_KEY_RECORD_SIZE 64\n+#define TF_P4_HW_EM_KEY_MAX_SIZE 52\n+#define TF_P4_EM_KEY_RECORD_SIZE 64\n+\n+#define TF_P58_HW_EM_KEY_MAX_SIZE 80\n \n #define TF_EM_MAX_MASK 0x7FFF\n #define TF_EM_MAX_ENTRY (128 * 1024 * 1024)\n@@ -95,7 +97,7 @@ struct tf_em_64b_entry {\n \t/** Header is 8 bytes long */\n \tstruct cfa_p4_eem_entry_hdr hdr;\n \t/** Key is 448 bits - 56 bytes */\n-\tuint8_t key[TF_EM_KEY_RECORD_SIZE - sizeof(struct cfa_p4_eem_entry_hdr)];\n+\tuint8_t key[TF_P4_EM_KEY_RECORD_SIZE - sizeof(struct cfa_p4_eem_entry_hdr)];\n };\n \n /** EEM Memory Type\ndiff --git a/drivers/net/bnxt/tf_core/tf_em_common.c b/drivers/net/bnxt/tf_core/tf_em_common.c\nindex 589df60041..d8278f1ce1 100644\n--- a/drivers/net/bnxt/tf_core/tf_em_common.c\n+++ b/drivers/net/bnxt/tf_core/tf_em_common.c\n@@ -284,7 +284,7 @@ tf_em_create_key_entry(struct cfa_p4_eem_entry_hdr *result,\n {\n \tkey_entry->hdr.word1 = result->word1;\n \tkey_entry->hdr.pointer = result->pointer;\n-\tmemcpy(key_entry->key, in_key, TF_HW_EM_KEY_MAX_SIZE + 4);\n+\tmemcpy(key_entry->key, in_key, TF_P4_HW_EM_KEY_MAX_SIZE + 4);\n }\n \n \n@@ -680,7 +680,8 @@ tf_em_validate_num_entries(struct tf_tbl_scope_cb *tbl_scope_cb,\n  *   TF_ERR_EM_DUP  - key is already in table\n  */\n static int\n-tf_insert_eem_entry(struct tf_tbl_scope_cb *tbl_scope_cb,\n+tf_insert_eem_entry(struct tf_dev_info *dev,\n+\t\t    struct tf_tbl_scope_cb *tbl_scope_cb,\n \t\t    struct tf_insert_em_entry_parms *parms)\n {\n \tuint32_t mask;\n@@ -706,11 +707,14 @@ tf_insert_eem_entry(struct tf_tbl_scope_cb *tbl_scope_cb,\n \t\treturn -EINVAL;\n \n #ifdef TF_EEM_DEBUG\n-\tdump_raw((uint8_t *)parms->key, TF_HW_EM_KEY_MAX_SIZE + 4, \"In Key\");\n+\tdump_raw((uint8_t *)parms->key, TF_P4_HW_EM_KEY_MAX_SIZE + 4, \"In Key\");\n #endif\n \n-\tbig_hash = hcapi_cfa_key_hash((uint64_t *)parms->key,\n-\t\t\t\t      (TF_HW_EM_KEY_MAX_SIZE + 4) * 8);\n+\tif (dev->ops->tf_dev_cfa_key_hash == NULL)\n+\t\treturn -EINVAL;\n+\n+\tbig_hash = dev->ops->tf_dev_cfa_key_hash((uint64_t *)parms->key,\n+\t\t\t\t\t (TF_P4_HW_EM_KEY_MAX_SIZE + 4) * 8);\n \tkey0_hash = (uint32_t)(big_hash >> 32);\n \tkey1_hash = (uint32_t)(big_hash & 0xFFFFFFFF);\n \n@@ -739,9 +743,9 @@ tf_insert_eem_entry(struct tf_tbl_scope_cb *tbl_scope_cb,\n \tkey_tbl.base0 =\n \t\t(uint8_t *)&tbl_scope_cb->em_ctx_info[parms->dir].em_tables[TF_KEY0_TABLE];\n \tkey_tbl.page_size = TF_EM_PAGE_SIZE;\n-\tkey_obj.offset = index * TF_EM_KEY_RECORD_SIZE;\n+\tkey_obj.offset = index * TF_P4_EM_KEY_RECORD_SIZE;\n \tkey_obj.data = (uint8_t *)&key_entry;\n-\tkey_obj.size = TF_EM_KEY_RECORD_SIZE;\n+\tkey_obj.size = TF_P4_EM_KEY_RECORD_SIZE;\n \n \trc = hcapi_cfa_key_hw_op(&op,\n \t\t\t\t &key_tbl,\n@@ -755,7 +759,7 @@ tf_insert_eem_entry(struct tf_tbl_scope_cb *tbl_scope_cb,\n \n \t\tkey_tbl.base0 =\n \t\t\t(uint8_t *)&tbl_scope_cb->em_ctx_info[parms->dir].em_tables[TF_KEY1_TABLE];\n-\t\tkey_obj.offset = index * TF_EM_KEY_RECORD_SIZE;\n+\t\tkey_obj.offset = index * TF_P4_EM_KEY_RECORD_SIZE;\n \n \t\trc = hcapi_cfa_key_hw_op(&op,\n \t\t\t\t\t &key_tbl,\n@@ -818,9 +822,9 @@ tf_delete_eem_entry(struct tf_tbl_scope_cb *tbl_scope_cb,\n \t\t(uint8_t *)&tbl_scope_cb->em_ctx_info[parms->dir].em_tables\n \t\t\t[(hash_type == 0 ? TF_KEY0_TABLE : TF_KEY1_TABLE)];\n \tkey_tbl.page_size = TF_EM_PAGE_SIZE;\n-\tkey_obj.offset = index * TF_EM_KEY_RECORD_SIZE;\n+\tkey_obj.offset = index * TF_P4_EM_KEY_RECORD_SIZE;\n \tkey_obj.data = NULL;\n-\tkey_obj.size = TF_EM_KEY_RECORD_SIZE;\n+\tkey_obj.size = TF_P4_EM_KEY_RECORD_SIZE;\n \n \trc = hcapi_cfa_key_hw_op(&op,\n \t\t\t\t &key_tbl,\n@@ -843,7 +847,10 @@ int\n tf_em_insert_ext_entry(struct tf *tfp __rte_unused,\n \t\t       struct tf_insert_em_entry_parms *parms)\n {\n+\tint rc;\n \tstruct tf_tbl_scope_cb *tbl_scope_cb;\n+\tstruct tf_session *tfs;\n+\tstruct tf_dev_info *dev;\n \n \ttbl_scope_cb = tbl_scope_cb_find(parms->tbl_scope_id);\n \tif (tbl_scope_cb == NULL) {\n@@ -851,9 +858,20 @@ tf_em_insert_ext_entry(struct tf *tfp __rte_unused,\n \t\treturn -EINVAL;\n \t}\n \n+\t/* Retrieve the session information */\n+\trc = tf_session_get_session_internal(tfp, &tfs);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\t/* Retrieve the device information */\n+\trc = tf_session_get_device(tfs, &dev);\n+\tif (rc)\n+\t\treturn rc;\n+\n \treturn tf_insert_eem_entry\n-\t\t(tbl_scope_cb,\n-\t\tparms);\n+\t\t(dev,\n+\t\t tbl_scope_cb,\n+\t\t parms);\n }\n \n /** Delete EM hash entry API\ndiff --git a/drivers/net/bnxt/tf_core/tf_em_hash_internal.c b/drivers/net/bnxt/tf_core/tf_em_hash_internal.c\nindex 09183b42f0..f6c9772b44 100644\n--- a/drivers/net/bnxt/tf_core/tf_em_hash_internal.c\n+++ b/drivers/net/bnxt/tf_core/tf_em_hash_internal.c\n@@ -15,6 +15,7 @@\n #include \"tf_msg.h\"\n #include \"tfp.h\"\n #include \"tf_ext_flow_handle.h\"\n+#include \"tf_device.h\"\n \n #include \"bnxt.h\"\n \n@@ -43,6 +44,18 @@ tf_em_hash_insert_int_entry(struct tf *tfp,\n \tuint32_t key0_hash;\n \tuint32_t key1_hash;\n \tuint64_t big_hash;\n+\tstruct tf_dev_info *dev;\n+\tstruct tf_session *tfs;\n+\n+\t/* Retrieve the session information */\n+\trc = tf_session_get_session_internal(tfp, &tfs);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\t/* Retrieve the device information */\n+\trc = tf_session_get_device(tfs, &dev);\n+\tif (rc)\n+\t\treturn rc;\n \n \trc = stack_pop(pool, &index);\n \tif (rc) {\n@@ -52,8 +65,11 @@ tf_em_hash_insert_int_entry(struct tf *tfp,\n \t\treturn rc;\n \t}\n \n-\tbig_hash = hcapi_cfa_key_hash((uint64_t *)parms->key,\n-\t\t\t\t      (TF_HW_EM_KEY_MAX_SIZE + 4) * 8);\n+\tif (dev->ops->tf_dev_cfa_key_hash == NULL)\n+\t\treturn -EINVAL;\n+\n+\tbig_hash = dev->ops->tf_dev_cfa_key_hash((uint64_t *)parms->key,\n+\t\t\t\t\tTF_P58_HW_EM_KEY_MAX_SIZE * 8);\n \tkey0_hash = (uint32_t)(big_hash >> 32);\n \tkey1_hash = (uint32_t)(big_hash & 0xFFFFFFFF);\n \n@@ -93,7 +109,7 @@ tf_em_hash_insert_int_entry(struct tf *tfp,\n \tTF_SET_FIELDS_IN_FLOW_HANDLE(parms->flow_handle,\n \t\t\t\t     (uint32_t)num_of_entries,\n \t\t\t\t     0,\n-\t\t\t\t     0,\n+\t\t\t\t     TF_FLAGS_FLOW_HANDLE_INTERNAL,\n \t\t\t\t     rptr_index,\n \t\t\t\t     rptr_entry,\n \t\t\t\t     0);\n",
    "prefixes": [
        "v2",
        "11/58"
    ]
}