fa79baf4a6
Copy backport, hack, pending patch and config from 5.15 to 6.1. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
150 lines
4.5 KiB
Diff
150 lines
4.5 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sat, 5 Nov 2022 23:36:22 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_wed: add rx mib counters
|
|
|
|
Introduce WED RX MIB counters support available on MT7986a SoC.
|
|
|
|
Tested-by: Daniel Golle <daniel@makrotopia.org>
|
|
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
|
|
@@ -2,6 +2,7 @@
|
|
/* Copyright (C) 2021 Felix Fietkau <nbd@nbd.name> */
|
|
|
|
#include <linux/seq_file.h>
|
|
+#include <linux/soc/mediatek/mtk_wed.h>
|
|
#include "mtk_wed.h"
|
|
#include "mtk_wed_regs.h"
|
|
|
|
@@ -18,6 +19,8 @@ enum {
|
|
DUMP_TYPE_WDMA,
|
|
DUMP_TYPE_WPDMA_TX,
|
|
DUMP_TYPE_WPDMA_TXFREE,
|
|
+ DUMP_TYPE_WPDMA_RX,
|
|
+ DUMP_TYPE_WED_RRO,
|
|
};
|
|
|
|
#define DUMP_STR(_str) { _str, 0, DUMP_TYPE_STRING }
|
|
@@ -36,6 +39,9 @@ enum {
|
|
|
|
#define DUMP_WPDMA_TX_RING(_n) DUMP_RING("WPDMA_TX" #_n, 0, DUMP_TYPE_WPDMA_TX, _n)
|
|
#define DUMP_WPDMA_TXFREE_RING DUMP_RING("WPDMA_RX1", 0, DUMP_TYPE_WPDMA_TXFREE)
|
|
+#define DUMP_WPDMA_RX_RING(_n) DUMP_RING("WPDMA_RX" #_n, 0, DUMP_TYPE_WPDMA_RX, _n)
|
|
+#define DUMP_WED_RRO_RING(_base)DUMP_RING("WED_RRO_MIOD", MTK_##_base, DUMP_TYPE_WED_RRO)
|
|
+#define DUMP_WED_RRO_FDBK(_base)DUMP_RING("WED_RRO_FDBK", MTK_##_base, DUMP_TYPE_WED_RRO)
|
|
|
|
static void
|
|
print_reg_val(struct seq_file *s, const char *name, u32 val)
|
|
@@ -57,6 +63,7 @@ dump_wed_regs(struct seq_file *s, struct
|
|
cur > regs ? "\n" : "",
|
|
cur->name);
|
|
continue;
|
|
+ case DUMP_TYPE_WED_RRO:
|
|
case DUMP_TYPE_WED:
|
|
val = wed_r32(dev, cur->offset);
|
|
break;
|
|
@@ -69,6 +76,9 @@ dump_wed_regs(struct seq_file *s, struct
|
|
case DUMP_TYPE_WPDMA_TXFREE:
|
|
val = wpdma_txfree_r32(dev, cur->offset);
|
|
break;
|
|
+ case DUMP_TYPE_WPDMA_RX:
|
|
+ val = wpdma_rx_r32(dev, cur->base, cur->offset);
|
|
+ break;
|
|
}
|
|
print_reg_val(s, cur->name, val);
|
|
}
|
|
@@ -132,6 +142,80 @@ wed_txinfo_show(struct seq_file *s, void
|
|
}
|
|
DEFINE_SHOW_ATTRIBUTE(wed_txinfo);
|
|
|
|
+static int
|
|
+wed_rxinfo_show(struct seq_file *s, void *data)
|
|
+{
|
|
+ static const struct reg_dump regs[] = {
|
|
+ DUMP_STR("WPDMA RX"),
|
|
+ DUMP_WPDMA_RX_RING(0),
|
|
+ DUMP_WPDMA_RX_RING(1),
|
|
+
|
|
+ DUMP_STR("WPDMA RX"),
|
|
+ DUMP_WED(WED_WPDMA_RX_D_MIB(0)),
|
|
+ DUMP_WED_RING(WED_WPDMA_RING_RX_DATA(0)),
|
|
+ DUMP_WED(WED_WPDMA_RX_D_PROCESSED_MIB(0)),
|
|
+ DUMP_WED(WED_WPDMA_RX_D_MIB(1)),
|
|
+ DUMP_WED_RING(WED_WPDMA_RING_RX_DATA(1)),
|
|
+ DUMP_WED(WED_WPDMA_RX_D_PROCESSED_MIB(1)),
|
|
+ DUMP_WED(WED_WPDMA_RX_D_COHERENT_MIB),
|
|
+
|
|
+ DUMP_STR("WED RX"),
|
|
+ DUMP_WED_RING(WED_RING_RX_DATA(0)),
|
|
+ DUMP_WED_RING(WED_RING_RX_DATA(1)),
|
|
+
|
|
+ DUMP_STR("WED RRO"),
|
|
+ DUMP_WED_RRO_RING(WED_RROQM_MIOD_CTRL0),
|
|
+ DUMP_WED(WED_RROQM_MID_MIB),
|
|
+ DUMP_WED(WED_RROQM_MOD_MIB),
|
|
+ DUMP_WED(WED_RROQM_MOD_COHERENT_MIB),
|
|
+ DUMP_WED_RRO_FDBK(WED_RROQM_FDBK_CTRL0),
|
|
+ DUMP_WED(WED_RROQM_FDBK_IND_MIB),
|
|
+ DUMP_WED(WED_RROQM_FDBK_ENQ_MIB),
|
|
+ DUMP_WED(WED_RROQM_FDBK_ANC_MIB),
|
|
+ DUMP_WED(WED_RROQM_FDBK_ANC2H_MIB),
|
|
+
|
|
+ DUMP_STR("WED Route QM"),
|
|
+ DUMP_WED(WED_RTQM_R2H_MIB(0)),
|
|
+ DUMP_WED(WED_RTQM_R2Q_MIB(0)),
|
|
+ DUMP_WED(WED_RTQM_Q2H_MIB(0)),
|
|
+ DUMP_WED(WED_RTQM_R2H_MIB(1)),
|
|
+ DUMP_WED(WED_RTQM_R2Q_MIB(1)),
|
|
+ DUMP_WED(WED_RTQM_Q2H_MIB(1)),
|
|
+ DUMP_WED(WED_RTQM_Q2N_MIB),
|
|
+ DUMP_WED(WED_RTQM_Q2B_MIB),
|
|
+ DUMP_WED(WED_RTQM_PFDBK_MIB),
|
|
+
|
|
+ DUMP_STR("WED WDMA TX"),
|
|
+ DUMP_WED(WED_WDMA_TX_MIB),
|
|
+ DUMP_WED_RING(WED_WDMA_RING_TX),
|
|
+
|
|
+ DUMP_STR("WDMA TX"),
|
|
+ DUMP_WDMA(WDMA_GLO_CFG),
|
|
+ DUMP_WDMA_RING(WDMA_RING_TX(0)),
|
|
+ DUMP_WDMA_RING(WDMA_RING_TX(1)),
|
|
+
|
|
+ DUMP_STR("WED RX BM"),
|
|
+ DUMP_WED(WED_RX_BM_BASE),
|
|
+ DUMP_WED(WED_RX_BM_RX_DMAD),
|
|
+ DUMP_WED(WED_RX_BM_PTR),
|
|
+ DUMP_WED(WED_RX_BM_TKID_MIB),
|
|
+ DUMP_WED(WED_RX_BM_BLEN),
|
|
+ DUMP_WED(WED_RX_BM_STS),
|
|
+ DUMP_WED(WED_RX_BM_INTF2),
|
|
+ DUMP_WED(WED_RX_BM_INTF),
|
|
+ DUMP_WED(WED_RX_BM_ERR_STS),
|
|
+ };
|
|
+ struct mtk_wed_hw *hw = s->private;
|
|
+ struct mtk_wed_device *dev = hw->wed_dev;
|
|
+
|
|
+ if (!dev)
|
|
+ return 0;
|
|
+
|
|
+ dump_wed_regs(s, dev, regs, ARRAY_SIZE(regs));
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+DEFINE_SHOW_ATTRIBUTE(wed_rxinfo);
|
|
|
|
static int
|
|
mtk_wed_reg_set(void *data, u64 val)
|
|
@@ -175,4 +259,7 @@ void mtk_wed_hw_add_debugfs(struct mtk_w
|
|
debugfs_create_u32("regidx", 0600, dir, &hw->debugfs_reg);
|
|
debugfs_create_file_unsafe("regval", 0600, dir, hw, &fops_regval);
|
|
debugfs_create_file_unsafe("txinfo", 0400, dir, hw, &wed_txinfo_fops);
|
|
+ if (hw->version != 1)
|
|
+ debugfs_create_file_unsafe("rxinfo", 0400, dir, hw,
|
|
+ &wed_rxinfo_fops);
|
|
}
|