From nobody Wed Oct 12 12:05:34 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 4MnWZ71Hwlz4fC5G; Wed, 12 Oct 2022 12:05:35 +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 4MnWZ7025Lz3v4h; Wed, 12 Oct 2022 12:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665576335; 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=BinkDLUh/4MCPPrIMx7krGiO3SMbTeVJUGMdOnPFq8Q=; b=M+rbvndjBZn/u2ilyyFAKwWc8GwZw3B94TaCTDl2/X6JdJVXl7YSG0LSaUVzSRmvt2fUbc tnYBg4LfIz4UdTLyVFe6vuZCg579okZjrXGaiQ06HWUtSE/pVjyj7pia4U/CgoRPCc+opJ /pLm85mAfIQMFyvIBNYaktG6WTkNxaqSi/QgkmJCPqlG0QhWa7ydVFBrYV2Vu9m2MHXmbq /pS057jI1IGHTyKJ69jPAZlHSTN5xgChrj0NttCoB4TP/jSSX9gnUjLSBbD9cTP/us9FzV G/J4YCqE5/Kl3DUU1RhlRDJjjlj5A33X26LqeaTW9W/uKr/9TmLer+1tbkFqgQ== 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 4MnWZ66CXkz1JY1; Wed, 12 Oct 2022 12:05:34 +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 29CC5YK8057473; Wed, 12 Oct 2022 12:05:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CC5YJ4057472; Wed, 12 Oct 2022 12:05:34 GMT (envelope-from git) Date: Wed, 12 Oct 2022 12:05:34 GMT Message-Id: <202210121205.29CC5YJ4057472@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: 218009b18d5e - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 218009b18d5ee135ae3d91617bdc4a8b3e9aa862 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665576335; 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=BinkDLUh/4MCPPrIMx7krGiO3SMbTeVJUGMdOnPFq8Q=; b=v+FCnCWP6orRQnuqracsZR3PF5oLKgvzoniCYmiBUQDT0n2WM+knCcb2DjK7NedPMA2r2V G/6751x2IbwjiFg0azjjYtqnPI2aJce2LnxyqlOv0NsXca4lVVH7glkHVzfrVHpII10/pP DtHrCO7odw4n2kzJX77UVPd6BxfgxfvSnUePZxV9iDCJfNqcgsS+vdbBEJgsw3m+Qhyl6a O2f1X7tKEOzNtgbdJde1ifLp21gk7Av6ylOcpZ/hlgNlbIOKv9RLR6+BA/jsiEh31Fr89e OQhbnThjT5BB/4O3+SY3g8m6wyU44sTvn3rqPEyUNLDeKOGJoKpV+FQY377ZRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665576335; a=rsa-sha256; cv=none; b=gq9iqPUgUdWOWm/v0vlZ9TTNxiBGsXjRDCV18p2eXSXrOTQN9xnxKEGYgrb+KAFNbRbDAf bu+E5miRG7FKQEmIT6RmRkbwIT3mvlEB7rtwe+Vjik3WM0yEqD3s+yKokzRCnXWXnhCgiW 4NLvmJeoOU5a+4DfEcHUFAIMHJmoxt79jYZSXYxxG1LiTtTDZRdv/o/9Yey/GV5I+sCCFX qFJtf7Afjr1ppIevutX5knJPZmCEdhFdMvsALTYrmeoCeeJCvABGVNtmH897VJsOFSiZ2H 78a76yCTHNaLiHz9lvFq2ENu0u0eP787pMxVLuiwBHALvyCfk6GckXZxPYC/0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=218009b18d5ee135ae3d91617bdc4a8b3e9aa862 commit 218009b18d5ee135ae3d91617bdc4a8b3e9aa862 Author: Kevin Bowling AuthorDate: 2022-10-12 12:01:12 +0000 Commit: Kevin Bowling CommitDate: 2022-10-12 12:05: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 821bb87f0ff3..a9ab2fb21535 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1629,24 +1629,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");