From nobody Tue Aug 19 16:52:08 2025 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 4c5wbs11Wrz65GZg; Tue, 19 Aug 2025 16:52: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c5wbs0Nyrz3vtd; Tue, 19 Aug 2025 16:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755622329; 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=vBuaqgBb/UeveVFbCZwzGyDEAavwFAr6sGdEm3c+600=; b=cgFhGGfmRp9MgdJkLKo4mZCDTPEXDH3Do8Py95zLnclcHhWAnAV0V45KvC8MBm86bJuzAX 4xIPQJXlQQp3HDqQLXvoeq8zrHN/tpip/wIHDI3MHj5uxqc0QKBtr9rVVKqzinz8tIMAgi D2AngwwwL8/bGOA8IczKEfgaHh9/hoVZqOjP3pb3G61TvGIJXAveL6TDkKKaspdzViqqAZ 9q31jM3E0N3O9p0zsGP531r4nPLvzg9/98vQGcGJ9l41lF/M7RPQvcyhOUfvJBCbF+uiEL Ivn8VZywfYPw8MjrNPCOfYxhTBwEs1sGM7RfKd98IKNDr8TMmd+TqmVz9FS4aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755622329; 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=vBuaqgBb/UeveVFbCZwzGyDEAavwFAr6sGdEm3c+600=; b=KkzZtZm9szLZtmo1hWxRZiCJ1mtiJkr6miWBSRglkY4l5bchsa/66B5nsyaQ8UjLuSqxpJ q9P8CEd5bnE5NjLGbfjHP3iX/dUnrBwpvu0B53J1vMwb6CLA+ck/5bj+eZ/j8AppUeToBV HN4h7ZmYKTPyqGE7OMwv8JcoL/5XVNBsBtT6SaHYTuJP8ziPt6sv+MP3ios2IXACquOado e1rZvICEvPFGDaij7yQkE90mNxbIyds1yRCgYcjabxu9eQLCBgWD6liwIHC06IYJNcpqzE N2kzjFf+ta9R6Xwes7Gz/pP6xDiwnJfJbYOcYhgksjwCEKDgUfw0YqcU4y4aNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755622329; a=rsa-sha256; cv=none; b=wOjluVV3lBTZUP3ON/hXS92YumF9DU7CpfxWRIvxO73e5vcpQe1JyLfSJUHkReq3Wv+U6Z 03xJ7jN+g/9Ywf8dYMiYSMOdzWNkmcuZIvHIot3oecEPuGQ5QfrK+SGYWAU5jvyX0X7T25 H2eyDD6qt3p4yRDUcIX0JXUqp0AfKvaxB5Q5u8A5XKMvTjPVxQx7uiUOS+ZgliKTqeZJVB ocgPibDOOZYzkkf24bW4LrC1Qjr8I5o4EwV3IaYpDVc6NopMBOk1ry4G3mMKSofwFbw16x 73mUalMcdpf4Qdfv4APnsuv3DGF1E10kRZWmmIRjxjWbBzpT/DjUfdBz9c5H0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c5wbr74p4zbpL; Tue, 19 Aug 2025 16:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57JGq8qL038911; Tue, 19 Aug 2025 16:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57JGq8qQ038908; Tue, 19 Aug 2025 16:52:08 GMT (envelope-from git) Date: Tue, 19 Aug 2025 16:52:08 GMT Message-Id: <202508191652.57JGq8qQ038908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 3ff0231c87f3 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 3ff0231c87f360afa4521e635b46f6c711dc4ee3 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff0231c87f360afa4521e635b46f6c711dc4ee3 commit 3ff0231c87f360afa4521e635b46f6c711dc4ee3 Author: Kevin Bowling AuthorDate: 2025-08-19 16:45:48 +0000 Commit: Kevin Bowling CommitDate: 2025-08-19 16:51:00 +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 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47336 This reverts commit 645c45e297c0fcbbb9d2d24cdeeb124234825019. --- 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 f0ef6051fab1..9c5ae2806f75 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2000,18 +2000,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: @@ -2024,12 +2013,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; } /********************************************************************* @@ -2063,26 +2051,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) @@ -2090,7 +2058,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)