Commit 78cf4b92 authored by Danielle Ratson's avatar Danielle Ratson Committed by David S. Miller
Browse files

mlxsw: spectrum_ethtool: Add support for two new link modes 



As part of a process for supporting a new system with RJ45 connectors,
100BaseT and 1000BaseT link modes need to be supported.

Add support for these two link modes by adding the two corresponding
bits in PTYS (Port Type and Speed) register.

Signed-off-by: default avatarDanielle Ratson <danieller@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eaec6d8

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

+2 −0
Original line number Diff line number Diff line
@@ -4482,6 +4482,8 @@ MLXSW_ITEM32(reg, ptys, ext_eth_proto_cap, 0x08, 0, 32); 
#define MLXSW_REG_PTYS_ETH_SPEED_100GBASE_SR4		BIT(21)

#define MLXSW_REG_PTYS_ETH_SPEED_100GBASE_KR4		BIT(22)

#define MLXSW_REG_PTYS_ETH_SPEED_100GBASE_LR4_ER4	BIT(23)

#define MLXSW_REG_PTYS_ETH_SPEED_100BASE_T		BIT(24)

#define MLXSW_REG_PTYS_ETH_SPEED_1000BASE_T		BIT(25)

#define MLXSW_REG_PTYS_ETH_SPEED_25GBASE_CR		BIT(27)

#define MLXSW_REG_PTYS_ETH_SPEED_25GBASE_KR		BIT(28)

#define MLXSW_REG_PTYS_ETH_SPEED_25GBASE_SR		BIT(29)

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

+10 −0
Original line number Diff line number Diff line
@@ -1266,12 +1266,22 @@ struct mlxsw_sp1_port_link_mode { 
};



static const struct mlxsw_sp1_port_link_mode mlxsw_sp1_port_link_mode[] = {

	{

		.mask		= MLXSW_REG_PTYS_ETH_SPEED_100BASE_T,

		.mask_ethtool	= ETHTOOL_LINK_MODE_100baseT_Full_BIT,

		.speed		= SPEED_100,

	},

	{

		.mask		= MLXSW_REG_PTYS_ETH_SPEED_SGMII |

				  MLXSW_REG_PTYS_ETH_SPEED_1000BASE_KX,

		.mask_ethtool	= ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,

		.speed		= SPEED_1000,

	},

	{

		.mask		= MLXSW_REG_PTYS_ETH_SPEED_1000BASE_T,

		.mask_ethtool   = ETHTOOL_LINK_MODE_1000baseT_Full_BIT,

		.speed          = SPEED_1000,

	},

	{

		.mask		= MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CX4 |

				  MLXSW_REG_PTYS_ETH_SPEED_10GBASE_KX4,