{"id":833254,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833254/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171102083136.2096-9-jakub.kicinski@netronome.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171102083136.2096-9-jakub.kicinski@netronome.com>","list_archive_url":null,"date":"2017-11-02T08:31:36","name":"[net-next,8/8] nfp: improve defines for constants in ethtool","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"58b7dfa14cfa16b490d3d87af05077bfdc1bc20f","submitter":{"id":67484,"url":"http://patchwork.ozlabs.org/api/1.2/people/67484/?format=json","name":"Jakub Kicinski","email":"jakub.kicinski@netronome.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171102083136.2096-9-jakub.kicinski@netronome.com/mbox/","series":[{"id":11454,"url":"http://patchwork.ozlabs.org/api/1.2/series/11454/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11454","date":"2017-11-02T08:31:28","name":"nfp: TC block fixes, app fallback and dev_alloc()","version":1,"mbox":"http://patchwork.ozlabs.org/series/11454/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/833254/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833254/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=netronome-com.20150623.gappssmtp.com\n\theader.i=@netronome-com.20150623.gappssmtp.com\n\theader.b=\"SI+XxYN1\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySJHp6x1Kz9t2f\n\tfor ;\n\tThu, 2 Nov 2017 19:32:54 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755451AbdKBIco (ORCPT );\n\tThu, 2 Nov 2017 04:32:44 -0400","from mail-pf0-f193.google.com ([209.85.192.193]:52236 \"EHLO\n\tmail-pf0-f193.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1755440AbdKBIc3 (ORCPT\n\t); Thu, 2 Nov 2017 04:32:29 -0400","by mail-pf0-f193.google.com with SMTP id e64so4043646pfk.9\n\tfor ; Thu, 02 Nov 2017 01:32:29 -0700 (PDT)","from jkicinski-Precision-T1700.netronome.com ([75.53.12.129])\n\tby smtp.gmail.com with ESMTPSA id\n\tz13sm5390484pgc.29.2017.11.02.01.32.27\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 02 Nov 2017 01:32:27 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=netronome-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=3MpdFl3UuNK1eUbxyioz858H+kcvgp7EAS1gVOIK+bw=;\n\tb=SI+XxYN1dFqLs8dHLPKPWJY8USVQIpk0sYiazhzsyaIT36x5OFJwm06QAAUliXfIC1\n\tXiOEv9t6uoxJeQBkeeoW0yDOrjXgHqVLipInKh5cn8dzcXqH90kEDByee+Nz9jHBh97y\n\tNQMAaw2q2yey6rdx77cpDUs8oZW4PpuWS5DgUx9HE2iFk9MUn8+SsiO0a7CmFP9J4wNU\n\tklqjyzWHqyf+xmbAE45CLTRADZi/gKyRAXqps3amr0F/NmNPb9uC5ymRXzxX4F1Zvn4Y\n\tzJpUg0i1zvTCDmj50HvNNYjuk9HL8+WwOC/8qIQjdgQpCVq1JBoMi4Id78HMw8BhYGyK\n\txj+g==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=3MpdFl3UuNK1eUbxyioz858H+kcvgp7EAS1gVOIK+bw=;\n\tb=oAEHB07uPUWbmiSCvpCoUbrO1uKH8CRKzcpE+mOFYP1iTsM1RK58eZPFNm8qXVsFOS\n\tEvwXRdy2IckDcmQyuPzQF7vwkiTJliJQkfw4EmxarfL7QyeRWQc/i+KXkPBvs5VmLTUd\n\t4xIPJ9wgDdxawMPzME0PAAnyRVbnPxglQWMGdVznY6Pc5+p9V/2WeQVcGWVKHxo5XC0D\n\tW+rmItGSZ53hCPsxlCtzqEwgF1O4M34C/n1EzfAgtx/VGg5p6rUPSCYuwuwjJcS7fmgr\n\tzLE2DZ6JgrKGxx35z/30dJ2ne5lM431MwoRufw6T7IAbNFFEisKIAEZbyKI6wH7CNv5j\n\tgFag==","X-Gm-Message-State":"AMCzsaWi2uficoolM6qHoLIAmtdDNrQb/Wnqr3fwA5Gk0CI47ni9KED/\n\tfjxyQSHVQV1DpwGou59twx4lkdNk","X-Google-Smtp-Source":"ABhQp+RWZP7gLfrM8AJwvSVarUWbERNXT2MWd/O6Xyze8PM+jH38zzsKvQt5NxUJWUWNvYjCKsZgwA==","X-Received":"by 10.84.234.129 with SMTP id n1mr2327243plk.298.1509611548801; \n\tThu, 02 Nov 2017 01:32:28 -0700 (PDT)","From":"Jakub Kicinski ","To":"netdev@vger.kernel.org","Cc":"oss-drivers@netronome.com, Jakub Kicinski ","Subject":"[PATCH net-next 8/8] nfp: improve defines for constants in ethtool","Date":"Thu, 2 Nov 2017 01:31:36 -0700","Message-Id":"<20171102083136.2096-9-jakub.kicinski@netronome.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20171102083136.2096-1-jakub.kicinski@netronome.com>","References":"<20171102083136.2096-1-jakub.kicinski@netronome.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"We split rvector stats into two categories - per queue and\nstats which are added up into one total counter. Improve\nthe defines denoting their number.\n\nSigned-off-by: Jakub Kicinski \nReviewed-by: Simon Horman \n---\n drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 15 ++++++++-------\n 1 file changed, 8 insertions(+), 7 deletions(-)","diff":"diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c\nindex 6d5c376f0000..c67b90c8d8b7 100644\n--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c\n+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c\n@@ -181,7 +181,8 @@ static const struct nfp_et_stat nfp_mac_et_stats[] = {\n \n #define NN_ET_GLOBAL_STATS_LEN ARRAY_SIZE(nfp_net_et_stats)\n #define NN_ET_SWITCH_STATS_LEN 9\n-#define NN_ET_RVEC_GATHER_STATS 8\n+#define NN_RVEC_GATHER_STATS\t8\n+#define NN_RVEC_PER_Q_STATS\t3\n \n static void nfp_net_get_nspinfo(struct nfp_app *app, char *version)\n {\n@@ -427,7 +428,7 @@ static unsigned int nfp_vnic_get_sw_stats_count(struct net_device *netdev)\n {\n \tstruct nfp_net *nn = netdev_priv(netdev);\n \n-\treturn NN_ET_RVEC_GATHER_STATS + nn->dp.num_r_vecs * 3;\n+\treturn NN_RVEC_GATHER_STATS + nn->dp.num_r_vecs * NN_RVEC_PER_Q_STATS;\n }\n \n static u8 *nfp_vnic_get_sw_stats_strings(struct net_device *netdev, u8 *data)\n@@ -455,9 +456,9 @@ static u8 *nfp_vnic_get_sw_stats_strings(struct net_device *netdev, u8 *data)\n \n static u64 *nfp_vnic_get_sw_stats(struct net_device *netdev, u64 *data)\n {\n-\tu64 gathered_stats[NN_ET_RVEC_GATHER_STATS] = {};\n+\tu64 gathered_stats[NN_RVEC_GATHER_STATS] = {};\n \tstruct nfp_net *nn = netdev_priv(netdev);\n-\tu64 tmp[NN_ET_RVEC_GATHER_STATS];\n+\tu64 tmp[NN_RVEC_GATHER_STATS];\n \tunsigned int i, j;\n \n \tfor (i = 0; i < nn->dp.num_r_vecs; i++) {\n@@ -482,13 +483,13 @@ static u64 *nfp_vnic_get_sw_stats(struct net_device *netdev, u64 *data)\n \t\t\ttmp[7] = nn->r_vecs[i].tx_lso;\n \t\t} while (u64_stats_fetch_retry(&nn->r_vecs[i].tx_sync, start));\n \n-\t\tdata += 3;\n+\t\tdata += NN_RVEC_PER_Q_STATS;\n \n-\t\tfor (j = 0; j < NN_ET_RVEC_GATHER_STATS; j++)\n+\t\tfor (j = 0; j < NN_RVEC_GATHER_STATS; j++)\n \t\t\tgathered_stats[j] += tmp[j];\n \t}\n \n-\tfor (j = 0; j < NN_ET_RVEC_GATHER_STATS; j++)\n+\tfor (j = 0; j < NN_RVEC_GATHER_STATS; j++)\n \t\t*data++ = gathered_stats[j];\n \n \treturn data;\n","prefixes":["net-next","8/8"]}