Commit e0e0def9 authored by Kamal Heib's avatar Kamal Heib Committed by Saeed Mahameed
Browse files

net/mlx5e: Switch RFC 2819 counters to use stats group API 



Switch the RFC 2819 counters to use the new stats group API.

Signed-off-by: default avatarKamal Heib <kamalh@mellanox.com>
Reviewed-by: default avatarGal Pressman <galp@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent fc8e64a3

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

+0 −8
Original line number Diff line number Diff line
@@ -216,10 +216,6 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, u8 *data) 
	for (i = 0; i < mlx5e_num_stats_grps; i++)

		idx = mlx5e_stats_grps[i].fill_strings(priv, data, idx);



	for (i = 0; i < NUM_PPORT_2819_COUNTERS; i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN,

		       pport_2819_stats_desc[i].format);



	for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_COUNTERS(priv); i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN,

		       pport_phy_statistical_stats_desc[i].format);
@@ -340,10 +336,6 @@ void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv, 
	for (i = 0; i < mlx5e_num_stats_grps; i++)

		idx = mlx5e_stats_grps[i].fill_stats(priv, data, idx);



	for (i = 0; i < NUM_PPORT_2819_COUNTERS; i++)

		data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.RFC_2819_counters,

						  pport_2819_stats_desc, i);



	for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_COUNTERS(priv); i++)

		data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.phy_statistical_counters,

						  pport_phy_statistical_stats_desc, i);

drivers/net/ethernet/mellanox/mlx5/core/en_stats.c

+52 −0
Original line number Diff line number Diff line
@@ -286,6 +286,53 @@ static int mlx5e_grp_2863_fill_stats(struct mlx5e_priv *priv, u64 *data, 
	return idx;

}



#define PPORT_2819_OFF(c) \

	MLX5_BYTE_OFF(ppcnt_reg, \

		      counter_set.eth_2819_cntrs_grp_data_layout.c##_high)

static const struct counter_desc pport_2819_stats_desc[] = {

	{ "rx_undersize_pkts_phy", PPORT_2819_OFF(ether_stats_undersize_pkts) },

	{ "rx_fragments_phy", PPORT_2819_OFF(ether_stats_fragments) },

	{ "rx_jabbers_phy", PPORT_2819_OFF(ether_stats_jabbers) },

	{ "rx_64_bytes_phy", PPORT_2819_OFF(ether_stats_pkts64octets) },

	{ "rx_65_to_127_bytes_phy", PPORT_2819_OFF(ether_stats_pkts65to127octets) },

	{ "rx_128_to_255_bytes_phy", PPORT_2819_OFF(ether_stats_pkts128to255octets) },

	{ "rx_256_to_511_bytes_phy", PPORT_2819_OFF(ether_stats_pkts256to511octets) },

	{ "rx_512_to_1023_bytes_phy", PPORT_2819_OFF(ether_stats_pkts512to1023octets) },

	{ "rx_1024_to_1518_bytes_phy", PPORT_2819_OFF(ether_stats_pkts1024to1518octets) },

	{ "rx_1519_to_2047_bytes_phy", PPORT_2819_OFF(ether_stats_pkts1519to2047octets) },

	{ "rx_2048_to_4095_bytes_phy", PPORT_2819_OFF(ether_stats_pkts2048to4095octets) },

	{ "rx_4096_to_8191_bytes_phy", PPORT_2819_OFF(ether_stats_pkts4096to8191octets) },

	{ "rx_8192_to_10239_bytes_phy", PPORT_2819_OFF(ether_stats_pkts8192to10239octets) },

};



#define NUM_PPORT_2819_COUNTERS		ARRAY_SIZE(pport_2819_stats_desc)



static int mlx5e_grp_2819_get_num_stats(struct mlx5e_priv *priv)

{

	return NUM_PPORT_2819_COUNTERS;

}



static int mlx5e_grp_2819_fill_strings(struct mlx5e_priv *priv, u8 *data,

				       int idx)

{

	int i;



	for (i = 0; i < NUM_PPORT_2819_COUNTERS; i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN, pport_2819_stats_desc[i].format);

	return idx;

}



static int mlx5e_grp_2819_fill_stats(struct mlx5e_priv *priv, u64 *data,

				     int idx)

{

	int i;



	for (i = 0; i < NUM_PPORT_2819_COUNTERS; i++)

		data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.RFC_2819_counters,

						  pport_2819_stats_desc, i);

	return idx;

}



