Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41279/?format=api
{ "id": 41279, "url": "http://patches.dpdk.org/api/patches/41279/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180619213058.12273-12-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": "<20180619213058.12273-12-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180619213058.12273-12-ajit.khaparde@broadcom.com", "date": "2018-06-19T21:30:38", "name": "[11/31] net/bnxt: code cleanup style of bnxt rxr", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "b163089b7e96a4d085617631acb3d601dd81191a", "submitter": { "id": 501, "url": "http://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180619213058.12273-12-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 171, "url": "http://patches.dpdk.org/api/series/171/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=171", "date": "2018-06-19T21:30:31", "name": "bnxt patchset", "version": 1, "mbox": "http://patches.dpdk.org/series/171/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/41279/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/41279/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 D52581B3A4;\n\tTue, 19 Jun 2018 23:31:29 +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 011121B05A\n\tfor <dev@dpdk.org>; Tue, 19 Jun 2018 23:31:08 +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 A75E830C110;\n\tTue, 19 Jun 2018 14:31:04 -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 DABEAAC0768;\n\tTue, 19 Jun 2018 14:31:04 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com A75E830C110", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n\ts=dkimrelay; t=1529443864;\n\tbh=0IxLGtELlBOa3GB8j2vwWDZcFQg6EkRMNUonZlg1ZrI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=uqePfDoZBzOSi/c7U/aop+kLaIAabwmiuL/8iC5XC4NmDx4ijy1eSqQrxZH+7ynP6\n\tfFqWi/uivajcZCt0vYYXCX+ULF/n/vDnmI64Mvt1Odcj4rKK807pnLvbru8XUMahBu\n\tabPljWG8DXSgleeowAqVZ73IhGOA1PJrd/9DS19U=", "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:38 -0700", "Message-Id": "<20180619213058.12273-12-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 11/31] net/bnxt: code cleanup style of bnxt rxr", "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_rxr\n\nSigned-off-by: Scott Branden <scott.branden@broadcom.com>\nReviewed-by: Randy Schacher <stuart.schacher@broadcom.com>\nReviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt_rxr.c | 58 ++++++++++++++++++++++++---------------------\n drivers/net/bnxt/bnxt_rxr.h | 6 +++--\n 2 files changed, 35 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c\nindex e4d473f4b..13928c388 100644\n--- a/drivers/net/bnxt/bnxt_rxr.c\n+++ b/drivers/net/bnxt/bnxt_rxr.c\n@@ -72,7 +72,6 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,\n \tif (rx_buf == NULL)\n \t\tPMD_DRV_LOG(ERR, \"Jumbo Frame. rx_buf is NULL\\n\");\n \n-\n \trx_buf->mbuf = mbuf;\n \tmbuf->data_off = RTE_PKTMBUF_HEADROOM;\n \n@@ -82,7 +81,7 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,\n }\n \n static inline void bnxt_reuse_rx_mbuf(struct bnxt_rx_ring_info *rxr,\n-\t\t\t struct rte_mbuf *mbuf)\n+\t\t\t\t struct rte_mbuf *mbuf)\n {\n \tuint16_t prod = RING_NEXT(rxr->rx_ring_struct, rxr->rx_prod);\n \tstruct bnxt_sw_rx_bd *prod_rx_buf;\n@@ -185,7 +184,8 @@ static void bnxt_tpa_start(struct bnxt_rx_queue *rxq,\n }\n \n static int bnxt_agg_bufs_valid(struct bnxt_cp_ring_info *cpr,\n-\t\tuint8_t agg_bufs, uint32_t raw_cp_cons)\n+\t\t\t uint8_t agg_bufs,\n+\t\t\t uint32_t raw_cp_cons)\n {\n \tuint16_t last_cp_cons;\n \tstruct rx_pkt_cmpl *agg_cmpl;\n@@ -236,8 +236,7 @@ static int bnxt_rx_pages(struct bnxt_rx_queue *rxq,\n \t\tstruct rte_mbuf *ag_mbuf;\n \t\t*tmp_raw_cons = NEXT_RAW_CMP(*tmp_raw_cons);\n \t\tcp_cons = RING_CMP(cpr->cp_ring_struct, *tmp_raw_cons);\n-\t\trxcmp = (struct rx_pkt_cmpl *)\n-\t\t\t\t\t&cpr->cp_desc_ring[cp_cons];\n+\t\trxcmp = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[cp_cons];\n \n #ifdef BNXT_DEBUG\n \t\tbnxt_dump_cmpl(cp_cons, rxcmp);\n@@ -270,11 +269,11 @@ static int bnxt_rx_pages(struct bnxt_rx_queue *rxq,\n \treturn 0;\n }\n \n-static inline struct rte_mbuf *bnxt_tpa_end(\n-\t\tstruct bnxt_rx_queue *rxq,\n-\t\tuint32_t *raw_cp_cons,\n-\t\tstruct rx_tpa_end_cmpl *tpa_end,\n-\t\tstruct rx_tpa_end_cmpl_hi *tpa_end1 __rte_unused)\n+static inline\n+struct rte_mbuf *bnxt_tpa_end(struct bnxt_rx_queue *rxq,\n+\t\t\t uint32_t *raw_cp_cons,\n+\t\t\t struct rx_tpa_end_cmpl *tpa_end,\n+\t\t\t struct rx_tpa_end_cmpl_hi *tpa_end1 __rte_unused)\n {\n \tstruct bnxt_cp_ring_info *cpr = rxq->cp_ring;\n \tstruct bnxt_rx_ring_info *rxr = rxq->rx_ring;\n@@ -299,6 +298,7 @@ static inline struct rte_mbuf *bnxt_tpa_end(\n \tmbuf->l4_len = tpa_end->payload_offset;\n \n \tstruct rte_mbuf *new_data = __bnxt_alloc_rx_data(rxq->mb_pool);\n+\n \tRTE_ASSERT(new_data != NULL);\n \tif (!new_data) {\n \t\trte_atomic64_inc(&rxq->rx_mbuf_alloc_fail);\n@@ -368,7 +368,8 @@ bnxt_parse_pkt_type(struct rx_pkt_cmpl *rxcmp, struct rx_pkt_cmpl_hi *rxcmp1)\n }\n \n static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,\n-\t\t\t struct bnxt_rx_queue *rxq, uint32_t *raw_cons)\n+\t\t struct bnxt_rx_queue *rxq,\n+\t\t uint32_t *raw_cons)\n {\n \tstruct bnxt_cp_ring_info *cpr = rxq->cp_ring;\n \tstruct bnxt_rx_ring_info *rxr = rxq->rx_ring;\n@@ -401,14 +402,16 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,\n \n \tcmp_type = CMP_TYPE(rxcmp);\n \tif (cmp_type == RX_TPA_START_CMPL_TYPE_RX_TPA_START) {\n-\t\tbnxt_tpa_start(rxq, (struct rx_tpa_start_cmpl *)rxcmp,\n+\t\tbnxt_tpa_start(rxq,\n+\t\t\t (struct rx_tpa_start_cmpl *)rxcmp,\n \t\t\t (struct rx_tpa_start_cmpl_hi *)rxcmp1);\n \t\trc = -EINVAL; /* Continue w/o new mbuf */\n \t\tgoto next_rx;\n \t} else if (cmp_type == RX_TPA_END_CMPL_TYPE_RX_TPA_END) {\n-\t\tmbuf = bnxt_tpa_end(rxq, &tmp_raw_cons,\n-\t\t\t\t (struct rx_tpa_end_cmpl *)rxcmp,\n-\t\t\t\t (struct rx_tpa_end_cmpl_hi *)rxcmp1);\n+\t\tmbuf = bnxt_tpa_end(rxq,\n+\t\t\t\t &tmp_raw_cons,\n+\t\t\t\t (struct rx_tpa_end_cmpl *)rxcmp,\n+\t\t\t\t (struct rx_tpa_end_cmpl_hi *)rxcmp1);\n \t\tif (unlikely(!mbuf))\n \t\t\treturn -EBUSY;\n \t\t*rx_pkt = mbuf;\n@@ -525,8 +528,9 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,\n \treturn rc;\n }\n \n-uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n-\t\t\t uint16_t nb_pkts)\n+uint16_t bnxt_recv_pkts(void *rx_queue,\n+\t\t\tstruct rte_mbuf **rx_pkts,\n+\t\t\tuint16_t nb_pkts)\n {\n \tstruct bnxt_rx_queue *rxq = rx_queue;\n \tstruct bnxt_cp_ring_info *cpr = rxq->cp_ring;\n@@ -674,8 +678,8 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)\n \trxq->rx_ring = rxr;\n \n \tring = rte_zmalloc_socket(\"bnxt_rx_ring_struct\",\n-\t\t\t\t sizeof(struct bnxt_ring),\n-\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id);\n+\t\t\t\t sizeof(struct bnxt_ring),\n+\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id);\n \tif (ring == NULL)\n \t\treturn -ENOMEM;\n \trxr->rx_ring_struct = ring;\n@@ -694,8 +698,8 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)\n \trxq->cp_ring = cpr;\n \n \tring = rte_zmalloc_socket(\"bnxt_rx_ring_struct\",\n-\t\t\t\t sizeof(struct bnxt_ring),\n-\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id);\n+\t\t\t\t sizeof(struct bnxt_ring),\n+\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id);\n \tif (ring == NULL)\n \t\treturn -ENOMEM;\n \tcpr->cp_ring_struct = ring;\n@@ -709,8 +713,8 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)\n \n \t/* Allocate Aggregator rings */\n \tring = rte_zmalloc_socket(\"bnxt_rx_ring_struct\",\n-\t\t\t\t sizeof(struct bnxt_ring),\n-\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id);\n+\t\t\t\t sizeof(struct bnxt_ring),\n+\t\t\t\t RTE_CACHE_LINE_SIZE, socket_id);\n \tif (ring == NULL)\n \t\treturn -ENOMEM;\n \trxr->ag_ring_struct = ring;\n@@ -762,8 +766,8 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)\n \tfor (i = 0; i < ring->ring_size; i++) {\n \t\tif (bnxt_alloc_rx_data(rxq, rxr, prod) != 0) {\n \t\t\tPMD_DRV_LOG(WARNING,\n-\t\t\t\t\"init'ed rx ring %d with %d/%d mbufs only\\n\",\n-\t\t\t\trxq->queue_id, i, ring->ring_size);\n+\t\t\t\t \"rx ring %d only has %d/%d mbufs\\n\",\n+\t\t\t\t rxq->queue_id, i, ring->ring_size);\n \t\t\tbreak;\n \t\t}\n \t\trxr->rx_prod = prod;\n@@ -778,8 +782,8 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)\n \tfor (i = 0; i < ring->ring_size; i++) {\n \t\tif (bnxt_alloc_ag_data(rxq, rxr, prod) != 0) {\n \t\t\tPMD_DRV_LOG(WARNING,\n-\t\t\t\"init'ed AG ring %d with %d/%d mbufs only\\n\",\n-\t\t\trxq->queue_id, i, ring->ring_size);\n+\t\t\t\t \"AG ring %d only has %d/%d mbufs\\n\",\n+\t\t\t\t rxq->queue_id, i, ring->ring_size);\n \t\t\tbreak;\n \t\t}\n \t\trxr->ag_prod = prod;\ndiff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h\nindex 3815a2199..c8ba22ee1 100644\n--- a/drivers/net/bnxt/bnxt_rxr.h\n+++ b/drivers/net/bnxt/bnxt_rxr.h\n@@ -103,8 +103,10 @@ struct bnxt_rx_ring_info {\n \tstruct bnxt_tpa_info *tpa_info;\n };\n \n-uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n-\t\t\t uint16_t nb_pkts);\n+uint16_t bnxt_recv_pkts(void *rx_queue,\n+\t\t\tstruct rte_mbuf **rx_pkts,\n+\t\t\tuint16_t nb_pkts);\n+\n void bnxt_free_rx_rings(struct bnxt *bp);\n int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id);\n int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq);\n", "prefixes": [ "11/31" ] }