| Message ID | 20230210095319.603867-1-simon.horman@corigine.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 170677fee45baa955b3f7c1f41e6031d1d1e2272 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] nfp: ethtool: supplement nfp link modes supported | expand |
On Fri, Feb 10, 2023 at 10:53:19AM +0100, Simon Horman wrote: > From: Yu Xiao <yu.xiao@corigine.com> > > 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. Is it backward compatible? Will it work if I run old FW? Thanks
On Sun, 12 Feb 2023 20:30:09 +0200, Leon Romanovsky wrote: > On Fri, Feb 10, 2023 at 10:53:19AM +0100, Simon Horman wrote: > > From: Yu Xiao <yu.xiao@corigine.com> > > > > 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. > > Is it backward compatible? Will it work if I run old FW? Yes. The new ones are appended, not inserted. > > Thanks
On Fri, Feb 10, 2023 at 10:53:19AM +0100, Simon Horman wrote: > From: Yu Xiao <yu.xiao@corigine.com> > > 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: Yu Xiao <yu.xiao@corigine.com> > Signed-off-by: Simon Horman <simon.horman@corigine.com> > --- > drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 12 ++++++++++++ > drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 3 +++ > 2 files changed, 15 insertions(+) > Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 10 Feb 2023 10:53:19 +0100 you wrote: > From: Yu Xiao <yu.xiao@corigine.com> > > Add support for the following modes to the nfp driver: > > NFP_MEDIA_10GBASE_LR > NFP_MEDIA_25GBASE_LR > NFP_MEDIA_25GBASE_ER > > [...] Here is the summary with links: - [net-next] nfp: ethtool: supplement nfp link modes supported https://git.kernel.org/netdev/net-next/c/170677fee45b You are awesome, thank you!
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c index 918319f965b3..dfedb52b7e70 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c @@ -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, diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h index 8f5cab0032d0..781edc451bd4 100644 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h @@ -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 };