From: MeiChia Chiu <[email protected]>
Add mu-mimo and ofdma packet counters statistics.
Reviewed-by: Money Wang <[email protected]>
Reviewed-by: Ryder Lee <[email protected]>
Signed-off-by: MeiChia Chiu <[email protected]>
---
.../net/wireless/mediatek/mt76/mt7915/debugfs.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++-
.../net/wireless/mediatek/mt76/mt7915/mcu.c | 41 ++++++++
.../net/wireless/mediatek/mt76/mt7915/mcu.h | 45 +++++++++
.../net/wireless/mediatek/mt76/mt7915/mt7915.h | 3 +
4 files changed, 330 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index a15aa256..b57818b3 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -81,6 +81,244 @@ mt7915_radar_trigger(void *data, u64 val)
DEFINE_DEBUGFS_ATTRIBUTE(fops_radar_trigger, NULL,
mt7915_radar_trigger, "%lld\n");
+static int
+mt7915_muru_debug_set(void *data, u64 val)
+{
+ struct mt7915_dev *dev = data;
+
+ dev->muru_debug = val;
+ mt7915_mcu_muru_debug_set(dev, data);
+
+ return 0;
+}
+
+static int
+mt7915_muru_debug_get(void *data, u64 *val)
+{
+ struct mt7915_dev *dev = data;
+
+ *val = dev->muru_debug;
+
+ return 0;
+}
+
+DEFINE_DEBUGFS_ATTRIBUTE(fops_muru_debug, mt7915_muru_debug_get,
+ mt7915_muru_debug_set, "%lld\n");
+
+static int mt7915_muru_stat_show(struct seq_file *file, void *data)
+{
+ struct mt7915_phy *phy = file->private;
+ struct mt7915_dev *dev = phy->dev;
+ struct mt7915_mcu_muru_stats mu_stats = {};
+ static const char * const dl_non_he_type[] = {
+ "CCK", "OFDM", "HT MIX", "HT GF",
+ "VHT SU", "VHT 2MU", "VHT 3MU", "VHT 4MU"
+ };
+ static const char * const dl_he_type[] = {
+ "HE SU", "HE EXT", "HE 2MU", "HE 3MU", "HE 4MU",
+ "HE 2RU", "HE 3RU", "HE 4RU", "HE 5-8RU", "HE 9-16RU",
+ "HE >16RU"
+ };
+ static const char * const ul_he_type[] = {
+ "HE 2MU", "HE 3MU", "HE 4MU", "HE SU", "HE 2RU",
+ "HE 3RU", "HE 4RU", "HE 5-8RU", "HE 9-16RU", "HE >16RU"
+ };
+ int ret, i;
+ __le32 total_ppdu_cnt;
+
+ if (!dev->muru_debug) {
+ seq_puts(file, "Please enable muru_debug first.\n");
+ return 0;
+ }
+
+ mutex_lock(&dev->mt76.mutex);
+
+ ret = mt7915_mcu_muru_debug_get(phy, &mu_stats);
+ if (ret)
+ goto exit;
+
+#define __ms_ratio(s) (!total_ppdu_cnt ? 0 : \
+ le32_to_cpu(s) * 100 / le32_to_cpu(total_ppdu_cnt))
+
+ /* Non-HE Downlink*/
+ total_ppdu_cnt = mu_stats.dl.cck_cnt +
+ mu_stats.dl.ofdm_cnt +
+ mu_stats.dl.htmix_cnt +
+ mu_stats.dl.htgf_cnt +
+ mu_stats.dl.vht_su_cnt +
+ mu_stats.dl.vht_2mu_cnt +
+ mu_stats.dl.vht_3mu_cnt +
+ mu_stats.dl.vht_4mu_cnt;
+
+ seq_puts(file, "[Non-HE]\nDownlink\nData Type: ");
+
+ for (i = 0; i < 5; i++)
+ seq_printf(file, "%8s | ", dl_non_he_type[i]);
+
+ seq_puts(file, "\nTotal Cnt: ");
+ seq_printf(file, "%8u | %8u | %8u | %8u | %8u | ",
+ le32_to_cpu(mu_stats.dl.cck_cnt),
+ le32_to_cpu(mu_stats.dl.ofdm_cnt),
+ le32_to_cpu(mu_stats.dl.htmix_cnt),
+ le32_to_cpu(mu_stats.dl.htgf_cnt),
+ le32_to_cpu(mu_stats.dl.vht_su_cnt));
+
+ seq_puts(file, "\nRatio : ");
+ seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %7d%% | ",
+ __ms_ratio(mu_stats.dl.cck_cnt),
+ __ms_ratio(mu_stats.dl.ofdm_cnt),
+ __ms_ratio(mu_stats.dl.htmix_cnt),
+ __ms_ratio(mu_stats.dl.htgf_cnt),
+ __ms_ratio(mu_stats.dl.vht_su_cnt));
+
+ seq_puts(file, "\nDownlink MU-MIMO\nData Type: ");
+
+ for (i = 5; i < 8; i++)
+ seq_printf(file, "%8s | ", dl_non_he_type[i]);
+
+ seq_puts(file, "\nTotal Cnt: ");
+ seq_printf(file, "%8u | %8u | %8u | ",
+ le32_to_cpu(mu_stats.dl.vht_2mu_cnt),
+ le32_to_cpu(mu_stats.dl.vht_3mu_cnt),
+ le32_to_cpu(mu_stats.dl.vht_4mu_cnt));
+
+ seq_puts(file, "\nRatio : ");
+ seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
+ __ms_ratio(mu_stats.dl.vht_2mu_cnt),
+ __ms_ratio(mu_stats.dl.vht_3mu_cnt),
+ __ms_ratio(mu_stats.dl.vht_4mu_cnt));
+
+ /* HE Downlink */
+ total_ppdu_cnt = mu_stats.dl.he_su_cnt +
+ mu_stats.dl.he_ext_su_cnt +
+ mu_stats.dl.he_2mu_cnt +
+ mu_stats.dl.he_3mu_cnt +
+ mu_stats.dl.he_4mu_cnt +
+ mu_stats.dl.he_2ru_cnt +
+ mu_stats.dl.he_3ru_cnt +
+ mu_stats.dl.he_4ru_cnt +
+ mu_stats.dl.he_5to8ru_cnt +
+ mu_stats.dl.he_9to16ru_cnt +
+ mu_stats.dl.he_gtr16ru_cnt;
+
+ seq_puts(file, "\n\n[HE]\nDownlink\nData Type: ");
+
+ for (i = 0; i < 2; i++)
+ seq_printf(file, "%8s | ", dl_he_type[i]);
+
+ seq_puts(file, "\nTotal Cnt: ");
+ seq_printf(file, "%8u | %8u | ",
+ le32_to_cpu(mu_stats.dl.he_su_cnt),
+ le32_to_cpu(mu_stats.dl.he_ext_su_cnt));
+
+ seq_puts(file, "\nRatio : ");
+ seq_printf(file, "%7d%% | %7d%% | ",
+ __ms_ratio(mu_stats.dl.he_su_cnt),
+ __ms_ratio(mu_stats.dl.he_ext_su_cnt));
+
+ seq_puts(file, "\nDownlink MU-MIMO\nData Type: ");
+
+ for (i = 2; i < 5; i++)
+ seq_printf(file, "%8s | ", dl_he_type[i]);
+
+ seq_puts(file, "\nTotal Cnt: ");
+ seq_printf(file, "%8u | %8u | %8u | ",
+ le32_to_cpu(mu_stats.dl.he_2mu_cnt),
+ le32_to_cpu(mu_stats.dl.he_3mu_cnt),
+ le32_to_cpu(mu_stats.dl.he_4mu_cnt));
+
+ seq_puts(file, "\nRatio : ");
+ seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
+ __ms_ratio(mu_stats.dl.he_2mu_cnt),
+ __ms_ratio(mu_stats.dl.he_3mu_cnt),
+ __ms_ratio(mu_stats.dl.he_4mu_cnt));
+
+ seq_puts(file, "\nDownlink OFDMA\nData Type: ");
+
+ for (i = 5; i < 11; i++)
+ seq_printf(file, "%8s | ", dl_he_type[i]);
+
+ seq_puts(file, "\nTotal Cnt: ");
+ seq_printf(file, "%8u | %8u | %8u | %8u | %9u | %8u | ",
+ le32_to_cpu(mu_stats.dl.he_2ru_cnt),
+ le32_to_cpu(mu_stats.dl.he_3ru_cnt),
+ le32_to_cpu(mu_stats.dl.he_4ru_cnt),
+ le32_to_cpu(mu_stats.dl.he_5to8ru_cnt),
+ le32_to_cpu(mu_stats.dl.he_9to16ru_cnt),
+ le32_to_cpu(mu_stats.dl.he_gtr16ru_cnt));
+
+ seq_puts(file, "\nRatio : ");
+ seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %8d%% | %7d%% | ",
+ __ms_ratio(mu_stats.dl.he_2ru_cnt),
+ __ms_ratio(mu_stats.dl.he_3ru_cnt),
+ __ms_ratio(mu_stats.dl.he_4ru_cnt),
+ __ms_ratio(mu_stats.dl.he_5to8ru_cnt),
+ __ms_ratio(mu_stats.dl.he_9to16ru_cnt),
+ __ms_ratio(mu_stats.dl.he_gtr16ru_cnt));
+
+ /* HE Uplink */
+ total_ppdu_cnt = mu_stats.ul.hetrig_2ru_cnt +
+ mu_stats.ul.hetrig_3ru_cnt +
+ mu_stats.ul.hetrig_4ru_cnt +
+ mu_stats.ul.hetrig_5to8ru_cnt +
+ mu_stats.ul.hetrig_9to16ru_cnt +
+ mu_stats.ul.hetrig_gtr16ru_cnt +
+ mu_stats.ul.hetrig_su_cnt +
+ mu_stats.ul.hetrig_2mu_cnt +
+ mu_stats.ul.hetrig_3mu_cnt +
+ mu_stats.ul.hetrig_4mu_cnt;
+
+ seq_puts(file, "\n\nUplink\nData Type: ");
+ seq_puts(file, "\nTrigger-based Uplink MU-MIMO\nData Type: ");
+
+ for (i = 0; i < 3; i++)
+ seq_printf(file, "%8s | ", ul_he_type[i]);
+
+ seq_puts(file, "\nTotal Cnt: ");
+ seq_printf(file, "%8u | %8u | %8u | ",
+ le32_to_cpu(mu_stats.ul.hetrig_2mu_cnt),
+ le32_to_cpu(mu_stats.ul.hetrig_3mu_cnt),
+ le32_to_cpu(mu_stats.ul.hetrig_4mu_cnt));
+
+ seq_puts(file, "\nRatio : ");
+ seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
+ __ms_ratio(mu_stats.ul.hetrig_2mu_cnt),
+ __ms_ratio(mu_stats.ul.hetrig_3mu_cnt),
+ __ms_ratio(mu_stats.ul.hetrig_4mu_cnt));
+
+ seq_puts(file, "\nTrigger-based Uplink OFDMA\nData Type: ");
+
+ for (i = 3; i < 10; i++)
+ seq_printf(file, "%8s | ", ul_he_type[i]);
+
+ seq_puts(file, "\nTotal Cnt: ");
+ seq_printf(file, "%8u | %8u | %8u | %8u | %8u | %9u | %7u | ",
+ le32_to_cpu(mu_stats.ul.hetrig_su_cnt),
+ le32_to_cpu(mu_stats.ul.hetrig_2ru_cnt),
+ le32_to_cpu(mu_stats.ul.hetrig_3ru_cnt),
+ le32_to_cpu(mu_stats.ul.hetrig_4ru_cnt),
+ le32_to_cpu(mu_stats.ul.hetrig_5to8ru_cnt),
+ le32_to_cpu(mu_stats.ul.hetrig_9to16ru_cnt),
+ le32_to_cpu(mu_stats.ul.hetrig_gtr16ru_cnt));
+
+ seq_puts(file, "\nRatio : ");
+ seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %7d%% | %7d%% | %7d%% |\n",
+ __ms_ratio(mu_stats.ul.hetrig_su_cnt),
+ __ms_ratio(mu_stats.ul.hetrig_2ru_cnt),
+ __ms_ratio(mu_stats.ul.hetrig_3ru_cnt),
+ __ms_ratio(mu_stats.ul.hetrig_4ru_cnt),
+ __ms_ratio(mu_stats.ul.hetrig_5to8ru_cnt),
+ __ms_ratio(mu_stats.ul.hetrig_9to16ru_cnt),
+ __ms_ratio(mu_stats.ul.hetrig_gtr16ru_cnt));
+#undef __ms_ratio
+
+exit:
+ mutex_unlock(&dev->mt76.mutex);
+
+ return ret;
+}
+DEFINE_SHOW_ATTRIBUTE(mt7915_muru_stat);
+
static int
mt7915_fw_debug_wm_set(void *data, u64 val)
{
@@ -528,7 +766,9 @@ int mt7915_init_debugfs(struct mt7915_phy *phy)
dir = mt76_register_debugfs_fops(phy->mt76, NULL);
if (!dir)
return -ENOMEM;
-
+ debugfs_create_file("muru_debug", 0600, dir, dev, &fops_muru_debug);
+ debugfs_create_file("muru_stat", 0400, dir, phy,
+ &mt7915_muru_stat_fops);
debugfs_create_file("hw-queues", 0400, dir, phy,
&mt7915_hw_queues_fops);
debugfs_create_file("xmit-queues", 0400, dir, phy,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 73a11448..a32d2199 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -2993,6 +2993,47 @@ int mt7915_mcu_fw_dbg_ctrl(struct mt7915_dev *dev, u32 module, u8 level)
sizeof(data), false);
}
+int mt7915_mcu_muru_debug_set(struct mt7915_dev *dev, bool enabled)
+{
+ struct {
+ __le32 cmd;
+ u8 enable;
+ } data = {
+ .cmd = cpu_to_le32(MURU_SET_TXC_TX_STATS_EN),
+ .enable = enabled,
+ };
+
+ return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(MURU_CTRL), &data,
+ sizeof(data), false);
+}
+
+int mt7915_mcu_muru_debug_get(struct mt7915_phy *phy, void *ms)
+{
+ struct mt7915_dev *dev = phy->dev;
+ struct sk_buff *skb;
+ struct mt7915_mcu_muru_stats *mu_stats =
+ (struct mt7915_mcu_muru_stats *)ms;
+ int ret;
+
+ struct {
+ __le32 cmd;
+ u8 band_idx;
+ } req = {
+ .cmd = cpu_to_le32(MURU_GET_TXC_TX_STATS),
+ .band_idx = phy != &dev->phy,
+ };
+
+ ret = mt76_mcu_send_and_get_msg(&dev->mt76, MCU_EXT_CMD(MURU_CTRL),
+ &req, sizeof(req), true, &skb);
+ if (ret)
+ return ret;
+
+ memcpy(mu_stats, skb->data, sizeof(struct mt7915_mcu_muru_stats));
+ dev_kfree_skb(skb);
+
+ return 0;
+}
+
static int mt7915_mcu_set_mwds(struct mt7915_dev *dev, bool enabled)
{
struct {
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
index 4636b7dc..60b18457 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -44,6 +44,13 @@ enum {
MCU_EXT_EVENT_RDD_REPORT = 0x3a,
MCU_EXT_EVENT_CSA_NOTIFY = 0x4f,
MCU_EXT_EVENT_BCC_NOTIFY = 0x75,
+ MCU_EXT_EVENT_MURU_CTRL = 0x9f,
+};
+
+/* tx cmd tx statistics */
+enum {
+ MURU_SET_TXC_TX_STATS_EN = 150,
+ MURU_GET_TXC_TX_STATS = 151,
};
enum {
@@ -206,6 +213,44 @@ struct mt7915_mcu_tx {
struct edca edca[IEEE80211_NUM_ACS];
} __packed;
+struct mt7915_mcu_muru_stats {
+ __le32 event_id;
+ struct {
+ __le32 cck_cnt;
+ __le32 ofdm_cnt;
+ __le32 htmix_cnt;
+ __le32 htgf_cnt;
+ __le32 vht_su_cnt;
+ __le32 vht_2mu_cnt;
+ __le32 vht_3mu_cnt;
+ __le32 vht_4mu_cnt;
+ __le32 he_su_cnt;
+ __le32 he_ext_su_cnt;
+ __le32 he_2ru_cnt;
+ __le32 he_2mu_cnt;
+ __le32 he_3ru_cnt;
+ __le32 he_3mu_cnt;
+ __le32 he_4ru_cnt;
+ __le32 he_4mu_cnt;
+ __le32 he_5to8ru_cnt;
+ __le32 he_9to16ru_cnt;
+ __le32 he_gtr16ru_cnt;
+ } dl;
+
+ struct {
+ __le32 hetrig_su_cnt;
+ __le32 hetrig_2ru_cnt;
+ __le32 hetrig_3ru_cnt;
+ __le32 hetrig_4ru_cnt;
+ __le32 hetrig_5to8ru_cnt;
+ __le32 hetrig_9to16ru_cnt;
+ __le32 hetrig_gtr16ru_cnt;
+ __le32 hetrig_2mu_cnt;
+ __le32 hetrig_3mu_cnt;
+ __le32 hetrig_4mu_cnt;
+ } ul;
+};
+
#define WMM_AIFS_SET BIT(0)
#define WMM_CW_MIN_SET BIT(1)
#define WMM_CW_MAX_SET BIT(2)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index c6c846d1..81f1ab18 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -273,6 +273,7 @@ struct mt7915_dev {
bool dbdc_support;
bool flash_mode;
+ bool muru_debug;
bool ibf;
u8 fw_debug_wm;
u8 fw_debug_wa;
@@ -526,6 +527,8 @@ int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy);
void mt7915_set_stream_he_caps(struct mt7915_phy *phy);
void mt7915_set_stream_vht_txbf_caps(struct mt7915_phy *phy);
void mt7915_update_channel(struct mt76_phy *mphy);
+int mt7915_mcu_muru_debug_set(struct mt7915_dev *dev, bool enable);
+int mt7915_mcu_muru_debug_get(struct mt7915_phy *phy, void *ms);
int mt7915_init_debugfs(struct mt7915_phy *phy);
#ifdef CONFIG_MAC80211_DEBUGFS
void mt7915_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
--
2.29.2
On 12/6/21 6:10 AM, MeiChia Chiu wrote:
> From: MeiChia Chiu <[email protected]>
>
> Add mu-mimo and ofdma packet counters statistics.
Hello,
Are these stats clear-on-read in the firmware? If so, then we need to accumulate
them in the driver.
Is there any significant downside to enabling the stats? For instance, a performance
degradation in the firmware/hardware?
Thanks,
Ben
>
> Reviewed-by: Money Wang <[email protected]>
> Reviewed-by: Ryder Lee <[email protected]>
> Signed-off-by: MeiChia Chiu <[email protected]>
> ---
> .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++-
> .../net/wireless/mediatek/mt76/mt7915/mcu.c | 41 ++++++++
> .../net/wireless/mediatek/mt76/mt7915/mcu.h | 45 +++++++++
> .../net/wireless/mediatek/mt76/mt7915/mt7915.h | 3 +
> 4 files changed, 330 insertions(+), 1 deletion(-)
>
--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com
On Mon, 2021-12-06 at 08:43 -0800, Ben Greear wrote:
> On 12/6/21 6:10 AM, MeiChia Chiu wrote:
> > From: MeiChia Chiu <[email protected]>
> >
> > Add mu-mimo and ofdma packet counters statistics.
>
> Hello,
>
> Are these stats clear-on-read in the firmware? If so, then we need
> to accumulate
> them in the driver.
>
> Is there any significant downside to enabling the stats? For
> instance, a performance
> degradation in the firmware/hardware?
>
> Thanks,
> Ben
Hi Ben,
Yes, the current design is clear-on-read and its sole purpose is for
debugging only. If you need statistics, this may have to be done in
another way.
Yes, a performance degradation is expected since enabling this debug
function would burden MCU with more calculation.
Thanks,
Meichia
On 12/6/21 11:25 PM, meichia chiu wrote:
> On Mon, 2021-12-06 at 08:43 -0800, Ben Greear wrote:
>> On 12/6/21 6:10 AM, MeiChia Chiu wrote:
>>> From: MeiChia Chiu <[email protected]>
>>>
>>> Add mu-mimo and ofdma packet counters statistics.
>>
>> Hello,
>>
>> Are these stats clear-on-read in the firmware? If so, then we need
>> to accumulate
>> them in the driver.
>>
>> Is there any significant downside to enabling the stats? For
>> instance, a performance
>> degradation in the firmware/hardware?
>>
>> Thanks,
>> Ben
>
> Hi Ben,
>
> Yes, the current design is clear-on-read and its sole purpose is for
> debugging only. If you need statistics, this may have to be done in
> another way.
So we could poll these stats in the other logic that polls firmware stats and accumulate
them in the driver and display with debugfs and/or ethtool. If you don't want
to do the accumulation, and lease add a comment to your patch about the
values being clear-on-read and someone else can add the accumulation logic
later.
> Yes, a performance degradation is expected since enabling this debug
> function would burden MCU with more calculation.
Have you done any testing to verify this? If it is just bumping a few
counters, it may not matter. But I don't know how the firmware is actually
implementing this, so maybe it is a lot more expensive than expected?
Thanks,
Ben
>
> Thanks,
> Meichia
>
--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com