From nobody Tue Sep 01 09:04:08 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 4hZ0KV52NZz6qVGs for ; Tue, 01 Sep 2026 09:04:14 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hZ0KV2sCJz3DxW for ; Tue, 01 Sep 2026 09:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788253454; 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=q9As/FyP8WdrWCqaT9OmpHo6uBdRI0Xtx/qLzHwV1Ck=; b=I7FlcNd0/+Z4/SWoquu6faQKSVWoIGfsWqUk9a4b7ufsSasXvor2q94UAPI5ZYtKDoxlx1 rvNsos8aN+fSojF5oSgtwzx7OUv05sw4OIUI1c/pPoxMDs1tWTW0MKwRqeFidxdHaWNNzQ 2j+vPY1DEWH49v6VTsMaXJIUYjL3LBhr5NzHpNL2fWj1JsWQBXER8fezTkVXALhvmQ5P8h OReUP1ZzmGU71WLojnE0ToRFsZKkboZHIlm5SMVeD/6qwmsy75eQ2whU1hkns4b7sNUWuN tpNoNAmlrTGctnzkOm9v0KSsZnvXXsiOJzVjyfZTiYpQ6mVRTm+Ut8cGzPC5ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788253454; a=rsa-sha256; cv=none; b=uMV43g10SXiyGjkYFsijNLBXPtTWXYjvlC+0cp3ZQzadQIJKzYsUqoFlkZUn6rHzCcP8gL N83q6PXUrM1uRDyOxlgrzz1gMlnu8J98gzAskZJ3va5nmplO8JIXqCbhBEDZFsvUJsEhhE Wq6ojqYzUPq1JO33S8aUf1rS8IfXzezr3nj/oXOauz4XH3KV2Uj1xEhgxsuBE/0fWGcTgQ vISk4tlC4lC2XKk7j0wfITA35JyMl8Xq80OYZgelLvSymHAfDSJWKOEx9QAFv31kPwCTrP wnALZeb9Uo6wlDgWdQl1zdaHl43VO1kn2ebA30MkmrfK1ej879tTflX8JMLS2Q== 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=1788253454; 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=q9As/FyP8WdrWCqaT9OmpHo6uBdRI0Xtx/qLzHwV1Ck=; b=NvN2aj720+HigYxtjsZtDggiAkvyp+Ff+e2ThOz1zk+QBjtknxA3Og4KBiJvhiDlIpHf1r VtMT3vGk3hnrE+ADmAjVCMbjASRoTDB03zlJ1jwDVhAc77xTdGsuQ2ULQ6W6XI9Oem2Eb7 GNyk59RyKdvrok+oLc+TZtIrVRHeP/YDzOS4DQbVxDhuXjvMxe/4mS34GcDT8CTirMlWCs wYppwHUAct4fMXwIRZoBhdjTl3fkrcKVfDMRel5RJDSbLvr4Hq/0zlhdEfg6/6jFn6VATE U3LizfhSZgm0aENK1pe9ueELQcaShln8fhSsoO5SXW6g7UsFc/IFk7UzhKYhzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZ0KV1Tcgzs7g for ; Tue, 01 Sep 2026 09:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25ef6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 01 Sep 2026 09:04:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Krzysztof Galazka Subject: git: 63e9ab9f31df - stable/15 - ix(4): Remove workaround for 2.5/5G speeds on E610 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: 63e9ab9f31df52ddf11146b9cb04ac041dcfec61 Auto-Submitted: auto-generated Date: Tue, 01 Sep 2026 09:04:08 +0000 Message-Id: <6a969508.25ef6.58923287@gitrepo.freebsd.org> The branch stable/15 has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=63e9ab9f31df52ddf11146b9cb04ac041dcfec61 commit 63e9ab9f31df52ddf11146b9cb04ac041dcfec61 Author: Krzysztof Galazka AuthorDate: 2026-08-17 09:17:46 +0000 Commit: Krzysztof Galazka CommitDate: 2026-09-01 09:02:57 +0000 ix(4): Remove workaround for 2.5/5G speeds on E610 The problem observed on X550 adapters with 2.5 and 5 Gbps speeds negotiation on some switches is not affecting E610 adapters. Remove workaround, which omitted those speeds in the list of initially advertised speeds and advertise all speeds supported by adapter. Signed-off-by: Krzysztof Galazka Reviewed by: kbowling Tested by: Mateusz Moga Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D57339 (cherry picked from commit 62d5d119ee7d935ac05966f1c7c4333c33c4f3a9) --- sys/dev/ixgbe/ixgbe_e610.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_e610.c b/sys/dev/ixgbe/ixgbe_e610.c index 68ec9d8816de..058c79928cd3 100644 --- a/sys/dev/ixgbe/ixgbe_e610.c +++ b/sys/dev/ixgbe/ixgbe_e610.c @@ -5191,6 +5191,16 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw) pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_1G_SGMII || pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_1G_USXGMII) hw->phy.speeds_supported |= IXGBE_LINK_SPEED_1GB_FULL; + if (pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_T || + pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_X || + pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_KX || + pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_2500M_SGMII || + pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_2500M_USXGMII) + hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL; + if (pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_5GBASE_T || + pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_5GBASE_KR || + pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_5G_USXGMII) + hw->phy.speeds_supported |= IXGBE_LINK_SPEED_5GB_FULL; if (pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_T || pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10G_SFI_DA || pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_SR || @@ -5201,31 +5211,10 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw) pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_10G_USXGMII) hw->phy.speeds_supported |= IXGBE_LINK_SPEED_10GB_FULL; - /* 2.5 and 5 Gbps link speeds must be excluded from the - * auto-negotiation set used during driver initialization due to - * compatibility issues with certain switches. Those issues do not - * exist in case of E610 2.5G SKU device (0x57b1). - */ - if (!hw->phy.autoneg_advertised && - hw->device_id != IXGBE_DEV_ID_E610_2_5G_T) + /* Initialize autoneg speeds */ + if (!hw->phy.autoneg_advertised) hw->phy.autoneg_advertised = hw->phy.speeds_supported; - if (pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_T || - pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_X || - pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_KX || - pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_2500M_SGMII || - pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_2500M_USXGMII) - hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL; - - if (!hw->phy.autoneg_advertised && - hw->device_id == IXGBE_DEV_ID_E610_2_5G_T) - hw->phy.autoneg_advertised = hw->phy.speeds_supported; - - if (pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_5GBASE_T || - pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_5GBASE_KR || - pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_5G_USXGMII) - hw->phy.speeds_supported |= IXGBE_LINK_SPEED_5GB_FULL; - /* Set PHY ID */ memcpy(&hw->phy.id, pcaps.phy_id_oui, sizeof(u32));