From patchwork Fri Sep 10 16:04:47 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: 12485527 X-Patchwork-Delegate: kuba@kernel.org 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, 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 55E7EC433FE for ; Fri, 10 Sep 2021 16:10:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 41F386121F for ; Fri, 10 Sep 2021 16:10:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232954AbhIJQLN (ORCPT ); Fri, 10 Sep 2021 12:11:13 -0400 Received: from mail-mw2nam10on2082.outbound.protection.outlook.com ([40.107.94.82]:58752 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229907AbhIJQJC (ORCPT ); Fri, 10 Sep 2021 12:09:02 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BRdiBPUklVd1jToTtFlqIGhuCa+h5YkxA1vmVZDdUIDrKVE6p/ZuY8Yf8Tkmg7I9w8ZgLCRR69y/uyYAs4958Hul6kdKPJ8myePevTQ7ozU87d2e6ds04B+nezlIkiBqaBBUtrJj6n5xlvlDu2BkAZ7TVm9i/SW4YSR5Hgst+yIkXnG0e97gMsAAjmOkkPjmOCWd8QQvEHYCodqvzD5otoCLUa8n/L6/UHlKbjA5uo314rEgEK+wEk9OkYlRmpOpk+M/n5jQ4wA7zX1jynHI+6D4e8gQVDWCHLnwGlji1NVgHTVOn46UNDRpU3NM27cIurzjA7vlDAPui6evPczVeg== 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=K8U64UoLXvj1ac+Co4mxj7VShsDKiKyK5sD6A4oybqi6qvCu5FWDIq9RGtoOy/2HQjN40fOplie+GYd3C0PnaVNBC0rP1dRec7tpBQD9sCfuy7oMgtznMNGT8NwuzRZ7UQZRqeVdPphNJs4KDh2IPIK8IgBgUfeNMt3EBf/FIJsS/xBGC6ubPiN0gd84QORPPlhyZKNQmwDmXRW8OQWdw8/RrsPv8QTK95wml5QPC/v2ajlgEOZfo6gF5EaBNamN/elXyGlbkV+TFP2f15zyJtW+/9YghE4oeExM+OhuFpPbcAW0RNKPoEv6MLvHBAr5y2IPLmu3h82CeDXpyhsSnA== 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=o8g/yrYmRBcNMMh0ZtxfhbQ4Srt+5pJ4CooILanKooLhVL5d50S6gOFqyj4aOa4FNtJPUDsnGIwOT5jb+wbK1EG/fXCCnEw8fjkmG93FdgT6leK5HMf1pykB7EUhLPssNNu8kdwYULh5yIMnWncyCRzWRLWdOvteLzIQzYxOCVw= 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 SN6PR11MB3118.namprd11.prod.outlook.com (2603:10b6:805:dc::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Fri, 10 Sep 2021 16:06:00 +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; Fri, 10 Sep 2021 16:06:00 +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 14/31] staging: wfx: uniformize counter names Date: Fri, 10 Sep 2021 18:04:47 +0200 Message-Id: <20210910160504.1794332-15-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210910160504.1794332-1-Jerome.Pouiller@silabs.com> References: <20210910160504.1794332-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: SN4PR0601CA0006.namprd06.prod.outlook.com (2603:10b6:803:2f::16) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 Received: from pc-42.silabs.com (2a01:e34:ecb5:66a0:9876:e1d7:65be:d294) by SN4PR0601CA0006.namprd06.prod.outlook.com (2603:10b6:803:2f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Fri, 10 Sep 2021 16:05:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ec5d45af-97c7-415c-c969-08d97474e164 X-MS-TrafficTypeDiagnostic: SN6PR11MB3118: 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: 0u8oYv2028EhiOWhDYXb6X/y0Z1YDiki8TNWacMTarEVejiY26k9t5l9QkuLrM0zMQszp3pxGrz/joIEwhhsN8V4Q0NMEVyAM1X5Tj/iWL6WcqgZErdiEMkiEeitQ2k4rLXOk2IqH99l07pMVbhJu2cILyW7zbCyXSMqiW4xXi+BbMFpxmq0ZPi41K08QTJRn70Q4mLqjnP5ZHD3wyLFnl/yOQ5rkjLs06/02MHrnvztQblBETedGkM2eEe3+SrYqugKLOnjL7hS30q6PT2yHz7sJafxUGe7ohAtyvUSuMJYelQnsrhj6S+gVld6havV2Uap238UdnHRnxnJrkfmKLHkZm7v6t8KwAhKgGtlSTdj832dBY2U0tHQkzNoCil5fuZDv9Ct9audscFhRehbj3pBIYzX1er929U06j1nrlJaL3BtBxgdFOxR8fe0mtlAPcw5YmVnR64UcP+9v9GdjLVz+szIj6fLU+4ViCn6FGMWgQc7CLBZGeAqTRpH765eaCUE6ASawVIxse21bCdwJk+KmWKWL1VFxs3N+/dJTSyHSVscbBGi56nrWYtr3672vvWr/6HYZcd9S7sc7LHsw/eH0nY91QzoU5rVWPeAJvnTSV/WA/RIM+ggGJxtfYSlxftIU6E9CepZmyVVq0ct+A== 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:(136003)(366004)(376002)(346002)(39850400004)(396003)(4326008)(66476007)(107886003)(36756003)(186003)(316002)(6486002)(66556008)(8676002)(6666004)(86362001)(2906002)(54906003)(38100700002)(83380400001)(8936002)(5660300002)(66946007)(1076003)(2616005)(52116002)(7696005)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?M41k7LxBM/G3KxnStRlzx13Gctze?= =?utf-8?q?ee5o41meJyciYAWGoSQ9Xq2WC5zfb7iyYj8iqdZmMRQ4lx9dY1RU2zGzAVHp+8BvX?= =?utf-8?q?jHAbgZONMsPic7awlhCOY2Apvnj+7KKSBmufQjuoFiMMuewlZ/FThhqvcjAMUbWg+?= =?utf-8?q?fyPrz6teuxDKrBvcgf83mFjDHdzX1jOPYTZTxeFSWBr7SGrijLLcOMM+W/408DiLA?= =?utf-8?q?L+d2cY74RfRJxmfg1s0qz4PFNxp3JF638Cwktp/EuLYd+UAnDUaeyFDlx4btuDrZO?= =?utf-8?q?BgdMnUJKeclOSjC9r4gyxbXo/NWXxdXhhgKrRWC8Ja/5kCCvIPqIgjj9IyYCHAV+t?= =?utf-8?q?9mzx9FNNujjRK9ULJokdF53dpls8PELJoLETK25s6v3jmjxm5ABtpfap9qYUhnK73?= =?utf-8?q?2JVV8yDJIAmDpr8YOwTTZHm7ohH/pSVlngNYruIHF/ODcGHfQ4ATQpuDw8/87ypLq?= =?utf-8?q?I3x6SfncR0v+MWAGd64MEyneZn+bPeXFpJIXFnKEL2MEsqlP6G6JNS/m6Ul2TQk2L?= =?utf-8?q?dm4Hz+oUKdVCrOUxLpJslyIBB8YTc6DCjyl4SID03KZ4shcyvqmqXKH5G+iJ0wiou?= =?utf-8?q?N5hzZ3/zgUyM9VumDY0b2jKnXxqgizD3YNfGN4Xf/vN4mg4AkAV35Yrq6Kv7177iM?= =?utf-8?q?if68CvsJpLb1QIInxjYZZKVCRyFaaomj4aGU0XXr2K/x5DCcQdzF2d2YbZEi9Bbcn?= =?utf-8?q?Kj5JfOqCKdM/tlEoWLPNV+GLYNWHjl1ibDy4W4FYbxZgMOSQDxXWjcPIaGlCrPNTM?= =?utf-8?q?Y+0BUCRx2zZYaA/V0YPMY7PvgeRsW+aCrtPVffuVzsrC/2l/FehcmcBbmFHpGPjkN?= =?utf-8?q?7RXAC6bvQz2DWrSh0QT6rbTp9NtO2236fFQLnbs2S8RMGfIWJdAWagsguek7xcir+?= =?utf-8?q?Njr8aeYBcSCjdfFKskFmjVcq6GVGtusGPZ0e1tRy2kqX0/vV6bOSePXTMK38x96Ox?= =?utf-8?q?33PlKacgJV52MKWs7m06sMRZd9CBaWRFVhyXVnGVEw0xIepYNU7g3/Vbjgx+gd71F?= =?utf-8?q?THWVpp+nCIwhwNk1FB09VVbDZ3G1zRNfScZfxn+JVS3VoYij87mVBbA8BIPZYbxTD?= =?utf-8?q?2ZZMBLTYuuohxgHSmaNKd3UezkjVtod2x9FBcHiXu7uxo5KVbakZkvSyQuwyvWMbC?= =?utf-8?q?pQwvtwlzUw5wpgvuYnwx6b6vpgFEc1GqViplV9XmlFvOMblZtZ5nS2dOdAzTv+F2S?= =?utf-8?q?EQGF1lM/4WPHgegYyV33RcdDwsaPBcX5V508XcZS2Djke22BKoX21STM5P8mZIi82?= =?utf-8?q?jvWpxgxdjSwwqp/K4c+pgH9SgHtZaW+nNvy2AqeI0M9L3UTFFGL2al/lxog3D1ZDf?= =?utf-8?q?0VhwmKXTZkwRDBu?= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec5d45af-97c7-415c-c969-08d97474e164 X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2021 16:05:59.8881 (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: Qd7YDW3dz1Ztw7Uq5Teq8sIG1WqXIr3r7udm91SO1K3MQcl08axGy7zXqN3Z3QSvfLMHO6+ooZkv5YNPnauXtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3118 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 {