Commit 170677fe authored by Yu Xiao's avatar Yu Xiao Committed by David S. Miller
Browse files

nfp: ethtool: supplement nfp link modes supported 



Add support for the following modes to the nfp driver:

	NFP_MEDIA_10GBASE_LR
	NFP_MEDIA_25GBASE_LR
	NFP_MEDIA_25GBASE_ER

These modes are supported by the hardware and,
support for them was recently added to firmware.

Signed-off-by: default avatarYu Xiao <yu.xiao@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d86bb0a

drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c

+12 −0
Original line number Diff line number Diff line
@@ -313,6 +313,10 @@ static const struct nfp_eth_media_link_mode { 
		.ethtool_link_mode	= ETHTOOL_LINK_MODE_10000baseKR_Full_BIT,

		.speed			= NFP_SPEED_10G,

	},

	[NFP_MEDIA_10GBASE_LR] = {

		.ethtool_link_mode	= ETHTOOL_LINK_MODE_10000baseLR_Full_BIT,

		.speed			= NFP_SPEED_10G,

	},

	[NFP_MEDIA_10GBASE_CX4] = {

		.ethtool_link_mode	= ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT,

		.speed			= NFP_SPEED_10G,
@@ -349,6 +353,14 @@ static const struct nfp_eth_media_link_mode { 
		.ethtool_link_mode	= ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,

		.speed			= NFP_SPEED_25G,

	},

	[NFP_MEDIA_25GBASE_LR] = {

		.ethtool_link_mode	= ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,

		.speed			= NFP_SPEED_25G,

	},

	[NFP_MEDIA_25GBASE_ER] = {

		.ethtool_link_mode	= ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,

		.speed			= NFP_SPEED_25G,

	},

	[NFP_MEDIA_40GBASE_CR4] = {

		.ethtool_link_mode	= ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT,

		.speed			= NFP_SPEED_40G,

drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h

+3 −0
Original line number Diff line number Diff line
@@ -140,6 +140,9 @@ enum nfp_ethtool_link_mode_list { 
	NFP_MEDIA_100GBASE_CR4,

	NFP_MEDIA_100GBASE_KP4,

	NFP_MEDIA_100GBASE_CR10,

	NFP_MEDIA_10GBASE_LR,

	NFP_MEDIA_25GBASE_LR,

	NFP_MEDIA_25GBASE_ER,

	NFP_MEDIA_LINK_MODES_NUMBER

};