Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp833761pxv; Thu, 22 Jul 2021 13:27:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgtyPI1wgPjmVIHmwmPqXbvd0oBbgvE+lxSAXRyFObz4H+65gNl1I02t0M7aHIRw4Fthjv X-Received: by 2002:a92:dcc2:: with SMTP id b2mr1109053ilr.84.1626985642107; Thu, 22 Jul 2021 13:27:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626985642; cv=none; d=google.com; s=arc-20160816; b=obpowCDQdErCTuqL1aPXKQ1vripeyPtPBQQA/ZleWGEDdbg/ITqcMZNCCuf7srP+2/ YJbxTCKAyFVUNNPbaXOmSEs1dz29YHYO7XWNhC3tApXsmKYgbta2jAt88ZYrmTt21ttf kBQ0Vq+WCf8Mrbia27vvZKT2esNlX30PkxXlSOI0vef/tqS7Z9tE6+GRiEBxgnF/2IOc 4B18MuU298Mi365ssVubcYHMFlNxlwrX9c/4oFhf8Kf5224uDhCCXRrZRSuu6k9BDXwn l0oOyOqfMelX6MJ0CfLaVp1ZxcyMnm64Ndftip7zKK1UqwAW5ZFK2a/JDRMo7ynWqvOw ECBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=+1/H8HLQ98fmF4AI5/JPH09A0ac+OK1/WqeJirr3fLE=; b=CiTgmebB2iH90aeSXqQjkIuMNsOX4etQyZhtP57vRtDGX8nOd75h9kbbfPSoFb5ug8 5DZBIQeyRDrSAxMSupYmazylWZ37x04EBzKkjaEbHw6CYPDEnRMKp5NPvtwLr/O4dYf0 AwZDUbadX4JH23JDk5l9cUM7UghDiUrS+tdZ2ZieFfBwV/H3M5ddODGThoHT2KXItlab diFNMJXfcuoTxs7NjYIkU38+VA4UpbxTQ8tIxKC1tJBZEutQI4cM7iGxkTG8IO0xfTSa n5ns7yroEbTlKvFP9J3vnRTAexEMs/3PL5eohjqAIJwCz0mDmD5oc6un0zlO+ZymeEZg GP1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b="e/FhEZlR"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=candelatech.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v25si32292865jan.107.2021.07.22.13.27.09; Thu, 22 Jul 2021 13:27:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b="e/FhEZlR"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=candelatech.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230455AbhGVTol (ORCPT + 99 others); Thu, 22 Jul 2021 15:44:41 -0400 Received: from dispatch1-us1.ppe-hosted.com ([67.231.154.184]:7350 "EHLO dispatch1-us1.ppe-hosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230481AbhGVToi (ORCPT ); Thu, 22 Jul 2021 15:44:38 -0400 X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.51.166]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 756E4A0080 for ; Thu, 22 Jul 2021 20:25:11 +0000 (UTC) Received: from mail3.candelatech.com (mail2.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 3CAFF90006B for ; Thu, 22 Jul 2021 20:25:11 +0000 (UTC) Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id CB5FC13C2BC; Thu, 22 Jul 2021 13:25:10 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com CB5FC13C2BC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1626985510; bh=sARaDeybTSETqc1WM+PGvuNw2nCtPJrhkzA15pt1ySM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e/FhEZlR6CKSAj6w0PLHrkthqT0WD6sybCZr1GeLch5lVuA0cc31IGP+QkZHxeDyS 387RWTayClJLwPShzEyodA6WidSZyMMSWOb/fZud7zzu6zGqP96Vrj55znR99qyYlM qv0IfOvIClhoFhbtXyYPFYhQvplXZsikpyS79vac= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v3 8/8] mt76 - mt7915: Add mib counters to ethtool stats. Date: Thu, 22 Jul 2021 13:25:04 -0700 Message-Id: <20210722202504.6180-8-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210722202504.6180-1-greearb@candelatech.com> References: <20210722202504.6180-1-greearb@candelatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MDID: 1626985512-aORSKiDvN4Nu Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear This adds the new mib counters from last patch into ethtool stats. Signed-off-by: Ben Greear --- .../wireless/mediatek/mt76/mt7915/debugfs.c | 50 ++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c index 9299208a73ee..a074ecf8ec38 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c @@ -381,6 +381,14 @@ void mt7915_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif, #endif static const char mt7915_gstrings_stats[][ETH_GSTRING_LEN] = { + "tx_ampdu_cnt", + "tx_stop_q_empty_cnt", + "tx_mpdu_attempts", + "tx_mpdu_success", + "tx_rwp_fail_cnt", + "tx_rwp_need_cnt", + "tx_pkt_ebf_cnt", + "tx_pkt_ibf_cnt", "tx_ampdu_len:0-1", "tx_ampdu_len:2-10", "tx_ampdu_len:11-19", @@ -420,6 +428,22 @@ static const char mt7915_gstrings_stats[][ETH_GSTRING_LEN] = { "tx_msdu_pack_6", "tx_msdu_pack_7", "tx_msdu_pack_8", + + /* rx counters */ + "rx_fifo_full_cnt", + "rx_mpdu_cnt", + "channel_idle_cnt", + "rx_vector_mismatch_cnt", + "rx_delimiter_fail_cnt", + "rx_len_mismatch_cnt", + "rx_ampdu_cnt", + "rx_ampdu_bytes_cnt", + "rx_ampdu_valid_subframe_cnt", + "rx_ampdu_valid_subframe_b_cnt", + "rx_pfdrop_cnt", + "rx_vec_queue_overflow_drop_cnt", + "rx_ba_cnt", + /* per vif counters */ "v_tx_mpdu_attempts", "v_tx_mpdu_fail", @@ -493,6 +517,15 @@ void mt7915_debug_get_et_stats(struct ieee80211_hw *hw, if (!phy) return; + data[ei++] = mib->tx_ampdu_cnt; + data[ei++] = mib->tx_stop_q_empty_cnt; + data[ei++] = mib->tx_mpdu_attempts_cnt; + data[ei++] = mib->tx_mpdu_success_cnt; + data[ei++] = mib->tx_rwp_fail_cnt; + data[ei++] = mib->tx_rwp_need_cnt; + data[ei++] = mib->tx_pkt_ebf_cnt; + data[ei++] = mib->tx_pkt_ibf_cnt; + /* Tx ampdu stat */ n = ext_phy ? ARRAY_SIZE(dev->mt76.aggr_stats) / 2 : 0; for (i = 0; i < 15 /*ARRAY_SIZE(bound)*/; i++) @@ -524,12 +557,25 @@ void mt7915_debug_get_et_stats(struct ieee80211_hw *hw, data[ei++] = mib->tx_mu_successful_mpdu_cnt; data[ei++] = mib->tx_su_successful_mpdu_cnt; - /* TODO: External phy too?? */ - /* Tx amsdu info (pack-count histogram) */ for (i = 0; i < 8; i++) data[ei++] = mt76_rr(dev, MT_PLE_AMSDU_PACK_MSDU_CNT(i)); + /* rx counters */ + data[ei++] = mib->rx_fifo_full_cnt; + data[ei++] = mib->rx_mpdu_cnt; + data[ei++] = mib->channel_idle_cnt; + data[ei++] = mib->rx_vector_mismatch_cnt; + data[ei++] = mib->rx_delimiter_fail_cnt; + data[ei++] = mib->rx_len_mismatch_cnt; + data[ei++] = mib->rx_ampdu_cnt; + data[ei++] = mib->rx_ampdu_bytes_cnt; + data[ei++] = mib->rx_ampdu_valid_subframe_cnt; + data[ei++] = mib->rx_ampdu_valid_subframe_bytes_cnt; + data[ei++] = mib->rx_pfdrop_cnt; + data[ei++] = mib->rx_vec_queue_overflow_drop_cnt; + data[ei++] = mib->rx_ba_cnt; + /* Add values for all stations owned by this vif */ /* See mt76_get_min_avr_rssi for example of how to find all sta -- 2.20.1