From patchwork Mon Sep 13 13:01:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 511629 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C33BEC433F5 for ; Mon, 13 Sep 2021 13:04:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A786C60FA0 for ; Mon, 13 Sep 2021 13:04:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239016AbhIMNF3 (ORCPT ); Mon, 13 Sep 2021 09:05:29 -0400 Received: from mail-bn8nam08on2055.outbound.protection.outlook.com ([40.107.100.55]:54369 "EHLO NAM04-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S240050AbhIMNEq (ORCPT ); Mon, 13 Sep 2021 09:04:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a1GaEn8OIQr0+exMK5Cl847ZpBfIWrJdQ1vO+WRc6evUHPP9x6SdQecmef+Jm2OrSxxyUx2btuUY5ZaCxgpiOUTCO62pq1bzN4n533R16/+nEq15WqehWTE8j5e9BGmGD04eyOl9fER41T+wqS7/59UWmSL9PSPkStLBFbQ/K0dpy9jaOhg6nGaoocXzLDmdpABjKD4NLYVqj3XtHKlksBsni+pNuTftTfjaP/vJMc3HVok9d7akIf8f8cpFHbMonR3KYW3M7YQl5ca4Yy6gQxtMtD7kIiwL5+SPvOpK7l6uiMedwbcx0PKl/44NiF4i59r3vbiDRpSq1r9UO+te7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ASE4rAagVGXa5deMw5+RxN7XsAlkN46v5/lzPTuDMuc=; b=lJwEZlXvGUUvx8O4bjb/jpC2ekwXVti223DgKj0Dfaq1e8Md2ezFBpr3T6IINKm1rEB+GnY2jKO7u49eAm3xm/ooQDhDbYMtB7HaUGhNc717gKc11TXFg3lG44GyQw5+UYONtFsHtIUiXJzGVQ5Fuq8TCfoBfIrJgnnDzLfIJMryVYar8t+SzvdCxvdT7bHTWm337YCQaHi/V5T3PrUU0orIoIXpuvPHsJBfPC2AUNKtS/VEdddC7MhDR6LAwN+PZb4v3qsGOKu/j6dBfvtF5ewpQnxe5Iw+3Jsq6hyTgb/Ff2GNArw6szXqDtaGRQwCuhMXvt0sfhLdNDphldFirQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ASE4rAagVGXa5deMw5+RxN7XsAlkN46v5/lzPTuDMuc=; b=IeNb/vZYEXSwoe1jQpHQr1ZG/JCoq6wElkl8uWq93qOu067jEWWg67nv83zzgXqv3YvvXm5vkvJFYbDKgSt1NnikipxmBo8b4/t8oNzvcV9QvdVS682jRiJ2+LMM7SAlzzYh4qBW4tygGLQKRlIhn3Uc3wze9RqQShObcfzqRt0= Authentication-Results: driverdev.osuosl.org; dkim=none (message not signed) header.d=none; driverdev.osuosl.org; dmarc=none action=none header.from=silabs.com; Received: from SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) by SA2PR11MB4860.namprd11.prod.outlook.com (2603:10b6:806:11b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Mon, 13 Sep 2021 13:02:43 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::7050:a0a:415:2ccd]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::7050:a0a:415:2ccd%7]) with mapi id 15.20.4500.017; Mon, 13 Sep 2021 13:02:43 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH v3 14/32] staging: wfx: uniformize counter names Date: Mon, 13 Sep 2021 15:01:45 +0200 Message-Id: <20210913130203.1903622-15-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913130203.1903622-1-Jerome.Pouiller@silabs.com> References: <20210913130203.1903622-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PR2P264CA0021.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::33) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 Received: from pc-42.silabs.com (37.71.187.125) by PR2P264CA0021.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 13:02:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 32b03780-05d8-42b8-7165-08d976b6c632 X-MS-TrafficTypeDiagnostic: SA2PR11MB4860: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1923; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6JBDPapyxcdNDrnC4VHtwDfbZwQiKjH732XZLyTB9R49Ta5i0IqVfp3Vd989ypHxJRq+g9WUTqn59S6AqCAm9LNOq0yaHQM6ZhkhX9TnSkLP2gIiUjTit8mIMj9T51i0FT/RX45J+wubW2sbvJFBI5yQkCw90vSk72EjLvIVtTEhwCipfJ1IwBYxZPUj0O47ysfKUYI3CJrjr/MYZFhJ1sbKnaRAQkoRQ6JFdFPt98RzhEtkpgzUbM/AT33dBdcmLf5h7NYVLtP1g2G/0JPMTrllQvdiCMhSEpA8/TGaXHqca+E1/G0qgMC+M//U42iXUapgHvoTIWEPJnBkZYsH2VSVNrmVFLd5sqEltT7AHlIoQFp9GA4RWUGIdP+cziKs/M1/E6GH/a5NGWJ04qdIMyxhrKXKPB7Iz9XH+y/akaRtw/7twptX9VzydEY/rx/PS+PHJCQUvZymSrn8D9rz8O1CRugjmVgYuNx3RrF6AZ44KiFOzHmL29WJO8S9JDC4Imcb6SZZMGx08eiUxYMPTq4HnFORmLmjkF9K6CGhyKoNkgtH+96POaPGNz3HRQHZpC1gSM8yKznk/otsdDncGZSPvG1xAxM0suYcvIyz9fmOHMIiAVlpdJDffGFUpV/c7By1UgyY/DhNqeXS180CzUV/iGTcVHz72fIWVQTPHVEK4R4WPRVomI1vaehFqu6uKDYzO+OAKjxuNh3uyFHxwQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB2718.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(956004)(66946007)(2616005)(26005)(36756003)(38100700002)(38350700002)(316002)(4326008)(107886003)(7696005)(54906003)(5660300002)(52116002)(66556008)(1076003)(66476007)(6486002)(508600001)(8936002)(83380400001)(86362001)(2906002)(8676002)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?dsWqief72Lrlfez2+GTAfPDyz?= =?utf-8?q?t7usIOO1ibODit2Z1GKEgrGtawd9m1pGg8nCdB/aVwxB1BOKMDvVEvGn?= =?utf-8?q?fVOsKuAMuobdd4p8IVpODHla2a/vKW5jYQ5mTTJJL3dH4mfdUiN2W876?= =?utf-8?q?nT80wZm4wGCyLSh3MVUn/Dp8BcEukVB4MdQJlXgbEs2WeHsoWhRTMHRs?= =?utf-8?q?ZtMDgW9/6I21EURu3XbgHKq4L1DJA0pzCoHDrULP1M9VHIMuerrI/xB8?= =?utf-8?q?TzPmFduHoLYZXifuA+eIlrWjgB9tIyxyZa9DEgUL6kmokE7s6ltRMALN?= =?utf-8?q?zHFOLEZJOGjOeCyByP13c2U5KzZWeQzARYwFh70srMlj3JHjlEp66R1g?= =?utf-8?q?v2KqlVId88NUAivvvlqXFo+XkmtvzOtH/cUsy8V/DHQDlcHRu5OmBRcc?= =?utf-8?q?jWFPh2P1VnSrZOCIF+lgvFcI5tR3lD71URMPCEbde4OjoWp4ZvPaZ7qn?= =?utf-8?q?ehcDQqS0+A6N0b3DvMa6kkXhGSVX5KYkw5nNvmozYmZkw3rdo2zEZ0Ff?= =?utf-8?q?E3aIPSNa/I7895jskM8t8xBV/lvSueKSGj5LCr6ifnVgrOy6Imrl/kmH?= =?utf-8?q?eLGvAwgjSfkfZlXB5aDsJiD91Wrq3EJXvk1Kl00qB0OiYg8KQhb6g9eW?= =?utf-8?q?1Bu7r0c2thEaHE3p4/ISeGO32HSTJ1Q5PYYglJ9JLf1aT4YqSEgRXBYy?= =?utf-8?q?ok1OyC9+NL6en3XmcSWWDYkRFuD/+GviDE9c+JgzR3Ul3wEzNza1/U0Y?= =?utf-8?q?YAuL7dHlzhEKZdEW/ACjclj8tcsWauXaegrQdZnsyaoADt6tQjXE6ciF?= =?utf-8?q?ZrsoyUukGYghUb9mKxi/OvSOqMBc2pqJnbKq3lCunY9bsElb4zDm08WP?= =?utf-8?q?QbwszbOAaql5T2AK0CfnhwDQRGjmjfO0fy7+5pgq2E0Bg6MpFLEbqXX+?= =?utf-8?q?MElHN4dicyWwX3n9wC6uDxQaRwLQBtjQZtE0j1LHTUG6GUlJhmWLct10?= =?utf-8?q?ns2M3Wz0rM60LK6Ey/urC1ZhCYLekoLYC6FWlVZlloXolCZglWPbH4Ry?= =?utf-8?q?U5KodGPOHl4y926+c4mfXCCC/KUyWRWXugCT8jEoUlbqrrDc43yHkTxJ?= =?utf-8?q?pfzg0OD54fiwd/RPift9nlhb+zFfII83zyF4ee9MKkM4DbxBtJWfnkmv?= =?utf-8?q?HJzCTMQnBsxPCUdxIi41QxEUe+i/L7MnoZ6pbtFyp1Ak3/Xq2DfnupAA?= =?utf-8?q?WWAzie7m+NIeG2qHeEjVS49Lyc6ep8p3M5GoPaDWua4Xjbl8iMec0qRO?= =?utf-8?q?AWm5y3n5ciypAOWW55qPpyu/TTNjQjdKcP1V1IlLT4mqXhE96EruWMW/?= =?utf-8?q?UDjxUGxFUb0gMvRTLfn6zEkvnjpLzaN?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32b03780-05d8-42b8-7165-08d976b6c632 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 13:02:43.2195 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KQvMqAonKDEcgKx5ETFiLNgt7sFngJu+CaROoIvAePljjTfVEZkaGtHgnGHyDqe0wbXgr1KuFFYzH3eyGsehoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4860 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller The device provide some internal statistic counters. However, the names of counter were not very meaningful. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/debug.c | 45 ++++++++--------- drivers/staging/wfx/hif_api_mib.h | 82 +++++++++++++++---------------- 2 files changed, 64 insertions(+), 63 deletions(-) diff --git a/drivers/staging/wfx/debug.c b/drivers/staging/wfx/debug.c index e67ca0d818ba..16c3f55f1a3d 100644 --- a/drivers/staging/wfx/debug.c +++ b/drivers/staging/wfx/debug.c @@ -82,36 +82,37 @@ static int wfx_counters_show(struct seq_file *seq, void *v) le32_to_cpu(counters[0].count_##name), \ le32_to_cpu(counters[1].count_##name)) - PUT_COUNTER(tx_packets); - PUT_COUNTER(tx_multicast_frames); + PUT_COUNTER(tx_frames); + PUT_COUNTER(tx_frames_multicast); PUT_COUNTER(tx_frames_success); - PUT_COUNTER(tx_frame_failures); PUT_COUNTER(tx_frames_retried); PUT_COUNTER(tx_frames_multi_retried); + PUT_COUNTER(tx_frames_failed); + PUT_COUNTER(ack_failed); PUT_COUNTER(rts_success); - PUT_COUNTER(rts_failures); - PUT_COUNTER(ack_failures); + PUT_COUNTER(rts_failed); - PUT_COUNTER(rx_packets); + PUT_COUNTER(rx_frames); + PUT_COUNTER(rx_frames_multicast); PUT_COUNTER(rx_frames_success); - PUT_COUNTER(rx_packet_errors); - PUT_COUNTER(plcp_errors); - PUT_COUNTER(fcs_errors); - PUT_COUNTER(rx_decryption_failures); - PUT_COUNTER(rx_mic_failures); - PUT_COUNTER(rx_no_key_failures); - PUT_COUNTER(rx_frame_duplicates); - PUT_COUNTER(rx_multicast_frames); - PUT_COUNTER(rx_cmacicv_errors); - PUT_COUNTER(rx_cmac_replays); - PUT_COUNTER(rx_mgmt_ccmp_replays); + PUT_COUNTER(rx_frames_failed); + PUT_COUNTER(drop_plcp); + PUT_COUNTER(drop_fcs); + PUT_COUNTER(drop_no_key); + PUT_COUNTER(drop_decryption); + PUT_COUNTER(drop_tkip_mic); + PUT_COUNTER(drop_bip_mic); + PUT_COUNTER(drop_cmac_icv); + PUT_COUNTER(drop_cmac_replay); + PUT_COUNTER(drop_ccmp_replay); + PUT_COUNTER(drop_duplicate); - PUT_COUNTER(rx_beacon); - PUT_COUNTER(miss_beacon); - PUT_COUNTER(rx_dtim); - PUT_COUNTER(rx_dtim_aid0_clr); - PUT_COUNTER(rx_dtim_aid0_set); + PUT_COUNTER(rx_bcn_miss); + PUT_COUNTER(rx_bcn_success); + PUT_COUNTER(rx_bcn_dtim); + PUT_COUNTER(rx_bcn_dtim_aid0_clr); + PUT_COUNTER(rx_bcn_dtim_aid0_set); #undef PUT_COUNTER diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/staging/wfx/hif_api_mib.h index b2dc47c314cc..2a741a37a90c 100644 --- a/drivers/staging/wfx/hif_api_mib.h +++ b/drivers/staging/wfx/hif_api_mib.h @@ -133,61 +133,61 @@ struct hif_mib_bcn_filter_enable { } __packed; struct hif_mib_extended_count_table { - __le32 count_plcp_errors; - __le32 count_fcs_errors; - __le32 count_tx_packets; - __le32 count_rx_packets; - __le32 count_rx_packet_errors; - __le32 count_rx_decryption_failures; - __le32 count_rx_mic_failures; - __le32 count_rx_no_key_failures; - __le32 count_tx_multicast_frames; + __le32 count_drop_plcp; + __le32 count_drop_fcs; + __le32 count_tx_frames; + __le32 count_rx_frames; + __le32 count_rx_frames_failed; + __le32 count_drop_decryption; + __le32 count_drop_tkip_mic; + __le32 count_drop_no_key; + __le32 count_tx_frames_multicast; __le32 count_tx_frames_success; - __le32 count_tx_frame_failures; + __le32 count_tx_frames_failed; __le32 count_tx_frames_retried; __le32 count_tx_frames_multi_retried; - __le32 count_rx_frame_duplicates; + __le32 count_drop_duplicate; __le32 count_rts_success; - __le32 count_rts_failures; - __le32 count_ack_failures; - __le32 count_rx_multicast_frames; + __le32 count_rts_failed; + __le32 count_ack_failed; + __le32 count_rx_frames_multicast; __le32 count_rx_frames_success; - __le32 count_rx_cmacicv_errors; - __le32 count_rx_cmac_replays; - __le32 count_rx_mgmt_ccmp_replays; - __le32 count_rx_bipmic_errors; - __le32 count_rx_beacon; - __le32 count_miss_beacon; - __le32 count_rx_dtim; - __le32 count_rx_dtim_aid0_clr; - __le32 count_rx_dtim_aid0_set; + __le32 count_drop_cmac_icv; + __le32 count_drop_cmac_replay; + __le32 count_drop_ccmp_replay; + __le32 count_drop_bip_mic; + __le32 count_rx_bcn_success; + __le32 count_rx_bcn_miss; + __le32 count_rx_bcn_dtim; + __le32 count_rx_bcn_dtim_aid0_clr; + __le32 count_rx_bcn_dtim_aid0_set; __le32 reserved[12]; } __packed; struct hif_mib_count_table { - __le32 count_plcp_errors; - __le32 count_fcs_errors; - __le32 count_tx_packets; - __le32 count_rx_packets; - __le32 count_rx_packet_errors; - __le32 count_rx_decryption_failures; - __le32 count_rx_mic_failures; - __le32 count_rx_no_key_failures; - __le32 count_tx_multicast_frames; + __le32 count_drop_plcp; + __le32 count_drop_fcs; + __le32 count_tx_frames; + __le32 count_rx_frames; + __le32 count_rx_frames_failed; + __le32 count_drop_decryption; + __le32 count_drop_tkip_mic; + __le32 count_drop_no_key; + __le32 count_tx_frames_multicast; __le32 count_tx_frames_success; - __le32 count_tx_frame_failures; + __le32 count_tx_frames_failed; __le32 count_tx_frames_retried; __le32 count_tx_frames_multi_retried; - __le32 count_rx_frame_duplicates; + __le32 count_drop_duplicate; __le32 count_rts_success; - __le32 count_rts_failures; - __le32 count_ack_failures; - __le32 count_rx_multicast_frames; + __le32 count_rts_failed; + __le32 count_ack_failed; + __le32 count_rx_frames_multicast; __le32 count_rx_frames_success; - __le32 count_rx_cmacicv_errors; - __le32 count_rx_cmac_replays; - __le32 count_rx_mgmt_ccmp_replays; - __le32 count_rx_bipmic_errors; + __le32 count_drop_cmac_icv; + __le32 count_drop_cmac_replay; + __le32 count_drop_ccmp_replay; + __le32 count_drop_bip_mic; } __packed; struct hif_mib_mac_address {