Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/71171/?format=api
{ "id": 71171, "url": "https://patches.dpdk.org/api/patches/71171/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200610114427.22146-36-somnath.kotur@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": "<20200610114427.22146-36-somnath.kotur@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200610114427.22146-36-somnath.kotur@broadcom.com", "date": "2020-06-10T11:44:26", "name": "[35/36] net/bnxt: rename fields in the device params structure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "8aacea27b5711778048184d33fb52815d5197674", "submitter": { "id": 908, "url": "https://patches.dpdk.org/api/people/908/?format=api", "name": "Somnath Kotur", "email": "somnath.kotur@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/20200610114427.22146-36-somnath.kotur@broadcom.com/mbox/", "series": [ { "id": 10380, "url": "https://patches.dpdk.org/api/series/10380/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10380", "date": "2020-06-10T11:43:51", "name": "bnxt patches", "version": 1, "mbox": "https://patches.dpdk.org/series/10380/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/71171/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/71171/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 8A4A4A051B;\n\tWed, 10 Jun 2020 13:55:42 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 26F221BFF2;\n\tWed, 10 Jun 2020 13:49:45 +0200 (CEST)", "from relay.smtp.broadcom.com (relay.smtp.broadcom.com\n [192.19.232.149]) by dpdk.org (Postfix) with ESMTP id E2A72323C\n for <dev@dpdk.org>; Wed, 10 Jun 2020 13:49:41 +0200 (CEST)", "from dhcp-10-123-153-55.dhcp.broadcom.net\n (dhcp-10-123-153-55.dhcp.broadcom.net [10.123.153.55])\n by relay.smtp.broadcom.com (Postfix) with ESMTP id 43A741BD575;\n Wed, 10 Jun 2020 04:49:41 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com 43A741BD575", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1591789782;\n bh=4poWtIgDB1LR4zLryFBz6UO73dw4kkkfFxBvJB3lXdo=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=tELifd3tKSNkCMTn93ijByh9rvYISbPbchBorDuDbK5k4wVELqMWV1ppm2mid2ix/\n Ar9k2ciIkH9FQ1dCQ30k/NK9qU5jtDtLagb7qcLARWO+xayM4sGSJodkzXDISVbXpl\n 89bHo/Nc0n1NXNvQBiBeexhL1tR4d48gYmf1NAfk=", "From": "Somnath Kotur <somnath.kotur@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com", "Date": "Wed, 10 Jun 2020 17:14:26 +0530", "Message-Id": "<20200610114427.22146-36-somnath.kotur@broadcom.com>", "X-Mailer": "git-send-email 2.10.1.613.g2cc2e70", "In-Reply-To": "<20200610114427.22146-1-somnath.kotur@broadcom.com>", "References": "<20200610114427.22146-1-somnath.kotur@broadcom.com>", "Subject": "[dpdk-dev] [PATCH 35/36] net/bnxt: rename fields in the device\n\tparams structure", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\n\nThe fields in the device params structure are renamed to reflect\nthe usage of those fields.\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nReviewed-by: Michael Baucom <michael.baucom@broadcom.com>\nSigned-off-by: Somnath Kotur <somnath.kotur@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 12 ++++++------\n drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 4 ++--\n drivers/net/bnxt/tf_ulp/ulp_mapper.c | 5 +++--\n drivers/net/bnxt/tf_ulp/ulp_mark_mgr.c | 4 ++--\n drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h | 7 +++++++\n drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c | 19 ++++++++++---------\n drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 12 ++++++------\n 7 files changed, 36 insertions(+), 27 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\nindex fd3f61b..0c3c638 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n@@ -146,14 +146,14 @@ bnxt_init_tbl_scope_parms(struct bnxt *bp,\n \t\tparams->rx_max_action_entry_sz_in_bits =\n \t\t\tBNXT_ULP_DFLT_RX_MAX_ACTN_ENTRY;\n \t\tparams->rx_mem_size_in_mb = BNXT_ULP_DFLT_RX_MEM;\n-\t\tparams->rx_num_flows_in_k = dparms->num_flows / (1024);\n+\t\tparams->rx_num_flows_in_k = dparms->flow_db_num_entries / 1024;\n \t\tparams->rx_tbl_if_id = BNXT_ULP_RX_TBL_IF_ID;\n \n \t\tparams->tx_max_key_sz_in_bits = BNXT_ULP_DFLT_TX_MAX_KEY;\n \t\tparams->tx_max_action_entry_sz_in_bits =\n \t\t\tBNXT_ULP_DFLT_TX_MAX_ACTN_ENTRY;\n \t\tparams->tx_mem_size_in_mb = BNXT_ULP_DFLT_TX_MEM;\n-\t\tparams->tx_num_flows_in_k = dparms->num_flows / (1024);\n+\t\tparams->tx_num_flows_in_k = dparms->flow_db_num_entries / 1024;\n \t\tparams->tx_tbl_if_id = BNXT_ULP_TX_TBL_IF_ID;\n \t}\n }\n@@ -299,11 +299,11 @@ ulp_dparms_init(struct bnxt *bp,\n \t}\n \n \t/* num_flows = max_num_kflows * 1024 */\n-\tdparms->num_flows = bp->max_num_kflows * 1024;\n+\tdparms->flow_db_num_entries = bp->max_num_kflows * 1024;\n \t/* GFID = 2 * num_flows */\n-\tdparms->gfid_entries = dparms->num_flows * 2;\n+\tdparms->mark_db_gfid_entries = dparms->flow_db_num_entries * 2;\n \tBNXT_TF_DBG(DEBUG, \"Set the number of flows = %\"PRIu64\"\\n\",\n-\t\t dparms->num_flows);\n+\t\t dparms->flow_db_num_entries);\n \n \treturn 0;\n }\n@@ -328,7 +328,7 @@ ulp_dparms_dev_port_intf_update(struct bnxt *bp,\n \t}\n \n \t/* Update the bp flag with gfid flag */\n-\tif (dparms->global_fid_enable)\n+\tif (dparms->flow_mem_type == BNXT_ULP_FLOW_MEM_TYPE_EXT)\n \t\tbp->flags |= BNXT_FLAG_GFID_ENABLE;\n \n \treturn 0;\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c\nindex fc4c4da..22996e5 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c\n@@ -300,7 +300,7 @@ int32_t\tulp_flow_db_init(struct bnxt_ulp_context *ulp_ctxt)\n \n \t/* Populate the regular flow table limits. */\n \tflow_tbl = &flow_db->flow_tbl[BNXT_ULP_REGULAR_FLOW_TABLE];\n-\tflow_tbl->num_flows = dparms->num_flows + 1;\n+\tflow_tbl->num_flows = dparms->flow_db_num_entries + 1;\n \tflow_tbl->num_resources = (flow_tbl->num_flows *\n \t\t\t\t dparms->num_resources_per_flow);\n \n@@ -317,7 +317,7 @@ int32_t\tulp_flow_db_init(struct bnxt_ulp_context *ulp_ctxt)\n \t\tgoto error_free;\n \n \t/* add 1 since we are not using index 0 for flow id */\n-\tflow_db->func_id_tbl_size = dparms->num_flows + 1;\n+\tflow_db->func_id_tbl_size = dparms->flow_db_num_entries + 1;\n \t/* Allocate the function Id table */\n \tflow_db->func_id_tbl = rte_zmalloc(\"bnxt_ulp_flow_db_func_id_table\",\n \t\t\t\t\t flow_db->func_id_tbl_size *\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex f86cd76..d8e544f 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -1285,6 +1285,7 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tstruct tf_insert_em_entry_parms iparms = { 0 };\n \tstruct tf_delete_em_entry_parms free_parms = { 0 };\n \tint32_t\ttrc;\n+\tenum bnxt_ulp_flow_mem_type mtype = parms->device_params->flow_mem_type;\n \tint32_t rc = 0;\n \n \tkflds = ulp_mapper_key_fields_get(tbl, &num_kflds);\n@@ -1375,10 +1376,10 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t}\n \n \t/* Mark action process */\n-\tif (parms->device_params->global_fid_enable &&\n+\tif (mtype == BNXT_ULP_FLOW_MEM_TYPE_EXT &&\n \t tbl->resource_type == TF_MEM_EXTERNAL)\n \t\trc = ulp_mapper_mark_gfid_process(parms, tbl, iparms.flow_id);\n-\telse if (!parms->device_params->global_fid_enable &&\n+\telse if (mtype == BNXT_ULP_FLOW_MEM_TYPE_INT &&\n \t\t tbl->resource_type == TF_MEM_INTERNAL)\n \t\trc = ulp_mapper_mark_act_ptr_process(parms, tbl);\n \tif (rc) {\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.c\nindex 0c47768..89c08ab 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mark_mgr.c\n@@ -77,7 +77,7 @@ ulp_mark_db_init(struct bnxt_ulp_context *ctxt)\n \t\tgoto mem_error;\n \n \t/* Need to allocate 2 * Num flows to account for hash type bit.*/\n-\tmark_tbl->lfid_num_entries = dparms->lfid_entries;\n+\tmark_tbl->lfid_num_entries = dparms->mark_db_lfid_entries;\n \tmark_tbl->lfid_tbl = rte_zmalloc(\"ulp_rx_em_flow_mark_table\",\n \t\t\t\t\t mark_tbl->lfid_num_entries *\n \t\t\t\t\t sizeof(struct bnxt_lfid_mark_info),\n@@ -86,7 +86,7 @@ ulp_mark_db_init(struct bnxt_ulp_context *ctxt)\n \t\tgoto mem_error;\n \n \t/* Need to allocate 2 * Num flows to account for hash type bit */\n-\tmark_tbl->gfid_num_entries = dparms->gfid_entries;\n+\tmark_tbl->gfid_num_entries = dparms->mark_db_gfid_entries;\n \tmark_tbl->gfid_tbl = rte_zmalloc(\"ulp_rx_eem_flow_mark_table\",\n \t\t\t\t\t mark_tbl->gfid_num_entries *\n \t\t\t\t\t sizeof(struct bnxt_gfid_mark_info),\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 5376245..50a28af 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@@ -139,6 +139,13 @@ enum bnxt_ulp_direction {\n \tBNXT_ULP_DIRECTION_LAST = 2\n };\n \n+enum bnxt_ulp_flow_mem_type {\n+\tBNXT_ULP_FLOW_MEM_TYPE_INT = 0,\n+\tBNXT_ULP_FLOW_MEM_TYPE_EXT = 1,\n+\tBNXT_ULP_FLOW_MEM_TYPE_BOTH = 2,\n+\tBNXT_ULP_FLOW_MEM_TYPE_LAST = 3\n+};\n+\n enum bnxt_ulp_glb_regfile_index {\n \tBNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID = 0,\n \tBNXT_ULP_GLB_REGFILE_INDEX_LAST = 1\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 b49b0a1..bd36368 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@@ -313,15 +313,16 @@ struct bnxt_ulp_cache_tbl_params ulp_cache_tbl_params[] = {\n \n struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {\n \t[BNXT_ULP_DEVICE_ID_WH_PLUS] = {\n-\t\t.global_fid_enable = BNXT_ULP_SYM_YES,\n-\t\t.byte_order = BNXT_ULP_BYTE_ORDER_LE,\n-\t\t.encap_byte_swap = 1,\n-\t\t.lfid_entries = 16384,\n-\t\t.lfid_entry_size = 4,\n-\t\t.gfid_entries = 65536,\n-\t\t.gfid_entry_size = 4,\n-\t\t.num_flows = 32768,\n-\t\t.num_resources_per_flow = 8\n+\t.description = \"Whitney_Plus\",\n+\t.flow_mem_type = BNXT_ULP_FLOW_MEM_TYPE_EXT,\n+\t.byte_order = BNXT_ULP_BYTE_ORDER_LE,\n+\t.encap_byte_swap = 1,\n+\t.flow_db_num_entries = 32768,\n+\t.mark_db_lfid_entries = 65536,\n+\t.mark_db_gfid_entries = 65536,\n+\t.flow_count_db_entries = 16384,\n+\t.num_resources_per_flow = 8,\n+\t.num_phy_ports = 2\n \t}\n };\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\nindex 5d11a7e..5c43358 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n@@ -137,14 +137,14 @@ extern struct bnxt_ulp_act_match_info ulp_act_match_list[];\n /* Device specific parameters */\n struct bnxt_ulp_device_params {\n \tuint8_t\t\t\t\tdescription[16];\n-\tuint32_t\t\t\tglobal_fid_enable;\n+\tenum bnxt_ulp_flow_mem_type\tflow_mem_type;\n \tenum bnxt_ulp_byte_order\tbyte_order;\n \tuint8_t\t\t\t\tencap_byte_swap;\n-\tuint32_t\t\t\tlfid_entries;\n-\tuint32_t\t\t\tlfid_entry_size;\n-\tuint64_t\t\t\tgfid_entries;\n-\tuint32_t\t\t\tgfid_entry_size;\n-\tuint64_t\t\t\tnum_flows;\n+\tuint8_t\t\t\t\tnum_phy_ports;\n+\tuint32_t\t\t\tmark_db_lfid_entries;\n+\tuint64_t\t\t\tmark_db_gfid_entries;\n+\tuint64_t\t\t\tflow_db_num_entries;\n+\tuint32_t\t\t\tflow_count_db_entries;\n \tuint32_t\t\t\tnum_resources_per_flow;\n };\n \n", "prefixes": [ "35/36" ] }