[PATCH v2 net-next 2/5] net: dsa: microchip: add eth ctrl grouping for ethtool statistics

Rakesh Sankaranarayanan
2023-02-17T11:02:57Z

Add support for ethtool standard device statistics grouping. Support
ethernet mac ctrl statistics grouping using eth-ctrl groups parameter
in ethtool command.

Signed-off-by: Rakesh Sankaranarayanan <rakesh.sankaranarayanan@microchip.com>
---
drivers/net/dsa/microchip/ksz_common.c | 13 ++++++++
drivers/net/dsa/microchip/ksz_common.h | 2 ++
drivers/net/dsa/microchip/ksz_ethtool.c | 42 +++++++++++++++++++++++++
drivers/net/dsa/microchip/ksz_ethtool.h | 4 +++
4 files changed, 61 insertions(+)

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 61f4e23d8849..91fc7eed79f0 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -206,6 +206,7 @@ static const struct ksz_dev_ops ksz8_dev_ops = {
.port_init_cnt = ksz8_port_init_cnt,
.fdb_dump = ksz8_fdb_dump,
.get_rmon_stats = ksz8_get_rmon_stats,
+ .get_eth_ctrl_stats = ksz8_get_eth_ctrl_stats,
.mdb_add = ksz8_mdb_add,
.mdb_del = ksz8_mdb_del,
.vlan_filtering = ksz8_port_vlan_filtering,
@@ -244,6 +245,7 @@ static const struct ksz_dev_ops ksz9477_dev_ops = {
.freeze_mib = ksz9477_freeze_mib,
.port_init_cnt = ksz9477_port_init_cnt,
.get_rmon_stats = ksz9477_get_rmon_stats,
+ .get_eth_ctrl_stats = ksz9477_get_eth_ctrl_stats,
.vlan_filtering = ksz9477_port_vlan_filtering,
.vlan_add = ksz9477_port_vlan_add,
.vlan_del = ksz9477_port_vlan_del,
@@ -281,6 +283,7 @@ static const struct ksz_dev_ops lan937x_dev_ops = {
.freeze_mib = ksz9477_freeze_mib,
.port_init_cnt = ksz9477_port_init_cnt,
.get_rmon_stats = ksz9477_get_rmon_stats,
+ .get_eth_ctrl_stats = ksz9477_get_eth_ctrl_stats,
.vlan_filtering = ksz9477_port_vlan_filtering,
.vlan_add = ksz9477_port_vlan_add,
.vlan_del = ksz9477_port_vlan_del,
@@ -1744,6 +1747,15 @@ static void ksz_get_rmon_stats(struct dsa_switch *ds, int port,
dev->dev_ops->get_rmon_stats(dev, port, rmon_stats, ranges);
}

+static void ksz_get_eth_ctrl_stats(struct dsa_switch *ds, int port,
+ struct ethtool_eth_ctrl_stats *ctrl_stats)
+{
+ struct ksz_device *dev = ds->priv;
+
+ if (dev->dev_ops->get_eth_ctrl_stats)
+ dev->dev_ops->get_eth_ctrl_stats(dev, port, ctrl_stats);
+}
+
static void ksz_get_strings(struct dsa_switch *ds, int port,
u32 stringset, uint8_t *buf)
{
@@ -3201,6 +3213,7 @@ static const struct dsa_switch_ops ksz_switch_ops = {
.get_stats64 = ksz_get_stats64,
.get_pause_stats = ksz_get_pause_stats,
.get_rmon_stats = ksz_get_rmon_stats,
+ .get_eth_ctrl_stats = ksz_get_eth_ctrl_stats,
.port_change_mtu = ksz_change_mtu,
.port_max_mtu = ksz_max_mtu,
.get_ts_info = ksz_get_ts_info,
diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index a4e53431218c..7b0219947c7a 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -364,6 +364,8 @@ struct ksz_dev_ops {
void (*get_rmon_stats)(struct ksz_device *dev, int port,
struct ethtool_rmon_stats *rmon_stats,
const struct ethtool_rmon_hist_range **ranges);
+ void (*get_eth_ctrl_stats)(struct ksz_device *dev, int port,
+ struct ethtool_eth_ctrl_stats *ctrl_stats);
};

struct ksz_device *ksz_switch_alloc(struct device *base, void *priv);
diff --git a/drivers/net/dsa/microchip/ksz_ethtool.c b/drivers/net/dsa/microchip/ksz_ethtool.c
index 0f3f18545858..122c4371810a 100644
--- a/drivers/net/dsa/microchip/ksz_ethtool.c
+++ b/drivers/net/dsa/microchip/ksz_ethtool.c
@@ -139,6 +139,27 @@ void ksz8_get_rmon_stats(struct ksz_device *dev, int port,
*ranges = ksz_rmon_ranges;
}

+void ksz8_get_eth_ctrl_stats(struct ksz_device *dev, int port,
+ struct ethtool_eth_ctrl_stats *ctrl_stats)
+{
+ struct ksz_port_mib *mib;
+ u64 *cnt;
+
+ mib = &dev->ports[port].mib;
+
+ mutex_lock(&mib->cnt_mutex);
+
+ cnt = &mib->counters[KSZ8_TX_PAUSE];
+ dev->dev_ops->r_mib_pkt(dev, port, KSZ8_TX_PAUSE, NULL, cnt);
+ ctrl_stats->MACControlFramesTransmitted = *cnt;
+
+ cnt = &mib->counters[KSZ8_RX_PAUSE];
+ dev->dev_ops->r_mib_pkt(dev, port, KSZ8_RX_PAUSE, NULL, cnt);
+ ctrl_stats->MACControlFramesReceived = *cnt;
+
+ mutex_unlock(&mib->cnt_mutex);
+}
+
void ksz9477_get_rmon_stats(struct ksz_device *dev, int port,
struct ethtool_rmon_stats *rmon_stats,
const struct ethtool_rmon_hist_range **ranges)
@@ -178,3 +199,24 @@ void ksz9477_get_rmon_stats(struct ksz_device *dev, int port,

*ranges = ksz_rmon_ranges;
}
+
+void ksz9477_get_eth_ctrl_stats(struct ksz_device *dev, int port,
+ struct ethtool_eth_ctrl_stats *ctrl_stats)
+{
+ struct ksz_port_mib *mib;
+ u64 *cnt;
+
+ mib = &dev->ports[port].mib;
+
+ mutex_lock(&mib->cnt_mutex);
+
+ cnt = &mib->counters[KSZ9477_TX_PAUSE];
+ dev->dev_ops->r_mib_pkt(dev, port, KSZ9477_TX_PAUSE, NULL, cnt);
+ ctrl_stats->MACControlFramesTransmitted = *cnt;
+
+ cnt = &mib->counters[KSZ9477_RX_PAUSE];
+ dev->dev_ops->r_mib_pkt(dev, port, KSZ9477_RX_PAUSE, NULL, cnt);
+ ctrl_stats->MACControlFramesReceived = *cnt;
+
+ mutex_unlock(&mib->cnt_mutex);
+}
diff --git a/drivers/net/dsa/microchip/ksz_ethtool.h b/drivers/net/dsa/microchip/ksz_ethtool.h
index 6927e2f143f8..18dc155d60b9 100644
--- a/drivers/net/dsa/microchip/ksz_ethtool.h
+++ b/drivers/net/dsa/microchip/ksz_ethtool.h
@@ -11,8 +11,12 @@
void ksz8_get_rmon_stats(struct ksz_device *dev, int port,
struct ethtool_rmon_stats *rmon_stats,
const struct ethtool_rmon_hist_range **ranges);
+void ksz8_get_eth_ctrl_stats(struct ksz_device *dev, int port,
+ struct ethtool_eth_ctrl_stats *ctrl_stats);

void ksz9477_get_rmon_stats(struct ksz_device *dev, int port,
struct ethtool_rmon_stats *rmon_stats,
const struct ethtool_rmon_hist_range **ranges);
+void ksz9477_get_eth_ctrl_stats(struct ksz_device *dev, int port,
+ struct ethtool_eth_ctrl_stats *ctrl_stats);
#endif
--
2.34.1