From nobody Sat Jan 24 11:13:05 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 4dysbk1BTWz6Pdfh for ; Sat, 24 Jan 2026 11:13:06 +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 4dysbk08sJz3Pkj for ; Sat, 24 Jan 2026 11:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769253186; 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=pswSf5A9l1oc2WNtPfP6GuEjz+m8GaQYQWVDNYTk5I0=; b=eBkNRFqORY6oI6tmlr2ulGV1FC+UVId4/rrJLrsn2bKipD8aHS+Uz1d5k7eAhTGeQ66e9q 14GKjns5kSOYExBtOC+vEMr6uk72nYCtBVY0Msh3kW5dvqWC8lMTKa1HGdWMJgcpQJGiFt mzORQxxJCYkEunuqsGPDnGM0bHmRepS3KMWel0FSj+QhxITNcswa2KNfeX+svfn+UGNoqO yHWRr6j/luab0wA4Z9lYactS87llLViMLdlDUPb5rs4kLsrPHVyqJ1rAkcMFgBlWomu2yL bBLBJx9AGra1p5oweV58Ea+oOffmybvtAny/pNQjX/GOJ7muaH6aGTMSyb8Tjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769253186; 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=pswSf5A9l1oc2WNtPfP6GuEjz+m8GaQYQWVDNYTk5I0=; b=rPIzL7qYgabw8kxDaMUmUFtS4+hic0sKk1FDlUaSxAze+gYdDdidoKoHrb6KMKLPY2kGC6 3RSQOPL7aVfBXOhKvoOdkAHk/U7fl85OSkRq0ctmqs4NBl9n2RE37FB3nQ89Xnvtj97XTV uRPNwHBkVHNhGjbZmNyGjLyz89y4NUBcfGthokiJGGMsOy88BwV15M0e7f6D/jGXyzIisL E7dv5mLijoWS6XWyFkOKAP9GD6tsv+edMsUA51xs6kJdq/ylftS2KgVHYtSxEfa5mmG935 ouCkVj7SqhCZ/dki9lxJbHFHaMIPdYU3rZkt7TNgexkEkclY+YiEbaSH+5qb6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769253186; a=rsa-sha256; cv=none; b=kUBWWuwsucwhqs7AoaK+iVz7/w0hQ7G8HYAu/Ng2PtnPbhrAHf4oTtW33sv53WOvHAYp+l 0o1vcxOLNFwisvYZe7FspSjfdSocJJ1ks0FBj1OR6v1jXceh/XxnAZEEKg3erRqVLDhl6O CkAcygzF9D3qS6QAweRA9p+dyaakzPRNRBwW5+Hg4wPrXvLEt1xH5rfiSLGtzm0qL7OQV0 UG3yBVnJgx9IOmqN8nyW93659w+XtSe5xxcH+08v4faHSPB+e0DtXhq5u5fwP/roxsdhtu Aqh2KH/YxxJJQFOKGwPi5GHjRCjebw1MoK5HYW7h0hM67PaHd4EeAGZOq2LLUw== 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 4dysbj6YyXz12Rv for ; Sat, 24 Jan 2026 11:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39674 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 11:13:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 44b0f31df65e - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 44b0f31df65ecc96e350f42a79a87b49d7cf8f46 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 11:13:05 +0000 Message-Id: <6974a941.39674.26c75446@gitrepo.freebsd.org> The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=44b0f31df65ecc96e350f42a79a87b49d7cf8f46 commit 44b0f31df65ecc96e350f42a79a87b49d7cf8f46 Author: Kevin Bowling AuthorDate: 2025-08-19 16:45:48 +0000 Commit: Kevin Bowling CommitDate: 2026-01-24 11:12:55 +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 53be6a48b671..4e2afc43a684 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 fcf1ccbd9a3e..75b8940587f6 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1997,18 +1997,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: @@ -2021,12 +2010,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; } /********************************************************************* @@ -2060,26 +2048,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) @@ -2087,7 +2055,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)