From nobody Wed Oct 12 12:05:02 2022 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 4MnWYV73flz4fC7H; Wed, 12 Oct 2022 12:05:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MnWYV6XxDz3v02; Wed, 12 Oct 2022 12:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665576302; 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=1y3Oha6TP71meDx/OwnpCDhsFO7FdsDUiMyk49wIgFE=; b=Gg8eM3509DLodx5lsVs0j581LXEiTEPME4UyjeEHRYBauOveuzyd50VWqhYYZ6xUmKACyA CxSxfIPy4xIA/zK2cmyQfb84ilmo+8HA+GYmBR3cqw0LAF8ssCPX4lgxMoRIJNSJwKCfw9 Hyl+adB52w93x4P3o3lS4t9edp8OanpLIRbtL++Rcpr+QLIoBqETXiaVk7ZrtSz0Zwdup7 Xb074N8JNbQjV+9y70ft8OJTwM8N2JpOW0xl75wgkG+O8M3FbNoCKk6cXoqgfsbIy+YIJR Y3hNhhYSW+sEQ5As+7AiJM6+vAPOk371PJa3BiYQdj2DsC0yq9ow5CPmXNMFSw== 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 4MnWYV5dbbz1JS5; Wed, 12 Oct 2022 12:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29CC52LF057293; Wed, 12 Oct 2022 12:05:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CC52q4057292; Wed, 12 Oct 2022 12:05:02 GMT (envelope-from git) Date: Wed, 12 Oct 2022 12:05:02 GMT Message-Id: <202210121205.29CC52q4057292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 4615eb96d844 - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4615eb96d844add110aae2d63ffe537d6f73e73f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665576302; 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=1y3Oha6TP71meDx/OwnpCDhsFO7FdsDUiMyk49wIgFE=; b=sieIFyCX8JFlhCNfT7NIKL5MEO992IyrldMoHHALpw7Zgg7/gd8Kq52AsMcnz8+1RPPkhv yfkvImWw7hOqYw4e227hErAZPzvzUt/P6opI2c2pk7393JQ5Wo8N18to8i1Z3RT41laQdw eSj4OYjd5QjMH4h7bXWEvYUdQqHFwIP8sAc2F3dE/vSnjJ59fxYtx7myw+p8JE/JCWE/26 gQfaFpaE7eTG3o7D1mXYoHewmIMuB5JlvX7cG/IV5Pt9b5LGy/It118g4TbLqSBEQR0qQh zslVzDADV8bW93Q/OFOfBCBYgFekp8sfmzVaAohYQRKAZ20774CO1g10Dw+5Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665576302; a=rsa-sha256; cv=none; b=N93xiNhko/2k9JckCHB2knpV+Ao08hptyvVOFa7dbfmFKbJf25Y0Jkh/h9QOotaGcKJJ9i CKxeONz7prZBNsrtp1cery34801vsp66Zd0rQatv9+paq3v/gHHgK8i3TXv40+f1Tg0Z+H D/eWVnhS4gaTsN8P6lu69aV8W+T6f3K6hQNPmY9QJfluAKuDLZ937aSjq5C5gdUeqXX83q 7Ceo6nOlQKYCSQu56aTjPFT4eNOeotD600eB2hozE60fNF9hIqrBvhNBrOQlS1s6MWz0oM aSh+xDuPcHnMofab22zk0yKoA3VduAMl6YoogMgYRVNaKf74Zb0ABfibYPgZHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=4615eb96d844add110aae2d63ffe537d6f73e73f commit 4615eb96d844add110aae2d63ffe537d6f73e73f Author: Kevin Bowling AuthorDate: 2022-10-12 12:01:12 +0000 Commit: Kevin Bowling CommitDate: 2022-10-12 12:04:28 +0000 Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" This reverts commit 9ab4dfce8feda8cf3545be0c3c7569095b1fcd24. OPNsense users have reported a regression with fixed configs. The e1000 api is not ready for this change. (cherry picked from commit 66dad2db0a484d65df331df76db0b68ef518f4db) --- sys/dev/e1000/if_em.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 6dd494f1fbb3..c17714dbd566 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1628,24 +1628,20 @@ 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.autoneg = false; + sc->hw.phy.autoneg_advertised = 0; + if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) sc->hw.mac.forced_speed_duplex = ADVERTISE_100_FULL; - } else { - sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; + else 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.autoneg = false; + sc->hw.phy.autoneg_advertised = 0; + if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) sc->hw.mac.forced_speed_duplex = ADVERTISE_10_FULL; - } else { - sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; + else sc->hw.mac.forced_speed_duplex = ADVERTISE_10_HALF; - } break; default: device_printf(sc->dev, "Unsupported media type\n");