mt76: mt7915: add mu-mimo and ofdma debugfs knobs

Add mu-mimo and ofdma packet counters statistics.
The statistics are clear on read.

Reviewed-by: Money Wang <Money.Wang@mediatek.com>
Reviewed-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 2b7db7b467cb6107f521d60be19410a5d57a033e..5baf8370b7bd88c3d23cdfece399b8e3675cea9d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -798,6 +798,7 @@ 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,
 };
 
 enum {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index 4c5a572cea9273d56500629ba67a75d3e0bdb507..e96d1c31dd36b6dd426598188385c9ec153c3e09 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -81,6 +81,225 @@ 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_stats_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;
+       u64 total_ppdu_cnt, sub_total_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;
+
+       /* Non-HE Downlink*/
+       seq_puts(file, "[Non-HE]\nDownlink\nData Type:  ");
+
+       for (i = 0; i < 5; i++)
+               seq_printf(file, "%8s | ", dl_non_he_type[i]);
+
+#define __dl_u32(s)     le32_to_cpu(mu_stats.dl.s)
+       seq_puts(file, "\nTotal Count:");
+       seq_printf(file, "%8u | %8u | %8u | %8u | %8u | ",
+                  __dl_u32(cck_cnt),
+                  __dl_u32(ofdm_cnt),
+                  __dl_u32(htmix_cnt),
+                  __dl_u32(htgf_cnt),
+                  __dl_u32(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 Count:");
+       seq_printf(file, "%8u | %8u | %8u | ",
+                  __dl_u32(vht_2mu_cnt),
+                  __dl_u32(vht_3mu_cnt),
+                  __dl_u32(vht_4mu_cnt));
+
+       sub_total_cnt = __dl_u32(vht_2mu_cnt) +
+               __dl_u32(vht_3mu_cnt) +
+               __dl_u32(vht_4mu_cnt);
+
+       seq_printf(file, "\nTotal non-HE MU-MIMO DL PPDU count: %lld",
+                  sub_total_cnt);
+
+       total_ppdu_cnt = sub_total_cnt +
+               __dl_u32(cck_cnt) +
+               __dl_u32(ofdm_cnt) +
+               __dl_u32(htmix_cnt) +
+               __dl_u32(htgf_cnt) +
+               __dl_u32(vht_su_cnt);
+
+       seq_printf(file, "\nAll non-HE DL PPDU count: %lld", total_ppdu_cnt);
+
+       /* HE Downlink */
+       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 Count:");
+       seq_printf(file, "%8u | %8u | ",
+                  __dl_u32(he_su_cnt),
+                  __dl_u32(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 Count:");
+       seq_printf(file, "%8u | %8u | %8u | ",
+                  __dl_u32(he_2mu_cnt),
+                  __dl_u32(he_3mu_cnt),
+                  __dl_u32(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 Count:");
+       seq_printf(file, "%8u | %8u | %8u | %8u | %9u | %8u | ",
+                  __dl_u32(he_2ru_cnt),
+                  __dl_u32(he_3ru_cnt),
+                  __dl_u32(he_4ru_cnt),
+                  __dl_u32(he_5to8ru_cnt),
+                  __dl_u32(he_9to16ru_cnt),
+                  __dl_u32(he_gtr16ru_cnt));
+
+       sub_total_cnt = __dl_u32(he_2mu_cnt) +
+               __dl_u32(he_3mu_cnt) +
+               __dl_u32(he_4mu_cnt);
+       total_ppdu_cnt = sub_total_cnt;
+
+       seq_printf(file, "\nTotal HE MU-MIMO DL PPDU count: %lld",
+                  sub_total_cnt);
+
+       sub_total_cnt = __dl_u32(he_2ru_cnt) +
+               __dl_u32(he_3ru_cnt) +
+               __dl_u32(he_4ru_cnt) +
+               __dl_u32(he_5to8ru_cnt) +
+               __dl_u32(he_9to16ru_cnt) +
+               __dl_u32(he_gtr16ru_cnt);
+       total_ppdu_cnt += sub_total_cnt;
+
+       seq_printf(file, "\nTotal HE OFDMA DL PPDU count: %lld",
+                  sub_total_cnt);
+
+       total_ppdu_cnt += __dl_u32(he_su_cnt) +
+               __dl_u32(he_ext_su_cnt);
+
+       seq_printf(file, "\nAll HE DL PPDU count: %lld", total_ppdu_cnt);
+#undef __dl_u32
+
+       /* HE Uplink */
+       seq_puts(file, "\n\nUplink");
+       seq_puts(file, "\nTrigger-based Uplink MU-MIMO\nData Type:  ");
+
+       for (i = 0; i < 3; i++)
+               seq_printf(file, "%8s | ", ul_he_type[i]);
+
+#define __ul_u32(s)     le32_to_cpu(mu_stats.ul.s)
+       seq_puts(file, "\nTotal Count:");
+       seq_printf(file, "%8u | %8u | %8u | ",
+                  __ul_u32(hetrig_2mu_cnt),
+                  __ul_u32(hetrig_3mu_cnt),
+                  __ul_u32(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 Count:");
+       seq_printf(file, "%8u | %8u | %8u | %8u | %8u | %9u |  %7u | ",
+                  __ul_u32(hetrig_su_cnt),
+                  __ul_u32(hetrig_2ru_cnt),
+                  __ul_u32(hetrig_3ru_cnt),
+                  __ul_u32(hetrig_4ru_cnt),
+                  __ul_u32(hetrig_5to8ru_cnt),
+                  __ul_u32(hetrig_9to16ru_cnt),
+                  __ul_u32(hetrig_gtr16ru_cnt));
+
+       sub_total_cnt = __ul_u32(hetrig_2mu_cnt) +
+               __ul_u32(hetrig_3mu_cnt) +
+               __ul_u32(hetrig_4mu_cnt);
+       total_ppdu_cnt = sub_total_cnt;
+
+       seq_printf(file, "\nTotal HE MU-MIMO UL TB PPDU count: %lld",
+                  sub_total_cnt);
+
+       sub_total_cnt = __ul_u32(hetrig_2ru_cnt) +
+               __ul_u32(hetrig_3ru_cnt) +
+               __ul_u32(hetrig_4ru_cnt) +
+               __ul_u32(hetrig_5to8ru_cnt) +
+               __ul_u32(hetrig_9to16ru_cnt) +
+               __ul_u32(hetrig_gtr16ru_cnt);
+       total_ppdu_cnt += sub_total_cnt;
+
+       seq_printf(file, "\nTotal HE OFDMA UL TB PPDU count: %lld",
+                  sub_total_cnt);
+
+       total_ppdu_cnt += __ul_u32(hetrig_su_cnt);
+
+       seq_printf(file, "\nAll HE UL TB PPDU count: %lld\n", total_ppdu_cnt);
+#undef __ul_u32
+
+exit:
+       mutex_unlock(&dev->mt76.mutex);
+
+       return ret;
+}
+DEFINE_SHOW_ATTRIBUTE(mt7915_muru_stats);
+
 static int
 mt7915_fw_debug_wm_set(void *data, u64 val)
 {
@@ -528,7 +747,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_stats", 0400, dir, phy,
+                           &mt7915_muru_stats_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 a03dafd698ac2fc26772fcd6c388518864c0cb6f..0911b6f973b5aa8ac95bebcb4efb2b9beee19649 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -2994,6 +2994,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 3ccded5289652e9f33ebfbd4b305d6ad694a7d7a..92268e6969310705d80417b57db0092d510bd278 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -185,6 +185,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)
@@ -414,6 +452,12 @@ enum {
        MURU_PLATFORM_TYPE_PERF_LEVEL_2,
 };
 
+/* tx cmd tx statistics */
+enum {
+       MURU_SET_TXC_TX_STATS_EN = 150,
+       MURU_GET_TXC_TX_STATS = 151,
+};
+
 #define MT7915_BSS_UPDATE_MAX_SIZE     (sizeof(struct sta_req_hdr) +   \
                                         sizeof(struct bss_info_omac) + \
                                         sizeof(struct bss_info_basic) +\

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 7313a1602dbb58296ca9207e95299837cfb2d7c0..42d887383e8d8a314fcbd723e8cfbfd464690265 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -270,6 +270,7 @@ struct mt7915_dev {
 
        bool dbdc_support;
        bool flash_mode;
+       bool muru_debug;
        bool ibf;
        u8 fw_debug_wm;
        u8 fw_debug_wa;
@@ -510,6 +511,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,