[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <3927499f-b732-44f6-92fe-6cbe250c13bb@intel.com>
Date: Mon, 19 May 2025 14:31:38 -0700
From: Tony Nguyen <anthony.l.nguyen@...el.com>
To: Aleksandr Loktionov <aleksandr.loktionov@...el.com>,
<intel-wired-lan@...ts.osuosl.org>
CC: <netdev@...r.kernel.org>, Przemek Kitszel <przemyslaw.kitszel@...el.com>,
Simon Horman <horms@...nel.org>
Subject: Re: [Intel-wired-lan] [PATCH iwl-next v3] ice: add 40G speed to Admin
Command GET PORT OPTION
On 5/16/2025 7:42 AM, Aleksandr Loktionov wrote:
> Introduce the ICE_AQC_PORT_OPT_MAX_LANE_40G constant and update the code
> to process this new option in both the devlink and the Admin Queue Command
> GET PORT OPTION (opcode 0x06EA) message, similar to existing constants like
> ICE_AQC_PORT_OPT_MAX_LANE_50G, ICE_AQC_PORT_OPT_MAX_LANE_100G, and so on.
>
> This feature allows the driver to correctly report configuration options
> for 2x40G on ICX-D LCC and other cards in the future via devlink.
>
> Example command:
> devlink port split pci/0000:01:00.0/0 count 2
>
> Example dmesg:
> ice 0000:01:00.0: Available port split options and max port speeds (Gbps):
> ice 0000:01:00.0: Status Split Quad 0 Quad 1
> ice 0000:01:00.0: count L0 L1 L2 L3 L4 L5 L6 L7
> ice 0000:01:00.0: 2 40 - - - 40 - - -
> ice 0000:01:00.0: 2 50 - 50 - - - - -
> ice 0000:01:00.0: 4 25 25 25 25 - - - -
> ice 0000:01:00.0: 4 25 25 - - 25 25 - -
> ice 0000:01:00.0: Active 8 10 10 10 10 10 10 10 10
> ice 0000:01:00.0: 1 100 - - - - - - -
>
> Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@...el.com>
> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@...el.com>
> Reviewed-by: Simon Horman <horms@...nel.org>
> ---
> v2->v3 - fix indent
> v1->v2 - fix typo in commit message
Applied.
Please remember to wait at least 24 hours between postings.
https://docs.kernel.org/process/maintainer-netdev.html#resending-after-review
Thanks,
Tony
> ---
> drivers/net/ethernet/intel/ice/devlink/port.c | 2 ++
> drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 1 +
> drivers/net/ethernet/intel/ice/ice_common.c | 2 +-
> drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 ++-
> 4 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/devlink/port.c b/drivers/net/ethernet/intel/ice/devlink/port.c
> index 767419a..63fb36f 100644
> --- a/drivers/net/ethernet/intel/ice/devlink/port.c
> +++ b/drivers/net/ethernet/intel/ice/devlink/port.c
> @@ -30,6 +30,8 @@ static const char *ice_devlink_port_opt_speed_str(u8 speed)
> return "10";
> case ICE_AQC_PORT_OPT_MAX_LANE_25G:
> return "25";
> + case ICE_AQC_PORT_OPT_MAX_LANE_40G:
> + return "40";
> case ICE_AQC_PORT_OPT_MAX_LANE_50G:
> return "50";
> case ICE_AQC_PORT_OPT_MAX_LANE_100G:
> diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> index bdee499..2ff141a 100644
> --- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> +++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> @@ -1672,6 +1672,7 @@ struct ice_aqc_get_port_options_elem {
> #define ICE_AQC_PORT_OPT_MAX_LANE_50G 6
> #define ICE_AQC_PORT_OPT_MAX_LANE_100G 7
> #define ICE_AQC_PORT_OPT_MAX_LANE_200G 8
> +#define ICE_AQC_PORT_OPT_MAX_LANE_40G 9
>
> u8 global_scid[2];
> u8 phy_scid[2];
> diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
> index 4fedf01..2519ad6 100644
> --- a/drivers/net/ethernet/intel/ice/ice_common.c
> +++ b/drivers/net/ethernet/intel/ice/ice_common.c
> @@ -4080,7 +4080,7 @@ int ice_get_phy_lane_number(struct ice_hw *hw)
>
> speed = options[active_idx].max_lane_speed;
> /* If we don't get speed for this lane, it's unoccupied */
> - if (speed > ICE_AQC_PORT_OPT_MAX_LANE_200G)
> + if (speed > ICE_AQC_PORT_OPT_MAX_LANE_40G)
> continue;
>
> if (hw->pf_id == lport) {
> diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> index 6488151..f2c0b28 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> @@ -667,7 +667,8 @@ static int ice_get_port_topology(struct ice_hw *hw, u8 lport,
>
> if (max_speed == ICE_AQC_PORT_OPT_MAX_LANE_100G)
> port_topology->serdes_lane_count = 4;
> - else if (max_speed == ICE_AQC_PORT_OPT_MAX_LANE_50G)
> + else if (max_speed == ICE_AQC_PORT_OPT_MAX_LANE_50G ||
> + max_speed == ICE_AQC_PORT_OPT_MAX_LANE_40G)
> port_topology->serdes_lane_count = 2;
> else
> port_topology->serdes_lane_count = 1;
Powered by blists - more mailing lists