Commit bde55dd9 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by Jakub Kicinski
Browse files

net: dsa: microchip: add stats64 support for ksz8 series of switches 



Add stats64 support for ksz8xxx series of switches.

Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.kernel.org/r/20221205052904.2834962-1-o.rempel@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d8b879c0

drivers/net/dsa/microchip/ksz_common.c

+87 −0
Original line number Diff line number Diff line
@@ -70,6 +70,43 @@ struct ksz_stats_raw { 
	u64 tx_discards;

};



struct ksz88xx_stats_raw {

	u64 rx;

	u64 rx_hi;

	u64 rx_undersize;

	u64 rx_fragments;

	u64 rx_oversize;

	u64 rx_jabbers;

	u64 rx_symbol_err;

	u64 rx_crc_err;

	u64 rx_align_err;

	u64 rx_mac_ctrl;

	u64 rx_pause;

	u64 rx_bcast;

	u64 rx_mcast;

	u64 rx_ucast;

	u64 rx_64_or_less;

	u64 rx_65_127;

	u64 rx_128_255;

	u64 rx_256_511;

	u64 rx_512_1023;

	u64 rx_1024_1522;

	u64 tx;

	u64 tx_hi;

	u64 tx_late_col;

	u64 tx_pause;

	u64 tx_bcast;

	u64 tx_mcast;

	u64 tx_ucast;

	u64 tx_deferred;

	u64 tx_total_col;

	u64 tx_exc_col;

	u64 tx_single_col;

	u64 tx_mult_col;

	u64 rx_discards;

	u64 tx_discards;

};



static const struct ksz_mib_names ksz88xx_mib_names[] = {

	{ 0x00, "rx" },

	{ 0x01, "rx_hi" },
@@ -156,6 +193,7 @@ static const struct ksz_dev_ops ksz8_dev_ops = { 
	.w_phy = ksz8_w_phy,

	.r_mib_cnt = ksz8_r_mib_cnt,

	.r_mib_pkt = ksz8_r_mib_pkt,

	.r_mib_stat64 = ksz88xx_r_mib_stats64,

	.freeze_mib = ksz8_freeze_mib,

	.port_init_cnt = ksz8_port_init_cnt,

	.fdb_dump = ksz8_fdb_dump,
@@ -1583,6 +1621,55 @@ void ksz_r_mib_stats64(struct ksz_device *dev, int port) 
	spin_unlock(&mib->stats64_lock);

}



void ksz88xx_r_mib_stats64(struct ksz_device *dev, int port)

{

	struct ethtool_pause_stats *pstats;

	struct rtnl_link_stats64 *stats;

	struct ksz88xx_stats_raw *raw;

	struct ksz_port_mib *mib;



	mib = &dev->ports[port].mib;

	stats = &mib->stats64;

	pstats = &mib->pause_stats;

	raw = (struct ksz88xx_stats_raw *)mib->counters;



	spin_lock(&mib->stats64_lock);



	stats->rx_packets = raw->rx_bcast + raw->rx_mcast + raw->rx_ucast +

		raw->rx_pause;

	stats->tx_packets = raw->tx_bcast + raw->tx_mcast + raw->tx_ucast +

		raw->tx_pause;



	/* HW counters are counting bytes + FCS which is not acceptable

	 * for rtnl_link_stats64 interface

	 */

	stats->rx_bytes = raw->rx + raw->rx_hi - stats->rx_packets * ETH_FCS_LEN;

	stats->tx_bytes = raw->tx + raw->tx_hi - stats->tx_packets * ETH_FCS_LEN;



	stats->rx_length_errors = raw->rx_undersize + raw->rx_fragments +

		raw->rx_oversize;



	stats->rx_crc_errors = raw->rx_crc_err;

	stats->rx_frame_errors = raw->rx_align_err;

	stats->rx_dropped = raw->rx_discards;

	stats->rx_errors = stats->rx_length_errors + stats->rx_crc_errors +

		stats->rx_frame_errors  + stats->rx_dropped;



	stats->tx_window_errors = raw->tx_late_col;

	stats->tx_fifo_errors = raw->tx_discards;

	stats->tx_aborted_errors = raw->tx_exc_col;

	stats->tx_errors = stats->tx_window_errors + stats->tx_fifo_errors +

		stats->tx_aborted_errors;



	stats->multicast = raw->rx_mcast;

	stats->collisions = raw->tx_total_col;



	pstats->tx_pause_frames = raw->tx_pause;

	pstats->rx_pause_frames = raw->rx_pause;



	spin_unlock(&mib->stats64_lock);

}



static void ksz_get_stats64(struct dsa_switch *ds, int port,

			    struct rtnl_link_stats64 *s)

{

drivers/net/dsa/microchip/ksz_common.h

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ void ksz_switch_remove(struct ksz_device *dev); 


void ksz_init_mib_timer(struct ksz_device *dev);

void ksz_r_mib_stats64(struct ksz_device *dev, int port);

void ksz88xx_r_mib_stats64(struct ksz_device *dev, int port);

void ksz_port_stp_state_set(struct dsa_switch *ds, int port, u8 state);

bool ksz_get_gbit(struct ksz_device *dev, int port);

phy_interface_t ksz_get_xmii(struct ksz_device *dev, int port, bool gbit);