net: mscc: ocelot: remove unnecessary exposure of stats structures

Since commit 4d1d157fb6a4 ("net: mscc: ocelot: share the common stat
definitions between all drivers") there is no longer a need to share the
stats structures to the world. Relocate these definitions to inside
ocelot_stats.c instead of a global include header.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/mscc/ocelot_stats.c b/drivers/net/ethernet/mscc/ocelot_stats.c
index 5dc132f..68e9f45 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_stats.c
+++ b/drivers/net/ethernet/mscc/ocelot_stats.c
@@ -9,6 +9,221 @@
 #include <linux/workqueue.h>
 #include "ocelot.h"
 
+enum ocelot_stat {
+       OCELOT_STAT_RX_OCTETS,
+       OCELOT_STAT_RX_UNICAST,
+       OCELOT_STAT_RX_MULTICAST,
+       OCELOT_STAT_RX_BROADCAST,
+       OCELOT_STAT_RX_SHORTS,
+       OCELOT_STAT_RX_FRAGMENTS,
+       OCELOT_STAT_RX_JABBERS,
+       OCELOT_STAT_RX_CRC_ALIGN_ERRS,
+       OCELOT_STAT_RX_SYM_ERRS,
+       OCELOT_STAT_RX_64,
+       OCELOT_STAT_RX_65_127,
+       OCELOT_STAT_RX_128_255,
+       OCELOT_STAT_RX_256_511,
+       OCELOT_STAT_RX_512_1023,
+       OCELOT_STAT_RX_1024_1526,
+       OCELOT_STAT_RX_1527_MAX,
+       OCELOT_STAT_RX_PAUSE,
+       OCELOT_STAT_RX_CONTROL,
+       OCELOT_STAT_RX_LONGS,
+       OCELOT_STAT_RX_CLASSIFIED_DROPS,
+       OCELOT_STAT_RX_RED_PRIO_0,
+       OCELOT_STAT_RX_RED_PRIO_1,
+       OCELOT_STAT_RX_RED_PRIO_2,
+       OCELOT_STAT_RX_RED_PRIO_3,
+       OCELOT_STAT_RX_RED_PRIO_4,
+       OCELOT_STAT_RX_RED_PRIO_5,
+       OCELOT_STAT_RX_RED_PRIO_6,
+       OCELOT_STAT_RX_RED_PRIO_7,
+       OCELOT_STAT_RX_YELLOW_PRIO_0,
+       OCELOT_STAT_RX_YELLOW_PRIO_1,
+       OCELOT_STAT_RX_YELLOW_PRIO_2,
+       OCELOT_STAT_RX_YELLOW_PRIO_3,
+       OCELOT_STAT_RX_YELLOW_PRIO_4,
+       OCELOT_STAT_RX_YELLOW_PRIO_5,
+       OCELOT_STAT_RX_YELLOW_PRIO_6,
+       OCELOT_STAT_RX_YELLOW_PRIO_7,
+       OCELOT_STAT_RX_GREEN_PRIO_0,
+       OCELOT_STAT_RX_GREEN_PRIO_1,
+       OCELOT_STAT_RX_GREEN_PRIO_2,
+       OCELOT_STAT_RX_GREEN_PRIO_3,
+       OCELOT_STAT_RX_GREEN_PRIO_4,
+       OCELOT_STAT_RX_GREEN_PRIO_5,
+       OCELOT_STAT_RX_GREEN_PRIO_6,
+       OCELOT_STAT_RX_GREEN_PRIO_7,
+       OCELOT_STAT_TX_OCTETS,
+       OCELOT_STAT_TX_UNICAST,
+       OCELOT_STAT_TX_MULTICAST,
+       OCELOT_STAT_TX_BROADCAST,
+       OCELOT_STAT_TX_COLLISION,
+       OCELOT_STAT_TX_DROPS,
+       OCELOT_STAT_TX_PAUSE,
+       OCELOT_STAT_TX_64,
+       OCELOT_STAT_TX_65_127,
+       OCELOT_STAT_TX_128_255,
+       OCELOT_STAT_TX_256_511,
+       OCELOT_STAT_TX_512_1023,
+       OCELOT_STAT_TX_1024_1526,
+       OCELOT_STAT_TX_1527_MAX,
+       OCELOT_STAT_TX_YELLOW_PRIO_0,
+       OCELOT_STAT_TX_YELLOW_PRIO_1,
+       OCELOT_STAT_TX_YELLOW_PRIO_2,
+       OCELOT_STAT_TX_YELLOW_PRIO_3,
+       OCELOT_STAT_TX_YELLOW_PRIO_4,
+       OCELOT_STAT_TX_YELLOW_PRIO_5,
+       OCELOT_STAT_TX_YELLOW_PRIO_6,
+       OCELOT_STAT_TX_YELLOW_PRIO_7,
+       OCELOT_STAT_TX_GREEN_PRIO_0,
+       OCELOT_STAT_TX_GREEN_PRIO_1,
+       OCELOT_STAT_TX_GREEN_PRIO_2,
+       OCELOT_STAT_TX_GREEN_PRIO_3,
+       OCELOT_STAT_TX_GREEN_PRIO_4,
+       OCELOT_STAT_TX_GREEN_PRIO_5,
+       OCELOT_STAT_TX_GREEN_PRIO_6,
+       OCELOT_STAT_TX_GREEN_PRIO_7,
+       OCELOT_STAT_TX_AGED,
+       OCELOT_STAT_DROP_LOCAL,
+       OCELOT_STAT_DROP_TAIL,
+       OCELOT_STAT_DROP_YELLOW_PRIO_0,
+       OCELOT_STAT_DROP_YELLOW_PRIO_1,
+       OCELOT_STAT_DROP_YELLOW_PRIO_2,
+       OCELOT_STAT_DROP_YELLOW_PRIO_3,
+       OCELOT_STAT_DROP_YELLOW_PRIO_4,
+       OCELOT_STAT_DROP_YELLOW_PRIO_5,
+       OCELOT_STAT_DROP_YELLOW_PRIO_6,
+       OCELOT_STAT_DROP_YELLOW_PRIO_7,
+       OCELOT_STAT_DROP_GREEN_PRIO_0,
+       OCELOT_STAT_DROP_GREEN_PRIO_1,
+       OCELOT_STAT_DROP_GREEN_PRIO_2,
+       OCELOT_STAT_DROP_GREEN_PRIO_3,
+       OCELOT_STAT_DROP_GREEN_PRIO_4,
+       OCELOT_STAT_DROP_GREEN_PRIO_5,
+       OCELOT_STAT_DROP_GREEN_PRIO_6,
+       OCELOT_STAT_DROP_GREEN_PRIO_7,
+       OCELOT_NUM_STATS,
+};
+
+struct ocelot_stat_layout {
+       u32 reg;
+       char name[ETH_GSTRING_LEN];
+};
+
+/* 32-bit counter checked for wraparound by ocelot_port_update_stats()
+ * and copied to ocelot->stats.
+ */
+#define OCELOT_STAT(kind) \
+       [OCELOT_STAT_ ## kind] = { .reg = SYS_COUNT_ ## kind }
+/* Same as above, except also exported to ethtool -S. Standard counters should
+ * only be exposed to more specific interfaces rather than by their string name.
+ */
+#define OCELOT_STAT_ETHTOOL(kind, ethtool_name) \
+       [OCELOT_STAT_ ## kind] = { .reg = SYS_COUNT_ ## kind, .name = ethtool_name }
+
+#define OCELOT_COMMON_STATS \
+       OCELOT_STAT_ETHTOOL(RX_OCTETS, "rx_octets"), \
+       OCELOT_STAT_ETHTOOL(RX_UNICAST, "rx_unicast"), \
+       OCELOT_STAT_ETHTOOL(RX_MULTICAST, "rx_multicast"), \
+       OCELOT_STAT_ETHTOOL(RX_BROADCAST, "rx_broadcast"), \
+       OCELOT_STAT_ETHTOOL(RX_SHORTS, "rx_shorts"), \
+       OCELOT_STAT_ETHTOOL(RX_FRAGMENTS, "rx_fragments"), \
+       OCELOT_STAT_ETHTOOL(RX_JABBERS, "rx_jabbers"), \
+       OCELOT_STAT_ETHTOOL(RX_CRC_ALIGN_ERRS, "rx_crc_align_errs"), \
+       OCELOT_STAT_ETHTOOL(RX_SYM_ERRS, "rx_sym_errs"), \
+       OCELOT_STAT_ETHTOOL(RX_64, "rx_frames_below_65_octets"), \
+       OCELOT_STAT_ETHTOOL(RX_65_127, "rx_frames_65_to_127_octets"), \
+       OCELOT_STAT_ETHTOOL(RX_128_255, "rx_frames_128_to_255_octets"), \
+       OCELOT_STAT_ETHTOOL(RX_256_511, "rx_frames_256_to_511_octets"), \
+       OCELOT_STAT_ETHTOOL(RX_512_1023, "rx_frames_512_to_1023_octets"), \
+       OCELOT_STAT_ETHTOOL(RX_1024_1526, "rx_frames_1024_to_1526_octets"), \
+       OCELOT_STAT_ETHTOOL(RX_1527_MAX, "rx_frames_over_1526_octets"), \
+       OCELOT_STAT_ETHTOOL(RX_PAUSE, "rx_pause"), \
+       OCELOT_STAT_ETHTOOL(RX_CONTROL, "rx_control"), \
+       OCELOT_STAT_ETHTOOL(RX_LONGS, "rx_longs"), \
+       OCELOT_STAT_ETHTOOL(RX_CLASSIFIED_DROPS, "rx_classified_drops"), \
+       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_0, "rx_red_prio_0"), \
+       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_1, "rx_red_prio_1"), \
+       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_2, "rx_red_prio_2"), \
+       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_3, "rx_red_prio_3"), \
+       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_4, "rx_red_prio_4"), \
+       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_5, "rx_red_prio_5"), \
+       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_6, "rx_red_prio_6"), \
+       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_7, "rx_red_prio_7"), \
+       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_0, "rx_yellow_prio_0"), \
+       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_1, "rx_yellow_prio_1"), \
+       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_2, "rx_yellow_prio_2"), \
+       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_3, "rx_yellow_prio_3"), \
+       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_4, "rx_yellow_prio_4"), \
+       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_5, "rx_yellow_prio_5"), \
+       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_6, "rx_yellow_prio_6"), \
+       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_7, "rx_yellow_prio_7"), \
+       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_0, "rx_green_prio_0"), \
+       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_1, "rx_green_prio_1"), \
+       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_2, "rx_green_prio_2"), \
+       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_3, "rx_green_prio_3"), \
+       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_4, "rx_green_prio_4"), \
+       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_5, "rx_green_prio_5"), \
+       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_6, "rx_green_prio_6"), \
+       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_7, "rx_green_prio_7"), \
+       OCELOT_STAT_ETHTOOL(TX_OCTETS, "tx_octets"), \
+       OCELOT_STAT_ETHTOOL(TX_UNICAST, "tx_unicast"), \
+       OCELOT_STAT_ETHTOOL(TX_MULTICAST, "tx_multicast"), \
+       OCELOT_STAT_ETHTOOL(TX_BROADCAST, "tx_broadcast"), \
+       OCELOT_STAT_ETHTOOL(TX_COLLISION, "tx_collision"), \
+       OCELOT_STAT_ETHTOOL(TX_DROPS, "tx_drops"), \
+       OCELOT_STAT_ETHTOOL(TX_PAUSE, "tx_pause"), \
+       OCELOT_STAT_ETHTOOL(TX_64, "tx_frames_below_65_octets"), \
+       OCELOT_STAT_ETHTOOL(TX_65_127, "tx_frames_65_to_127_octets"), \
+       OCELOT_STAT_ETHTOOL(TX_128_255, "tx_frames_128_255_octets"), \
+       OCELOT_STAT_ETHTOOL(TX_256_511, "tx_frames_256_511_octets"), \
+       OCELOT_STAT_ETHTOOL(TX_512_1023, "tx_frames_512_1023_octets"), \
+       OCELOT_STAT_ETHTOOL(TX_1024_1526, "tx_frames_1024_1526_octets"), \
+       OCELOT_STAT_ETHTOOL(TX_1527_MAX, "tx_frames_over_1526_octets"), \
+       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_0, "tx_yellow_prio_0"), \
+       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_1, "tx_yellow_prio_1"), \
+       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_2, "tx_yellow_prio_2"), \
+       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_3, "tx_yellow_prio_3"), \
+       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_4, "tx_yellow_prio_4"), \
+       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_5, "tx_yellow_prio_5"), \
+       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_6, "tx_yellow_prio_6"), \
+       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_7, "tx_yellow_prio_7"), \
+       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_0, "tx_green_prio_0"), \
+       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_1, "tx_green_prio_1"), \
+       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_2, "tx_green_prio_2"), \
+       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_3, "tx_green_prio_3"), \
+       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_4, "tx_green_prio_4"), \
+       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_5, "tx_green_prio_5"), \
+       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_6, "tx_green_prio_6"), \
+       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_7, "tx_green_prio_7"), \
+       OCELOT_STAT_ETHTOOL(TX_AGED, "tx_aged"), \
+       OCELOT_STAT_ETHTOOL(DROP_LOCAL, "drop_local"), \
+       OCELOT_STAT_ETHTOOL(DROP_TAIL, "drop_tail"), \
+       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_0, "drop_yellow_prio_0"), \
+       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_1, "drop_yellow_prio_1"), \
+       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_2, "drop_yellow_prio_2"), \
+       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_3, "drop_yellow_prio_3"), \
+       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_4, "drop_yellow_prio_4"), \
+       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_5, "drop_yellow_prio_5"), \
+       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_6, "drop_yellow_prio_6"), \
+       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_7, "drop_yellow_prio_7"), \
+       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_0, "drop_green_prio_0"), \
+       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_1, "drop_green_prio_1"), \
+       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_2, "drop_green_prio_2"), \
+       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_3, "drop_green_prio_3"), \
+       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_4, "drop_green_prio_4"), \
+       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_5, "drop_green_prio_5"), \
+       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_6, "drop_green_prio_6"), \
+       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_7, "drop_green_prio_7")
+
+struct ocelot_stats_region {
+       struct list_head node;
+       u32 base;
+       int count;
+       u32 *buf;
+};
+
 static const struct ocelot_stat_layout ocelot_stats_layout[OCELOT_NUM_STATS] = {
        OCELOT_COMMON_STATS,
 };
