Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/81627/?format=api
{ "id": 81627, "url": "http://patches.dpdk.org/api/patches/81627/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201020215538.59242-9-ajit.khaparde@broadcom.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20201020215538.59242-9-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201020215538.59242-9-ajit.khaparde@broadcom.com", "date": "2020-10-20T21:55:35", "name": "[v2,08/11] net/bnxt: add mapper support for wildcard TCAM", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "9222758bd4da4c5c2083b3a6de1e5b3b02585832", "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/20201020215538.59242-9-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 13155, "url": "http://patches.dpdk.org/api/series/13155/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13155", "date": "2020-10-20T21:55:27", "name": "bnxt fixes and enhancements to TRUFLOW support", "version": 2, "mbox": "http://patches.dpdk.org/series/13155/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/81627/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/81627/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 AAD42A04DD;\n\tTue, 20 Oct 2020 23:58:28 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 37A9FACCC;\n\tTue, 20 Oct 2020 23:56:05 +0200 (CEST)", "from mail-pj1-f68.google.com (mail-pj1-f68.google.com\n [209.85.216.68]) by dpdk.org (Postfix) with ESMTP id 7A85EACAA\n for <dev@dpdk.org>; Tue, 20 Oct 2020 23:55:54 +0200 (CEST)", "by mail-pj1-f68.google.com with SMTP id a17so53014pju.1\n for <dev@dpdk.org>; Tue, 20 Oct 2020 14:55:54 -0700 (PDT)", "from localhost.localdomain ([192.19.223.252])\n by smtp.gmail.com with ESMTPSA id e6sm24113pfn.190.2020.10.20.14.55.51\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Tue, 20 Oct 2020 14:55:51 -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=mt+fW+kIY+3LeT/KhoVZUkd+mdsJPMmDJOJwtrc3874=;\n b=cpNS8XwUCkibRkpBSA8usMYutQ1U/W9orkA1KOKz6cQHoIWB5IkAAfr/f5O86qImkY\n gbGEjoRh4hmiDiVCtcOq9wfIg3ooyjP5pbG2gnv0gw5j/Dge8mVfWIzJPhv5/XWR3YQv\n LtzR0OtWerhFvbk5+pA4b7C2g+UwmjS7KIios=", "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=mt+fW+kIY+3LeT/KhoVZUkd+mdsJPMmDJOJwtrc3874=;\n b=cgpwW4Dm0lBo37NIrBptCZZN2uW9SnVVYl1FrL86GO/HiDl11hHWlCrS65P8AlZnHp\n cmmrfAKsF+m8KSd88jR2kKNPWNg/eLBvW2OJTkjyubyXV3/JBQlPTuN7rlgYZAy3l7Xw\n ac9AII/OQ3vju/YGb2xGSg1DL6nx/g9Pte/ZXAvoCsNlvPYAyj0isbj4MuXCncwW+IMU\n aSyPlVZGaqOW88WnYidsMuq9aH5toNP5ue79czEFFibbqGmd3mqGtKAKHZLJr5SQ+ye4\n kA8MEDrDdNje3k0I9UUvcg3Q5Hl6bN1xy9mC0SVd/d3FeBIBEoo37R90er5nVDFzQl19\n mUwQ==", "X-Gm-Message-State": "AOAM532Ys3tBOgLCqKFp4xU7oZUIQ9rBAgZgDwahu4KajDofXtv6BhMc\n Rby+uj3kyrUn2bqcoSJLGV+1FsEArJAESO4b/p09jmPkJGpj90UgTx0oGxGNH5q4qe64bSiine3\n eTG2E7+miM8rISGiumrU+SwfaQLbhwVBs4E0DVF02QPMaBQE2ErKNabYw/U8tCee2TQ==", "X-Google-Smtp-Source": "\n ABdhPJwo9UXxO/SmhspYsS+YcQDOkjN3l78MjQzkLSChoVRkyMC0bMasTllRlEWpeRQJBGvTL+agPQ==", "X-Received": "by 2002:a17:902:ec02:b029:d2:ab80:4dcc with SMTP id\n l2-20020a170902ec02b02900d2ab804dccmr250532pld.64.1603230951960;\n Tue, 20 Oct 2020 14:55:51 -0700 (PDT)", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "Kishore Padmanabha <kishore.padmanabha@broadcom.com>,\n Mike Baucom <michael.baucom@broadcom.com>", "Date": "Tue, 20 Oct 2020 14:55:35 -0700", "Message-Id": "<20201020215538.59242-9-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": "\n <1602916089-18576-1-git-send-email-venkatkumar.duvvuru@broadcom.com>\n <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 v2 08/11] net/bnxt: add mapper support for\n\twildcard TCAM", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\n\nAdded support for the key and mask fields encoding for the\nwildcard tcam entry.\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@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_mapper.c | 47 ++++++++--\n drivers/net/bnxt/tf_ulp/ulp_utils.c | 125 +++++++++++++++++++++++++++\n drivers/net/bnxt/tf_ulp/ulp_utils.h | 48 +++++++++-\n 3 files changed, 212 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex b74cb92f5..27b478099 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -1497,6 +1497,29 @@ ulp_mapper_tcam_tbl_entry_write(struct bnxt_ulp_mapper_parms *parms,\n \treturn rc;\n }\n \n+#define BNXT_ULP_WC_TCAM_SLICE_SIZE 80\n+/* internal function to post process the key/mask blobs for wildcard tcam tbl */\n+static void ulp_mapper_wc_tcam_tbl_post_process(struct ulp_blob *blob,\n+\t\t\t\t\t\tuint32_t len)\n+{\n+\tuint8_t mode[2] = {0x0, 0x0};\n+\tuint32_t mode_len = len / BNXT_ULP_WC_TCAM_SLICE_SIZE;\n+\tuint32_t size, idx;\n+\n+\t/* Add the mode bits to the key and mask*/\n+\tif (mode_len == 2)\n+\t\tmode[1] = 2;\n+\telse if (mode_len > 2)\n+\t\tmode[1] = 3;\n+\n+\tsize = BNXT_ULP_WC_TCAM_SLICE_SIZE + ULP_BYTE_2_BITS(sizeof(mode));\n+\tfor (idx = 0; idx < mode_len; idx++)\n+\t\tulp_blob_insert(blob, (size * idx), mode,\n+\t\t\t\tULP_BYTE_2_BITS(sizeof(mode)));\n+\tulp_blob_perform_64B_word_swap(blob);\n+\tulp_blob_perform_64B_byte_swap(blob);\n+}\n+\n static int32_t\n ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\t struct bnxt_ulp_mapper_tbl_info *tbl)\n@@ -1533,9 +1556,9 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\treturn -EINVAL;\n \t}\n \n-\tif (!ulp_blob_init(&key, tbl->key_bit_size,\n+\tif (!ulp_blob_init(&key, tbl->blob_key_bit_size,\n \t\t\t parms->device_params->byte_order) ||\n-\t !ulp_blob_init(&mask, tbl->key_bit_size,\n+\t !ulp_blob_init(&mask, tbl->blob_key_bit_size,\n \t\t\t parms->device_params->byte_order) ||\n \t !ulp_blob_init(&data, tbl->result_bit_size,\n \t\t\t parms->device_params->byte_order) ||\n@@ -1545,6 +1568,11 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\treturn -EINVAL;\n \t}\n \n+\tif (tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM) {\n+\t\tkey.byte_order = BNXT_ULP_BYTE_ORDER_BE;\n+\t\tmask.byte_order = BNXT_ULP_BYTE_ORDER_BE;\n+\t}\n+\n \t/* create the key/mask */\n \t/*\n \t * NOTE: The WC table will require some kind of flag to handle the\n@@ -1570,6 +1598,11 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t}\n \t}\n \n+\tif (tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM) {\n+\t\tulp_mapper_wc_tcam_tbl_post_process(&key, tbl->key_bit_size);\n+\t\tulp_mapper_wc_tcam_tbl_post_process(&mask, tbl->key_bit_size);\n+\t}\n+\n \tif (tbl->srch_b4_alloc == BNXT_ULP_SEARCH_BEFORE_ALLOC_NO) {\n \t\t/*\n \t\t * No search for re-use is requested, so simply allocate the\n@@ -1578,18 +1611,18 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\taparms.dir\t\t= tbl->direction;\n \t\taparms.tcam_tbl_type\t= tbl->resource_type;\n \t\taparms.search_enable\t= tbl->srch_b4_alloc;\n-\t\taparms.key_sz_in_bits\t= tbl->key_bit_size;\n \t\taparms.key\t\t= ulp_blob_data_get(&key, &tmplen);\n-\t\tif (tbl->key_bit_size != tmplen) {\n+\t\taparms.key_sz_in_bits\t= tmplen;\n+\t\tif (tbl->blob_key_bit_size != tmplen) {\n \t\t\tBNXT_TF_DBG(ERR, \"Key len (%d) != Expected (%d)\\n\",\n-\t\t\t\t tmplen, tbl->key_bit_size);\n+\t\t\t\t tmplen, tbl->blob_key_bit_size);\n \t\t\treturn -EINVAL;\n \t\t}\n \n \t\taparms.mask\t\t= ulp_blob_data_get(&mask, &tmplen);\n-\t\tif (tbl->key_bit_size != tmplen) {\n+\t\tif (tbl->blob_key_bit_size != tmplen) {\n \t\t\tBNXT_TF_DBG(ERR, \"Mask len (%d) != Expected (%d)\\n\",\n-\t\t\t\t tmplen, tbl->key_bit_size);\n+\t\t\t\t tmplen, tbl->blob_key_bit_size);\n \t\t\treturn -EINVAL;\n \t\t}\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_utils.c b/drivers/net/bnxt/tf_ulp/ulp_utils.c\nindex 24474e2e2..a13a3bbf6 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_utils.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_utils.c\n@@ -273,6 +273,69 @@ ulp_blob_push(struct ulp_blob *blob,\n \treturn datalen;\n }\n \n+/*\n+ * Insert data into the binary blob at the given offset.\n+ *\n+ * blob [in] The blob that data is added to. The blob must\n+ * be initialized prior to pushing data.\n+ *\n+ * offset [in] The offset where the data needs to be inserted.\n+ *\n+ * data [in/out] A pointer to bytes to be added to the blob.\n+ *\n+ * datalen [in] The number of bits to be added to the blob.\n+ *\n+ * The offset of the data is updated after each push of data.\n+ * NULL returned on error.\n+ */\n+uint32_t\n+ulp_blob_insert(struct ulp_blob *blob, uint32_t offset,\n+\t\tuint8_t *data, uint32_t datalen)\n+{\n+\tuint32_t rc;\n+\tuint8_t local_data[BNXT_ULP_FLMP_BLOB_SIZE];\n+\tuint16_t mov_len;\n+\n+\t/* validate the arguments */\n+\tif (!blob || datalen > (uint32_t)(blob->bitlen - blob->write_idx) ||\n+\t offset > blob->write_idx) {\n+\t\tBNXT_TF_DBG(ERR, \"invalid argument\\n\");\n+\t\treturn 0; /* failure */\n+\t}\n+\n+\tmov_len = blob->write_idx - offset;\n+\t/* If offset and data len are not 8 bit aligned then return error */\n+\tif (ULP_BITS_IS_BYTE_NOT_ALIGNED(offset) ||\n+\t ULP_BITS_IS_BYTE_NOT_ALIGNED(datalen)) {\n+\t\tBNXT_TF_DBG(ERR, \"invalid argument, not aligned\\n\");\n+\t\treturn 0; /* failure */\n+\t}\n+\n+\t/* copy the data so we can move the data */\n+\tmemcpy(local_data, &blob->data[ULP_BITS_2_BYTE_NR(offset)],\n+\t ULP_BITS_2_BYTE(mov_len));\n+\tblob->write_idx = offset;\n+\tif (blob->byte_order == BNXT_ULP_BYTE_ORDER_BE)\n+\t\trc = ulp_bs_push_msb(blob->data,\n+\t\t\t\t blob->write_idx,\n+\t\t\t\t datalen,\n+\t\t\t\t data);\n+\telse\n+\t\trc = ulp_bs_push_lsb(blob->data,\n+\t\t\t\t blob->write_idx,\n+\t\t\t\t datalen,\n+\t\t\t\t data);\n+\tif (!rc) {\n+\t\tBNXT_TF_DBG(ERR, \"Failed ro write blob\\n\");\n+\t\treturn 0;\n+\t}\n+\t/* copy the previously stored data */\n+\tmemcpy(&blob->data[ULP_BITS_2_BYTE_NR(offset + datalen)], local_data,\n+\t ULP_BITS_2_BYTE(mov_len));\n+\tblob->write_idx += (mov_len + datalen);\n+\treturn datalen;\n+}\n+\n /*\n * Add data to the binary blob at the current offset.\n *\n@@ -603,6 +666,68 @@ ulp_blob_perform_byte_reverse(struct ulp_blob *blob)\n \t}\n }\n \n+/*\n+ * Perform the blob buffer 64 bit word swap.\n+ * This api makes the first 4 bytes the last in\n+ * a given 64 bit value and vice-versa.\n+ *\n+ * blob [in] The blob's data to be used for swap.\n+ *\n+ * returns void.\n+ */\n+void\n+ulp_blob_perform_64B_word_swap(struct ulp_blob *blob)\n+{\n+\tuint32_t i, j, num;\n+\tuint8_t xchar;\n+\tuint32_t word_size = ULP_64B_IN_BYTES / 2;\n+\n+\t/* validate the arguments */\n+\tif (!blob) {\n+\t\tBNXT_TF_DBG(ERR, \"invalid argument\\n\");\n+\t\treturn; /* failure */\n+\t}\n+\tnum = ULP_BITS_2_BYTE(blob->write_idx);\n+\tfor (i = 0; i < num; i = i + ULP_64B_IN_BYTES) {\n+\t\tfor (j = 0; j < word_size; j++) {\n+\t\t\txchar = blob->data[i + j];\n+\t\t\tblob->data[i + j] = blob->data[i + j + word_size];\n+\t\t\tblob->data[i + j + word_size] = xchar;\n+\t\t}\n+\t}\n+}\n+\n+/*\n+ * Perform the blob buffer 64 bit byte swap.\n+ * This api makes the first byte the last in\n+ * a given 64 bit value and vice-versa.\n+ *\n+ * blob [in] The blob's data to be used for swap.\n+ *\n+ * returns void.\n+ */\n+void\n+ulp_blob_perform_64B_byte_swap(struct ulp_blob *blob)\n+{\n+\tuint32_t i, j, num;\n+\tuint8_t xchar;\n+\tuint32_t offset = ULP_64B_IN_BYTES - 1;\n+\n+\t/* validate the arguments */\n+\tif (!blob) {\n+\t\tBNXT_TF_DBG(ERR, \"invalid argument\\n\");\n+\t\treturn; /* failure */\n+\t}\n+\tnum = ULP_BITS_2_BYTE(blob->write_idx);\n+\tfor (i = 0; i < num; i = i + ULP_64B_IN_BYTES) {\n+\t\tfor (j = 0; j < (ULP_64B_IN_BYTES / 2); j++) {\n+\t\t\txchar = blob->data[i + j];\n+\t\t\tblob->data[i + j] = blob->data[i + offset - j];\n+\t\t\tblob->data[i + offset - j] = xchar;\n+\t\t}\n+\t}\n+}\n+\n /*\n * Read data from the operand\n *\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_utils.h b/drivers/net/bnxt/tf_ulp/ulp_utils.h\nindex 898e85123..749ac06d8 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_utils.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_utils.h\n@@ -12,7 +12,7 @@\n #define ULP_BUFFER_ALIGN_8_BYTE\t\t8\n #define ULP_BUFFER_ALIGN_16_BYTE\t16\n #define ULP_BUFFER_ALIGN_64_BYTE\t64\n-\n+#define ULP_64B_IN_BYTES\t\t8\n /*\n * Macros for bitmap sets and gets\n * These macros can be used if the val are power of 2.\n@@ -57,6 +57,9 @@\n /* Macro to round off to next multiple of 8*/\n #define ULP_BYTE_ROUND_OFF_8(x)\t(((x) + 7) & ~7)\n \n+/* Macro to check bits are byte aligned */\n+#define ULP_BITS_IS_BYTE_NOT_ALIGNED(x)\t((x) % 8)\n+\n /* Macros to read the computed fields */\n #define ULP_COMP_FLD_IDX_RD(params, idx) \\\n \trte_be_to_cpu_32((params)->comp_fld[(idx)])\n@@ -167,6 +170,25 @@ ulp_blob_push(struct ulp_blob *blob,\n \t uint8_t *data,\n \t uint32_t datalen);\n \n+/*\n+ * Insert data into the binary blob at the given offset.\n+ *\n+ * blob [in] The blob that data is added to. The blob must\n+ * be initialized prior to pushing data.\n+ *\n+ * offset [in] The offset where the data needs to be inserted.\n+ *\n+ * data [in/out] A pointer to bytes to be added to the blob.\n+ *\n+ * datalen [in] The number of bits to be added to the blob.\n+ *\n+ * The offset of the data is updated after each push of data.\n+ * NULL returned on error.\n+ */\n+uint32_t\n+ulp_blob_insert(struct ulp_blob *blob, uint32_t offset,\n+\t\tuint8_t *data, uint32_t datalen);\n+\n /*\n * Add data to the binary blob at the current offset.\n *\n@@ -299,6 +321,30 @@ ulp_blob_perform_encap_swap(struct ulp_blob *blob);\n void\n ulp_blob_perform_byte_reverse(struct ulp_blob *blob);\n \n+/*\n+ * Perform the blob buffer 64 bit word swap.\n+ * This api makes the first 4 bytes the last in\n+ * a given 64 bit value and vice-versa.\n+ *\n+ * blob [in] The blob's data to be used for swap.\n+ *\n+ * returns void.\n+ */\n+void\n+ulp_blob_perform_64B_word_swap(struct ulp_blob *blob);\n+\n+/*\n+ * Perform the blob buffer 64 bit byte swap.\n+ * This api makes the first byte the last in\n+ * a given 64 bit value and vice-versa.\n+ *\n+ * blob [in] The blob's data to be used for swap.\n+ *\n+ * returns void.\n+ */\n+void\n+ulp_blob_perform_64B_byte_swap(struct ulp_blob *blob);\n+\n /*\n * Read data from the operand\n *\n", "prefixes": [ "v2", "08/11" ] }