From nobody Fri Jul 10 19:30:43 2026 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 4gxhkw4Zkgz6cwwK for ; Fri, 10 Jul 2026 19:30:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gxhkw46T6z3xYl for ; Fri, 10 Jul 2026 19:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783711848; 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=23VrXdEsYEs3SBDfdxPkfsmSDsqkDwMwcWl2TG7Ou8E=; b=O7mygnB7l1ElNPaVwE1ccuUC3rbDIJeRVv0xFIGuZ1I8LZDWwTXEaJFHGIMnOLmKThuZC/ S4pWpQvS7QcVh1qGTUpy46ybil/oJR9jcXDHkybXlw+guWxuZelEX2pXUqfkBXEoU9w5j5 DvJAnetd3BAwZSCUjAvI0FghruWQeqUYqJ0q9Hsp4hXRTh6muNc8Cv+JWQwkJEDZbK48Bh aBSztZa7lZTc/n5stIlE+s9Gm/z9SCYJb9PaJs4RozJ/dpj8J5opWuCE6lyNqm+otYeRr+ tDQHROTKo+5pDR1xn9nuoJFBXBG/wdZE8+dLLtH6xt/N/awRX3dH6VwR/+0OsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783711848; a=rsa-sha256; cv=none; b=d1OiKiCl9ZHVj08Rk+FS17m9cR6rk2s93NH/rHdKt1LvqVO1YwxpeMzuWzNLnIt7cC4tU6 vEwMBb0Js3J5dYSOHC3+sE7qaZdYFkRlOIoP732RwG/T/ZXPDp4DhQHLMMWzzU5R22PNVU 7xho1W76yP6Uy1RxcaLORc6AT/XC3oSGJAI2z66JUTjc1W1O/qXxctoxNqJR6pSNOtP4+5 E7QWoZRWHb+oZ1i3CIGWui5xacRurQMZ5BR33POf2o9ZiGZtqrSMbH8gghLTfrOpVen0uZ OasxM4EAE7leSKiYyUDzjjq6AT0Nc/gWhUHyrNKN8RtXZEIlXFDaVf0demzjuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783711848; 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=23VrXdEsYEs3SBDfdxPkfsmSDsqkDwMwcWl2TG7Ou8E=; b=r7nACTNmT3+TekF4DrV2tQCzY3kKzYaVPATbIqejwyeEbumespLtqvvj+6bJE6KlfQX7MY y1t/8cCJYaajQrLOqOb1hImGSciygRCGTCvPdPh3Z8B3yDHsje51af02l53lSV7DfhhzZA 4U1WlNklD+TmKyrMFRSqZpZqy5Z0J7ol0mJiuNAm1RbnyQ7RhnvZS/dqTEwPXd0OtO6Hyv en1ttv18FRZ8Jl1q/JAt9N5Y3EzeH97PI05kjF8C5GFUazc34gyJ2cYpQg9N516CEIM+aU IK+CkYlbd6BhmyGm7tlVMXuIX42ePFXPvfKV4xffC0mQPnYUi5cfbI7LyowuVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gxhkw2zcLz17r1 for ; Fri, 10 Jul 2026 19:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cfae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Jul 2026 19:30:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Krzysztof Galazka Subject: git: 6cd16ef19cd2 - stable/15 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6cd16ef19cd2ceef6c57b7e21d399165bb05328e Auto-Submitted: auto-generated Date: Fri, 10 Jul 2026 19:30:43 +0000 Message-Id: <6a514863.1cfae.1d62f752@gitrepo.freebsd.org> The branch stable/15 has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=6cd16ef19cd2ceef6c57b7e21d399165bb05328e commit 6cd16ef19cd2ceef6c57b7e21d399165bb05328e Author: Krzysztof Galazka AuthorDate: 2025-12-05 22:02:45 +0000 Commit: Krzysztof Galazka CommitDate: 2026-07-10 19:30:21 +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 (cherry picked from commit c6212b7da110d82b1d0086ec525deb216993021e) --- 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 cfaa54bc0306..9ae27d7bed87 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -11346,10 +11346,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, @@ -11364,7 +11364,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;