net: dsa: mt7530: move remaining MIB counter to define

For consistency with the other MIB counter, move also the remaining MIB
counter to define and update the custom MIB table.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Link: https://patch.msgid.link/20250410163022.3695-6-ansuelsmth@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 2202c657930e424a34fa415b81300e844ecd0cd3..fdceefb2083cd1879985f0b60ef3b155d2b034b6 100644 (file)
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -32,15 +32,15 @@ static struct mt753x_pcs *pcs_to_mt753x_pcs(struct phylink_pcs *pcs)
 
 /* String, offset, and register size in bytes if different from 4 bytes */
 static const struct mt7530_mib_desc mt7530_mib[] = {
-       MIB_DESC(1, 0x00, "TxDrop"),
-       MIB_DESC(1, 0x04, "TxCrcErr"),
-       MIB_DESC(1, 0x14, "TxCollision"),
-       MIB_DESC(1, 0x60, "RxDrop"),
-       MIB_DESC(1, 0x64, "RxFiltering"),
-       MIB_DESC(1, 0x78, "RxCrcErr"),
-       MIB_DESC(1, 0xb0, "RxCtrlDrop"),
-       MIB_DESC(1, 0xb4, "RxIngressDrop"),
-       MIB_DESC(1, 0xb8, "RxArlDrop"),
+       MIB_DESC(1, MT7530_PORT_MIB_TX_DROP, "TxDrop"),
+       MIB_DESC(1, MT7530_PORT_MIB_TX_CRC_ERR, "TxCrcErr"),
+       MIB_DESC(1, MT7530_PORT_MIB_TX_COLLISION, "TxCollision"),
+       MIB_DESC(1, MT7530_PORT_MIB_RX_DROP, "RxDrop"),
+       MIB_DESC(1, MT7530_PORT_MIB_RX_FILTERING, "RxFiltering"),
+       MIB_DESC(1, MT7530_PORT_MIB_RX_CRC_ERR, "RxCrcErr"),
+       MIB_DESC(1, MT7530_PORT_MIB_RX_CTRL_DROP, "RxCtrlDrop"),
+       MIB_DESC(1, MT7530_PORT_MIB_RX_INGRESS_DROP, "RxIngressDrop"),
+       MIB_DESC(1, MT7530_PORT_MIB_RX_ARL_DROP, "RxArlDrop"),
 };
 
 static void

diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
index 0cc999fa13808050cc998e8d179a085f045a27e0..d4b838a055ad93fe8f301ef53241591955035d56 100644 (file)
--- a/drivers/net/dsa/mt7530.h
+++ b/drivers/net/dsa/mt7530.h
@@ -424,9 +424,12 @@ enum mt7530_vlan_port_acc_frm {
 /* Register for MIB */
 #define MT7530_PORT_MIB_COUNTER(x)     (0x4000 + (x) * 0x100)
 /* Each define is an offset of MT7530_PORT_MIB_COUNTER */
+#define   MT7530_PORT_MIB_TX_DROP      0x00
+#define   MT7530_PORT_MIB_TX_CRC_ERR   0x04
 #define   MT7530_PORT_MIB_TX_UNICAST   0x08
 #define   MT7530_PORT_MIB_TX_MULTICAST 0x0c
 #define   MT7530_PORT_MIB_TX_BROADCAST 0x10
+#define   MT7530_PORT_MIB_TX_COLLISION 0x14
 #define   MT7530_PORT_MIB_TX_SINGLE_COLLISION 0x18
 #define   MT7530_PORT_MIB_TX_MULTIPLE_COLLISION 0x1c
 #define   MT7530_PORT_MIB_TX_DEFERRED  0x20
@@ -440,10 +443,13 @@ enum mt7530_vlan_port_acc_frm {
 #define   MT7530_PORT_MIB_TX_PKT_SZ_512_TO_1023 0x40
 #define   MT7530_PORT_MIB_TX_PKT_SZ_1024_TO_MAX 0x44
 #define   MT7530_PORT_MIB_TX_BYTES     0x48 /* 64 bytes */
+#define   MT7530_PORT_MIB_RX_DROP      0x60
+#define   MT7530_PORT_MIB_RX_FILTERING 0x64
 #define   MT7530_PORT_MIB_RX_UNICAST   0x68
 #define   MT7530_PORT_MIB_RX_MULTICAST 0x6c
 #define   MT7530_PORT_MIB_RX_BROADCAST 0x70
 #define   MT7530_PORT_MIB_RX_ALIGN_ERR 0x74
+#define   MT7530_PORT_MIB_RX_CRC_ERR   0x78
 #define   MT7530_PORT_MIB_RX_UNDER_SIZE_ERR 0x7c
 #define   MT7530_PORT_MIB_RX_FRAG_ERR  0x80
 #define   MT7530_PORT_MIB_RX_OVER_SZ_ERR 0x84
@@ -456,6 +462,9 @@ enum mt7530_vlan_port_acc_frm {
 #define   MT7530_PORT_MIB_RX_PKT_SZ_512_TO_1023 0xa0
 #define   MT7530_PORT_MIB_RX_PKT_SZ_1024_TO_MAX 0xa4
 #define   MT7530_PORT_MIB_RX_BYTES     0xa8 /* 64 bytes */
+#define   MT7530_PORT_MIB_RX_CTRL_DROP 0xb0
+#define   MT7530_PORT_MIB_RX_INGRESS_DROP 0xb4
+#define   MT7530_PORT_MIB_RX_ARL_DROP  0xb8
 #define MT7530_MIB_CCR                 0x4fe0
 #define  CCR_MIB_ENABLE                        BIT(31)
 #define  CCR_RX_OCT_CNT_GOOD           BIT(7)