From: Jacob Keller <jacob.e.keller@intel.com>
To: Shannon Nelson <shannon.nelson@amd.com>, <netdev@vger.kernel.org>,
<davem@davemloft.net>, <kuba@kernel.org>, <edumazet@google.com>,
<pabeni@redhat.com>, <andrew+netdev@lunn.ch>
Cc: <brett.creeley@amd.com>
Subject: Re: [PATCH net-next 4/5] ionic: add speed defines for 200G and 400G
Date: Tue, 10 Dec 2024 14:53:19 -0800 [thread overview]
Message-ID: <4acaaf9e-211f-4bc3-9886-a05cd5d0e7c8@intel.com> (raw)
In-Reply-To: <20241210183045.67878-5-shannon.nelson@amd.com>
On 12/10/2024 10:30 AM, Shannon Nelson wrote:
> Add higher speed defines to the ionic_if.h API and decode them
> in the ethtool get_link_ksettings callback.
>
> Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
> ---
You might consider refactoring the ionic driver to use the
ethtool_forced_speed_maps_init interface at some point. See 26c5334d344d
("ethtool: Add forced speed to supported link modes maps"), with
982b0192db45 ("ice: Refactor finding advertised link speed") and
1d4e4ecccb11 ("qede: populate supported link modes maps on module init")
(though it looks like the latter hasn't moved to the ethtool function).
This saves a bunch of text size on the module.
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
> .../ethernet/pensando/ionic/ionic_ethtool.c | 39 +++++++++++++++++++
> .../net/ethernet/pensando/ionic/ionic_if.h | 16 +++++++-
> 2 files changed, 54 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
> index dda22fa4448c..272317048cb9 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
> @@ -158,6 +158,20 @@ static int ionic_get_link_ksettings(struct net_device *netdev,
> 25000baseCR_Full);
> copper_seen++;
> break;
> + case IONIC_XCVR_PID_QSFP_50G_CR2_FC:
> + case IONIC_XCVR_PID_QSFP_50G_CR2:
> + ethtool_link_ksettings_add_link_mode(ks, supported,
> + 50000baseCR2_Full);
> + copper_seen++;
> + break;
> + case IONIC_XCVR_PID_QSFP_200G_CR4:
> + ethtool_link_ksettings_add_link_mode(ks, supported, 200000baseCR4_Full);
> + copper_seen++;
> + break;
> + case IONIC_XCVR_PID_QSFP_400G_CR4:
> + ethtool_link_ksettings_add_link_mode(ks, supported, 400000baseCR4_Full);
> + copper_seen++;
> + break;
> case IONIC_XCVR_PID_SFP_10GBASE_AOC:
> case IONIC_XCVR_PID_SFP_10GBASE_CU:
> ethtool_link_ksettings_add_link_mode(ks, supported,
> @@ -196,6 +210,31 @@ static int ionic_get_link_ksettings(struct net_device *netdev,
> ethtool_link_ksettings_add_link_mode(ks, supported,
> 25000baseSR_Full);
> break;
> + case IONIC_XCVR_PID_QSFP_200G_AOC:
> + case IONIC_XCVR_PID_QSFP_200G_SR4:
> + ethtool_link_ksettings_add_link_mode(ks, supported,
> + 200000baseSR4_Full);
> + break;
> + case IONIC_XCVR_PID_QSFP_200G_FR4:
> + ethtool_link_ksettings_add_link_mode(ks, supported,
> + 200000baseLR4_ER4_FR4_Full);
> + break;
> + case IONIC_XCVR_PID_QSFP_200G_DR4:
> + ethtool_link_ksettings_add_link_mode(ks, supported,
> + 200000baseDR4_Full);
> + break;
> + case IONIC_XCVR_PID_QSFP_400G_FR4:
> + ethtool_link_ksettings_add_link_mode(ks, supported,
> + 400000baseLR4_ER4_FR4_Full);
> + break;
> + case IONIC_XCVR_PID_QSFP_400G_DR4:
> + ethtool_link_ksettings_add_link_mode(ks, supported,
> + 400000baseDR4_Full);
> + break;
> + case IONIC_XCVR_PID_QSFP_400G_SR4:
> + ethtool_link_ksettings_add_link_mode(ks, supported,
> + 400000baseSR4_Full);
> + break;
> case IONIC_XCVR_PID_SFP_10GBASE_SR:
> ethtool_link_ksettings_add_link_mode(ks, supported,
> 10000baseSR_Full);
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_if.h b/drivers/net/ethernet/pensando/ionic/ionic_if.h
> index 6ea190f1a706..830c8adbfbee 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_if.h
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_if.h
> @@ -1277,7 +1277,10 @@ enum ionic_xcvr_pid {
> IONIC_XCVR_PID_SFP_25GBASE_CR_S = 3,
> IONIC_XCVR_PID_SFP_25GBASE_CR_L = 4,
> IONIC_XCVR_PID_SFP_25GBASE_CR_N = 5,
> -
> + IONIC_XCVR_PID_QSFP_50G_CR2_FC = 6,
> + IONIC_XCVR_PID_QSFP_50G_CR2 = 7,
> + IONIC_XCVR_PID_QSFP_200G_CR4 = 8,
> + IONIC_XCVR_PID_QSFP_400G_CR4 = 9,
> /* Fiber */
> IONIC_XCVR_PID_QSFP_100G_AOC = 50,
> IONIC_XCVR_PID_QSFP_100G_ACC = 51,
> @@ -1303,6 +1306,15 @@ enum ionic_xcvr_pid {
> IONIC_XCVR_PID_SFP_25GBASE_ACC = 71,
> IONIC_XCVR_PID_SFP_10GBASE_T = 72,
> IONIC_XCVR_PID_SFP_1000BASE_T = 73,
> + IONIC_XCVR_PID_QSFP_200G_AOC = 74,
> + IONIC_XCVR_PID_QSFP_200G_FR4 = 75,
> + IONIC_XCVR_PID_QSFP_200G_DR4 = 76,
> + IONIC_XCVR_PID_QSFP_200G_SR4 = 77,
> + IONIC_XCVR_PID_QSFP_200G_ACC = 78,
> + IONIC_XCVR_PID_QSFP_400G_FR4 = 79,
> + IONIC_XCVR_PID_QSFP_400G_DR4 = 80,
> + IONIC_XCVR_PID_QSFP_400G_SR4 = 81,
> + IONIC_XCVR_PID_QSFP_400G_VR4 = 82,
> };
>
> /**
> @@ -1404,6 +1416,8 @@ struct ionic_xcvr_status {
> */
> union ionic_port_config {
> struct {
> +#define IONIC_SPEED_400G 400000 /* 400G in Mbps */
> +#define IONIC_SPEED_200G 200000 /* 200G in Mbps */
> #define IONIC_SPEED_100G 100000 /* 100G in Mbps */
> #define IONIC_SPEED_50G 50000 /* 50G in Mbps */
> #define IONIC_SPEED_40G 40000 /* 40G in Mbps */
next prev parent reply other threads:[~2024-12-10 22:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-10 18:30 [PATCH net-next 0/5] ionic: minor code updates Shannon Nelson
2024-12-10 18:30 ` [PATCH net-next 1/5] ionic: add asic codes to firmware interface file Shannon Nelson
2024-12-10 22:44 ` Jacob Keller
2024-12-11 3:36 ` Kalesh Anakkur Purayil
2024-12-10 18:30 ` [PATCH net-next 2/5] ionic: Use VLAN_ETH_HLEN when possible Shannon Nelson
2024-12-10 22:45 ` Jacob Keller
2024-12-11 3:32 ` Kalesh Anakkur Purayil
2024-12-10 18:30 ` [PATCH net-next 3/5] ionic: Translate IONIC_RC_ENOSUPP to EOPNOTSUPP Shannon Nelson
2024-12-10 22:45 ` Jacob Keller
2024-12-11 3:31 ` Kalesh Anakkur Purayil
2024-12-10 18:30 ` [PATCH net-next 4/5] ionic: add speed defines for 200G and 400G Shannon Nelson
2024-12-10 22:53 ` Jacob Keller [this message]
2024-12-10 23:21 ` Nelson, Shannon
2024-12-10 18:30 ` [PATCH net-next 5/5] ionic: add support for QSFP_PLUS_CMIS Shannon Nelson
2024-12-10 22:53 ` Jacob Keller
2024-12-11 3:30 ` Kalesh Anakkur Purayil
2024-12-11 10:12 ` Ido Schimmel
2024-12-11 17:15 ` Nelson, Shannon
2024-12-12 11:20 ` [PATCH net-next 0/5] ionic: minor code updates patchwork-bot+netdevbpf
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=4acaaf9e-211f-4bc3-9886-a05cd5d0e7c8@intel.com \
--to=jacob.e.keller@intel.com \
--cc=andrew+netdev@lunn.ch \
--cc=brett.creeley@amd.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shannon.nelson@amd.com \
/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