From nobody Sat Jan 24 11:12:34 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 4dysb62DS8z6Pdfc for ; Sat, 24 Jan 2026 11:12:34 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dysb61d7Jz3P5J for ; Sat, 24 Jan 2026 11:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769253154; 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=YpXznXX7S+gpFJRl43MFEmbFxIEbSPqBQJ7A42xQ4aM=; b=B765CYeUpekUAHCRQP+OHWWDb9hfkfHA2KbinNGBrDzzJC8+BOHbT1+WS4YlvidxDKkPsd W3XtRRD6Bx8JsEkhkV/vQZlw3A3mhs0O6ntXhgn7Cdh+Ln1/Rl/UdynLj31CHRBh42PIA0 bC3I7jydmrm4zaS8mN3rL95N5LTHZgQxsNBX5VqPwgxtNz7bT4ITjhmSWGCRcCQMKfDI9T W/dCNSjvHqg9/7/2mNOPfrg8eyCSkK8Pf+AB/RG4Bx1WjekHp68G1xkTJV6wAv0tIdobEC 3xEraZEhZkcyD9RXfS1Eo34lyF1gXHfNnbF4Zf/NuiIqiCoBkbrWi9ojlfSF2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769253154; 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=YpXznXX7S+gpFJRl43MFEmbFxIEbSPqBQJ7A42xQ4aM=; b=ubJxpC51tlV3hH6tfW8RT6s9bkoyOg4F7uehtfCsOKcOwoaVfmogDdOZpWVAOGlmCWcGDQ +tvqkRXmK7pFffM5NvQ+9HsuvWq5DA8IaFhOiCJs0U+A2mkHNOj5To7y9h+2o3BzBxahMm c+4nfC9HeJdjbSVE8a1JgHGVZKmhp0D3O4zi3xbbmTXsQjQXcGrBc9s9JS1SkLxrF6n5DT 8LI6ZrYCdfjVE1IQnSlMxmpKBuFvKQt3le44mzqvGzDrcOc4IIalYLxd0lYbsFgksHrSjj kOazAWlzFQCC/2bVnSltILPgVKrQp9fAh8qfcxRbVGdvz2+6VSxURAZu2Ohd+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769253154; a=rsa-sha256; cv=none; b=JHJfcYEEcSKJefL9olrTb5e0oQkncox62rqLrbIbhs0P+W5CuOX+503jMCR8fp0ZX8aAH4 vFW6XLuqUzNrg9lBxvf6GKvFp1SetJSworp/rKSjfymCFaBFkPsEjji2Py7EjB5D7JMtFC tNOWXUTXA252nsTVhqjKiQdpnNHu1witw9HmRfpfPp6jSOTTApfwo+ZcXZrEXKujoYLYWU ch7ff3dpTfYQK0VL54ZEWW1uJbxTx2+NNY63JrYpk8/uiNwN+0ecK+C1XLC1KNW8svtRfo XKlRYB4+Zux685Fckdtxo9pSPqP4MF0zYXvApsCeB4JYBBQLr7fxwA0ZU5tNcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dysb6113Tz12n4 for ; Sat, 24 Jan 2026 11:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ace3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 11:12:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: e4730bb6bbd7 - stable/14 - Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e4730bb6bbd703ae20b73922bb394c4038681b16 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 11:12:34 +0000 Message-Id: <6974a922.3ace3.6840f53@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e4730bb6bbd703ae20b73922bb394c4038681b16 commit e4730bb6bbd703ae20b73922bb394c4038681b16 Author: Kevin Bowling AuthorDate: 2025-08-19 16:45:48 +0000 Commit: Kevin Bowling CommitDate: 2026-01-24 11:12:19 +0000 Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" We've gotten a report of this breaking a fixed no autoneg setup. Since no link is worse than what this intends to fix (negotiating full duplex at forced speed), revert for the undeway 15.0 release cycle until this can be further reviewed. PR: 288827 Differential Revision: https://reviews.freebsd.org/D47336 This reverts commit 645c45e297c0fcbbb9d2d24cdeeb124234825019. (cherry picked from commit 3ff0231c87f360afa4521e635b46f6c711dc4ee3) --- sys/dev/e1000/e1000_phy.c | 5 ++--- sys/dev/e1000/if_em.c | 44 ++++++-------------------------------------- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c index c34897e3b31a..634f48171c3e 100644 --- a/sys/dev/e1000/e1000_phy.c +++ b/sys/dev/e1000/e1000_phy.c @@ -1707,10 +1707,9 @@ s32 e1000_setup_copper_link_generic(struct e1000_hw *hw) * autonegotiation. */ ret_val = e1000_copper_link_autoneg(hw); - if (ret_val && !hw->mac.forced_speed_duplex) + if (ret_val) return ret_val; - } - if (!hw->mac.autoneg || (ret_val && hw->mac.forced_speed_duplex)) { + } else { /* PHY will be set to 10H, 10F, 100H or 100F * depending on user settings. */ diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 0a25f4ec46b5..553a334efd6d 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2002,18 +2002,7 @@ em_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) (sc->hw.phy.media_type == e1000_media_type_internal_serdes)) { if (sc->hw.mac.type == e1000_82545) fiber_type = IFM_1000_LX; - switch (sc->link_speed) { - case 10: - ifmr->ifm_active |= IFM_10_FL; - break; - case 100: - ifmr->ifm_active |= IFM_100_FX; - break; - case 1000: - default: - ifmr->ifm_active |= fiber_type | IFM_FDX; - break; - } + ifmr->ifm_active |= fiber_type | IFM_FDX; } else { switch (sc->link_speed) { case 10: @@ -2026,12 +2015,11 @@ em_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) ifmr->ifm_active |= IFM_1000_T; break; } + if (sc->link_duplex == FULL_DUPLEX) + ifmr->ifm_active |= IFM_FDX; + else + ifmr->ifm_active |= IFM_HDX; } - - if (sc->link_duplex == FULL_DUPLEX) - ifmr->ifm_active |= IFM_FDX; - else - ifmr->ifm_active |= IFM_HDX; } /********************************************************************* @@ -2065,26 +2053,6 @@ em_if_media_change(if_ctx_t ctx) sc->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; break; case IFM_100_TX: - sc->hw.mac.autoneg = DO_AUTO_NEG; - if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { - sc->hw.phy.autoneg_advertised = ADVERTISE_100_FULL; - sc->hw.mac.forced_speed_duplex = ADVERTISE_100_FULL; - } else { - sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; - sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF; - } - break; - case IFM_10_T: - sc->hw.mac.autoneg = DO_AUTO_NEG; - if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { - sc->hw.phy.autoneg_advertised = ADVERTISE_10_FULL; - sc->hw.mac.forced_speed_duplex = ADVERTISE_10_FULL; - } else { - sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; - sc->hw.mac.forced_speed_duplex = ADVERTISE_10_HALF; - } - break; - case IFM_100_FX: sc->hw.mac.autoneg = false; sc->hw.phy.autoneg_advertised = 0; if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) @@ -2092,7 +2060,7 @@ em_if_media_change(if_ctx_t ctx) else sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF; break; - case IFM_10_FL: + case IFM_10_T: sc->hw.mac.autoneg = false; sc->hw.phy.autoneg_advertised = 0; if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX)