* [PATCH] sfc: Export fibre-specific link modes for 1/10G
@ 2021-10-18 18:37 Erik Ekman
2021-10-19 15:31 ` Andrew Lunn
2021-10-19 19:18 ` Martin Habets
0 siblings, 2 replies; 4+ messages in thread
From: Erik Ekman @ 2021-10-18 18:37 UTC (permalink / raw)
To: Edward Cree, Martin Habets, David S. Miller, Jakub Kicinski
Cc: Erik Ekman, netdev, linux-kernel
These modes were added to ethtool.h in 5711a98221443 ("net: ethtool: add support
for 1000BaseX and missing 10G link modes") back in 2016.
Only setting CR mode for 10G, similar to how 25/40/50/100G modes are set up.
Tested using SFN5122F-R7 (with 2 SFP+ ports) and a 1000BASE-BX10 SFP module.
Before:
$ ethtool ext
Settings for ext:
Supported ports: [ FIBRE ]
Supported link modes: 1000baseT/Full
10000baseT/Full
Supported pause frame use: Symmetric Receive-only
Supports auto-negotiation: No
Supported FEC modes: Not reported
Advertised link modes: Not reported
Advertised pause frame use: No
Advertised auto-negotiation: No
Advertised FEC modes: Not reported
Link partner advertised link modes: Not reported
Link partner advertised pause frame use: No
Link partner advertised auto-negotiation: No
Link partner advertised FEC modes: Not reported
Speed: 1000Mb/s
Duplex: Full
Auto-negotiation: off
Port: FIBRE
PHYAD: 255
Transceiver: internal
Current message level: 0x000020f7 (8439)
drv probe link ifdown ifup rx_err tx_err hw
Link detected: yes
After:
$ ethtool ext
Settings for ext:
Supported ports: [ FIBRE ]
Supported link modes: 1000baseX/Full
10000baseCR/Full
Supported pause frame use: Symmetric Receive-only
Supports auto-negotiation: No
Supported FEC modes: Not reported
Advertised link modes: Not reported
Advertised pause frame use: No
Advertised auto-negotiation: No
Advertised FEC modes: Not reported
Link partner advertised link modes: Not reported
Link partner advertised pause frame use: No
Link partner advertised auto-negotiation: No
Link partner advertised FEC modes: Not reported
Speed: 1000Mb/s
Duplex: Full
Auto-negotiation: off
Port: FIBRE
PHYAD: 255
Transceiver: internal
Supports Wake-on: g
Wake-on: d
Current message level: 0x000020f7 (8439)
drv probe link ifdown ifup rx_err tx_err hw
Link detected: yes
Signed-off-by: Erik Ekman <erik@kryo.se>
---
drivers/net/ethernet/sfc/mcdi_port_common.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/sfc/mcdi_port_common.c b/drivers/net/ethernet/sfc/mcdi_port_common.c
index 4bd3ef8f3384..e84cdcb6a595 100644
--- a/drivers/net/ethernet/sfc/mcdi_port_common.c
+++ b/drivers/net/ethernet/sfc/mcdi_port_common.c
@@ -133,9 +133,9 @@ void mcdi_to_ethtool_linkset(u32 media, u32 cap, unsigned long *linkset)
case MC_CMD_MEDIA_QSFP_PLUS:
SET_BIT(FIBRE);
if (cap & (1 << MC_CMD_PHY_CAP_1000FDX_LBN))
- SET_BIT(1000baseT_Full);
+ SET_BIT(1000baseX_Full);
if (cap & (1 << MC_CMD_PHY_CAP_10000FDX_LBN))
- SET_BIT(10000baseT_Full);
+ SET_BIT(10000baseCR_Full);
if (cap & (1 << MC_CMD_PHY_CAP_40000FDX_LBN))
SET_BIT(40000baseCR4_Full);
if (cap & (1 << MC_CMD_PHY_CAP_100000FDX_LBN))
@@ -192,9 +192,11 @@ u32 ethtool_linkset_to_mcdi_cap(const unsigned long *linkset)
result |= (1 << MC_CMD_PHY_CAP_100FDX_LBN);
if (TEST_BIT(1000baseT_Half))
result |= (1 << MC_CMD_PHY_CAP_1000HDX_LBN);
- if (TEST_BIT(1000baseT_Full) || TEST_BIT(1000baseKX_Full))
+ if (TEST_BIT(1000baseT_Full) || TEST_BIT(1000baseKX_Full) ||
+ TEST_BIT(1000baseX_Full))
result |= (1 << MC_CMD_PHY_CAP_1000FDX_LBN);
- if (TEST_BIT(10000baseT_Full) || TEST_BIT(10000baseKX4_Full))
+ if (TEST_BIT(10000baseT_Full) || TEST_BIT(10000baseKX4_Full) ||
+ TEST_BIT(10000baseCR_Full))
result |= (1 << MC_CMD_PHY_CAP_10000FDX_LBN);
if (TEST_BIT(40000baseCR4_Full) || TEST_BIT(40000baseKR4_Full))
result |= (1 << MC_CMD_PHY_CAP_40000FDX_LBN);
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] sfc: Export fibre-specific link modes for 1/10G
2021-10-18 18:37 [PATCH] sfc: Export fibre-specific link modes for 1/10G Erik Ekman
@ 2021-10-19 15:31 ` Andrew Lunn
2021-10-19 19:18 ` Martin Habets
1 sibling, 0 replies; 4+ messages in thread
From: Andrew Lunn @ 2021-10-19 15:31 UTC (permalink / raw)
To: Erik Ekman
Cc: Edward Cree, Martin Habets, David S. Miller, Jakub Kicinski,
netdev, linux-kernel
On Mon, Oct 18, 2021 at 08:37:08PM +0200, Erik Ekman wrote:
> These modes were added to ethtool.h in 5711a98221443 ("net: ethtool: add support
> for 1000BaseX and missing 10G link modes") back in 2016.
>
> Only setting CR mode for 10G, similar to how 25/40/50/100G modes are set up.
>
> Tested using SFN5122F-R7 (with 2 SFP+ ports) and a 1000BASE-BX10 SFP module.
Did you test with a Copper SFP modules?
> +++ b/drivers/net/ethernet/sfc/mcdi_port_common.c
> @@ -133,9 +133,9 @@ void mcdi_to_ethtool_linkset(u32 media, u32 cap, unsigned long *linkset)
> case MC_CMD_MEDIA_QSFP_PLUS:
> SET_BIT(FIBRE);
> if (cap & (1 << MC_CMD_PHY_CAP_1000FDX_LBN))
> - SET_BIT(1000baseT_Full);
> + SET_BIT(1000baseX_Full);
I'm wondering if you should have both? The MAC is doing 1000BaseX. But
it could then be connected to a copper PHY which then does
1000baseT_Full? At 1G, it is however more likely to be using SGMII,
not 1000BaseX.
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] sfc: Export fibre-specific link modes for 1/10G
2021-10-18 18:37 [PATCH] sfc: Export fibre-specific link modes for 1/10G Erik Ekman
2021-10-19 15:31 ` Andrew Lunn
@ 2021-10-19 19:18 ` Martin Habets
2021-10-19 20:09 ` Erik Ekman
1 sibling, 1 reply; 4+ messages in thread
From: Martin Habets @ 2021-10-19 19:18 UTC (permalink / raw)
To: Erik Ekman
Cc: Edward Cree, David S. Miller, Jakub Kicinski, netdev,
linux-kernel
On Mon, Oct 18, 2021 at 08:37:08PM +0200, Erik Ekman wrote:
> These modes were added to ethtool.h in 5711a98221443 ("net: ethtool: add support
> for 1000BaseX and missing 10G link modes") back in 2016.
>
> Only setting CR mode for 10G, similar to how 25/40/50/100G modes are set up.
>
> Tested using SFN5122F-R7 (with 2 SFP+ ports) and a 1000BASE-BX10 SFP module.
> Before:
>
> $ ethtool ext
> Settings for ext:
> Supported ports: [ FIBRE ]
> Supported link modes: 1000baseT/Full
> 10000baseT/Full
> Supported pause frame use: Symmetric Receive-only
> Supports auto-negotiation: No
> Supported FEC modes: Not reported
> Advertised link modes: Not reported
> Advertised pause frame use: No
> Advertised auto-negotiation: No
> Advertised FEC modes: Not reported
> Link partner advertised link modes: Not reported
> Link partner advertised pause frame use: No
> Link partner advertised auto-negotiation: No
> Link partner advertised FEC modes: Not reported
> Speed: 1000Mb/s
> Duplex: Full
> Auto-negotiation: off
> Port: FIBRE
> PHYAD: 255
> Transceiver: internal
> Current message level: 0x000020f7 (8439)
> drv probe link ifdown ifup rx_err tx_err hw
> Link detected: yes
>
> After:
>
> $ ethtool ext
> Settings for ext:
> Supported ports: [ FIBRE ]
> Supported link modes: 1000baseX/Full
> 10000baseCR/Full
> Supported pause frame use: Symmetric Receive-only
> Supports auto-negotiation: No
> Supported FEC modes: Not reported
> Advertised link modes: Not reported
> Advertised pause frame use: No
> Advertised auto-negotiation: No
> Advertised FEC modes: Not reported
> Link partner advertised link modes: Not reported
> Link partner advertised pause frame use: No
> Link partner advertised auto-negotiation: No
> Link partner advertised FEC modes: Not reported
> Speed: 1000Mb/s
> Duplex: Full
> Auto-negotiation: off
> Port: FIBRE
> PHYAD: 255
> Transceiver: internal
> Supports Wake-on: g
> Wake-on: d
> Current message level: 0x000020f7 (8439)
> drv probe link ifdown ifup rx_err tx_err hw
> Link detected: yes
>
> Signed-off-by: Erik Ekman <erik@kryo.se>
Acked-by: Martin Habets <habetsm.xilinx@gmail.com>
> ---
> drivers/net/ethernet/sfc/mcdi_port_common.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/sfc/mcdi_port_common.c b/drivers/net/ethernet/sfc/mcdi_port_common.c
> index 4bd3ef8f3384..e84cdcb6a595 100644
> --- a/drivers/net/ethernet/sfc/mcdi_port_common.c
> +++ b/drivers/net/ethernet/sfc/mcdi_port_common.c
> @@ -133,9 +133,9 @@ void mcdi_to_ethtool_linkset(u32 media, u32 cap, unsigned long *linkset)
> case MC_CMD_MEDIA_QSFP_PLUS:
> SET_BIT(FIBRE);
> if (cap & (1 << MC_CMD_PHY_CAP_1000FDX_LBN))
> - SET_BIT(1000baseT_Full);
> + SET_BIT(1000baseX_Full);
> if (cap & (1 << MC_CMD_PHY_CAP_10000FDX_LBN))
> - SET_BIT(10000baseT_Full);
> + SET_BIT(10000baseCR_Full);
> if (cap & (1 << MC_CMD_PHY_CAP_40000FDX_LBN))
> SET_BIT(40000baseCR4_Full);
> if (cap & (1 << MC_CMD_PHY_CAP_100000FDX_LBN))
> @@ -192,9 +192,11 @@ u32 ethtool_linkset_to_mcdi_cap(const unsigned long *linkset)
> result |= (1 << MC_CMD_PHY_CAP_100FDX_LBN);
> if (TEST_BIT(1000baseT_Half))
> result |= (1 << MC_CMD_PHY_CAP_1000HDX_LBN);
> - if (TEST_BIT(1000baseT_Full) || TEST_BIT(1000baseKX_Full))
> + if (TEST_BIT(1000baseT_Full) || TEST_BIT(1000baseKX_Full) ||
> + TEST_BIT(1000baseX_Full))
> result |= (1 << MC_CMD_PHY_CAP_1000FDX_LBN);
> - if (TEST_BIT(10000baseT_Full) || TEST_BIT(10000baseKX4_Full))
> + if (TEST_BIT(10000baseT_Full) || TEST_BIT(10000baseKX4_Full) ||
> + TEST_BIT(10000baseCR_Full))
> result |= (1 << MC_CMD_PHY_CAP_10000FDX_LBN);
> if (TEST_BIT(40000baseCR4_Full) || TEST_BIT(40000baseKR4_Full))
> result |= (1 << MC_CMD_PHY_CAP_40000FDX_LBN);
> --
> 2.31.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] sfc: Export fibre-specific link modes for 1/10G
2021-10-19 19:18 ` Martin Habets
@ 2021-10-19 20:09 ` Erik Ekman
0 siblings, 0 replies; 4+ messages in thread
From: Erik Ekman @ 2021-10-19 20:09 UTC (permalink / raw)
To: Erik Ekman, Edward Cree, David S. Miller, Jakub Kicinski, netdev,
linux-kernel
On Tue, 19 Oct 2021 at 21:18, Martin Habets <habetsm.xilinx@gmail.com> wrote:
>
> On Mon, Oct 18, 2021 at 08:37:08PM +0200, Erik Ekman wrote:
> > These modes were added to ethtool.h in 5711a98221443 ("net: ethtool: add support
> > for 1000BaseX and missing 10G link modes") back in 2016.
> >
> > Only setting CR mode for 10G, similar to how 25/40/50/100G modes are set up.
> >
> > Tested using SFN5122F-R7 (with 2 SFP+ ports) and a 1000BASE-BX10 SFP module.
> > Before:
> >
> > $ ethtool ext
> > Settings for ext:
> > Supported ports: [ FIBRE ]
> > Supported link modes: 1000baseT/Full
> > 10000baseT/Full
> > Supported pause frame use: Symmetric Receive-only
> > Supports auto-negotiation: No
> > Supported FEC modes: Not reported
> > Advertised link modes: Not reported
> > Advertised pause frame use: No
> > Advertised auto-negotiation: No
> > Advertised FEC modes: Not reported
> > Link partner advertised link modes: Not reported
> > Link partner advertised pause frame use: No
> > Link partner advertised auto-negotiation: No
> > Link partner advertised FEC modes: Not reported
> > Speed: 1000Mb/s
> > Duplex: Full
> > Auto-negotiation: off
> > Port: FIBRE
> > PHYAD: 255
> > Transceiver: internal
> > Current message level: 0x000020f7 (8439)
> > drv probe link ifdown ifup rx_err tx_err hw
> > Link detected: yes
> >
> > After:
> >
> > $ ethtool ext
> > Settings for ext:
> > Supported ports: [ FIBRE ]
> > Supported link modes: 1000baseX/Full
> > 10000baseCR/Full
> > Supported pause frame use: Symmetric Receive-only
> > Supports auto-negotiation: No
> > Supported FEC modes: Not reported
> > Advertised link modes: Not reported
> > Advertised pause frame use: No
> > Advertised auto-negotiation: No
> > Advertised FEC modes: Not reported
> > Link partner advertised link modes: Not reported
> > Link partner advertised pause frame use: No
> > Link partner advertised auto-negotiation: No
> > Link partner advertised FEC modes: Not reported
> > Speed: 1000Mb/s
> > Duplex: Full
> > Auto-negotiation: off
> > Port: FIBRE
> > PHYAD: 255
> > Transceiver: internal
> > Supports Wake-on: g
> > Wake-on: d
> > Current message level: 0x000020f7 (8439)
> > drv probe link ifdown ifup rx_err tx_err hw
> > Link detected: yes
> >
> > Signed-off-by: Erik Ekman <erik@kryo.se>
>
> Acked-by: Martin Habets <habetsm.xilinx@gmail.com>
>
I will send a v2 patch with more modes marked supported.
/Erik
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-19 20:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-18 18:37 [PATCH] sfc: Export fibre-specific link modes for 1/10G Erik Ekman
2021-10-19 15:31 ` Andrew Lunn
2021-10-19 19:18 ` Martin Habets
2021-10-19 20:09 ` Erik Ekman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox