Commit 198836fd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-Various-updates' 



Ido Schimmel says:

====================
mlxsw: Various updates

Patch #1 from Amit removes 56G speed support. The reasons for this are
detailed in the commit message.

Patch #2 from Shalom ensures that the hardware does not auto negotiate
the number of used lanes. For example, if a four lane port supports 100G
over both two and four lanes, it will not advertise the two lane link
mode.

Patch #3 bumps the firmware version supported by the driver.

Patch #4 from Petr adds ethtool counters to help debug the internal PTP
implementation in mlxsw. I copied Richard on this patch in case he has
comments.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 95fb8bb3 dc4f3eb0

drivers/net/ethernet/mellanox/mlxsw/reg.h

+0 −1
Original line number Diff line number Diff line
@@ -4126,7 +4126,6 @@ MLXSW_ITEM32(reg, ptys, ext_eth_proto_cap, 0x08, 0, 32); 
#define MLXSW_REG_PTYS_ETH_SPEED_20GBASE_KR2		BIT(5)

#define MLXSW_REG_PTYS_ETH_SPEED_40GBASE_CR4		BIT(6)

#define MLXSW_REG_PTYS_ETH_SPEED_40GBASE_KR4		BIT(7)

#define MLXSW_REG_PTYS_ETH_SPEED_56GBASE_R4		BIT(8)

#define MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CR		BIT(12)

#define MLXSW_REG_PTYS_ETH_SPEED_10GBASE_SR		BIT(13)

#define MLXSW_REG_PTYS_ETH_SPEED_10GBASE_ER_LR		BIT(14)

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+97 −43
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 


#define MLXSW_SP1_FWREV_MAJOR 13

#define MLXSW_SP1_FWREV_MINOR 2000

#define MLXSW_SP1_FWREV_SUBMINOR 1122

#define MLXSW_SP1_FWREV_SUBMINOR 1886

#define MLXSW_SP1_FWREV_CAN_RESET_MINOR 1702



static const struct mlxsw_fw_rev mlxsw_sp1_fw_rev = {
@@ -175,6 +175,10 @@ struct mlxsw_sp_ptp_ops { 
	void (*shaper_work)(struct work_struct *work);

	int (*get_ts_info)(struct mlxsw_sp *mlxsw_sp,

			   struct ethtool_ts_info *info);

	int (*get_stats_count)(void);

	void (*get_stats_strings)(u8 **p);

	void (*get_stats)(struct mlxsw_sp_port *mlxsw_sp_port,

			  u64 *data, int data_index);

};



static int mlxsw_sp_component_query(struct mlxfw_dev *mlxfw_dev,
@@ -2329,6 +2333,7 @@ static void mlxsw_sp_port_get_tc_strings(u8 **p, int tc) 
static void mlxsw_sp_port_get_strings(struct net_device *dev,

				      u32 stringset, u8 *data)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

	u8 *p = data;

	int i;
@@ -2370,6 +2375,7 @@ static void mlxsw_sp_port_get_strings(struct net_device *dev, 
		for (i = 0; i < TC_MAX_QUEUE; i++)

			mlxsw_sp_port_get_tc_strings(&p, i);



		mlxsw_sp_port->mlxsw_sp->ptp_ops->get_stats_strings(&p);

		break;

	}

}
@@ -2464,6 +2470,7 @@ static void __mlxsw_sp_port_get_stats(struct net_device *dev, 
static void mlxsw_sp_port_get_stats(struct net_device *dev,

				    struct ethtool_stats *stats, u64 *data)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

	int i, data_index = 0;



	/* IEEE 802.3 Counters */
@@ -2504,13 +2511,21 @@ static void mlxsw_sp_port_get_stats(struct net_device *dev, 
					  data, data_index);

		data_index += MLXSW_SP_PORT_HW_TC_STATS_LEN;

	}



	/* PTP counters */

	mlxsw_sp_port->mlxsw_sp->ptp_ops->get_stats(mlxsw_sp_port,

						    data, data_index);

	data_index += mlxsw_sp_port->mlxsw_sp->ptp_ops->get_stats_count();

}



