mt76: mt7915: add debugfs knobs for MCU utilization

Add debugfs knobs to read MCU utilization, which helps user know
firmware status more easily to narrow down CPU bottleneck issues.

Co-developed-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index 182cc6cf095e8cf23ef511f27bb424da9b95fa20..a15aa256d0cfd799dd46178c9e19a45ff01b0df4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -106,6 +106,12 @@ mt7915_fw_debug_wm_set(void *data, u64 val)
                        return ret;
        }
 
+       /* WM CPU info record control */
+       mt76_clear(dev, MT_CPU_UTIL_CTRL, BIT(0));
+       mt76_wr(dev, MT_DIC_CMD_REG_CMD, BIT(2) | BIT(13) | !dev->fw_debug_wm);
+       mt76_wr(dev, MT_MCU_WM_CIRQ_IRQ_MASK_CLR_ADDR, BIT(5));
+       mt76_wr(dev, MT_MCU_WM_CIRQ_IRQ_SOFT_ADDR, BIT(5));
+
        return 0;
 }
 
@@ -126,10 +132,16 @@ static int
 mt7915_fw_debug_wa_set(void *data, u64 val)
 {
        struct mt7915_dev *dev = data;
+       int ret;
 
        dev->fw_debug_wa = val ? MCU_FW_LOG_TO_HOST : 0;
 
-       return mt7915_mcu_fw_log_2_host(dev, MCU_FW_LOG_WA, dev->fw_debug_wa);
+       ret = mt7915_mcu_fw_log_2_host(dev, MCU_FW_LOG_WA, dev->fw_debug_wa);
+       if (ret)
+               return ret;
+
+       return mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(SET), MCU_WA_PARAM_PDMA_RX,
+                                !!dev->fw_debug_wa, 0);
 }
 
 static int
@@ -145,6 +157,39 @@ mt7915_fw_debug_wa_get(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug_wa, mt7915_fw_debug_wa_get,
                         mt7915_fw_debug_wa_set, "%lld\n");
 
+static int
+mt7915_fw_util_wm_show(struct seq_file *file, void *data)
+{
+       struct mt7915_dev *dev = file->private;
+
+       if (dev->fw_debug_wm) {
+               seq_printf(file, "Busy: %u%%  Peak busy: %u%%\n",
+                          mt76_rr(dev, MT_CPU_UTIL_BUSY_PCT),
+                          mt76_rr(dev, MT_CPU_UTIL_PEAK_BUSY_PCT));
+               seq_printf(file, "Idle count: %u  Peak idle count: %u\n",
+                          mt76_rr(dev, MT_CPU_UTIL_IDLE_CNT),
+                          mt76_rr(dev, MT_CPU_UTIL_PEAK_IDLE_CNT));
+       }
+
+       return 0;
+}
+
+DEFINE_SHOW_ATTRIBUTE(mt7915_fw_util_wm);
+
+static int
+mt7915_fw_util_wa_show(struct seq_file *file, void *data)
+{
+       struct mt7915_dev *dev = file->private;
+
+       if (dev->fw_debug_wa)
+               return mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(QUERY),
+                                        MCU_WA_PARAM_CPU_UTIL, 0, 0);
+
+       return 0;
+}
+
+DEFINE_SHOW_ATTRIBUTE(mt7915_fw_util_wa);
+
 static void
 mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy,
                           struct seq_file *file)
@@ -491,6 +536,10 @@ int mt7915_init_debugfs(struct mt7915_phy *phy)
        debugfs_create_file("tx_stats", 0400, dir, phy, &mt7915_tx_stats_fops);
        debugfs_create_file("fw_debug_wm", 0600, dir, dev, &fops_fw_debug_wm);
        debugfs_create_file("fw_debug_wa", 0600, dir, dev, &fops_fw_debug_wa);
+       debugfs_create_file("fw_util_wm", 0400, dir, dev,
+                           &mt7915_fw_util_wm_fops);
+       debugfs_create_file("fw_util_wa", 0400, dir, dev,
+                           &mt7915_fw_util_wa_fops);
        debugfs_create_file("implicit_txbf", 0600, dir, dev,
                            &fops_implicit_txbf);
        debugfs_create_file("txpower_sku", 0400, dir, phy,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 13d5d7e544a332bb44d7b2d5d73b4432cad0295b..899957b9d0f19c6c11ccb3f0c52654d49e3dec50 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -416,8 +416,7 @@ exit:
        return mt76_tx_queue_skb_raw(dev, mdev->q_mcu[qid], skb, 0);
 }
 
-static int
-mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)
+int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)
 {
        struct {
                __le32 args[3];
@@ -429,7 +428,7 @@ mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)
                },
        };
 