@@ -460,3 +675,4 @@ void ocelot_stats_deinit(struct ocelot *ocelot)
        cancel_delayed_work(&ocelot->stats_work);
        destroy_workqueue(ocelot->stats_queue);
 }
+

diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 995b595..df62be8 100644 (file)
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -596,221 +596,6 @@ enum ocelot_ptp_pins {
        TOD_ACC_PIN
 };
 
-enum ocelot_stat {
-       OCELOT_STAT_RX_OCTETS,
-       OCELOT_STAT_RX_UNICAST,
-       OCELOT_STAT_RX_MULTICAST,
-       OCELOT_STAT_RX_BROADCAST,
-       OCELOT_STAT_RX_SHORTS,
-       OCELOT_STAT_RX_FRAGMENTS,
-       OCELOT_STAT_RX_JABBERS,
-       OCELOT_STAT_RX_CRC_ALIGN_ERRS,
-       OCELOT_STAT_RX_SYM_ERRS,
-       OCELOT_STAT_RX_64,
-       OCELOT_STAT_RX_65_127,
-       OCELOT_STAT_RX_128_255,
-       OCELOT_STAT_RX_256_511,
-       OCELOT_STAT_RX_512_1023,
-       OCELOT_STAT_RX_1024_1526,
-       OCELOT_STAT_RX_1527_MAX,
-       OCELOT_STAT_RX_PAUSE,
-       OCELOT_STAT_RX_CONTROL,
-       OCELOT_STAT_RX_LONGS,
-       OCELOT_STAT_RX_CLASSIFIED_DROPS,
-       OCELOT_STAT_RX_RED_PRIO_0,
-       OCELOT_STAT_RX_RED_PRIO_1,
-       OCELOT_STAT_RX_RED_PRIO_2,
-       OCELOT_STAT_RX_RED_PRIO_3,
-       OCELOT_STAT_RX_RED_PRIO_4,
-       OCELOT_STAT_RX_RED_PRIO_5,
-       OCELOT_STAT_RX_RED_PRIO_6,
-       OCELOT_STAT_RX_RED_PRIO_7,
-       OCELOT_STAT_RX_YELLOW_PRIO_0,
-       OCELOT_STAT_RX_YELLOW_PRIO_1,
-       OCELOT_STAT_RX_YELLOW_PRIO_2,
-       OCELOT_STAT_RX_YELLOW_PRIO_3,
-       OCELOT_STAT_RX_YELLOW_PRIO_4,
-       OCELOT_STAT_RX_YELLOW_PRIO_5,
-       OCELOT_STAT_RX_YELLOW_PRIO_6,
-       OCELOT_STAT_RX_YELLOW_PRIO_7,
-       OCELOT_STAT_RX_GREEN_PRIO_0,
-       OCELOT_STAT_RX_GREEN_PRIO_1,
-       OCELOT_STAT_RX_GREEN_PRIO_2,
-       OCELOT_STAT_RX_GREEN_PRIO_3,
-       OCELOT_STAT_RX_GREEN_PRIO_4,
-       OCELOT_STAT_RX_GREEN_PRIO_5,
-       OCELOT_STAT_RX_GREEN_PRIO_6,
-       OCELOT_STAT_RX_GREEN_PRIO_7,
-       OCELOT_STAT_TX_OCTETS,
-       OCELOT_STAT_TX_UNICAST,
-       OCELOT_STAT_TX_MULTICAST,
-       OCELOT_STAT_TX_BROADCAST,
-       OCELOT_STAT_TX_COLLISION,
-       OCELOT_STAT_TX_DROPS,
-       OCELOT_STAT_TX_PAUSE,
-       OCELOT_STAT_TX_64,
-       OCELOT_STAT_TX_65_127,
-       OCELOT_STAT_TX_128_255,
-       OCELOT_STAT_TX_256_511,
-       OCELOT_STAT_TX_512_1023,
-       OCELOT_STAT_TX_1024_1526,
-       OCELOT_STAT_TX_1527_MAX,
-       OCELOT_STAT_TX_YELLOW_PRIO_0,
-       OCELOT_STAT_TX_YELLOW_PRIO_1,
-       OCELOT_STAT_TX_YELLOW_PRIO_2,
-       OCELOT_STAT_TX_YELLOW_PRIO_3,
-       OCELOT_STAT_TX_YELLOW_PRIO_4,
-       OCELOT_STAT_TX_YELLOW_PRIO_5,
-       OCELOT_STAT_TX_YELLOW_PRIO_6,
-       OCELOT_STAT_TX_YELLOW_PRIO_7,
-       OCELOT_STAT_TX_GREEN_PRIO_0,
-       OCELOT_STAT_TX_GREEN_PRIO_1,
-       OCELOT_STAT_TX_GREEN_PRIO_2,
-       OCELOT_STAT_TX_GREEN_PRIO_3,
-       OCELOT_STAT_TX_GREEN_PRIO_4,
-       OCELOT_STAT_TX_GREEN_PRIO_5,
-       OCELOT_STAT_TX_GREEN_PRIO_6,
-       OCELOT_STAT_TX_GREEN_PRIO_7,
-       OCELOT_STAT_TX_AGED,
-       OCELOT_STAT_DROP_LOCAL,
-       OCELOT_STAT_DROP_TAIL,
-       OCELOT_STAT_DROP_YELLOW_PRIO_0,
-       OCELOT_STAT_DROP_YELLOW_PRIO_1,
-       OCELOT_STAT_DROP_YELLOW_PRIO_2,
-       OCELOT_STAT_DROP_YELLOW_PRIO_3,
-       OCELOT_STAT_DROP_YELLOW_PRIO_4,
-       OCELOT_STAT_DROP_YELLOW_PRIO_5,
-       OCELOT_STAT_DROP_YELLOW_PRIO_6,
-       OCELOT_STAT_DROP_YELLOW_PRIO_7,
-       OCELOT_STAT_DROP_GREEN_PRIO_0,
-       OCELOT_STAT_DROP_GREEN_PRIO_1,
-       OCELOT_STAT_DROP_GREEN_PRIO_2,
-       OCELOT_STAT_DROP_GREEN_PRIO_3,
-       OCELOT_STAT_DROP_GREEN_PRIO_4,
-       OCELOT_STAT_DROP_GREEN_PRIO_5,
-       OCELOT_STAT_DROP_GREEN_PRIO_6,
-       OCELOT_STAT_DROP_GREEN_PRIO_7,
-       OCELOT_NUM_STATS,
-};
-
-struct ocelot_stat_layout {
-       u32 reg;
-       char name[ETH_GSTRING_LEN];
-};
-
-/* 32-bit counter checked for wraparound by ocelot_port_update_stats()
- * and copied to ocelot->stats.
- */
-#define OCELOT_STAT(kind) \
-       [OCELOT_STAT_ ## kind] = { .reg = SYS_COUNT_ ## kind }
-/* Same as above, except also exported to ethtool -S. Standard counters should
- * only be exposed to more specific interfaces rather than by their string name.
- */
-#define OCELOT_STAT_ETHTOOL(kind, ethtool_name) \
-       [OCELOT_STAT_ ## kind] = { .reg = SYS_COUNT_ ## kind, .name = ethtool_name }
-
-#define OCELOT_COMMON_STATS \
-       OCELOT_STAT_ETHTOOL(RX_OCTETS, "rx_octets"), \
-       OCELOT_STAT_ETHTOOL(RX_UNICAST, "rx_unicast"), \
-       OCELOT_STAT_ETHTOOL(RX_MULTICAST, "rx_multicast"), \
-       OCELOT_STAT_ETHTOOL(RX_BROADCAST, "rx_broadcast"), \
-       OCELOT_STAT_ETHTOOL(RX_SHORTS, "rx_shorts"), \
-       OCELOT_STAT_ETHTOOL(RX_FRAGMENTS, "rx_fragments"), \
-       OCELOT_STAT_ETHTOOL(RX_JABBERS, "rx_jabbers"), \
-       OCELOT_STAT_ETHTOOL(RX_CRC_ALIGN_ERRS, "rx_crc_align_errs"), \
-       OCELOT_STAT_ETHTOOL(RX_SYM_ERRS, "rx_sym_errs"), \
-       OCELOT_STAT_ETHTOOL(RX_64, "rx_frames_below_65_octets"), \
-       OCELOT_STAT_ETHTOOL(RX_65_127, "rx_frames_65_to_127_octets"), \
-       OCELOT_STAT_ETHTOOL(RX_128_255, "rx_frames_128_to_255_octets"), \
-       OCELOT_STAT_ETHTOOL(RX_256_511, "rx_frames_256_to_511_octets"), \
-       OCELOT_STAT_ETHTOOL(RX_512_1023, "rx_frames_512_to_1023_octets"), \
-       OCELOT_STAT_ETHTOOL(RX_1024_1526, "rx_frames_1024_to_1526_octets"), \
-       OCELOT_STAT_ETHTOOL(RX_1527_MAX, "rx_frames_over_1526_octets"), \
-       OCELOT_STAT_ETHTOOL(RX_PAUSE, "rx_pause"), \
-       OCELOT_STAT_ETHTOOL(RX_CONTROL, "rx_control"), \
-       OCELOT_STAT_ETHTOOL(RX_LONGS, "rx_longs"), \
-       OCELOT_STAT_ETHTOOL(RX_CLASSIFIED_DROPS, "rx_classified_drops"), \
-       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_0, "rx_red_prio_0"), \
-       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_1, "rx_red_prio_1"), \
-       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_2, "rx_red_prio_2"), \
-       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_3, "rx_red_prio_3"), \
-       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_4, "rx_red_prio_4"), \
-       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_5, "rx_red_prio_5"), \
-       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_6, "rx_red_prio_6"), \
-       OCELOT_STAT_ETHTOOL(RX_RED_PRIO_7, "rx_red_prio_7"), \
-       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_0, "rx_yellow_prio_0"), \
-       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_1, "rx_yellow_prio_1"), \
-       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_2, "rx_yellow_prio_2"), \
-       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_3, "rx_yellow_prio_3"), \
-       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_4, "rx_yellow_prio_4"), \
-       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_5, "rx_yellow_prio_5"), \
-       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_6, "rx_yellow_prio_6"), \
-       OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_7, "rx_yellow_prio_7"), \
-       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_0, "rx_green_prio_0"), \
-       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_1, "rx_green_prio_1"), \
-       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_2, "rx_green_prio_2"), \
-       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_3, "rx_green_prio_3"), \
-       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_4, "rx_green_prio_4"), \
-       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_5, "rx_green_prio_5"), \
-       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_6, "rx_green_prio_6"), \
-       OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_7, "rx_green_prio_7"), \
-       OCELOT_STAT_ETHTOOL(TX_OCTETS, "tx_octets"), \
-       OCELOT_STAT_ETHTOOL(TX_UNICAST, "tx_unicast"), \
-       OCELOT_STAT_ETHTOOL(TX_MULTICAST, "tx_multicast"), \
-       OCELOT_STAT_ETHTOOL(TX_BROADCAST, "tx_broadcast"), \
-       OCELOT_STAT_ETHTOOL(TX_COLLISION, "tx_collision"), \
-       OCELOT_STAT_ETHTOOL(TX_DROPS, "tx_drops"), \
-       OCELOT_STAT_ETHTOOL(TX_PAUSE, "tx_pause"), \
-       OCELOT_STAT_ETHTOOL(TX_64, "tx_frames_below_65_octets"), \
-       OCELOT_STAT_ETHTOOL(TX_65_127, "tx_frames_65_to_127_octets"), \
-       OCELOT_STAT_ETHTOOL(TX_128_255, "tx_frames_128_255_octets"), \
-       OCELOT_STAT_ETHTOOL(TX_256_511, "tx_frames_256_511_octets"), \
-       OCELOT_STAT_ETHTOOL(TX_512_1023, "tx_frames_512_1023_octets"), \
-       OCELOT_STAT_ETHTOOL(TX_1024_1526, "tx_frames_1024_1526_octets"), \
-       OCELOT_STAT_ETHTOOL(TX_1527_MAX, "tx_frames_over_1526_octets"), \
-       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_0, "tx_yellow_prio_0"), \
-       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_1, "tx_yellow_prio_1"), \
-       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_2, "tx_yellow_prio_2"), \
-       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_3, "tx_yellow_prio_3"), \
-       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_4, "tx_yellow_prio_4"), \
-       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_5, "tx_yellow_prio_5"), \
-       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_6, "tx_yellow_prio_6"), \
-       OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_7, "tx_yellow_prio_7"), \
-       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_0, "tx_green_prio_0"), \
-       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_1, "tx_green_prio_1"), \
-       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_2, "tx_green_prio_2"), \
-       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_3, "tx_green_prio_3"), \
-       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_4, "tx_green_prio_4"), \
-       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_5, "tx_green_prio_5"), \
-       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_6, "tx_green_prio_6"), \
-       OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_7, "tx_green_prio_7"), \
-       OCELOT_STAT_ETHTOOL(TX_AGED, "tx_aged"), \
-       OCELOT_STAT_ETHTOOL(DROP_LOCAL, "drop_local"), \
-       OCELOT_STAT_ETHTOOL(DROP_TAIL, "drop_tail"), \
-       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_0, "drop_yellow_prio_0"), \
-       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_1, "drop_yellow_prio_1"), \
-       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_2, "drop_yellow_prio_2"), \
-       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_3, "drop_yellow_prio_3"), \
-       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_4, "drop_yellow_prio_4"), \
-       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_5, "drop_yellow_prio_5"), \
-       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_6, "drop_yellow_prio_6"), \
-       OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_7, "drop_yellow_prio_7"), \
-       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_0, "drop_green_prio_0"), \
-       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_1, "drop_green_prio_1"), \
-       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_2, "drop_green_prio_2"), \
-       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_3, "drop_green_prio_3"), \
-       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_4, "drop_green_prio_4"), \
-       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_5, "drop_green_prio_5"), \
-       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_6, "drop_green_prio_6"), \
-       OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_7, "drop_green_prio_7")
-
-struct ocelot_stats_region {
-       struct list_head node;
-       u32 base;
-       int count;
-       u32 *buf;
-};
-
 enum ocelot_tag_prefix {
        OCELOT_TAG_PREFIX_DISABLED      = 0,
        OCELOT_TAG_PREFIX_NONE,