static int mlxsw_sp_port_get_sset_count(struct net_device *dev, int sset)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);



	switch (sset) {

	case ETH_SS_STATS:

		return MLXSW_SP_PORT_ETHTOOL_STATS_LEN;

		return MLXSW_SP_PORT_ETHTOOL_STATS_LEN +

		       mlxsw_sp_port->mlxsw_sp->ptp_ops->get_stats_count();

	default:

		return -EOPNOTSUPP;

	}
@@ -2608,26 +2623,6 @@ static const struct mlxsw_sp1_port_link_mode mlxsw_sp1_port_link_mode[] = { 
		.mask_ethtool	= ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,

		.speed		= SPEED_50000,

	},

	{

		.mask		= MLXSW_REG_PTYS_ETH_SPEED_56GBASE_R4,

		.mask_ethtool	= ETHTOOL_LINK_MODE_56000baseKR4_Full_BIT,

		.speed		= SPEED_56000,

	},

	{

		.mask		= MLXSW_REG_PTYS_ETH_SPEED_56GBASE_R4,

		.mask_ethtool	= ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT,

		.speed		= SPEED_56000,

	},

	{

		.mask		= MLXSW_REG_PTYS_ETH_SPEED_56GBASE_R4,

		.mask_ethtool	= ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT,

		.speed		= SPEED_56000,

	},

	{

		.mask		= MLXSW_REG_PTYS_ETH_SPEED_56GBASE_R4,

		.mask_ethtool	= ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT,

		.speed		= SPEED_56000,

	},

	{

		.mask		= MLXSW_REG_PTYS_ETH_SPEED_100GBASE_CR4,

		.mask_ethtool	= ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT,
@@ -2675,7 +2670,7 @@ mlxsw_sp1_from_ptys_supported_port(struct mlxsw_sp *mlxsw_sp, 


static void

mlxsw_sp1_from_ptys_link(struct mlxsw_sp *mlxsw_sp, u32 ptys_eth_proto,

			 unsigned long *mode)

			 u8 width, unsigned long *mode)

{

	int i;
@@ -2716,7 +2711,7 @@ mlxsw_sp1_from_ptys_speed_duplex(struct mlxsw_sp *mlxsw_sp, bool carrier_ok, 
}



static u32

mlxsw_sp1_to_ptys_advert_link(struct mlxsw_sp *mlxsw_sp,

mlxsw_sp1_to_ptys_advert_link(struct mlxsw_sp *mlxsw_sp, u8 width,

			      const struct ethtool_link_ksettings *cmd)

{

	u32 ptys_proto = 0;
@@ -2730,7 +2725,8 @@ mlxsw_sp1_to_ptys_advert_link(struct mlxsw_sp *mlxsw_sp, 
	return ptys_proto;

}



static u32 mlxsw_sp1_to_ptys_speed(struct mlxsw_sp *mlxsw_sp, u32 speed)

static u32 mlxsw_sp1_to_ptys_speed(struct mlxsw_sp *mlxsw_sp, u8 width,

				   u32 speed)

{

	u32 ptys_proto = 0;

	int i;
@@ -2918,11 +2914,31 @@ mlxsw_sp2_mask_ethtool_200gaui_4_200gbase_cr4_kr4[] = { 
#define MLXSW_SP2_MASK_ETHTOOL_200GAUI_4_200GBASE_CR4_KR4_LEN \

	ARRAY_SIZE(mlxsw_sp2_mask_ethtool_200gaui_4_200gbase_cr4_kr4)



#define MLXSW_SP_PORT_MASK_WIDTH_1X	BIT(0)

#define MLXSW_SP_PORT_MASK_WIDTH_2X	BIT(1)

#define MLXSW_SP_PORT_MASK_WIDTH_4X	BIT(2)



static u8 mlxsw_sp_port_mask_width_get(u8 width)

{

	switch (width) {

	case 1:

		return MLXSW_SP_PORT_MASK_WIDTH_1X;

	case 2:

		return MLXSW_SP_PORT_MASK_WIDTH_2X;

	case 4:

		return MLXSW_SP_PORT_MASK_WIDTH_4X;

	default:

		WARN_ON_ONCE(1);

		return 0;

	}

}



struct mlxsw_sp2_port_link_mode {

	const enum ethtool_link_mode_bit_indices *mask_ethtool;

	int m_ethtool_len;

	u32 mask;

	u32 speed;

	u8 mask_width;

};



static const struct mlxsw_sp2_port_link_mode mlxsw_sp2_port_link_mode[] = {
@@ -2930,72 +2946,97 @@ static const struct mlxsw_sp2_port_link_mode mlxsw_sp2_port_link_mode[] = { 
		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_SGMII_100M,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_sgmii_100m,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_SGMII_100M_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_1X |

				  MLXSW_SP_PORT_MASK_WIDTH_2X |

				  MLXSW_SP_PORT_MASK_WIDTH_4X,

		.speed		= SPEED_100,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_1000BASE_X_SGMII,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_1000base_x_sgmii,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_1000BASE_X_SGMII_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_1X |

				  MLXSW_SP_PORT_MASK_WIDTH_2X |

				  MLXSW_SP_PORT_MASK_WIDTH_4X,

		.speed		= SPEED_1000,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_2_5GBASE_X_2_5GMII,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_2_5gbase_x_2_5gmii,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_2_5GBASE_X_2_5GMII_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_1X |

				  MLXSW_SP_PORT_MASK_WIDTH_2X |

				  MLXSW_SP_PORT_MASK_WIDTH_4X,

		.speed		= SPEED_2500,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_5GBASE_R,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_5gbase_r,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_5GBASE_R_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_1X |

				  MLXSW_SP_PORT_MASK_WIDTH_2X |

				  MLXSW_SP_PORT_MASK_WIDTH_4X,

		.speed		= SPEED_5000,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_XFI_XAUI_1_10G,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_xfi_xaui_1_10g,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_XFI_XAUI_1_10G_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_1X |

				  MLXSW_SP_PORT_MASK_WIDTH_2X |

				  MLXSW_SP_PORT_MASK_WIDTH_4X,

		.speed		= SPEED_10000,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_XLAUI_4_XLPPI_4_40G,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_xlaui_4_xlppi_4_40g,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_XLAUI_4_XLPPI_4_40G_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_4X,

		.speed		= SPEED_40000,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_25GAUI_1_25GBASE_CR_KR,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_25gaui_1_25gbase_cr_kr,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_25GAUI_1_25GBASE_CR_KR_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_1X |

				  MLXSW_SP_PORT_MASK_WIDTH_2X |

				  MLXSW_SP_PORT_MASK_WIDTH_4X,

		.speed		= SPEED_25000,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_50GAUI_2_LAUI_2_50GBASE_CR2_KR2,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_50gaui_2_laui_2_50gbase_cr2_kr2,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_50GAUI_2_LAUI_2_50GBASE_CR2_KR2_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_2X |

				  MLXSW_SP_PORT_MASK_WIDTH_4X,

		.speed		= SPEED_50000,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_50GAUI_1_LAUI_1_50GBASE_CR_KR,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_50gaui_1_laui_1_50gbase_cr_kr,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_50GAUI_1_LAUI_1_50GBASE_CR_KR_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_1X,

		.speed		= SPEED_50000,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_CAUI_4_100GBASE_CR4_KR4,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_caui_4_100gbase_cr4_kr4,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_CAUI_4_100GBASE_CR4_KR4_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_4X,

		.speed		= SPEED_100000,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_100GAUI_2_100GBASE_CR2_KR2,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_100gaui_2_100gbase_cr2_kr2,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_100GAUI_2_100GBASE_CR2_KR2_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_2X,

		.speed		= SPEED_100000,

	},

	{

		.mask		= MLXSW_REG_PTYS_EXT_ETH_SPEED_200GAUI_4_200GBASE_CR4_KR4,

		.mask_ethtool	= mlxsw_sp2_mask_ethtool_200gaui_4_200gbase_cr4_kr4,

		.m_ethtool_len	= MLXSW_SP2_MASK_ETHTOOL_200GAUI_4_200GBASE_CR4_KR4_LEN,

		.mask_width	= MLXSW_SP_PORT_MASK_WIDTH_4X,

		.speed		= SPEED_200000,

	},

};
@@ -3023,12 +3064,14 @@ mlxsw_sp2_set_bit_ethtool(const struct mlxsw_sp2_port_link_mode *link_mode, 


static void

mlxsw_sp2_from_ptys_link(struct mlxsw_sp *mlxsw_sp, u32 ptys_eth_proto,

			 unsigned long *mode)

			 u8 width, unsigned long *mode)

{

	u8 mask_width = mlxsw_sp_port_mask_width_get(width);

	int i;



	for (i = 0; i < MLXSW_SP2_PORT_LINK_MODE_LEN; i++) {

		if (ptys_eth_proto & mlxsw_sp2_port_link_mode[i].mask)

		if ((ptys_eth_proto & mlxsw_sp2_port_link_mode[i].mask) &&

		    (mask_width & mlxsw_sp2_port_link_mode[i].mask_width))

			mlxsw_sp2_set_bit_ethtool(&mlxsw_sp2_port_link_mode[i],

						  mode);

	}
@@ -3079,27 +3122,32 @@ mlxsw_sp2_test_bit_ethtool(const struct mlxsw_sp2_port_link_mode *link_mode, 
}



static u32

mlxsw_sp2_to_ptys_advert_link(struct mlxsw_sp *mlxsw_sp,

mlxsw_sp2_to_ptys_advert_link(struct mlxsw_sp *mlxsw_sp, u8 width,

			      const struct ethtool_link_ksettings *cmd)

{

	u8 mask_width = mlxsw_sp_port_mask_width_get(width);

	u32 ptys_proto = 0;

	int i;



	for (i = 0; i < MLXSW_SP2_PORT_LINK_MODE_LEN; i++) {

		if (mlxsw_sp2_test_bit_ethtool(&mlxsw_sp2_port_link_mode[i],

		if ((mask_width & mlxsw_sp2_port_link_mode[i].mask_width) &&

		    mlxsw_sp2_test_bit_ethtool(&mlxsw_sp2_port_link_mode[i],

					       cmd->link_modes.advertising))

			ptys_proto |= mlxsw_sp2_port_link_mode[i].mask;

	}

	return ptys_proto;

}



static u32 mlxsw_sp2_to_ptys_speed(struct mlxsw_sp *mlxsw_sp, u32 speed)

static u32 mlxsw_sp2_to_ptys_speed(struct mlxsw_sp *mlxsw_sp,

				   u8 width, u32 speed)

{

	u8 mask_width = mlxsw_sp_port_mask_width_get(width);

	u32 ptys_proto = 0;

	int i;



	for (i = 0; i < MLXSW_SP2_PORT_LINK_MODE_LEN; i++) {

		if (speed == mlxsw_sp2_port_link_mode[i].speed)

		if ((speed == mlxsw_sp2_port_link_mode[i].speed) &&

		    (mask_width & mlxsw_sp2_port_link_mode[i].mask_width))

			ptys_proto |= mlxsw_sp2_port_link_mode[i].mask;

	}

	return ptys_proto;
@@ -3183,7 +3231,7 @@ mlxsw_sp2_port_type_speed_ops = { 


static void

mlxsw_sp_port_get_link_supported(struct mlxsw_sp *mlxsw_sp, u32 eth_proto_cap,

				 struct ethtool_link_ksettings *cmd)

				 u8 width, struct ethtool_link_ksettings *cmd)

{

	const struct mlxsw_sp_port_type_speed_ops *ops;
@@ -3194,12 +3242,13 @@ mlxsw_sp_port_get_link_supported(struct mlxsw_sp *mlxsw_sp, u32 eth_proto_cap, 
	ethtool_link_ksettings_add_link_mode(cmd, supported, Pause);



	ops->from_ptys_supported_port(mlxsw_sp, eth_proto_cap, cmd);

	ops->from_ptys_link(mlxsw_sp, eth_proto_cap, cmd->link_modes.supported);

	ops->from_ptys_link(mlxsw_sp, eth_proto_cap, width,

			    cmd->link_modes.supported);

}



static void

mlxsw_sp_port_get_link_advertise(struct mlxsw_sp *mlxsw_sp,

				 u32 eth_proto_admin, bool autoneg,

				 u32 eth_proto_admin, bool autoneg, u8 width,

				 struct ethtool_link_ksettings *cmd)

{

	const struct mlxsw_sp_port_type_speed_ops *ops;
@@ -3210,7 +3259,7 @@ mlxsw_sp_port_get_link_advertise(struct mlxsw_sp *mlxsw_sp, 
		return;



	ethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg);

	ops->from_ptys_link(mlxsw_sp, eth_proto_admin,

	ops->from_ptys_link(mlxsw_sp, eth_proto_admin, width,

			    cmd->link_modes.advertising);

}
@@ -3265,10 +3314,11 @@ static int mlxsw_sp_port_get_link_ksettings(struct net_device *dev, 
	ops->reg_ptys_eth_unpack(mlxsw_sp, ptys_pl, &eth_proto_cap,

				 &eth_proto_admin, &eth_proto_oper);



	mlxsw_sp_port_get_link_supported(mlxsw_sp, eth_proto_cap, cmd);

	mlxsw_sp_port_get_link_supported(mlxsw_sp, eth_proto_cap,

					 mlxsw_sp_port->mapping.width, cmd);



	mlxsw_sp_port_get_link_advertise(mlxsw_sp, eth_proto_admin, autoneg,

					 cmd);

					 mlxsw_sp_port->mapping.width, cmd);



	cmd->base.autoneg = autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE;

	connector_type = mlxsw_reg_ptys_connector_type_get(ptys_pl);
@@ -3301,13 +3351,11 @@ mlxsw_sp_port_set_link_ksettings(struct net_device *dev, 
	ops->reg_ptys_eth_unpack(mlxsw_sp, ptys_pl, &eth_proto_cap, NULL, NULL);



	autoneg = cmd->base.autoneg == AUTONEG_ENABLE;

	if (!autoneg && cmd->base.speed == SPEED_56000) {

		netdev_err(dev, "56G not supported with autoneg off\n");

		return -EINVAL;

	}

	eth_proto_new = autoneg ?

		ops->to_ptys_advert_link(mlxsw_sp, cmd) :

		ops->to_ptys_speed(mlxsw_sp, cmd->base.speed);

		ops->to_ptys_advert_link(mlxsw_sp, mlxsw_sp_port->mapping.width,

					 cmd) :

		ops->to_ptys_speed(mlxsw_sp, mlxsw_sp_port->mapping.width,

				   cmd->base.speed);



	eth_proto_new = eth_proto_new & eth_proto_cap;

	if (!eth_proto_new) {
@@ -4610,6 +4658,9 @@ static const struct mlxsw_sp_ptp_ops mlxsw_sp1_ptp_ops = { 
	.hwtstamp_set	= mlxsw_sp1_ptp_hwtstamp_set,

	.shaper_work	= mlxsw_sp1_ptp_shaper_work,

	.get_ts_info	= mlxsw_sp1_ptp_get_ts_info,

	.get_stats_count = mlxsw_sp1_get_stats_count,

	.get_stats_strings = mlxsw_sp1_get_stats_strings,

	.get_stats	= mlxsw_sp1_get_stats,

};



static const struct mlxsw_sp_ptp_ops mlxsw_sp2_ptp_ops = {
@@ -4623,6 +4674,9 @@ static const struct mlxsw_sp_ptp_ops mlxsw_sp2_ptp_ops = { 
	.hwtstamp_set	= mlxsw_sp2_ptp_hwtstamp_set,

	.shaper_work	= mlxsw_sp2_ptp_shaper_work,

	.get_ts_info	= mlxsw_sp2_ptp_get_ts_info,

	.get_stats_count = mlxsw_sp2_get_stats_count,

	.get_stats_strings = mlxsw_sp2_get_stats_strings,

	.get_stats	= mlxsw_sp2_get_stats,

};



static int mlxsw_sp_netdevice_event(struct notifier_block *unused,

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+14 −3
Original line number Diff line number Diff line
@@ -225,6 +225,16 @@ struct mlxsw_sp_port_xstats { 
	u64 tx_packets[IEEE_8021QAZ_MAX_TCS];

};



struct mlxsw_sp_ptp_port_dir_stats {

	u64 packets;

	u64 timestamps;

};



struct mlxsw_sp_ptp_port_stats {

	struct mlxsw_sp_ptp_port_dir_stats rx_gcd;

	struct mlxsw_sp_ptp_port_dir_stats tx_gcd;

};



struct mlxsw_sp_port {

	struct net_device *dev;

	struct mlxsw_sp_port_pcpu_stats __percpu *pcpu_stats;
@@ -271,6 +281,7 @@ struct mlxsw_sp_port { 
		struct hwtstamp_config hwtstamp_config;

		u16 ing_types;

		u16 egr_types;

		struct mlxsw_sp_ptp_port_stats stats;

	} ptp;

};
@@ -279,14 +290,14 @@ struct mlxsw_sp_port_type_speed_ops { 
					 u32 ptys_eth_proto,

					 struct ethtool_link_ksettings *cmd);

	void (*from_ptys_link)(struct mlxsw_sp *mlxsw_sp, u32 ptys_eth_proto,

			       unsigned long *mode);

			       u8 width, unsigned long *mode);

	u32 (*from_ptys_speed)(struct mlxsw_sp *mlxsw_sp, u32 ptys_eth_proto);

	void (*from_ptys_speed_duplex)(struct mlxsw_sp *mlxsw_sp,

				       bool carrier_ok, u32 ptys_eth_proto,

				       struct ethtool_link_ksettings *cmd);

	u32 (*to_ptys_advert_link)(struct mlxsw_sp *mlxsw_sp,

	u32 (*to_ptys_advert_link)(struct mlxsw_sp *mlxsw_sp, u8 width,

				   const struct ethtool_link_ksettings *cmd);

	u32 (*to_ptys_speed)(struct mlxsw_sp *mlxsw_sp, u32 speed);

	u32 (*to_ptys_speed)(struct mlxsw_sp *mlxsw_sp, u8 width, u32 speed);

	u32 (*to_ptys_upper_speed)(struct mlxsw_sp *mlxsw_sp, u32 upper_speed);

	int (*port_speed_base)(struct mlxsw_sp *mlxsw_sp, u8 local_port,

			       u32 *base_speed);

drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c

+67 −0
Original line number Diff line number Diff line
@@ -630,6 +630,8 @@ static void 
mlxsw_sp1_ptp_ht_gc_collect(struct mlxsw_sp_ptp_state *ptp_state,

			    struct mlxsw_sp1_ptp_unmatched *unmatched)

{

	struct mlxsw_sp_ptp_port_dir_stats *stats;

	struct mlxsw_sp_port *mlxsw_sp_port;

	int err;



	/* If an unmatched entry has an SKB, it has to be handed over to the
@@ -650,6 +652,17 @@ mlxsw_sp1_ptp_ht_gc_collect(struct mlxsw_sp_ptp_state *ptp_state, 
		/* The packet was matched with timestamp during the walk. */

		goto out;



	mlxsw_sp_port = ptp_state->mlxsw_sp->ports[unmatched->key.local_port];

	if (mlxsw_sp_port) {

		stats = unmatched->key.ingress ?

			&mlxsw_sp_port->ptp.stats.rx_gcd :

			&mlxsw_sp_port->ptp.stats.tx_gcd;

		if (unmatched->skb)

			stats->packets++;

		else

			stats->timestamps++;

	}



	/* mlxsw_sp1_ptp_unmatched_finish() invokes netif_receive_skb(). While

	 * the comment at that function states that it can only be called in

	 * soft IRQ context, this pattern of local_bh_disable() +
@@ -1098,3 +1111,57 @@ int mlxsw_sp1_ptp_get_ts_info(struct mlxsw_sp *mlxsw_sp, 


	return 0;

}



struct mlxsw_sp_ptp_port_stat {

	char str[ETH_GSTRING_LEN];

	ptrdiff_t offset;

};



#define MLXSW_SP_PTP_PORT_STAT(NAME, FIELD)				\

	{								\

		.str = NAME,						\

		.offset = offsetof(struct mlxsw_sp_ptp_port_stats,	\

				    FIELD),				\

	}



static const struct mlxsw_sp_ptp_port_stat mlxsw_sp_ptp_port_stats[] = {

	MLXSW_SP_PTP_PORT_STAT("ptp_rx_gcd_packets",    rx_gcd.packets),

	MLXSW_SP_PTP_PORT_STAT("ptp_rx_gcd_timestamps", rx_gcd.timestamps),

	MLXSW_SP_PTP_PORT_STAT("ptp_tx_gcd_packets",    tx_gcd.packets),

	MLXSW_SP_PTP_PORT_STAT("ptp_tx_gcd_timestamps", tx_gcd.timestamps),

};



#undef MLXSW_SP_PTP_PORT_STAT



#define MLXSW_SP_PTP_PORT_STATS_LEN \

	ARRAY_SIZE(mlxsw_sp_ptp_port_stats)



int mlxsw_sp1_get_stats_count(void)

{

	return MLXSW_SP_PTP_PORT_STATS_LEN;

}



void mlxsw_sp1_get_stats_strings(u8 **p)

{

	int i;



	for (i = 0; i < MLXSW_SP_PTP_PORT_STATS_LEN; i++) {

		memcpy(*p, mlxsw_sp_ptp_port_stats[i].str,

		       ETH_GSTRING_LEN);

		*p += ETH_GSTRING_LEN;

	}

}



void mlxsw_sp1_get_stats(struct mlxsw_sp_port *mlxsw_sp_port,

			 u64 *data, int data_index)

{

	void *stats = &mlxsw_sp_port->ptp.stats;

	ptrdiff_t offset;

	int i;



	data += data_index;

	for (i = 0; i < MLXSW_SP_PTP_PORT_STATS_LEN; i++) {

		offset = mlxsw_sp_ptp_port_stats[i].offset;

		*data++ = *(u64 *)(stats + offset);

	}

}

drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h

+32 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ void mlxsw_sp1_ptp_shaper_work(struct work_struct *work); 
int mlxsw_sp1_ptp_get_ts_info(struct mlxsw_sp *mlxsw_sp,

			      struct ethtool_ts_info *info);



int mlxsw_sp1_get_stats_count(void);

void mlxsw_sp1_get_stats_strings(u8 **p);

void mlxsw_sp1_get_stats(struct mlxsw_sp_port *mlxsw_sp_port,

			 u64 *data, int data_index);



#else



static inline struct mlxsw_sp_ptp_clock *
@@ -125,6 +130,19 @@ static inline int mlxsw_sp1_ptp_get_ts_info(struct mlxsw_sp *mlxsw_sp, 
	return mlxsw_sp_ptp_get_ts_info_noptp(info);

}



static inline int mlxsw_sp1_get_stats_count(void)

{

	return 0;

}



static inline void mlxsw_sp1_get_stats_strings(u8 **p)

{

}



static inline void mlxsw_sp1_get_stats(struct mlxsw_sp_port *mlxsw_sp_port,

				       u64 *data, int data_index)

{

}

#endif



static inline struct mlxsw_sp_ptp_clock *
@@ -183,4 +201,18 @@ static inline int mlxsw_sp2_ptp_get_ts_info(struct mlxsw_sp *mlxsw_sp, 
	return mlxsw_sp_ptp_get_ts_info_noptp(info);

}



static inline int mlxsw_sp2_get_stats_count(void)

{

	return 0;

}



static inline void mlxsw_sp2_get_stats_strings(u8 **p)

{

}



static inline void mlxsw_sp2_get_stats(struct mlxsw_sp_port *mlxsw_sp_port,

				       u64 *data, int data_index)

{

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE