From nobody Mon Aug 17 09:21:47 2026 X-Original-To: dev-commits-src-main@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 4hNnQg5hF9z6p1Qt for ; Mon, 17 Aug 2026 09:21:47 +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 4hNnQg4X8Rz3qfr for ; Mon, 17 Aug 2026 09:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786958507; 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=r727HfTNhKcB+opl7OJWH8W849ORJwMkXPgb0ZFt8lQ=; b=RiRo11G+ZjncLbApc1Xoh0HogzVM5jSqmWFlyY3GvEtF35WlPj9fOcAczM3HaUdHdfBFDD +DkemW6G7QLneax/Fzom60MJ6G0ObT0fc4Qu6woiFdKX3qlmqv711YC2+VPLY9VN9c1IT8 XEuKJzXGOwl/mlBW8gkp3yDi0FvVxrgG2Yq8zg/GihLCoQtzrlpZJZxHR6SILILlcYHvqA +gf36vVizvo5MF7fcDY+XuyjOKUhIRxdyUJBUnFeddSc5t922rvoLWu207DALtdEyuU6Hu N6rMJd9dhadtKW7tsXNX5iTbY0DZIeU9mBmD1IWpiSlO4Azq5f4DRJoC4q7A9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786958507; a=rsa-sha256; cv=none; b=GUxm07Ur0DjiIq6TIhkEUoOM+kO/++/k5B2AHvpow7ym4CgXHP6PDG67JXt+P1RCriam4m +v4wpl4sCvGpGV7IkWyTNpRJ/Ct5sdlyVVq5OEiwDWd5EcAEbDtehksOH3F8Ybyv+K0hZx PSFZmnGWO6SoLfs4gRcFc++2I1KWmUcPPn+i6NGa+kqAKbp6PiZdjafGgA/LyCawcwHvXH Q0IqUye8cNUFrpxjItqpqv0pjM7ycvdhXTbhpzxHwUe+9mmOmZLCr+rnJSDvSgwa0fsnP5 A4rzpf/kpuNCzAGP4Y+ppaIUTaT1zDLC69tdgcGN44z0CRF0euNJFUulsdSRoA== 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=1786958507; 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=r727HfTNhKcB+opl7OJWH8W849ORJwMkXPgb0ZFt8lQ=; b=Qws6a0+QiDTHLSC0afDiiHyU3/AgRyBlYIKhXlwRtn52FlyJ3XXJFa+kzyk8CWfLvr4gn9 c1tS4Ad/g0f1XwIM3CdVW05hhdzj8Wge0FT0nE0XadjFnP8i4J0aopJL+VNQ1IEtVM9q/N IpRp8b7ce/LnH1upIk40LddIHDfuCreIxmNtU6agZkYFAexRAfRzc7DrgtAeglDf61ZKI6 mxjmKKghSnBGSgm185HmsaYpCCVJRq7nuRLU+/D1HhNM2+e9RgKK0IOqTPfvU2xM0NPOB5 RLMe1TPot2v89Ja3bxdNR3v/YX/r4T+b7f3PfwpuYtHBFZcxfcVgORI281sgiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hNnQg3bfmz16sZ for ; Mon, 17 Aug 2026 09:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2077b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 17 Aug 2026 09:21:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: 62d5d119ee7d - main - ix(4): Remove workaround for 2.5/5G speeds on E610 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 62d5d119ee7d935ac05966f1c7c4333c33c4f3a9 Auto-Submitted: auto-generated Date: Mon, 17 Aug 2026 09:21:47 +0000 Message-Id: <6a82d2ab.2077b.5605232d@gitrepo.freebsd.org> The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=62d5d119ee7d935ac05966f1c7c4333c33c4f3a9 commit 62d5d119ee7d935ac05966f1c7c4333c33c4f3a9 Author: Krzysztof Galazka AuthorDate: 2026-08-17 09:17:46 +0000 Commit: Krzysztof Galazka CommitDate: 2026-08-17 09:17:52 +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 MFC after: 1 week Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D57339 --- 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));