Add icssg_stats.c to help dump, icssg related driver statistics.
ICSSG has hardware registers for providing statistics like total rx bytes,
total tx bytes, etc. These registers are of 32 bits and hence in case of 1G
link, they overflows in around 32 seconds. The behaviour of these registers
is such that they don't roll back to 0 after overflow but rather stay at
UINT_MAX.
These registers support a feature where the value written to them is
subtracted from the register. This feature can be utilized to fix the
overflowing of stats.
This solution uses a Workqueues based solution where a function gets
called before the registers overflow (every 25 seconds in 1G link, 25000
seconds in 100M link), this function saves the register
values in local variables and writes the last read value to the
register. So any update during the read will be taken care of.
Signed-off-by: MD Danish Anwar <[email protected]>
---
drivers/net/ethernet/ti/Makefile | 2 +-
drivers/net/ethernet/ti/icssg_prueth.c | 9 ++
drivers/net/ethernet/ti/icssg_prueth.h | 9 ++
drivers/net/ethernet/ti/icssg_stats.c | 44 +++++++
drivers/net/ethernet/ti/icssg_stats.h | 158 +++++++++++++++++++++++++
5 files changed, 221 insertions(+), 1 deletion(-)
create mode 100644 drivers/net/ethernet/ti/icssg_stats.c
create mode 100644 drivers/net/ethernet/ti/icssg_stats.h
diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile
index ad27001ce253..d2b62e328660 100644
--- a/drivers/net/ethernet/ti/Makefile
+++ b/drivers/net/ethernet/ti/Makefile
@@ -30,4 +30,4 @@ ti-am65-cpsw-nuss-$(CONFIG_TI_K3_AM65_CPSW_SWITCHDEV) += am65-cpsw-switchdev.o
obj-$(CONFIG_TI_K3_AM65_CPTS) += am65-cpts.o
obj-$(CONFIG_TI_ICSSG_PRUETH) += icssg-prueth.o
-icssg-prueth-y := icssg_prueth.o icssg_classifier.o icssg_queues.o icssg_config.o k3-cppi-desc-pool.o icssg_mii_cfg.o
+icssg-prueth-y := icssg_prueth.o icssg_classifier.o icssg_queues.o icssg_config.o k3-cppi-desc-pool.o icssg_mii_cfg.o icssg_stats.o
diff --git a/drivers/net/ethernet/ti/icssg_prueth.c b/drivers/net/ethernet/ti/icssg_prueth.c
index e8796cb80ebf..a60e0f98f425 100644
--- a/drivers/net/ethernet/ti/icssg_prueth.c
+++ b/drivers/net/ethernet/ti/icssg_prueth.c
@@ -8,6 +8,7 @@
#include <linux/bitops.h>
#include <linux/clk.h>
+#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/dma/ti-cppi5.h>
#include <linux/etherdevice.h>
@@ -1105,6 +1106,8 @@ static int emac_ndo_open(struct net_device *ndev)
prueth->emacs_initialized++;
+ queue_work(system_long_wq, &emac->stats_work.work);
+
return 0;
reset_tx_chan:
@@ -1178,6 +1181,10 @@ static int emac_ndo_stop(struct net_device *ndev)
napi_disable(&emac->napi_rx);
cancel_work_sync(&emac->rx_mode_work);
+
+ /* Destroying the queued work in ndo_stop() */
+ cancel_delayed_work_sync(&emac->stats_work);
+
/* stop PRUs */
prueth_emac_stop(emac);
@@ -1332,6 +1339,8 @@ static int prueth_netdev_init(struct prueth *prueth,
}
INIT_WORK(&emac->rx_mode_work, emac_ndo_set_rx_mode_work);
+ INIT_DELAYED_WORK(&emac->stats_work, emac_stats_work_handler);
+
ret = pruss_request_mem_region(prueth->pruss,
port == PRUETH_PORT_MII0 ?
PRUSS_MEM_DRAM0 : PRUSS_MEM_DRAM1,
diff --git a/drivers/net/ethernet/ti/icssg_prueth.h b/drivers/net/ethernet/ti/icssg_prueth.h
index 85e777aca61f..355bbbbd6888 100644
--- a/drivers/net/ethernet/ti/icssg_prueth.h
+++ b/drivers/net/ethernet/ti/icssg_prueth.h
@@ -45,6 +45,9 @@
#define ICSSG_MAX_RFLOWS 8 /* per slice */
+/* Number of ICSSG related stats */
+#define ICSSG_NUM_STATS 60
+
/* Firmware status codes */
#define ICSS_HS_FW_READY 0x55555555
#define ICSS_HS_FW_DEAD 0xDEAD0000 /* lower 16 bits contain error code */
@@ -149,6 +152,10 @@ struct prueth_emac {
struct workqueue_struct *cmd_wq;
struct pruss_mem_region dram;
+
+ struct delayed_work stats_work;
+ u64 stats[ICSSG_NUM_STATS];
+
};
/**
@@ -242,4 +249,6 @@ void icssg_config_set_speed(struct prueth_emac *emac);
#define prueth_napi_to_tx_chn(pnapi) \
container_of(pnapi, struct prueth_tx_chn, napi_tx)
+void emac_stats_work_handler(struct work_struct *work);
+void emac_update_hardware_stats(struct prueth_emac *emac);
#endif /* __NET_TI_ICSSG_PRUETH_H */
diff --git a/drivers/net/ethernet/ti/icssg_stats.c b/drivers/net/ethernet/ti/icssg_stats.c
new file mode 100644
index 000000000000..25deb368a3f0
--- /dev/null
+++ b/drivers/net/ethernet/ti/icssg_stats.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Texas Instruments ICSSG Ethernet driver
+ *
+ * Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/
+ *
+ */
+
+#include "icssg_prueth.h"
+#include "icssg_stats.h"
+#include <linux/regmap.h>
+
+static u32 stats_base[] = { 0x54c, /* Slice 0 stats start */
+ 0xb18, /* Slice 1 stats start */
+};
+
+void emac_update_hardware_stats(struct prueth_emac *emac)
+{
+ struct prueth *prueth = emac->prueth;
+ int slice = prueth_emac_slice(emac);
+ u32 base = stats_base[slice];
+ u32 val;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(icssg_all_stats); i++) {
+ regmap_read(prueth->miig_rt,
+ base + icssg_all_stats[i].offset,
+ &val);
+ regmap_write(prueth->miig_rt,
+ base + icssg_all_stats[i].offset,
+ val);
+
+ emac->stats[i] += val;
+ }
+}
+
+void emac_stats_work_handler(struct work_struct *work)
+{
+ struct prueth_emac *emac = container_of(work, struct prueth_emac,
+ stats_work.work);
+ emac_update_hardware_stats(emac);
+
+ queue_delayed_work(system_long_wq, &emac->stats_work,
+ msecs_to_jiffies((STATS_TIME_LIMIT_1G_MS * 1000) / emac->speed));
+}
diff --git a/drivers/net/ethernet/ti/icssg_stats.h b/drivers/net/ethernet/ti/icssg_stats.h
new file mode 100644
index 000000000000..db28a3eab194
--- /dev/null
+++ b/drivers/net/ethernet/ti/icssg_stats.h
@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Texas Instruments ICSSG Ethernet driver
+ *
+ * Copyright (C) 2018-2022 Texas Instruments Incorporated - https://www.ti.com/
+ *
+ */
+
+#ifndef __NET_TI_ICSSG_STATS_H
+#define __NET_TI_ICSSG_STATS_H
+
+#include "icssg_prueth.h"
+
+#define STATS_TIME_LIMIT_1G_MS 25000 /* 25 seconds @ 1G */
+
+struct miig_stats_regs {
+ /* Rx */
+ u32 rx_packets;
+ u32 rx_broadcast_frames;
+ u32 rx_multicast_frames;
+ u32 rx_crc_errors;
+ u32 rx_mii_error_frames;
+ u32 rx_odd_nibble_frames;
+ u32 rx_frame_max_size;
+ u32 rx_max_size_error_frames;
+ u32 rx_frame_min_size;
+ u32 rx_min_size_error_frames;
+ u32 rx_over_errors;
+ u32 rx_class0_hits;
+ u32 rx_class1_hits;
+ u32 rx_class2_hits;
+ u32 rx_class3_hits;
+ u32 rx_class4_hits;
+ u32 rx_class5_hits;
+ u32 rx_class6_hits;
+ u32 rx_class7_hits;
+ u32 rx_class8_hits;
+ u32 rx_class9_hits;
+ u32 rx_class10_hits;
+ u32 rx_class11_hits;
+ u32 rx_class12_hits;
+ u32 rx_class13_hits;
+ u32 rx_class14_hits;
+ u32 rx_class15_hits;
+ u32 rx_smd_frags;
+ u32 rx_bucket1_size;
+ u32 rx_bucket2_size;
+ u32 rx_bucket3_size;
+ u32 rx_bucket4_size;
+ u32 rx_64B_frames;
+ u32 rx_bucket1_frames;
+ u32 rx_bucket2_frames;
+ u32 rx_bucket3_frames;
+ u32 rx_bucket4_frames;
+ u32 rx_bucket5_frames;
+ u32 rx_bytes;
+ u32 rx_tx_total_bytes;
+ /* Tx */
+ u32 tx_packets;
+ u32 tx_broadcast_frames;
+ u32 tx_multicast_frames;
+ u32 tx_odd_nibble_frames;
+ u32 tx_underflow_errors;
+ u32 tx_frame_max_size;
+ u32 tx_max_size_error_frames;
+ u32 tx_frame_min_size;
+ u32 tx_min_size_error_frames;
+ u32 tx_bucket1_size;
+ u32 tx_bucket2_size;
+ u32 tx_bucket3_size;
+ u32 tx_bucket4_size;
+ u32 tx_64B_frames;
+ u32 tx_bucket1_frames;
+ u32 tx_bucket2_frames;
+ u32 tx_bucket3_frames;
+ u32 tx_bucket4_frames;
+ u32 tx_bucket5_frames;
+ u32 tx_bytes;
+};
+
+#define ICSSG_STATS(field, stats_type) \
+{ \
+ #field, \
+ offsetof(struct miig_stats_regs, field), \
+ stats_type \
+}
+
+struct icssg_stats {
+ char name[ETH_GSTRING_LEN];
+ u32 offset;
+ bool standard_stats;
+};
+
+static const struct icssg_stats icssg_all_stats[] = {
+ /* Rx */
+ ICSSG_STATS(rx_packets, true),
+ ICSSG_STATS(rx_broadcast_frames, false),
+ ICSSG_STATS(rx_multicast_frames, false),
+ ICSSG_STATS(rx_crc_errors, true),
+ ICSSG_STATS(rx_mii_error_frames, false),
+ ICSSG_STATS(rx_odd_nibble_frames, false),
+ ICSSG_STATS(rx_frame_max_size, false),
+ ICSSG_STATS(rx_max_size_error_frames, false),
+ ICSSG_STATS(rx_frame_min_size, false),
+ ICSSG_STATS(rx_min_size_error_frames, false),
+ ICSSG_STATS(rx_over_errors, true),
+ ICSSG_STATS(rx_class0_hits, false),
+ ICSSG_STATS(rx_class1_hits, false),
+ ICSSG_STATS(rx_class2_hits, false),
+ ICSSG_STATS(rx_class3_hits, false),
+ ICSSG_STATS(rx_class4_hits, false),
+ ICSSG_STATS(rx_class5_hits, false),
+ ICSSG_STATS(rx_class6_hits, false),
+ ICSSG_STATS(rx_class7_hits, false),
+ ICSSG_STATS(rx_class8_hits, false),
+ ICSSG_STATS(rx_class9_hits, false),
+ ICSSG_STATS(rx_class10_hits, false),
+ ICSSG_STATS(rx_class11_hits, false),
+ ICSSG_STATS(rx_class12_hits, false),
+ ICSSG_STATS(rx_class13_hits, false),
+ ICSSG_STATS(rx_class14_hits, false),
+ ICSSG_STATS(rx_class15_hits, false),
+ ICSSG_STATS(rx_smd_frags, false),
+ ICSSG_STATS(rx_bucket1_size, false),
+ ICSSG_STATS(rx_bucket2_size, false),
+ ICSSG_STATS(rx_bucket3_size, false),
+ ICSSG_STATS(rx_bucket4_size, false),
+ ICSSG_STATS(rx_64B_frames, false),
+ ICSSG_STATS(rx_bucket1_frames, false),
+ ICSSG_STATS(rx_bucket2_frames, false),
+ ICSSG_STATS(rx_bucket3_frames, false),
+ ICSSG_STATS(rx_bucket4_frames, false),
+ ICSSG_STATS(rx_bucket5_frames, false),
+ ICSSG_STATS(rx_bytes, true),
+ ICSSG_STATS(rx_tx_total_bytes, false),
+ /* Tx */
+ ICSSG_STATS(tx_packets, true),
+ ICSSG_STATS(tx_broadcast_frames, false),
+ ICSSG_STATS(tx_multicast_frames, false),
+ ICSSG_STATS(tx_odd_nibble_frames, false),
+ ICSSG_STATS(tx_underflow_errors, false),
+ ICSSG_STATS(tx_frame_max_size, false),
+ ICSSG_STATS(tx_max_size_error_frames, false),
+ ICSSG_STATS(tx_frame_min_size, false),
+ ICSSG_STATS(tx_min_size_error_frames, false),
+ ICSSG_STATS(tx_bucket1_size, false),
+ ICSSG_STATS(tx_bucket2_size, false),
+ ICSSG_STATS(tx_bucket3_size, false),
+ ICSSG_STATS(tx_bucket4_size, false),
+ ICSSG_STATS(tx_64B_frames, false),
+ ICSSG_STATS(tx_bucket1_frames, false),
+ ICSSG_STATS(tx_bucket2_frames, false),
+ ICSSG_STATS(tx_bucket3_frames, false),
+ ICSSG_STATS(tx_bucket4_frames, false),
+ ICSSG_STATS(tx_bucket5_frames, false),
+ ICSSG_STATS(tx_bytes, true),
+};
+
+#endif /* __NET_TI_ICSSG_STATS_H */
--
2.34.1
On Mon, 24 Jul 2023 16:59:31 +0530 MD Danish Anwar wrote:
> + /* Rx */
> + ICSSG_STATS(rx_packets, true),
> + ICSSG_STATS(rx_broadcast_frames, false),
> + ICSSG_STATS(rx_multicast_frames, false),
There is a standard stat for mcast.
> + ICSSG_STATS(rx_crc_errors, true),
> + ICSSG_STATS(rx_mii_error_frames, false),
> + ICSSG_STATS(rx_odd_nibble_frames, false),
> + ICSSG_STATS(rx_frame_max_size, false),
> + ICSSG_STATS(rx_max_size_error_frames, false),
> + ICSSG_STATS(rx_frame_min_size, false),
> + ICSSG_STATS(rx_min_size_error_frames, false),
> + ICSSG_STATS(rx_over_errors, true),
> + ICSSG_STATS(rx_class0_hits, false),
> + ICSSG_STATS(rx_class1_hits, false),
> + ICSSG_STATS(rx_class2_hits, false),
> + ICSSG_STATS(rx_class3_hits, false),
> + ICSSG_STATS(rx_class4_hits, false),
> + ICSSG_STATS(rx_class5_hits, false),
> + ICSSG_STATS(rx_class6_hits, false),
> + ICSSG_STATS(rx_class7_hits, false),
> + ICSSG_STATS(rx_class8_hits, false),
> + ICSSG_STATS(rx_class9_hits, false),
> + ICSSG_STATS(rx_class10_hits, false),
> + ICSSG_STATS(rx_class11_hits, false),
> + ICSSG_STATS(rx_class12_hits, false),
> + ICSSG_STATS(rx_class13_hits, false),
> + ICSSG_STATS(rx_class14_hits, false),
> + ICSSG_STATS(rx_class15_hits, false),
> + ICSSG_STATS(rx_smd_frags, false),
> + ICSSG_STATS(rx_bucket1_size, false),
> + ICSSG_STATS(rx_bucket2_size, false),
> + ICSSG_STATS(rx_bucket3_size, false),
> + ICSSG_STATS(rx_bucket4_size, false),
Are the bucket sizes configurable? Can we set the bucket sizes
to standard RMON ones and use ethtool RMON stats?
Hi Jakub
On 26/07/23 9:20 am, Jakub Kicinski wrote:
> On Mon, 24 Jul 2023 16:59:31 +0530 MD Danish Anwar wrote:
>> + /* Rx */
>> + ICSSG_STATS(rx_packets, true),
>> + ICSSG_STATS(rx_broadcast_frames, false),
>> + ICSSG_STATS(rx_multicast_frames, false),
>
> There is a standard stat for mcast.
>
Sure. I will add multicast stats via .ndo_get_stats64 instead of ethtool.
>> + ICSSG_STATS(rx_crc_errors, true),
>> + ICSSG_STATS(rx_mii_error_frames, false),
>> + ICSSG_STATS(rx_odd_nibble_frames, false),
>> + ICSSG_STATS(rx_frame_max_size, false),
>> + ICSSG_STATS(rx_max_size_error_frames, false),
>> + ICSSG_STATS(rx_frame_min_size, false),
>> + ICSSG_STATS(rx_min_size_error_frames, false),
>> + ICSSG_STATS(rx_over_errors, true),
>> + ICSSG_STATS(rx_class0_hits, false),
>> + ICSSG_STATS(rx_class1_hits, false),
>> + ICSSG_STATS(rx_class2_hits, false),
>> + ICSSG_STATS(rx_class3_hits, false),
>> + ICSSG_STATS(rx_class4_hits, false),
>> + ICSSG_STATS(rx_class5_hits, false),
>> + ICSSG_STATS(rx_class6_hits, false),
>> + ICSSG_STATS(rx_class7_hits, false),
>> + ICSSG_STATS(rx_class8_hits, false),
>> + ICSSG_STATS(rx_class9_hits, false),
>> + ICSSG_STATS(rx_class10_hits, false),
>> + ICSSG_STATS(rx_class11_hits, false),
>> + ICSSG_STATS(rx_class12_hits, false),
>> + ICSSG_STATS(rx_class13_hits, false),
>> + ICSSG_STATS(rx_class14_hits, false),
>> + ICSSG_STATS(rx_class15_hits, false),
>> + ICSSG_STATS(rx_smd_frags, false),
>> + ICSSG_STATS(rx_bucket1_size, false),
>> + ICSSG_STATS(rx_bucket2_size, false),
>> + ICSSG_STATS(rx_bucket3_size, false),
>> + ICSSG_STATS(rx_bucket4_size, false),
>
> Are the bucket sizes configurable? Can we set the bucket sizes
> to standard RMON ones and use ethtool RMON stats?
The bucket sizes are not configurable. Bucket size is read from hardware and is
fixed. I don't think we can configure bucket size and use ethtool RMON stats.
It's better to dump bucket sizes via ethtool -S.
--
Thanks and Regards,
Danish.
On Wed, 26 Jul 2023 16:06:06 +0530 Md Danish Anwar wrote:
> > Are the bucket sizes configurable? Can we set the bucket sizes
> > to standard RMON ones and use ethtool RMON stats?
>
> The bucket sizes are not configurable. Bucket size is read from hardware and is
> fixed. I don't think we can configure bucket size and use ethtool RMON stats.
> It's better to dump bucket sizes via ethtool -S.
The buckets in the ethtool API are up to the device to define.
Driver returns bucket ranges via struct ethtool_rmon_hist_range
from struct ethtool_ops::get_rmon_stats.
On 7/26/2023 9:09 PM, Jakub Kicinski wrote:
> On Wed, 26 Jul 2023 16:06:06 +0530 Md Danish Anwar wrote:
>>> Are the bucket sizes configurable? Can we set the bucket sizes
>>> to standard RMON ones and use ethtool RMON stats?
>>
>> The bucket sizes are not configurable. Bucket size is read from hardware and is
>> fixed. I don't think we can configure bucket size and use ethtool RMON stats.
>> It's better to dump bucket sizes via ethtool -S.
>
> The buckets in the ethtool API are up to the device to define.
> Driver returns bucket ranges via struct ethtool_rmon_hist_range
> from struct ethtool_ops::get_rmon_stats.
Sure Jakub I will try to implement this using ethtool_ops::get_rmon_stats.
--
Thanks and Regards,
Md Danish Anwar