From nobody Tue Sep 01 09:04:08 2026 X-Original-To: dev-commits-src-branches@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 4hZ0KP2N4sz6qV9r for ; Tue, 01 Sep 2026 09:04:09 +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 4hZ0KP0sgmz3DsF for ; Tue, 01 Sep 2026 09:04:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788253449; 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=IkJ97VH1LvA9u65FGbZbAPEzmmJzlwfGpE3k3WosAvGIvSZOZw6pMz2MlA0iZQbUC3RY9j gYE9GGkB7JbyO71JmtNkzqfise7+fH+vJCfsQvAmXDzGLI5M7bqsxqxw38qS1VXkieT63X qDBCmUuv+/WYlmDNe38gbpH4ofCwLc/mVY+rms4QUS5pUmsWajWLQhiyALpYj49tjTJ0/I 6PgC6YjG0RwGNTjTMnuyTIMmGqGa5V3YayH0huNQhBBDBOoE6kPmj+WqfRTSQYvI6EXtnQ 1NUVscqauw5pUGBt9P9uRdKI330kYHvIJT1CAmtq4VUVB5GpJlSVvDK/Cwg1kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788253449; a=rsa-sha256; cv=none; b=m1L/E4soP767UP8vgoFNYrQFbv77Or2u1ybbds5gQi8CcbOrotZVssY5QVX+0Cf5bObyGe /mVSrwdhFbfiHJiDlZ1JcBpfUEot+q/EeJc1SWKhhj8o4Sd0v2bfd99MnhHdUsQzfHFe9Z ZC/lNo+TAJGThHbdcOa9LuCAXAvwVKzL0XvHPW26JuBPCaRrrpIU83YJIzCDUug6B+dYmj IuJeVW9mPuEb5lUkCkhb8GgdWDqcPBUwMJitTYkDvM7izgka5bd/AfXu9Izwv2pByMx9EJ 7wdiQ7v3lwBsGoAy+unnYt8fMAxB2KjF5VKuMHH1S9nKBRJtVeMJpcxWyKwv8w== 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=1788253449; 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=YiFYLta0vLe50r8yVCrZ2sAePzcET8izOL29OI8Q9vxKn1vcscWn3SKmQJhA7t9dX/dYJI 1IW2Qw1j6JKv8A/GWZQmDTamyYi5y8tkYY9pApMgda7u5h8G0BP12rm72Y66kAdodAxfjD qkr6FaZnVN3w2/4lp665H6Fsi3CQLzRzTDEtPq9H91+ijMVopQRZ0wDh5ORZmllmC+171a KloAnzSGYEcGB4EYIgKTBIEwhhNn2LYjyWU9IPR5ifTXvsV+8zBSVg/SHQGaRSx+i0Mv7w uYPHMwemqPyOlRZnriFzhsd3iaSEjLZzL2EDq800KJSM6sQ3Si8P8KM08+DjSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZ0KN6pg4zrbQ for ; Tue, 01 Sep 2026 09:04:08 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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));