-       return mt76_mcu_send_msg(&dev->mt76, cmd, &req, sizeof(req), true);
+       return mt76_mcu_send_msg(&dev->mt76, cmd, &req, sizeof(req), false);
 }
 
 static void

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
index 83dc39ac719d8b996712939ed5c114b50af08b61..1f5a64ba9b59d968393abb5e21989b4cc74101c8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -309,6 +309,8 @@ enum {
 };
 
 enum {
+       MCU_WA_PARAM_PDMA_RX = 0x04,
+       MCU_WA_PARAM_CPU_UTIL = 0x0b,
        MCU_WA_PARAM_RED = 0x0e,
 };
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
index 7bbb38e7116af29258017c0e49bc1ebfd319dd51..1f6ba306c850987f8a576254575bfe235a3de7ca 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
@@ -34,6 +34,9 @@ static u32 __mt7915_reg_addr(struct mt7915_dev *dev, u32 addr)
                u32 mapped;
                u32 size;
        } fixed_map[] = {
+               { 0x00400000, 0x80000, 0x10000 }, /* WF_MCU_SYSRAM */
+               { 0x00410000, 0x90000, 0x10000 }, /* WF_MCU_SYSRAM (configure regs) */
+               { 0x40000000, 0x70000, 0x10000 }, /* WF_UMAC_SYSRAM */
                { 0x54000000, 0x02000, 0x1000 }, /* WFDMA PCIE0 MCU DMA0 */
                { 0x55000000, 0x03000, 0x1000 }, /* WFDMA PCIE0 MCU DMA1 */
                { 0x58000000, 0x06000, 0x1000 }, /* WFDMA PCIE1 MCU DMA0 (MEM_DMA) */

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 5fd74173c7eac7dfa197481f8064d6c4f0b32418..e69b4c8974ee749eebe1a4a0a55d9d900fff9a69 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -450,6 +450,7 @@ int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif,
                           struct ieee80211_sta *sta, struct rate_info *rate);
 int mt7915_mcu_rdd_cmd(struct mt7915_dev *dev, enum mt7915_rdd_cmd cmd,
                       u8 index, u8 rx_sel, u8 val);
+int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3);
 int mt7915_mcu_fw_log_2_host(struct mt7915_dev *dev, u8 type, u8 ctrl);
 int mt7915_mcu_fw_dbg_ctrl(struct mt7915_dev *dev, u32 module, u8 level);
 void mt7915_mcu_rx_event(struct mt7915_dev *dev, struct sk_buff *skb);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
index a2e98788f421dc88915d4b4fe06100cdf656a90c..59693535b098c697062d962739632fd3727f31fc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
@@ -528,6 +528,18 @@
 #define MT_HIF_REMAP_L2_BASE           GENMASK(31, 12)
 #define MT_HIF_REMAP_BASE_L2           0x00000
 
+#define MT_DIC_CMD_REG_BASE            0x41f000
+#define MT_DIC_CMD_REG(ofs)            (MT_DIC_CMD_REG_BASE + (ofs))
+#define MT_DIC_CMD_REG_CMD             MT_DIC_CMD_REG(0x10)
+
+#define MT_CPU_UTIL_BASE               0x41f030
+#define MT_CPU_UTIL(ofs)               (MT_CPU_UTIL_BASE + (ofs))
+#define MT_CPU_UTIL_BUSY_PCT           MT_CPU_UTIL(0x00)
+#define MT_CPU_UTIL_PEAK_BUSY_PCT      MT_CPU_UTIL(0x04)
+#define MT_CPU_UTIL_IDLE_CNT           MT_CPU_UTIL(0x08)
+#define MT_CPU_UTIL_PEAK_IDLE_CNT      MT_CPU_UTIL(0x0c)
+#define MT_CPU_UTIL_CTRL               MT_CPU_UTIL(0x1c)
+
 #define MT_SWDEF_BASE                  0x41f200
 #define MT_SWDEF(ofs)                  (MT_SWDEF_BASE + (ofs))
 #define MT_SWDEF_MODE                  MT_SWDEF(0x3c)
@@ -590,4 +602,9 @@
 #define MT_WF_PHY_RXTD12_IRPI_SW_CLR_ONLY      BIT(18)
 #define MT_WF_PHY_RXTD12_IRPI_SW_CLR   BIT(29)
 
+#define MT_MCU_WM_CIRQ_BASE                    0x89010000
+#define MT_MCU_WM_CIRQ(ofs)                    (MT_MCU_WM_CIRQ_BASE + (ofs))
+#define MT_MCU_WM_CIRQ_IRQ_MASK_CLR_ADDR       MT_MCU_WM_CIRQ(0x80)
+#define MT_MCU_WM_CIRQ_IRQ_SOFT_ADDR           MT_MCU_WM_CIRQ(0xc0)
+
 #endif