const struct mlx5e_stats_grp mlx5e_stats_grps[] = {

	{

		.get_num_stats = mlx5e_grp_sw_get_num_stats,
@@ -312,6 +359,11 @@ const struct mlx5e_stats_grp mlx5e_stats_grps[] = { 
		.fill_strings = mlx5e_grp_2863_fill_strings,

		.fill_stats = mlx5e_grp_2863_fill_stats,

	},

	{

		.get_num_stats = mlx5e_grp_2819_get_num_stats,

		.fill_strings = mlx5e_grp_2819_fill_strings,

		.fill_stats = mlx5e_grp_2819_fill_stats,

	},

};



const int mlx5e_num_stats_grps = ARRAY_SIZE(mlx5e_stats_grps);

drivers/net/ethernet/mellanox/mlx5/core/en_stats.h

+1 −22
Original line number Diff line number Diff line
@@ -108,9 +108,6 @@ struct mlx5e_vport_stats { 
#define PPORT_2863_GET(pstats, c) \

	MLX5_GET64(ppcnt_reg, pstats->RFC_2863_counters, \

		   counter_set.eth_2863_cntrs_grp_data_layout.c##_high)

#define PPORT_2819_OFF(c) \

	MLX5_BYTE_OFF(ppcnt_reg, \

		      counter_set.eth_2819_cntrs_grp_data_layout.c##_high)

#define PPORT_2819_GET(pstats, c) \

	MLX5_GET64(ppcnt_reg, pstats->RFC_2819_counters, \

		   counter_set.eth_2819_cntrs_grp_data_layout.c##_high)
@@ -144,22 +141,6 @@ struct mlx5e_pport_stats { 
	__be64 eth_ext_counters[MLX5_ST_SZ_QW(ppcnt_reg)];

};



static const struct counter_desc pport_2819_stats_desc[] = {

	{ "rx_undersize_pkts_phy", PPORT_2819_OFF(ether_stats_undersize_pkts) },

	{ "rx_fragments_phy", PPORT_2819_OFF(ether_stats_fragments) },

	{ "rx_jabbers_phy", PPORT_2819_OFF(ether_stats_jabbers) },

	{ "rx_64_bytes_phy", PPORT_2819_OFF(ether_stats_pkts64octets) },

	{ "rx_65_to_127_bytes_phy", PPORT_2819_OFF(ether_stats_pkts65to127octets) },

	{ "rx_128_to_255_bytes_phy", PPORT_2819_OFF(ether_stats_pkts128to255octets) },

	{ "rx_256_to_511_bytes_phy", PPORT_2819_OFF(ether_stats_pkts256to511octets) },

	{ "rx_512_to_1023_bytes_phy", PPORT_2819_OFF(ether_stats_pkts512to1023octets) },

	{ "rx_1024_to_1518_bytes_phy", PPORT_2819_OFF(ether_stats_pkts1024to1518octets) },

	{ "rx_1519_to_2047_bytes_phy", PPORT_2819_OFF(ether_stats_pkts1519to2047octets) },

	{ "rx_2048_to_4095_bytes_phy", PPORT_2819_OFF(ether_stats_pkts2048to4095octets) },

	{ "rx_4096_to_8191_bytes_phy", PPORT_2819_OFF(ether_stats_pkts4096to8191octets) },

	{ "rx_8192_to_10239_bytes_phy", PPORT_2819_OFF(ether_stats_pkts8192to10239octets) },

};



static const struct counter_desc pport_phy_statistical_stats_desc[] = {

	{ "rx_pcs_symbol_err_phy", PPORT_PHY_STATISTICAL_OFF(phy_symbol_errors) },

	{ "rx_corrected_bits_phy", PPORT_PHY_STATISTICAL_OFF(phy_corrected_bits) },
@@ -303,7 +284,6 @@ static const struct counter_desc sq_stats_desc[] = { 
	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, xmit_more) },

};



#define NUM_PPORT_2819_COUNTERS		ARRAY_SIZE(pport_2819_stats_desc)

#define NUM_PPORT_PHY_STATISTICAL_COUNTERS(priv) \

	(ARRAY_SIZE(pport_phy_statistical_stats_desc) * \

	 MLX5_CAP_PCAM_FEATURE((priv)->mdev, ppcnt_statistical_group))
@@ -323,8 +303,7 @@ static const struct counter_desc sq_stats_desc[] = { 
#define NUM_PPORT_ETH_EXT_COUNTERS(priv) \

	(ARRAY_SIZE(pport_eth_ext_stats_desc) * \

	 MLX5_CAP_PCAM_FEATURE((priv)->mdev, rx_buffer_fullness_counters))

#define NUM_PPORT_COUNTERS(priv)	(NUM_PPORT_2819_COUNTERS  + \

					 NUM_PPORT_PHY_STATISTICAL_COUNTERS(priv) + \

#define NUM_PPORT_COUNTERS(priv)	(NUM_PPORT_PHY_STATISTICAL_COUNTERS(priv) + \

					 NUM_PPORT_PER_PRIO_TRAFFIC_COUNTERS * \

					 NUM_PPORT_PRIO + \

					 NUM_PPORT_ETH_EXT_COUNTERS(priv))

CRA Git | Maintained and supported by SUSTech CRA and CCSE