From patchwork Mon Sep 13 08:30:26 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: 511641 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 53D7EC433EF for ; Mon, 13 Sep 2021 08:35:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F9E960FBF for ; Mon, 13 Sep 2021 08:35:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238137AbhIMIg7 (ORCPT ); Mon, 13 Sep 2021 04:36:59 -0400 Received: from mail-bn8nam12on2064.outbound.protection.outlook.com ([40.107.237.64]:55755 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S238399AbhIMIeK (ORCPT ); Mon, 13 Sep 2021 04:34:10 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YTaioXqjqfvxMrHzidRdYkMVb6AzVQANDsnrMlmDYSZPldi2Euj9iCLRh0jsFv09J4xGZiPJGEdvplThjRRn9pzY5x1aDFnt2ocrZNtWfijz7UpAb+h7fjH1diHhdWlSTn+bqDXi9KVLUVTCSHWNSktLGb/GcRMCYA/jvjN/hU8bkGItwGWNmKTRqPyrDvVRlmuvezClf3amHwqxXlGedRxXESr3ybkdQpJuQO+9j/pj+oarvA+/6z+s0Dkcf75f925C5O5JYziHs0oP61E/+RHiJCklVMvP+3sjVL61TBhL8v2His+fjwOI7pbDdyAhIObFgxwq1flkBDbnQ5V6lw== 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=A++33iaI/+B7cry2nPoeA53ULRN1nFeoywfeXQe2fzRQJZpyIu/KVWnNFThug8OMM6Jk6Y/o4Gc8gE/Am1lUaggm6p+y/HrEjGnK8RVI9UJhj8azntpUYFXpSLVQXTHRdkfXr6yAGrwVZpDa/PcU/WT63Irlmhm+j4RSwgD4QGANai//oyTxXoNUiBIRYVQ8kQYxXr6gGlUZvleeA0L+ogvhp5Wqi792JoyPcUHEQJax+rI2/pe1ZdvZrN9XEBVFqIdey1wroOm5iieOSBx7J1PJuoZ0wwww1qp/lwCNiMjX5t6NNi5sb4BIKvczmMi/mAjVvdk8UbBmhtnwPdxl0A== 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=VdIt6m+b0C4jywLa4rwDIDQSH2lkjupMplQRhr6JU8YwJnXURr3Y12yPjHt6tb9xaI+Mbfvlwh8tqUYjxZyE/8NtJC1cdO8i3l2saq6uUVM/DOqAveIDN+VmThe6Ucbrajr8ZBLDTySXbvo7VFS61JbmPwMNSSazysaKJ0unjqU= 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 (52.135.97.18) by SN6PR11MB3263.namprd11.prod.outlook.com (52.135.109.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 08:31:53 +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 08:31:53 +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 v2 14/33] staging: wfx: uniformize counter names Date: Mon, 13 Sep 2021 10:30:26 +0200 Message-Id: <20210913083045.1881321-15-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913083045.1881321-1-Jerome.Pouiller@silabs.com> References: <20210913083045.1881321-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: PAZP264CA0067.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1fd::10) 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 PAZP264CA0067.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1fd::10) 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 08:31:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 535819c8-0fc2-4d62-99e3-08d97690e225 X-MS-TrafficTypeDiagnostic: SN6PR11MB3263: 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: QZYuBRLyWVb2L0nwfIM3nwgYoJ2x/GAjbLsjwJieTR1Cz47Oph8sEZQ8wSW0HJ9AW6GcN5YzE/rcWlI0+cD9R/l+zZY++b96m2aFCNut6/9WlAWVsAgRSkMUqpGJyAr7Go/LvABnOyNXIG6qROXK/y7SkC9IoDwOyyduln46a0lizqQvrsmYvyYAbmMm367TXhWkqRNoEqQ4OHlpeFOj1vldy37LVoECJHTt23qsL+lUmyY6uA4Vsie2gaWnxTzW3gGCoSyJKdL3hHAjLqFhh4r1eLpA2M82WxuZFTGNqwiTn1ggwgc4476id9jhRMh7V8P8l5Mb4MfToVnLSFI1El05Q+SX/1TR5wLeA7XvHO4L+RaoX3gKH+IKgpqipK/kPS422OcaixiOksVH6gEfixJlIrMcNlJpBmAeFVLRhD2lzO8BJSUx3/oEq383f0NOmzXLxiYf7ZVQzJM6t/Kal1AQMyJN8vUraeJYE63HYxToWB4/zIOm05hNQczs2Mt023Q4LbxXaUsS2AKILE4fLF+iJMecBAt3vYbrcH2tjphguhhcbgJ274L6b1QjiwEfN5dVocbyMhFDHlDiGpoyuKkLibAWo+CDxQ9TsskFaCKwNQTA1+WxGAwixg8SlZ/kjfZ4RR70uU9mqgJbAWL8E4XgrAa+mgWUYe/E812FDyb6fiMGdtHSWwAmofubgdy+9ra8KMsK/aUsx1maN8PhKw== 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)(83380400001)(107886003)(956004)(2616005)(5660300002)(54906003)(38350700002)(4326008)(316002)(38100700002)(66946007)(26005)(66476007)(66556008)(186003)(8676002)(36756003)(8936002)(86362001)(508600001)(52116002)(7696005)(6486002)(1076003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?hNp6wJh7jLFiyd4KRwHU23amv?= =?utf-8?q?qdVVucl5x+tqy5mhRRiAH7YRBZ0NaEmLBhYc1je+tW6hWKjreK24SL4Q?= =?utf-8?q?M423lhlgchAa1PhN+dBlBOSEOTZ2Ts9e/Wp/JLWcjya0EmaZyUrbXkWp?= =?utf-8?q?IQvCxfpIq+2+M+johSOsmhOQ+qlt+oGALuqvyiJBarYdNTs55BS7g8j1?= =?utf-8?q?2K//XXOABAjIL7o06H9idDWSAhh9W4JeGwoBi/q4k0EErv+mW8+VNFAa?= =?utf-8?q?9Jm6e+FUr/UUrAqfpbMQxHfAibynwRnF57I8WGm/jNoMnKsGFPt+eH2H?= =?utf-8?q?7LTyNrzwKnnR9kjj7DJou7r94Ln8lDLTXrdPcmJiLy9eM70IYCcp+eSF?= =?utf-8?q?TWujPX+QhZHwn3za4WUOlAHlXXNdpXHlD7SMq6EHMyLJkHt2tc8vyu5y?= =?utf-8?q?LiFSZ8zydUQLGq4lno6VsOpNyWBn+ynHB66n1Gbw1qR2C0avNecZwim/?= =?utf-8?q?G+oqkGhLVxSVJqySZATfto8i1oTdExmJ6WBQLSOxjyysKCxC0ryk82GE?= =?utf-8?q?+tIiFJ1deZS+85l1TbsuZyZqSB6yyEPiJMfItzrs4xnkR08G8qb1L5gc?= =?utf-8?q?Pt/wGIK+IuipGl/pOcHiqlR0AEvAL4ytpjgcP/0SueumhsZp2EIWHWJH?= =?utf-8?q?5RKv2D1e3yCGhClB4dPn/GzVHL3Cd9djfFsKg/khjwtbJwVkLdyTE4ak?= =?utf-8?q?XilMk2OhJehHfyy4TczfyUquTNMruO7Ve1VyCmg9Tcf8AttLisuog3JV?= =?utf-8?q?ktI2D3PMtNXcE20VHYYDae+TpFcpGG9DFCuFa6Rc0/hDJGJ+SsiOVEUc?= =?utf-8?q?6LtOVorpzhXwrbKB0KCV0KnQWVqzTMcWjgXSlrHSNlylRrxSvQZ4nRy7?= =?utf-8?q?gGOySE7W0lnEWNtXLjbz5i1yWR780VyHpAV0KyRqo7w7cvgbWJTZXUzW?= =?utf-8?q?QdppDj8MGAMJRDDUfyi4r4KYqNbvktmKvzkv849wqBF9MY0/3SAM7aNn?= =?utf-8?q?yIAKZh03UvaBByyiISz36EPdjuV/BCbXPMJRgTJm2sHp1ms6aEGeCwlJ?= =?utf-8?q?PiDuspE0lzu/kWGSs3JhjcfIWdqz3ykmJ5k1/ShJ+8AFLJpG6em7JGxy?= =?utf-8?q?uiDQ3KrUgDOtnp0lGnJfm1v/o91yybLMtnpxdS+wR1fUHkLbi/RHowG9?= =?utf-8?q?FUozrzMswv/xpmjeO0xa+z+gQfKMu+KoXRHcDKHHx0fQIoutzDD5QEps?= =?utf-8?q?4Nag3/7Bj/Spe70isYpnFFDKmUMxllfgMvig/K7njyRDg+SonYedjQuh?= =?utf-8?q?jsXKsJAzRATTgFHgotHpnqofAsCzvlBkumtcfQMZS/ExyXAOiwSVUMlp?= =?utf-8?q?Rpvq4ny+RjtnHEdjyx67VKab4viGq9z?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 535819c8-0fc2-4d62-99e3-08d97690e225 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 08:31:29.2268 (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: uXf6YoVnlgA3LTMJpfzMvA54LzrUioS4s6U8XukeuDaBOd87f1cd+W+U36R7q4ddUhkp+tyj0oJE/o98M0MWLQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3263 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 {