From nobody Tue Sep 01 09:20:54 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 4hZ0hk4TX3z6qWXP for ; Tue, 01 Sep 2026 09:20:54 +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 4hZ0hk2YkHz3H9Q for ; Tue, 01 Sep 2026 09:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788254454; 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=l2ot3fw5ip+1VAOgDqAcY9q3+74lEC4KnAAJZfOtC80=; b=kRTgOlzM93BgPKpuhG1H0VBF7gmTIC8SPAP0/ThF3DSg5s6CkqUyvsFTnXy0+sO+x6B11R svtOk0hM0mYXxS33Vgu7348BBpcgjKP0xqqzQ+XYzjEQrzUPiVUTrvrUYBn7Bw1dnGu8xD AGhnuN7B3Lquo/42J0KM2bF/l73Qn+MEPqAk4UyPqo4R5P2yJ05kiku00t4y3mgGOXWky9 3Vs94j9v8wxst2PEzoyB/h7obUCWKIG8zaYWvQQ0ckHluleq4RxJlzUVUyj1eUCuoGZaN7 FiCaYlW3EijTTBiO+QQSRG5yuv9rLThib1WnLVqcqrI01q6kkZT5IKrr8O0FNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788254454; a=rsa-sha256; cv=none; b=mzniT3K7qEndfIc4+3IzD+Jv9O240owbKDWiLmdh52zd9lWluiDIUJdfwB4LRxh/RCG0yL 9PfzcPIVRIo2CAx0K3nqmzBhuntE/0ChH+jD+8oSEVpLeLPAht0DWvlZ4VIkSHJ+9zrYCc BSrI3HEue+b3rxs6J3iGYdVv6zGmyYQuhnTnB86BU9CwWXp/F87sXkR6el3001sDRMW1o8 D51V0hHAIpWxZVprXVw2gSCQ6Qhn/CIz5NYiSssP+NuXvVKzEDHgfs6hc3Xzfi26e2sHV3 2JmTZQGpIq3yx3RJLtvgskUFJyKyYo4ZNdBN4nINgh+rXYVDKcPq3qiO+wYfYw== 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=1788254454; 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=l2ot3fw5ip+1VAOgDqAcY9q3+74lEC4KnAAJZfOtC80=; b=aXtr4pMtQkUMUtTQY40skrSf8fsBjPw50bqNVX1B/4e0MFxr+IUpxby3y+TmMHJ9VR/GLc 5dPyXq2FzbxkPTUwLELJHYwzdT6TON2wSNuyw5cT9A94KrvUdHU80ngOXsNF0sJRo66eJU oik1BW+vJbcBro4evOuZeqiN+SQBuldOMdIG/7PoqMXx+VkqScYSeG71o8f+X1lVLIZSDT gI9i8uVi8A8hjtRCuo0QGopuOV/v5z2tbeX8H8yiZZ8HBiMlnQz/k9Tv6d6BEwApwygCqb sYJe+jnt8nLg5XA9DwqHEU+hV463xbw1bGOe0gxk5bC/lpqJiKLYjX9Me8H56A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZ0hk1K6VzrrQ for ; Tue, 01 Sep 2026 09:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 265ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 01 Sep 2026 09:20:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Krzysztof Galazka Subject: git: 05ef2394a193 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 05ef2394a1938bc5bad83464ff41976a5de29f57 Auto-Submitted: auto-generated Date: Tue, 01 Sep 2026 09:20:54 +0000 Message-Id: <6a9698f6.265ef.14705fb0@gitrepo.freebsd.org> The branch stable/14 has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=05ef2394a1938bc5bad83464ff41976a5de29f57 commit 05ef2394a1938bc5bad83464ff41976a5de29f57 Author: Krzysztof Galazka AuthorDate: 2026-08-17 09:17:46 +0000 Commit: Krzysztof Galazka CommitDate: 2026-09-01 09:19:58 +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));