On 5/9/22 06:18, Clément Léger wrote:
Add statistics support to the rzn1-a5psw driver by implementing the
following dsa_switch_ops callbacks:
- get_sset_count()
- get_strings()
- get_ethtool_stats()
- get_eth_mac_stats()
- get_eth_ctrl_stats()
- get_rmon_stats()
Signed-off-by: Clément Léger <clement.leger@xxxxxxxxxxx>
---
drivers/net/dsa/rzn1_a5psw.c | 178 +++++++++++++++++++++++++++++++++++
drivers/net/dsa/rzn1_a5psw.h | 46 ++++++++-
2 files changed, 223 insertions(+), 1 deletion(-)
diff --git a/drivers/net/dsa/rzn1_a5psw.c b/drivers/net/dsa/rzn1_a5psw.c
index 1e2fac80f3e0..46ba25672593 100644
--- a/drivers/net/dsa/rzn1_a5psw.c
+++ b/drivers/net/dsa/rzn1_a5psw.c
@@ -17,6 +17,61 @@
#include "rzn1_a5psw.h"
+struct a5psw_stats {
+ u16 offset;
+ const char name[ETH_GSTRING_LEN];
+};
+
+#define STAT_DESC(_offset, _name) {.offset = _offset, .name = _name}
You can build a more compact representation as long as you keep the
offset constant and the name in sync, the attached patch and leverage
the __stringify() macro to construct the name field:
-#define STAT_DESC(_offset, _name) {.offset = _offset, .name = _name}
+#define STAT_DESC(_offset) { \
+ .offset = A5PSW_##_offset, \
+ .name = __stringify(_offset), \
+}
The attached patch does the conversion if you want to fixup into your
commit.
--
Florian
diff --git a/drivers/net/dsa/rzn1_a5psw.c b/drivers/net/dsa/rzn1_a5psw.c
index ef9d8ef961b5..4e52898187a5 100644
--- a/drivers/net/dsa/rzn1_a5psw.c
+++ b/drivers/net/dsa/rzn1_a5psw.c
@@ -22,54 +22,50 @@ struct a5psw_stats {
const char name[ETH_GSTRING_LEN];
};
-#define STAT_DESC(_offset, _name) {.offset = _offset, .name = _name}
+#define STAT_DESC(_offset) { \
+ .offset = A5PSW_##_offset, \
+ .name = __stringify(_offset), \
+}
static const struct a5psw_stats a5psw_stats[] = {
- STAT_DESC(A5PSW_aFramesTransmittedOK, "aFrameTransmittedOK"),
- STAT_DESC(A5PSW_aFramesReceivedOK, "aFrameReceivedOK"),
- STAT_DESC(A5PSW_aFrameCheckSequenceErrors, "aFrameCheckSequenceErrors"),
- STAT_DESC(A5PSW_aAlignmentErrors, "aAlignmentErrors"),
- STAT_DESC(A5PSW_aOctetsTransmittedOK, "aOctetsTransmittedOK"),
- STAT_DESC(A5PSW_aOctetsReceivedOK, "aOctetsReceivedOK"),
- STAT_DESC(A5PSW_aTxPAUSEMACCtrlFrames, "aTxPAUSEMACCtrlFrames"),
- STAT_DESC(A5PSW_aRxPAUSEMACCtrlFrames, "aRxPAUSEMACCtrlFrames"),
- STAT_DESC(A5PSW_ifInErrors, "ifInErrors"),
- STAT_DESC(A5PSW_ifOutErrors, "ifOutErrors"),
- STAT_DESC(A5PSW_ifInUcastPkts, "ifInUcastPkts"),
- STAT_DESC(A5PSW_ifInMulticastPkts, "ifInMulticastPkts"),
- STAT_DESC(A5PSW_ifInBroadcastPkts, "ifInBroadcastPkts"),
- STAT_DESC(A5PSW_ifOutDiscards, "ifOutDiscards"),
- STAT_DESC(A5PSW_ifOutUcastPkts, "ifOutUcastPkts"),
- STAT_DESC(A5PSW_ifOutMulticastPkts, "ifOutMulticastPkts"),
- STAT_DESC(A5PSW_ifOutBroadcastPkts, "ifOutBroadcastPkts"),
- STAT_DESC(A5PSW_etherStatsDropEvents, "etherStatsDropEvents"),
- STAT_DESC(A5PSW_etherStatsOctets, "etherStatsOctets"),
- STAT_DESC(A5PSW_etherStatsPkts, "etherStatsPkts"),
- STAT_DESC(A5PSW_etherStatsUndersizePkts, "etherStatsUndersizePkts"),
- STAT_DESC(A5PSW_etherStatsOversizePkts, "etherStatsOversizePkts"),
- STAT_DESC(A5PSW_etherStatsPkts64Octets, "etherStatsPkts64Octets"),
- STAT_DESC(A5PSW_etherStatsPkts65to127Octets,
- "etherStatsPkts65to127Octets"),
- STAT_DESC(A5PSW_etherStatsPkts128to255Octets,
- "etherStatsPkts128to255Octets"),
- STAT_DESC(A5PSW_etherStatsPkts256to511Octets,
- "etherStatsPkts256to511Octets"),
- STAT_DESC(A5PSW_etherStatsPkts512to1023Octets,
- "etherStatsPkts512to1023Octets"),
- STAT_DESC(A5PSW_etherStatsPkts1024to1518Octets,
- "etherStatsPkts1024to1518Octets"),
- STAT_DESC(A5PSW_etherStatsPkts1519toXOctets,
- "etherStatsPkts1519toXOctets"),
- STAT_DESC(A5PSW_etherStatsJabbers, "etherStatsJabbers"),
- STAT_DESC(A5PSW_etherStatsFragments, "etherStatsFragments"),
- STAT_DESC(A5PSW_VLANReceived, "VLANReceived"),
- STAT_DESC(A5PSW_VLANTransmitted, "VLANTransmitted"),
- STAT_DESC(A5PSW_aDeferred, "aDeferred"),
- STAT_DESC(A5PSW_aMultipleCollisions, "aMultipleCollisions"),
- STAT_DESC(A5PSW_aSingleCollisions, "aSingleCollisions"),
- STAT_DESC(A5PSW_aLateCollisions, "aLateCollisions"),
- STAT_DESC(A5PSW_aExcessiveCollisions, "aExcessiveCollisions"),
- STAT_DESC(A5PSW_aCarrierSenseErrors, "aCarrierSenseErrors"),
+ STAT_DESC(aFramesTransmittedOK),
+ STAT_DESC(aFramesReceivedOK),
+ STAT_DESC(aFrameCheckSequenceErrors),
+ STAT_DESC(aAlignmentErrors),
+ STAT_DESC(aOctetsTransmittedOK),
+ STAT_DESC(aOctetsReceivedOK),
+ STAT_DESC(aTxPAUSEMACCtrlFrames),
+ STAT_DESC(aRxPAUSEMACCtrlFrames),
+ STAT_DESC(ifInErrors),
+ STAT_DESC(ifOutErrors),
+ STAT_DESC(ifInUcastPkts),
+ STAT_DESC(ifInMulticastPkts),
+ STAT_DESC(ifInBroadcastPkts),
+ STAT_DESC(ifOutDiscards),
+ STAT_DESC(ifOutUcastPkts),
+ STAT_DESC(ifOutMulticastPkts),
+ STAT_DESC(ifOutBroadcastPkts),
+ STAT_DESC(etherStatsDropEvents),
+ STAT_DESC(etherStatsOctets),
+ STAT_DESC(etherStatsPkts),
+ STAT_DESC(etherStatsUndersizePkts),
+ STAT_DESC(etherStatsOversizePkts),
+ STAT_DESC(etherStatsPkts64Octets),
+ STAT_DESC(etherStatsPkts65to127Octets),
+ STAT_DESC(etherStatsPkts128to255Octets),
+ STAT_DESC(etherStatsPkts256to511Octets),
+ STAT_DESC(etherStatsPkts1024to1518Octets),
+ STAT_DESC(etherStatsPkts1519toXOctets),
+ STAT_DESC(etherStatsJabbers),
+ STAT_DESC(etherStatsFragments),
+ STAT_DESC(VLANReceived),
+ STAT_DESC(VLANTransmitted),
+ STAT_DESC(aDeferred),
+ STAT_DESC(aMultipleCollisions),
+ STAT_DESC(aSingleCollisions),
+ STAT_DESC(aLateCollisions),
+ STAT_DESC(aExcessiveCollisions),
+ STAT_DESC(aCarrierSenseErrors),
};
static void a5psw_reg_writel(struct a5psw *a5psw, int offset, u32 value)
