Messages in this thread | | | Date | Tue, 19 Oct 2021 20:18:06 +0100 | From | Martin Habets <> | Subject | Re: [PATCH] sfc: Export fibre-specific link modes for 1/10G |
| |
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
| |