Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41291/?format=api
{ "id": 41291, "url": "https://patches.dpdk.org/api/patches/41291/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20180619213058.12273-20-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": "<20180619213058.12273-20-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180619213058.12273-20-ajit.khaparde@broadcom.com", "date": "2018-06-19T21:30:46", "name": "[19/31] net/bnxt: code cleanup style of bnxt ring", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "8e13788f637680ff4c27e966dc8f1b35915b15c9", "submitter": { "id": 501, "url": "https://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20180619213058.12273-20-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 171, "url": "https://patches.dpdk.org/api/series/171/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=171", "date": "2018-06-19T21:30:31", "name": "bnxt patchset", "version": 1, "mbox": "https://patches.dpdk.org/series/171/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/41291/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/41291/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 08C2B1B3A3;\n\tTue, 19 Jun 2018 23:31:55 +0200 (CEST)", "from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com\n\t[192.19.229.170]) by dpdk.org (Postfix) with ESMTP id E47AB1B05A\n\tfor <dev@dpdk.org>; Tue, 19 Jun 2018 23:31:09 +0200 (CEST)", "from nis-sj1-27.broadcom.com (nis-sj1-27.lvn.broadcom.net\n\t[10.75.144.136])\n\tby rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 60E3730C079;\n\tTue, 19 Jun 2018 14:31:07 -0700 (PDT)", "from C02VPB22HTD6.dhcp.broadcom.net (c02vpb22htd6.dhcp.broadcom.net\n\t[10.136.50.120])\n\tby nis-sj1-27.broadcom.com (Postfix) with ESMTP id 3ED53AC0768;\n\tTue, 19 Jun 2018 14:31:07 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 60E3730C079", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n\ts=dkimrelay; t=1529443867;\n\tbh=7tJ+Icai6gOmDyX6aiEMueobmNKwOpO53AvmyT8xqeM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=gfAueAqN9nm09t47iAZA+/5kKsSgHp2rCtzzSQNNIc4SGo9cw4ann4av38tqzsOID\n\tQO+POmU1rUXZ9mTlOGH+Tw81m4Hyh6mPCeqVu46YG4z5/0iBmJWQAsZBs2Oaixo3Ti\n\tAsYNyvLhgCz4CDDS92ZF2A0VxQr6ICCJC0wJnvvg=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com,\n\tScott Branden <scott.branden@broadcom.com>", "Date": "Tue, 19 Jun 2018 14:30:46 -0700", "Message-Id": "<20180619213058.12273-20-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.15.1 (Apple Git-101)", "In-Reply-To": "<20180619213058.12273-1-ajit.khaparde@broadcom.com>", "References": "<20180619213058.12273-1-ajit.khaparde@broadcom.com>", "Subject": "[dpdk-dev] [PATCH 19/31] net/bnxt: code cleanup style of bnxt ring", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Scott Branden <scott.branden@broadcom.com>\n\nCleanup alignment, brackets, debug string style of bnxt_ring\n\nSigned-off-by: Scott Branden <scott.branden@broadcom.com>\nSigned-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt_ring.c | 79 ++++++++++++++++++++++++++------------------\n drivers/net/bnxt/bnxt_ring.h | 40 +++++++++++-----------\n 2 files changed, 68 insertions(+), 51 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c\nindex fcbd6bc6e..03a5381a3 100644\n--- a/drivers/net/bnxt/bnxt_ring.c\n+++ b/drivers/net/bnxt/bnxt_ring.c\n@@ -64,10 +64,10 @@ int bnxt_init_ring_grps(struct bnxt *bp)\n * rx bd ring - Only non-zero length if rx_ring_info is not NULL\n */\n int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,\n-\t\t\t struct bnxt_tx_queue *txq,\n-\t\t\t struct bnxt_rx_queue *rxq,\n-\t\t\t struct bnxt_cp_ring_info *cp_ring_info,\n-\t\t\t const char *suffix)\n+\t\t struct bnxt_tx_queue *txq,\n+\t\t struct bnxt_rx_queue *rxq,\n+\t\t struct bnxt_cp_ring_info *cp_ring_info,\n+\t\t const char *suffix)\n {\n \tstruct bnxt_ring *cp_ring = cp_ring_info->cp_ring_struct;\n \tstruct bnxt_rx_ring_info *rx_ring_info = rxq ? rxq->rx_ring : NULL;\n@@ -90,20 +90,24 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,\n \n \tint tx_vmem_start = cp_vmem_start + cp_vmem_len;\n \tint tx_vmem_len =\n-\t tx_ring_info ? RTE_CACHE_LINE_ROUNDUP(tx_ring_info->\n-\t\t\t\t\t\ttx_ring_struct->vmem_size) : 0;\n+\t tx_ring_info ?\n+\t\tRTE_CACHE_LINE_ROUNDUP(tx_ring_info->tx_ring_struct->vmem_size)\n+\t\t: 0;\n \n \tint rx_vmem_start = tx_vmem_start + tx_vmem_len;\n \tint rx_vmem_len = rx_ring_info ?\n-\t\tRTE_CACHE_LINE_ROUNDUP(rx_ring_info->\n-\t\t\t\t\t\trx_ring_struct->vmem_size) : 0;\n+\t\tRTE_CACHE_LINE_ROUNDUP(rx_ring_info->rx_ring_struct->vmem_size)\n+\t\t: 0;\n+\n \tint ag_vmem_start = 0;\n \tint ag_vmem_len = 0;\n \tint cp_ring_start = 0;\n \n \tag_vmem_start = rx_vmem_start + rx_vmem_len;\n-\tag_vmem_len = rx_ring_info ? RTE_CACHE_LINE_ROUNDUP(\n-\t\t\t\trx_ring_info->ag_ring_struct->vmem_size) : 0;\n+\tag_vmem_len = rx_ring_info ?\n+\t\tRTE_CACHE_LINE_ROUNDUP(rx_ring_info->ag_ring_struct->vmem_size)\n+\t\t: 0;\n+\n \tcp_ring_start = ag_vmem_start + ag_vmem_len;\n \n \tint cp_ring_len = RTE_CACHE_LINE_ROUNDUP(cp_ring->ring_size *\n@@ -124,9 +128,11 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,\n \n \tint ag_bitmap_start = ag_ring_start + ag_ring_len;\n \tint ag_bitmap_len = rx_ring_info ?\n-\t\tRTE_CACHE_LINE_ROUNDUP(rte_bitmap_get_memory_footprint(\n-\t\t\trx_ring_info->rx_ring_struct->ring_size *\n-\t\t\tAGG_RING_SIZE_FACTOR)) : 0;\n+\t\tRTE_CACHE_LINE_ROUNDUP\n+\t\t (rte_bitmap_get_memory_footprint\n+\t\t (rx_ring_info->rx_ring_struct->ring_size *\n+\t\t AGG_RING_SIZE_FACTOR))\n+\t\t: 0;\n \n \tint tpa_info_start = ag_bitmap_start + ag_bitmap_len;\n \tint tpa_info_len = rx_ring_info ?\n@@ -134,6 +140,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,\n \t\t\t\t sizeof(struct bnxt_tpa_info)) : 0;\n \n \tint total_alloc_len = tpa_info_start;\n+\n \tif (rx_offloads & DEV_RX_OFFLOAD_TCP_LRO)\n \t\ttotal_alloc_len += tpa_info_len;\n \n@@ -144,12 +151,13 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,\n \tmz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;\n \tmz = rte_memzone_lookup(mz_name);\n \tif (!mz) {\n-\t\tmz = rte_memzone_reserve_aligned(mz_name, total_alloc_len,\n-\t\t\t\tSOCKET_ID_ANY,\n-\t\t\t\tRTE_MEMZONE_2MB |\n-\t\t\t\tRTE_MEMZONE_SIZE_HINT_ONLY |\n-\t\t\t\tRTE_MEMZONE_IOVA_CONTIG,\n-\t\t\t\tgetpagesize());\n+\t\tmz = rte_memzone_reserve_aligned(mz_name,\n+\t\t\t\t\t\t total_alloc_len,\n+\t\t\t\t\t\t SOCKET_ID_ANY,\n+\t\t\t\t\t\t RTE_MEMZONE_2MB |\n+\t\t\t\t\t\t RTE_MEMZONE_SIZE_HINT_ONLY |\n+\t\t\t\t\t\t RTE_MEMZONE_IOVA_CONTIG,\n+\t\t\t\t\t\t getpagesize());\n \t\tif (mz == NULL)\n \t\t\treturn -ENOMEM;\n \t}\n@@ -165,7 +173,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,\n \t\tmz_phys_addr = rte_mem_virt2iova(mz->addr);\n \t\tif (mz_phys_addr == 0) {\n \t\t\tPMD_DRV_LOG(ERR,\n-\t\t\t\"unable to map ring address to physical memory\\n\");\n+\t\t\t\t \"unable to map ring addr to phys memory\\n\");\n \t\t\treturn -ENOMEM;\n \t\t}\n \t}\n@@ -440,10 +448,12 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)\n \t\t\tgoto err_out;\n \t\t}\n \n-\t\trc = bnxt_hwrm_ring_alloc(bp, ring,\n-\t\t\t\tHWRM_RING_ALLOC_INPUT_RING_TYPE_RX,\n-\t\t\t\tmap_idx, HWRM_NA_SIGNATURE,\n-\t\t\t\tcp_ring->fw_ring_id);\n+\t\trc = bnxt_hwrm_ring_alloc(bp,\n+\t\t\t\t\t ring,\n+\t\t\t\t\t HWRM_RING_ALLOC_INPUT_RING_TYPE_RX,\n+\t\t\t\t\t map_idx,\n+\t\t\t\t\t HWRM_NA_SIGNATURE,\n+\t\t\t\t\t cp_ring->fw_ring_id);\n \t\tif (rc)\n \t\t\tgoto err_out;\n \t\tPMD_DRV_LOG(DEBUG, \"Alloc AGG Done!\\n\");\n@@ -473,10 +483,13 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)\n \t\tunsigned int idx = i + bp->rx_cp_nr_rings;\n \n \t\t/* Tx cmpl */\n-\t\trc = bnxt_hwrm_ring_alloc(bp, cp_ring,\n-\t\t\t\t\tHWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL,\n-\t\t\t\t\tidx, HWRM_NA_SIGNATURE,\n-\t\t\t\t\tHWRM_NA_SIGNATURE);\n+\t\trc = bnxt_hwrm_ring_alloc\n+\t\t\t(bp,\n+\t\t\t cp_ring,\n+\t\t\t HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL,\n+\t\t\t idx,\n+\t\t\t HWRM_NA_SIGNATURE,\n+\t\t\t HWRM_NA_SIGNATURE);\n \t\tif (rc)\n \t\t\tgoto err_out;\n \n@@ -484,10 +497,12 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)\n \t\tB_CP_DIS_DB(cpr, cpr->cp_raw_cons);\n \n \t\t/* Tx ring */\n-\t\trc = bnxt_hwrm_ring_alloc(bp, ring,\n-\t\t\t\t\tHWRM_RING_ALLOC_INPUT_RING_TYPE_TX,\n-\t\t\t\t\tidx, cpr->hw_stats_ctx_id,\n-\t\t\t\t\tcp_ring->fw_ring_id);\n+\t\trc = bnxt_hwrm_ring_alloc(bp,\n+\t\t\t\t\t ring,\n+\t\t\t\t\t HWRM_RING_ALLOC_INPUT_RING_TYPE_TX,\n+\t\t\t\t\t idx,\n+\t\t\t\t\t cpr->hw_stats_ctx_id,\n+\t\t\t\t\t cp_ring->fw_ring_id);\n \t\tif (rc)\n \t\t\tgoto err_out;\n \ndiff --git a/drivers/net/bnxt/bnxt_ring.h b/drivers/net/bnxt/bnxt_ring.h\nindex 1446d784f..9348bf2b2 100644\n--- a/drivers/net/bnxt/bnxt_ring.h\n+++ b/drivers/net/bnxt/bnxt_ring.h\n@@ -10,17 +10,17 @@\n \n #include <rte_memory.h>\n \n-#define RING_NEXT(ring, idx)\t\t(((idx) + 1) & (ring)->ring_mask)\n-\n-#define DB_IDX_MASK\t\t\t\t\t\t0xffffff\n-#define DB_IDX_VALID\t\t\t\t\t\t(0x1 << 26)\n-#define DB_IRQ_DIS\t\t\t\t\t\t(0x1 << 27)\n-#define DB_KEY_TX\t\t\t\t\t\t(0x0 << 28)\n-#define DB_KEY_RX\t\t\t\t\t\t(0x1 << 28)\n-#define DB_KEY_CP\t\t\t\t\t\t(0x2 << 28)\n-#define DB_KEY_ST\t\t\t\t\t\t(0x3 << 28)\n-#define DB_KEY_TX_PUSH\t\t\t\t\t\t(0x4 << 28)\n-#define DB_LONG_TX_PUSH\t\t\t\t\t\t(0x2 << 24)\n+#define RING_NEXT(ring, idx)\t(((idx) + 1) & (ring)->ring_mask)\n+\n+#define DB_IDX_MASK\t\t0xffffff\n+#define DB_IDX_VALID\t\t(0x1 << 26)\n+#define DB_IRQ_DIS\t\t(0x1 << 27)\n+#define DB_KEY_TX\t\t(0x0 << 28)\n+#define DB_KEY_RX\t\t(0x1 << 28)\n+#define DB_KEY_CP\t\t(0x2 << 28)\n+#define DB_KEY_ST\t\t(0x3 << 28)\n+#define DB_KEY_TX_PUSH\t\t(0x4 << 28)\n+#define DB_LONG_TX_PUSH\t\t(0x2 << 24)\n \n #define DEFAULT_CP_RING_SIZE\t256\n #define DEFAULT_RX_RING_SIZE\t256\n@@ -31,12 +31,13 @@\n #define AGG_RING_MULTIPLIER\t2\n \n /* These assume 4k pages */\n-#define MAX_RX_DESC_CNT (8 * 1024)\n-#define MAX_TX_DESC_CNT (4 * 1024)\n-#define MAX_CP_DESC_CNT (16 * 1024)\n+#define MAX_RX_DESC_CNT\t\t(8 * 1024)\n+#define MAX_TX_DESC_CNT\t\t(4 * 1024)\n+#define MAX_CP_DESC_CNT\t\t(16 * 1024)\n \n #define INVALID_HW_RING_ID ((uint16_t)-1)\n-#define INVALID_STATS_CTX_ID\t\t((uint16_t)-1)\n+#define INVALID_STATS_CTX_ID\t((uint16_t)-1)\n+#define INVALID_RING_GRP_ID ((uint16_t)-1)\n \n struct bnxt_ring {\n \tvoid\t\t\t*bd;\n@@ -65,11 +66,12 @@ struct bnxt_rx_ring_info;\n struct bnxt_cp_ring_info;\n void bnxt_free_ring(struct bnxt_ring *ring);\n int bnxt_init_ring_grps(struct bnxt *bp);\n+\n int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,\n-\t\t\t struct bnxt_tx_queue *txq,\n-\t\t\t struct bnxt_rx_queue *rxq,\n-\t\t\t struct bnxt_cp_ring_info *cp_ring_info,\n-\t\t\t const char *suffix);\n+\t\t struct bnxt_tx_queue *txq,\n+\t\t struct bnxt_rx_queue *rxq,\n+\t\t struct bnxt_cp_ring_info *cp_ring_info,\n+\t\t const char *suffix);\n int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index);\n int bnxt_alloc_hwrm_rings(struct bnxt *bp);\n \n", "prefixes": [ "19/31" ] }