From patchwork Tue Jun 19 21:30:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 41283 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 41CBF1B432; Tue, 19 Jun 2018 23:31:38 +0200 (CEST) Received: from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 0EE351B05D for ; Tue, 19 Jun 2018 23:31:09 +0200 (CEST) Received: from nis-sj1-27.broadcom.com (nis-sj1-27.lvn.broadcom.net [10.75.144.136]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 95AA630C06B; Tue, 19 Jun 2018 14:31:05 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 95AA630C06B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1529443865; bh=pz/89ztQ7TY/N7augos+j4Ef1sJsaJWwUTx9PVXcUEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FMOu27/8uBOD9rCbRhzTpujATwcFj5+qHEA9xazk3Cnu20yBgFmJ7w42tmBXQ5JO8 hIz65hTMj84NAUrLBbVU4i/WD5QoRzxmNb1vTrYJtbNVNzgRzhy12zFYqbofUUAEX5 AuBJ07BqzcDYWGGiwjTsC0zOct4ze/6A5HaqmGpQ= Received: from C02VPB22HTD6.dhcp.broadcom.net (c02vpb22htd6.dhcp.broadcom.net [10.136.50.120]) by nis-sj1-27.broadcom.com (Postfix) with ESMTP id 7861AAC0768; Tue, 19 Jun 2018 14:31:05 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Scott Branden Date: Tue, 19 Jun 2018 14:30:40 -0700 Message-Id: <20180619213058.12273-14-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 13/31] net/bnxt: code cleanup style of bnxt stats X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Scott Branden Cleanup alignment, brackets, debug string style of bnxt_stats Signed-off-by: Scott Branden Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_stats.c | 84 ++++++++++++++++++++++++++----------------- drivers/net/bnxt/bnxt_stats.h | 27 +++++++++----- 2 files changed, 70 insertions(+), 41 deletions(-) diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c index a5d3c8660..d930aa00e 100644 --- a/drivers/net/bnxt/bnxt_stats.c +++ b/drivers/net/bnxt/bnxt_stats.c @@ -201,7 +201,7 @@ void bnxt_free_stats(struct bnxt *bp) } int bnxt_stats_get_op(struct rte_eth_dev *eth_dev, - struct rte_eth_stats *bnxt_stats) + struct rte_eth_stats *bnxt_stats) { int rc = 0; unsigned int i; @@ -217,8 +217,11 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev, struct bnxt_rx_queue *rxq = bp->rx_queues[i]; struct bnxt_cp_ring_info *cpr = rxq->cp_ring; - rc = bnxt_hwrm_ctx_qstats(bp, cpr->hw_stats_ctx_id, i, - bnxt_stats, 1); + rc = bnxt_hwrm_ctx_qstats(bp, + cpr->hw_stats_ctx_id, + i, + bnxt_stats, + 1); if (unlikely(rc)) return rc; bnxt_stats->rx_nombuf += @@ -229,8 +232,12 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev, struct bnxt_tx_queue *txq = bp->tx_queues[i]; struct bnxt_cp_ring_info *cpr = txq->cp_ring; - rc = bnxt_hwrm_ctx_qstats(bp, cpr->hw_stats_ctx_id, i, - bnxt_stats, 0); + rc = bnxt_hwrm_ctx_qstats(bp, + cpr->hw_stats_ctx_id, + i, + bnxt_stats, + 0); + if (unlikely(rc)) return rc; } @@ -259,7 +266,8 @@ void bnxt_stats_reset_op(struct rte_eth_dev *eth_dev) } int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, - struct rte_eth_xstat *xstats, unsigned int n) + struct rte_eth_xstat *xstats, + unsigned int n) { struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private; @@ -279,18 +287,20 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, for (i = 0; i < RTE_DIM(bnxt_rx_stats_strings); i++) { uint64_t *rx_stats = (uint64_t *)bp->hw_rx_port_stats; xstats[count].id = count; - xstats[count].value = rte_le_to_cpu_64( - *(uint64_t *)((char *)rx_stats + - bnxt_rx_stats_strings[i].offset)); + xstats[count].value = rte_le_to_cpu_64 + (*(uint64_t *)((char *)rx_stats + + bnxt_rx_stats_strings[i].offset)); + count++; } for (i = 0; i < RTE_DIM(bnxt_tx_stats_strings); i++) { uint64_t *tx_stats = (uint64_t *)bp->hw_tx_port_stats; xstats[count].id = count; - xstats[count].value = rte_le_to_cpu_64( - *(uint64_t *)((char *)tx_stats + - bnxt_tx_stats_strings[i].offset)); + xstats[count].value = rte_le_to_cpu_64 + (*(uint64_t *)((char *)tx_stats + + bnxt_tx_stats_strings[i].offset)); + count++; } @@ -303,8 +313,8 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, } int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev, - struct rte_eth_xstat_name *xstats_names, - __rte_unused unsigned int limit) + struct rte_eth_xstat_name *xstats_names, + __rte_unused unsigned int limit) { /* Account for the Tx drop pkts aka the Anti spoof counter */ const unsigned int stat_cnt = RTE_DIM(bnxt_rx_stats_strings) + @@ -316,24 +326,27 @@ int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev, for (i = 0; i < RTE_DIM(bnxt_rx_stats_strings); i++) { snprintf(xstats_names[count].name, - sizeof(xstats_names[count].name), - "%s", - bnxt_rx_stats_strings[i].name); + sizeof(xstats_names[count].name), + "%s", + bnxt_rx_stats_strings[i].name); + count++; } for (i = 0; i < RTE_DIM(bnxt_tx_stats_strings); i++) { snprintf(xstats_names[count].name, - sizeof(xstats_names[count].name), - "%s", - bnxt_tx_stats_strings[i].name); + sizeof(xstats_names[count].name), + "%s", + bnxt_tx_stats_strings[i].name); + count++; } snprintf(xstats_names[count].name, - sizeof(xstats_names[count].name), - "%s", - bnxt_func_stats_strings[4].name); + sizeof(xstats_names[count].name), + "%s", + bnxt_func_stats_strings[4].name); + count++; } return stat_cnt; @@ -354,8 +367,10 @@ void bnxt_dev_xstats_reset_op(struct rte_eth_dev *eth_dev) PMD_DRV_LOG(ERR, "Operation not supported\n"); } -int bnxt_dev_xstats_get_by_id_op(struct rte_eth_dev *dev, const uint64_t *ids, - uint64_t *values, unsigned int limit) +int bnxt_dev_xstats_get_by_id_op(struct rte_eth_dev *dev, + const uint64_t *ids, + uint64_t *values, + unsigned int limit) { /* Account for the Tx drop pkts aka the Anti spoof counter */ const unsigned int stat_cnt = RTE_DIM(bnxt_rx_stats_strings) + @@ -370,7 +385,7 @@ int bnxt_dev_xstats_get_by_id_op(struct rte_eth_dev *dev, const uint64_t *ids, bnxt_dev_xstats_get_by_id_op(dev, NULL, values_copy, stat_cnt); for (i = 0; i < limit; i++) { if (ids[i] >= stat_cnt) { - PMD_DRV_LOG(ERR, "id value isn't valid"); + PMD_DRV_LOG(ERR, "id value isn't valid\n"); return -1; } values[i] = values_copy[ids[i]]; @@ -379,8 +394,9 @@ int bnxt_dev_xstats_get_by_id_op(struct rte_eth_dev *dev, const uint64_t *ids, } int bnxt_dev_xstats_get_names_by_id_op(struct rte_eth_dev *dev, - struct rte_eth_xstat_name *xstats_names, - const uint64_t *ids, unsigned int limit) + struct rte_eth_xstat_name *xstats_names, + const uint64_t *ids, + unsigned int limit) { /* Account for the Tx drop pkts aka the Anti spoof counter */ const unsigned int stat_cnt = RTE_DIM(bnxt_rx_stats_strings) + @@ -391,16 +407,18 @@ int bnxt_dev_xstats_get_names_by_id_op(struct rte_eth_dev *dev, if (!ids) return bnxt_dev_xstats_get_names_op(dev, xstats_names, stat_cnt); - bnxt_dev_xstats_get_names_by_id_op(dev, xstats_names_copy, NULL, - stat_cnt); + + bnxt_dev_xstats_get_names_by_id_op(dev, + xstats_names_copy, + NULL, + stat_cnt); for (i = 0; i < limit; i++) { if (ids[i] >= stat_cnt) { - PMD_DRV_LOG(ERR, "id value isn't valid"); + PMD_DRV_LOG(ERR, "id value isn't valid\n"); return -1; } - strcpy(xstats_names[i].name, - xstats_names_copy[ids[i]].name); + strcpy(xstats_names[i].name, xstats_names_copy[ids[i]].name); } return stat_cnt; } diff --git a/drivers/net/bnxt/bnxt_stats.h b/drivers/net/bnxt/bnxt_stats.h index b0f135a5a..08570238d 100644 --- a/drivers/net/bnxt/bnxt_stats.h +++ b/drivers/net/bnxt/bnxt_stats.h @@ -9,20 +9,31 @@ #include void bnxt_free_stats(struct bnxt *bp); + int bnxt_stats_get_op(struct rte_eth_dev *eth_dev, - struct rte_eth_stats *bnxt_stats); + struct rte_eth_stats *bnxt_stats); + void bnxt_stats_reset_op(struct rte_eth_dev *eth_dev); + int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev, - struct rte_eth_xstat_name *xstats_names, - __rte_unused unsigned int limit); + struct rte_eth_xstat_name *xstats_names, + __rte_unused unsigned int limit); + int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, - struct rte_eth_xstat *xstats, unsigned int n); + struct rte_eth_xstat *xstats, + unsigned int n); + void bnxt_dev_xstats_reset_op(struct rte_eth_dev *eth_dev); -int bnxt_dev_xstats_get_by_id_op(struct rte_eth_dev *dev, const uint64_t *ids, - uint64_t *values, unsigned int limit); + +int bnxt_dev_xstats_get_by_id_op(struct rte_eth_dev *dev, + const uint64_t *ids, + uint64_t *values, + unsigned int limit); + int bnxt_dev_xstats_get_names_by_id_op(struct rte_eth_dev *dev, - struct rte_eth_xstat_name *xstats_names, - const uint64_t *ids, unsigned int limit); + struct rte_eth_xstat_name *xstats_names, + const uint64_t *ids, + unsigned int limit); struct bnxt_xstats_name_off { char name[RTE_ETH_XSTATS_NAME_SIZE];