Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/69798/?format=api
{ "id": 69798, "url": "https://patches.dpdk.org/api/patches/69798/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200506062710.22093-2-kalesh-anakkur.purayil@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": "<20200506062710.22093-2-kalesh-anakkur.purayil@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200506062710.22093-2-kalesh-anakkur.purayil@broadcom.com", "date": "2020-05-06T06:27:09", "name": "[1/2] net/bnxt: fix to alloc FW specified TQM ring context memory", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "f7058206c53522c213fd4ab918fdbafe0ca3654a", "submitter": { "id": 1479, "url": "https://patches.dpdk.org/api/people/1479/?format=api", "name": "Kalesh A P", "email": "kalesh-anakkur.purayil@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/20200506062710.22093-2-kalesh-anakkur.purayil@broadcom.com/mbox/", "series": [ { "id": 9852, "url": "https://patches.dpdk.org/api/series/9852/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=9852", "date": "2020-05-06T06:27:09", "name": "bnxt bug fixes", "version": 1, "mbox": "https://patches.dpdk.org/series/9852/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/69798/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/69798/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 03A5EA00BE;\n\tWed, 6 May 2020 08:11:12 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 4D1C81D6BF;\n\tWed, 6 May 2020 08:11:12 +0200 (CEST)", "from relay.smtp.broadcom.com (relay.smtp.broadcom.com\n [192.19.232.149]) by dpdk.org (Postfix) with ESMTP id 941FD1D6A8\n for <dev@dpdk.org>; Wed, 6 May 2020 08:11:10 +0200 (CEST)", "from dhcp-10-123-153-22.dhcp.broadcom.net\n (bgccx-dev-host-lnx2.bec.broadcom.net [10.123.153.22])\n by relay.smtp.broadcom.com (Postfix) with ESMTP id 75A731BEFBA;\n Tue, 5 May 2020 23:11:09 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com 75A731BEFBA", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1588745470;\n bh=5VGtCxY80xahO/4yxRKb5sUE6jDSdVoqubw8X1RJ9x0=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=cQWdn2JDzMYlJo+5OgQZ9vXl5URtX51ow2oQJ88bHRTK3UmybTryVCqkUFHAE9mxN\n a/GEJ2R0oqt3LPn/RpIUM9tpsESJZI8a9CQ2G4jAiHx+r+MJP9FfHNhC3mhLtFM1xM\n 7/PePK6r+cpGjelZLQQHNG3InyNFeLEzSeZhUnBY=", "From": "Kalesh A P <kalesh-anakkur.purayil@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com,\n\tajit.khaparde@broadcom.com", "Date": "Wed, 6 May 2020 11:57:09 +0530", "Message-Id": "<20200506062710.22093-2-kalesh-anakkur.purayil@broadcom.com>", "X-Mailer": "git-send-email 2.10.1", "In-Reply-To": "<20200506062710.22093-1-kalesh-anakkur.purayil@broadcom.com>", "References": "<20200506062710.22093-1-kalesh-anakkur.purayil@broadcom.com>", "Subject": "[dpdk-dev] [PATCH 1/2] net/bnxt: fix to alloc FW specified TQM ring\n\tcontext memory", "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: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>\n\nNewer firmware advertises the number of TQM rings to allocate\ncontext memory for. Use the firmware specified value and fall back\nto the old value derived from \"bp->max_q\" if it is not available.\n\nFixes: f8168ca0e690 (\"net/bnxt: support thor controller\")\nCc: stable@dpdk.org\n\nSigned-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>\nReviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>\nReviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt.h | 2 +-\n drivers/net/bnxt/bnxt_ethdev.c | 5 ++---\n drivers/net/bnxt/bnxt_hwrm.c | 31 +++++++++++++++++++------------\n 3 files changed, 22 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h\nindex 12fed1e..bf5b39c 100644\n--- a/drivers/net/bnxt/bnxt.h\n+++ b/drivers/net/bnxt/bnxt.h\n@@ -362,7 +362,6 @@ struct bnxt_coal {\n #define BNXT_MAX_TC 8\n #define BNXT_MAX_QUEUE 8\n #define BNXT_MAX_TC_Q (BNXT_MAX_TC + 1)\n-#define BNXT_MAX_Q (bp->max_q + 1)\n #define BNXT_PAGE_SHFT 12\n #define BNXT_PAGE_SIZE (1 << BNXT_PAGE_SHFT)\n #define MAX_CTX_PAGES (BNXT_PAGE_SIZE / 8)\n@@ -421,6 +420,7 @@ struct bnxt_ctx_mem_info {\n \tuint16_t tim_entry_size;\n \tuint32_t tim_max_entries;\n \tuint8_t tqm_entries_multiple;\n+\tuint8_t tqm_fp_rings_count;\n \n \tuint32_t flags;\n #define BNXT_CTX_FLAG_INITED 0x01\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex c2bee54..d877ff6 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -4644,7 +4644,7 @@ static void bnxt_free_ctx_mem(struct bnxt *bp)\n \trte_memzone_free(bp->ctx->vnic_mem.ring_mem.pg_tbl_mz);\n \trte_memzone_free(bp->ctx->stat_mem.ring_mem.pg_tbl_mz);\n \n-\tfor (i = 0; i < BNXT_MAX_Q; i++) {\n+\tfor (i = 0; i < bp->ctx->tqm_fp_rings_count + 1; i++) {\n \t\tif (bp->ctx->tqm_mem[i])\n \t\t\trte_memzone_free(bp->ctx->tqm_mem[i]->ring_mem.mz);\n \t}\n@@ -4725,9 +4725,8 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp)\n \tentries = bnxt_roundup(entries, ctx->tqm_entries_multiple);\n \tentries = clamp_t(uint32_t, entries, ctx->tqm_min_entries_per_ring,\n \t\t\t ctx->tqm_max_entries_per_ring);\n-\tfor (i = 0, ena = 0; i < BNXT_MAX_Q; i++) {\n+\tfor (i = 0, ena = 0; i < ctx->tqm_fp_rings_count + 1; i++) {\n \t\tctx_pg = ctx->tqm_mem[i];\n-\t\t/* use min tqm entries for now. */\n \t\tctx_pg->entries = entries;\n \t\tmem_size = ctx->tqm_entry_size * ctx_pg->entries;\n \t\trc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg, mem_size, \"tqm_mem\", i);\ndiff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c\nindex b0a7835..ef65107 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.c\n+++ b/drivers/net/bnxt/bnxt_hwrm.c\n@@ -4694,7 +4694,7 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)\n \tstruct bnxt_ctx_pg_info *ctx_pg;\n \tstruct bnxt_ctx_mem_info *ctx;\n \tint total_alloc_len;\n-\tint rc, i;\n+\tint rc, i, tqm_rings;\n \n \tif (!BNXT_CHIP_THOR(bp) ||\n \t bp->hwrm_spec_code < HWRM_VERSION_1_9_2 ||\n@@ -4714,17 +4714,6 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)\n \t\tgoto ctx_err;\n \t}\n \n-\tctx_pg = rte_malloc(\"bnxt_ctx_pg_mem\",\n-\t\t\t sizeof(*ctx_pg) * BNXT_MAX_Q,\n-\t\t\t RTE_CACHE_LINE_SIZE);\n-\tif (!ctx_pg) {\n-\t\trc = -ENOMEM;\n-\t\tgoto ctx_err;\n-\t}\n-\tfor (i = 0; i < BNXT_MAX_Q; i++, ctx_pg++)\n-\t\tctx->tqm_mem[i] = ctx_pg;\n-\n-\tbp->ctx = ctx;\n \tctx->qp_max_entries = rte_le_to_cpu_32(resp->qp_max_entries);\n \tctx->qp_min_qp1_entries =\n \t\trte_le_to_cpu_16(resp->qp_min_qp1_entries);\n@@ -4760,6 +4749,24 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)\n \tctx->mrav_entry_size = rte_le_to_cpu_16(resp->mrav_entry_size);\n \tctx->tim_entry_size = rte_le_to_cpu_16(resp->tim_entry_size);\n \tctx->tim_max_entries = rte_le_to_cpu_32(resp->tim_max_entries);\n+\tctx->tqm_fp_rings_count = resp->tqm_fp_rings_count;\n+\n+\tif (!ctx->tqm_fp_rings_count)\n+\t\tctx->tqm_fp_rings_count = bp->max_q;\n+\n+\ttqm_rings = ctx->tqm_fp_rings_count + 1;\n+\n+\tctx_pg = rte_malloc(\"bnxt_ctx_pg_mem\",\n+\t\t\t sizeof(*ctx_pg) * tqm_rings,\n+\t\t\t RTE_CACHE_LINE_SIZE);\n+\tif (!ctx_pg) {\n+\t\trc = -ENOMEM;\n+\t\tgoto ctx_err;\n+\t}\n+\tfor (i = 0; i < tqm_rings; i++, ctx_pg++)\n+\t\tctx->tqm_mem[i] = ctx_pg;\n+\n+\tbp->ctx = ctx;\n ctx_err:\n \tHWRM_UNLOCK();\n \treturn rc;\n", "prefixes": [ "1/2" ] }