From: Martin Habets <habetsm.xilinx@gmail.com>
To: Erik Ekman <erik@kryo.se>
Cc: Edward Cree <ecree.xilinx@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] sfc: Export fibre-specific link modes for 1/10G
Date: Tue, 19 Oct 2021 20:18:06 +0100 [thread overview]
Message-ID: <20211019191806.csewm7p26x3imk25@gmail.com> (raw)
In-Reply-To: <20211018183709.124744-1-erik@kryo.se>
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
next prev parent reply other threads:[~2021-10-19 19:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2021-10-19 20:09 ` Erik Ekman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211019191806.csewm7p26x3imk25@gmail.com \
--to=habetsm.xilinx@gmail.com \
--cc=davem@davemloft.net \
--cc=ecree.xilinx@gmail.com \
--cc=erik@kryo.se \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox