From nobody Fri Dec 5 22:07:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNQTK6kwyz6Jp6y for ; Fri, 05 Dec 2025 22:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNQTK52Sjz46Gm for ; Fri, 05 Dec 2025 22:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764972421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAAIKJEo3WZe7EHJsDZKWh2O4R+KTTjYyiqat4kkySc=; b=jl++WYROmuWj5LwpUM0NZ1BfPUWilmZb43PeCvL4cy7dck+QdUpVZkC9wZ1xIPO47Ux1df Wn7CnuXUCTIgjDvB7XZ6Cl6/JcHCUT2zbIIatfSMlx7kSSc/PTo9xzlycAWNJkZKBxqOFF vtnJnhT44h/GWrqa+rOCblgilGVYG6N8kI4Sei6v2pIbVUCoxjBS34F9z1IKqoELa95GEx cGxmWT0qWPXs4Nh69uA4oauRA9bKKD1vk/uPSCsHHbenYSntItOJttfzLp+RfZ8Yl3h2Sm 0aBfCHEuqEm1IYWtdc6msvPQi/ztYs6vom0sxpjYbSc09RAmYiBa7d2P6G/y5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764972421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAAIKJEo3WZe7EHJsDZKWh2O4R+KTTjYyiqat4kkySc=; b=geXW1URXCct35t7nvy5bcMeqIIXCV9REQ3YijP3wrh1AbNOxaRO/XzHggWdtEROX5SyyAB M26EAjLCFKZZaPEyC8EWrl3Hw5gGLFLG6fZbhS9eI1/Q/o5I2hw/STOrk1d1Xw8nFuufzz YfgzJ3Z6MBJohDWt6rd7FIYfjfQcvpE7MFC4ZvEsba6OMjwGBtL/tCTkadIaJ3KJ6ccUZ4 m9BwPQjBuKP+owzAdxee74FI+xqct3duhdVsz0ZrrpZS10DQEcuDuhWrxSbKZNgF4gF7LX pj8PtiFOI8VemQKpnvGRmgwisMPTiV7apegDKAoprHJyhRI5Y0RkRpyoIFrGRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764972421; a=rsa-sha256; cv=none; b=xfyTEZsaPQlzfFc5Ge3z7OXbvHhwuY85q3a0sxorbkPcC4aZfk0mYMsXKO/cZH1U7ahgCx mxjyGH+AlzlT4rlBlktbVrhnUFFQAGR5qKN4sGesmU5sftOSXcTSaTqvmOb0x5vS3fEJD+ 7bgYc4uh5AEMr5IHkDymFcr98qim+bkhdMW7bJISKuaHDr4JyAbPLI2PI/Fn+n4FhlEv8E 2rzHdGnTkGq0ByDkugzl/rv71RCqbE0ivhyrTkOHX9zKeccOmIPOCDvSsdxNS1/zawAn5o IUB9AL0ERc9Wcgjl+WhclIccBvWqRmMuRlZnh0+2s4ZTAX8B5MiLD09z7sg9Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNQTK3fKgzCNS for ; Fri, 05 Dec 2025 22:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 348f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 22:07:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: c6212b7da110 - main - ice(4): Add support for 40G maximal PMD speed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6212b7da110d82b1d0086ec525deb216993021e Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 22:07:01 +0000 Message-Id: <69335785.348f8.60c84bc6@gitrepo.freebsd.org> The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=c6212b7da110d82b1d0086ec525deb216993021e commit c6212b7da110d82b1d0086ec525deb216993021e Author: Krzysztof Galazka AuthorDate: 2025-12-05 22:02:45 +0000 Commit: Krzysztof Galazka CommitDate: 2025-12-05 22:02:51 +0000 ice(4): Add support for 40G maximal PMD speed E823 backplane devices may support 40G as maximal PMD speed. Extend port topology reading logic to handle this case. While at that fix indentation according to FreeBSD style(9). Signed-off-by: Krzysztof Galazka Tested by: gowtham.kumar.ks_intel.com Approved by: kbowling (mentor), erj (mentor) Sponsored by: Intel Corporation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53587 --- sys/dev/ice/ice_adminq_cmd.h | 1 + sys/dev/ice/ice_lib.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h index 6225abc0f38b..b2dde986dd23 100644 --- a/sys/dev/ice/ice_adminq_cmd.h +++ b/sys/dev/ice/ice_adminq_cmd.h @@ -2131,6 +2131,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]; u8 pf2port_cid[2]; diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index 8b6349f686eb..393726eb1f59 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -11344,10 +11344,10 @@ ice_get_port_topology(struct ice_hw *hw, u8 lport, return err; if (cage_type == 0x11 || /* SFP */ - cage_type == 0x12) { /* SFP28 */ + cage_type == 0x12) { /* SFP28 */ port_topology->serdes_lane_count = 1; } else if (cage_type == 0x13 || /* QSFP */ - cage_type == 0x14) { /* QSFP28 */ + cage_type == 0x14) { /* QSFP28 */ u8 max_speed = 0; err = ice_get_maxspeed(hw, port_topology->primary_serdes_lane, @@ -11362,7 +11362,8 @@ 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;