Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751733AbdFFPBy (ORCPT ); Tue, 6 Jun 2017 11:01:54 -0400 Received: from mail-sn1nam01on0044.outbound.protection.outlook.com ([104.47.32.44]:48685 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751593AbdFFPBI (ORCPT ); Tue, 6 Jun 2017 11:01:08 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; From: Ioana Radulescu To: CC: , , , , , , , , Subject: [PATCH 11/18] staging: fsl-dpaa2/eth: Update ethtool stats names Date: Tue, 6 Jun 2017 10:00:34 -0500 Message-ID: <20170606150041.10955-12-ruxandra.radulescu@nxp.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170606150041.10955-1-ruxandra.radulescu@nxp.com> References: <20170606150041.10955-1-ruxandra.radulescu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131412348502616886;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(336005)(39860400002)(39450400003)(39850400002)(39840400002)(39410400002)(39380400002)(39400400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(2950100002)(2906002)(77096006)(6916009)(54906002)(4326008)(53936002)(38730400002)(110136004)(47776003)(50986999)(76176999)(189998001)(6666003)(39060400002)(85426001)(8656002)(86362001)(33646002)(50466002)(81166006)(8676002)(8936002)(50226002)(36756003)(104016004)(498600001)(5003940100001)(7416002)(5660300001)(305945005)(48376002)(1076002)(356003)(2351001)(106466001)(105606002);DIR:OUT;SFP:1101;SCL:1;SRVR:BL2PR03MB163;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;MX:1;A:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD043;1:Pqt8p6KHha5k6MkaOGWXBb7459TYeDHVZ7Whgcoa6ggcszw0cig8pt4tJYIyimlgVBiOi0frTORdlTn7f2hO0kgEtXeUQp+OGcEL9gYilIBxBaR1Mo0eA/D3ruD6NJj4WdNwA99HpcvEfjlur7F4kgNQ94D2zmW3Z0IcPmb2/1XeaS6G/4I4kqUuQ3Zjcku2QYpIgWHZ449bGQe/D3FnmvFbKWu1zwDC38S5n6LzbWOst3hamvafRDr8xHZUkUnakkwS5mfqa4evpAfa05t37Jk9XIeOP0BM+tMRwImfjkILHd/U32h6ij1ZzqtClQfeKSrA7lXpemh6NAoc3SKqS0IrpVQKggLW67eSlOechvMgKjGflVJyNXnJecqcCIKM0kSxBsbKx2eYxBloJXUyRpg0hMsrtEDB+Fkz9MNpVFEfhP2hiQe4yWL5ToQkYcpRs1aItfeBpvLgxqhl4puHNM9CEkKIfx1ESNtc8iuYAjoZ81aDrMY+ECeDmNnwLlVmGCYSG9qJPcdFcYM4uqDwPSB4Rl1bBUK38tNg9ya3bwP1yXyTfnywD6hVQoYsTPlmW9EINVb2b7Blze9sHVeRpG79ced7pYFIf57IpVsVbvHfXSa7xM59Z4p8A6+eHMKTuiNuwfQb6bLQCa5C+D6idPKDScjFV/yOHNIAOOTbCF6GvVAHTOJ+BMBsdxEAfMfc MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL2PR03MB163: X-MS-Office365-Filtering-Correlation-Id: c25b5406-80ae-4b22-7687-08d4acecd1ec X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131430075)(201703131517081);SRVR:BL2PR03MB163; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB163;3:UVClNbofvS8KqVtQ/j0aRO1xztPj0exavj8uQF4X5QA7mX9hqz9yGeGEhOUTAgOSqcNsx51qzJRjcNk3X7UTTC6O0S7gcvuNU55V9kZp88h3GmdgilUtuKQoh8J5cWeLJjT4iEDCMeu0VrPg3hG/Yf1jh+wHG1jsWImFJIqAAtrnYKNHx8i2/ZOKEAajlRpHL5WIFFBmNygYS7D/D6uGrWJRkQkeJUgrsUTySmLEcvqbEsAjPOIMhKG8TyrKvKeNgSyNzHAIUrbrWxH2XKbebvu11mHwgUmJ96H4QQi7JzhF2rlElDw6B/V/wY+IgwerJUnR+htlW3iDruyyc0r4f6CJKT4xdW7saa99the6LG7DFsEIv1wr+CrrZobfUU7ho+eOb0bcd1tUDb1p+0n+dDebmmKRqFOdkmPcdI2pimxAdsOJP8iV/wM4Y+ycR4Mk;25:5/n19kbf8CRF1k0H0Nt/9V21U2RV5Lw4wBS0+jT7lb2OeZCchPyyn/N2L4h9jGuOlTNPhU8BBESBwoUznlfiR43BvINnYiDKNMREa3FLX4IwgUUnYX9hCNCD/WJDP+AJAcI36noWcmhG5Z43+RwAgxn38numqdaMlE3sgraVFBY0MSzdoRLsGQxG182G9IrFaBKnfUzXiWtW3N3jmgMVlAEk2Y2uea32hGo2+GRVPI6HU+6lIzQVzxGNng9KcnaaLpbCI+LdPJtQRbwBV2bl9XTJHQ0AciKfUsl8/sQj0QeDJIDZkEvCvxjKieehmnBhiH4SKZRn0gfsHv/HIC6qCT14bGSybEf95rRtlJ//AzFa84njzx8vmKeYTxEAH8xTRhlOYQzDkbRhqMZZHzNt8eGuyIqNN7QdrgJMBsbUGg+xBFrMPlf4kKvCJK/48wIADxNZ1N53TZjNj3p2NPRmLsI0/nrx8ZjkNG2HezLyb8Y= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB163;31:eWP7ygSlpI9yu5ool8VIFBnuf9wv3d6kL+bl3cfqStq6EOZlPyYKONIXWuQE6wH4o4mRc99n7Yv4WKYPkxIfv/WMfRCJunkA5Gb2PZgsTAkThhN6hO5zbgxVlCn9z1Iar25k6RO3r/3qQ8cTDAlVr4EnuPVbYR/EZxcuQh+lXx/jseUSeEqCHI404phtFL2vU38HZMfvLpRwjzbAFQqWxMZX9gf7m5c+z61p7+qPk9aewZsLwSdayKpS7pL5kmZEKU29/XSEEFhr99PnwFtrbA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(8121501046)(5005006)(13018025)(13016025)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(20161123563025)(20161123559100)(20161123561025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123565025)(20161123556025)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BL2PR03MB163;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BL2PR03MB163; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB163;4:YHDn7OE9cnT9TYCsz0OyU1cMjw8217ZrYnBR4c2+ePt?= =?us-ascii?Q?AFbPvCXd4Xn2Gcp0llB/f54tLKKwkrTxGPcfK6h/A4ZNWAjRqi6UVmEygevx?= =?us-ascii?Q?Q+rc7xYiH/NIP5wbWsAL0exB5nIkCdRgyUEhl1Lxa0RcR6SWtiz6rAAnnMdj?= =?us-ascii?Q?FF0tRPNhk4pafOhFBNhOCE/XR2xQ9ez68scuCpp2sKGux4odLrxy5mJ/jRQG?= =?us-ascii?Q?kQJwu4wDfVMVdH7TG4cItyyTvS7MvJhYkYlioxR+WiZE6ut1a6UpzENLG8p1?= =?us-ascii?Q?Pqho3t+oMcIElqmduz8ndyVkgAHdYorfWxLHu7r2ZbVFZ5UvISg5++pMbGqn?= =?us-ascii?Q?/OwlieqVSfa+g0/dgRkslAg3c7Zmi04MDIv74Cy8PeKIwz7V2Stgxj0RpxFl?= =?us-ascii?Q?J48/Vv1qNr82M/yK4XrCJTh2pllvZOrw1CIqKU1/zeG6YLzql2urBhzZMpKz?= =?us-ascii?Q?jDRAK2U0Zenc2LOvj10dIkwi3B8WpKTxOdxXHcQHacznrmvbiUMQ3/0VMxwB?= =?us-ascii?Q?tWkT8ys/jKKetse2btFLZ+cq8vtlGtEsJc+FKCxovT5NQKPFgn36Z36wl3dS?= =?us-ascii?Q?T8isPIOe68bYxW6PO5oo8qZCIagzEh3Kqx9MJ51Z3jaCJv6JyCE66b0gcElU?= =?us-ascii?Q?dnBsdp6QQ9UcPOP1Mz3p0Gz6KDw/6QnOAwgvozq25MwZxpFUnm5SFfHcb9yb?= =?us-ascii?Q?L4mRcpqFsNTHZGr6YQc9W/lwMuJEGLyTmWNmrM2kHLM0nd4spc6Lqzt9uy7M?= =?us-ascii?Q?RrQepok9gwic/PcHvf2P+Is6YoeABWMeZaHMSOPpc/H8/qzf6GYUxqZ91zXq?= =?us-ascii?Q?AfCzABflweiW7ZmU0zGdwh8R7VgKPm6EM6P8+KPLtep8w6yMzK5aY8hMrwTn?= =?us-ascii?Q?YCRVVebW4ouUC0+oM52vo7ZyQi6Jm1df0E41WXvMBfyWerH+Dh6wey9jEbE1?= =?us-ascii?Q?lGQJhn3PXQxejDPPKW/wzLvjLqL4urDTKsJH7PQqLZ/iidg5z3OW04seWqd/?= =?us-ascii?Q?WY71+EUrYIIi9qjEWpw+iP7yennUq2V8k2WsCGAohjitB41W16aKS/6AW+MQ?= =?us-ascii?Q?+EgS8xWKBtl4xBttFoMqN7a64TEehbNhKF6mrqEqrE3eM5oI9qBE8D4p9ugz?= =?us-ascii?Q?LQcM8aEfC2yzit+HWh+QcRRduFPsQbhi1qZ+hhX5TocydRH8fMNmr/UiTkF9?= =?us-ascii?Q?8pIMqWs/8NYL2Hz32jl4pmbzRrXfQjI5wl1NRE9h6U/01gBXQVcO+TIAQqH3?= =?us-ascii?Q?f92XovgJcpqtcydQrIWT9eV6uLS08ei36tuEAsKOlDCFZqrdGzcPBBZfTTg?= =?us-ascii?Q?=3D=3D?= X-Forefront-PRVS: 033054F29A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB163;23:1M9Z6xsDJZ8/ZjCIo+NGax75vaEO8ZNATwRkQVpoNA?= =?us-ascii?Q?LvR/8ZVMrieOOHZVP9XvNohNfY3ikUnncs7ykpLGM283ua+pMbPnFl8r45q3?= =?us-ascii?Q?8EpMYbgVlBdjKCf7b1SB2PkBB1HnGLflx/nzwjd5plCqBB1z7qbN/B55MpZG?= =?us-ascii?Q?osFOF032DHxT4Gu8/y+W5JPQsHPS/0DtZo57h74sl/xFi7slnjit75UtReMM?= =?us-ascii?Q?yyxQ2hmn+a074xmjXooxvaeUC/Yb3pKHpaQa9y4irWFtZCOQsXFUXas50zsQ?= =?us-ascii?Q?e4cyHNsbUiShMH0eMr3Qo+8I0LAk7/sTA81Fqy99XhtCnb4yUQQc/BHwyJ9p?= =?us-ascii?Q?l8Y0awzhyPMBsoH7vVe5ByvWFHLhj0IwW7RnoDmn4roGe3WZzmYu68lLL21o?= =?us-ascii?Q?YmJt888lGvhHIWVCRqcWf2tVweoWWj9k0pjOmoZFhNNBANY8Un+jtyllLH0K?= =?us-ascii?Q?ovELqzycv1vE1qI09jcLX5HDzaq4i23id4D2f6GAi7pv1IVfkhBVRGFsjb8Z?= =?us-ascii?Q?PsFrs3yvfD2GXAsST9ubozKXB2+DRyRnd1kwjaJZ4Pc0cgG9HhXVvOuhj3Nh?= =?us-ascii?Q?c72ZNZ8uDZ0QCpWe+gLMD3/M6jmENB5fRA747Y/McBWkQro3nCQzO9oHhnY9?= =?us-ascii?Q?N60IWjd3olmrot3eE+TWrJucZxynT4Lw4slOqQ9VXxU2WpWBjJ7HGIJZhLMr?= =?us-ascii?Q?SO/UYhIFUNuPVfN7gkIGcf+EKT+TsEBf0BfqQNQpkRKoWVuD8I3EacSWZrGQ?= =?us-ascii?Q?mKWHpO+P8hADYvhLQO03k2p0ejywr+eFePVHd8NnjTCQwvoUl9Lkd7j2PP6J?= =?us-ascii?Q?1Jm7HgOfy2dxMhY5M5S0hRIFn23ETTIvmT9oKYsao1GHAGvQB/1B7roBNU2E?= =?us-ascii?Q?TnrYqp/YGesqfd2gUE9uO2eKXXDsmvG10XQ0q4zKjvruY1n7ILMBPslWCpgL?= =?us-ascii?Q?CEPj2+nOWuv06AXSpFVhLH2xnUM/2FbrSZi25SnLdEHQR5w8ZYN3oqA472Hb?= =?us-ascii?Q?jia6CjuL2j/+KAEexpAYULTaDGavO4qwu2Z2IEpk9IiY6sMEaxsc9LP0jfEr?= =?us-ascii?Q?rPD3RBCE2MW8pv7bAa6YHG3Khc9CIZ4lTY4A0JjDHJNQrgF7YQrJt93baX9q?= =?us-ascii?Q?sZa1fO8sPSQEp1WuVr5FGentg6u9AnyoMgIu5BG9QNBL+f+Rn3kOe8O9HOrH?= =?us-ascii?Q?uA/b8WIY0FTsN4RymeGM6GYljxjlxtrIv+VWQA+PESLgvA9zBl4VJBi8KS23?= =?us-ascii?Q?H8RSRkJ43A5LhPG8VGPTKzPo/M/l4miUSWMFmzA8Gblatind9qJdS1QuuHfs?= =?us-ascii?Q?HxncQfKxw7W4G1C+HygT4=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB163;6:fFWzbLZl3WtxXnileF+jauZmvt329yAKNlOQDyN4WR2NP8Pts6WgtVHlX1jBpZZ1tNUOWx9du79hsTcQ1c6ylkEiO6sIyuuuYdSd3PJPpzCp6XjMj1jaHvafYKIOBbo+74/cPd8EZQwk/N2EBveUpZA+/57BT2A2hTc9VUr0Mp38QiMayGMSBzOXqXYNyqw8JAGoMitpDiqgiBUDerHm1GQ/TTv8MruweNA8Rlfrimjw+B6NuWmFPlbHUvKxo7C8kZAY5KoKNn5Lnnkgaw8D2Lxf/BXUsSKKBa8CcnR9dykCtGpdsZAYov1p2zQVWhTK23AOLTnlaUzcq7UuyCZFOvUioSWz4qWvrV3cQUqSui/IvWAg/+ow/3uN2fH+BdEAw9m7snnv0OC34/NjCPXz+NHqW/puJdO6lb3XorCmDv6UnvGZIaZoTueksYOlpApwcjaeqyS6kjp037F5Xy3u9Mk3K8N6oUbAldzj8nocMkUYBhd9KyPDhsSEE0tjctLM X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB163;5:0y0du1dAF5z+aAdNlDaozjoch9mtcWhTC0QRD0dC1+9g0tS7PzFkqpkFH0UEpNTyLJx5uo+Bd2fhvWUQOBLdrutjt6WixUhZ/SPWzw9nPmjiaY0QeYgfTxeuEuE15kIDilcJyIyB5uTMGRESe8yxyQYEvJxawSxDMIpuJJ+lXSIf5FNYKiDLLltrsyjFL44pPHLY6TG8RxK5SZujQDujBavhI9Q0aCxOGIWELGCmPtdRxhOL7O7N7WddiNsAJyDh0ZOQv/kuqWumbQ7KV3yamga3iriCaHMVUhYGJI4hrWtk3niMbcVBRYQowFWH2xEMhUS75LznBg/SWXY3XMITeuNzL/FBllgXT/8NO5iNfTk0b/vrilm2gL0GUrE6lRaxOGbMMw6noUzqnTp67Cbf5n5ifQLVF/upppt5OJRnSp2A+rEvUIQK59oayxKMLXDAeNG1sNl84PtY0TYbYuBpS9EWgKAzYzrJdXLqro5lKIA2fXi0LSv7UuDQ95+uCfXNguZrjnLQUUUEXAuY05jKvw==;24:b+ovp3YAsHBDJZcRqhg4c3sN2RWrG5knrTdH4NZ64hc799aaQWJyjhQh+mU3WhX52Z/rgPZb9ZaBRGgx1FyaN6TK2HWmweMYQ9iCkxG42hU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB163;7:VfHSqEvGCqHAYPCr0d3tiG6HvVp/KDpghodT49VVh2Bb6si9POQvN3/bBbwuJrShVR4Ch+pP7LinepfHD7nwhMBdsCecgrmpKrbBrhPFD641gKO8mzwmU5XXz3i0UTH2KIgSrlYXPNCYGEqn2BLL+Ye2EvWx39tCx5OlnoqiXEEBaNkhDkwSt3tTU7IWM9zeZ+Ca89HkjGYtVqRoAbdRdHdjH5ppYD9BLgKCcThQEFLypK/lZ6tT8RPWW235T2Zf/2aYGAKd+X2TxZv7pNuE9JMEebyEhFRE1wyy6sXQtycDb2SGVh0P7QE6Kfj5go5ajwiEVgx6q6dQ+bBoOM6cWA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2017 15:00:49.7936 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB163 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2192 Lines: 82 Add a label to the ethtool statistics counters, to differentiate between hardware counters and driver specific ones. Signed-off-by: Ioana Radulescu --- drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c index 6a331c74e542..5312edc26f01 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c @@ -35,40 +35,40 @@ /* To be kept in sync with DPNI statistics */ static char dpaa2_ethtool_stats[][ETH_GSTRING_LEN] = { - "rx frames", - "rx bytes", - "rx mcast frames", - "rx mcast bytes", - "rx bcast frames", - "rx bcast bytes", - "tx frames", - "tx bytes", - "tx mcast frames", - "tx mcast bytes", - "tx bcast frames", - "tx bcast bytes", - "rx filtered frames", - "rx discarded frames", - "rx nobuffer discards", - "tx discarded frames", - "tx confirmed frames", + "[hw] rx frames", + "[hw] rx bytes", + "[hw] rx mcast frames", + "[hw] rx mcast bytes", + "[hw] rx bcast frames", + "[hw] rx bcast bytes", + "[hw] tx frames", + "[hw] tx bytes", + "[hw] tx mcast frames", + "[hw] tx mcast bytes", + "[hw] tx bcast frames", + "[hw] tx bcast bytes", + "[hw] rx filtered frames", + "[hw] rx discarded frames", + "[hw] rx nobuffer discards", + "[hw] tx discarded frames", + "[hw] tx confirmed frames", }; #define DPAA2_ETH_NUM_STATS ARRAY_SIZE(dpaa2_ethtool_stats) static char dpaa2_ethtool_extras[][ETH_GSTRING_LEN] = { /* per-cpu stats */ - "tx conf frames", - "tx conf bytes", - "tx sg frames", - "tx sg bytes", - "rx sg frames", - "rx sg bytes", - "enqueue portal busy", + "[drv] tx conf frames", + "[drv] tx conf bytes", + "[drv] tx sg frames", + "[drv] tx sg bytes", + "[drv] rx sg frames", + "[drv] rx sg bytes", + "[drv] enqueue portal busy", /* Channel stats */ - "dequeue portal busy", - "channel pull errors", - "cdan", + "[drv] dequeue portal busy", + "[drv] channel pull errors", + "[drv] cdan", }; #define DPAA2_ETH_NUM_EXTRA_STATS ARRAY_SIZE(dpaa2_ethtool_extras) -- 2.11.0