From nobody Wed Oct 12 12:02:46 2022 X-Original-To: dev-commits-src-main@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 4MnWVv0zpcz4fBhW; Wed, 12 Oct 2022 12:02:47 +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 4MnWVv0VZPz3tTr; Wed, 12 Oct 2022 12:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665576167; 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=grv1AI5yBUfKMi1H2UwayJyYc0zpLRKPRLzXddQrzuw=; b=yiCxmW6YOuVRqxdljEeP1vHii/E/Y10t904++Y0pTxijrv9wXEBWrzM1YM8NPDtOlV6WxC HyNUz9a54+tuxRo2YRg8+rxS5SHJOerMUNZKDj6W0ir5rfZpAVpFGu3BtMcpQ6qPZKEBJG JiXc+5tktZ6hg0MTK1FtER3osiCoPi0Zh8/TqbDvAd/4wKKDEp4BsRdxw49eCf3LRMPP0f LFP1lLFMAKMTnyzAylTknm+uM6qnHNYP2wpnamHpGdRs2Cu6jJi/WVqXOX369XIzkDou1R q0irUwpWylgQETOs2AjsWfyjmBh04b19WhODvqFyPLes9K7Wn5hJOdaZBtTLEg== 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 4MnWVt6h2Bz1JPp; Wed, 12 Oct 2022 12:02:46 +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 29CC2kqx056909; Wed, 12 Oct 2022 12:02:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CC2kTY056908; Wed, 12 Oct 2022 12:02:46 GMT (envelope-from git) Date: Wed, 12 Oct 2022 12:02:46 GMT Message-Id: <202210121202.29CC2kTY056908@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: 66dad2db0a48 - main - Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 66dad2db0a484d65df331df76db0b68ef518f4db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665576167; 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=grv1AI5yBUfKMi1H2UwayJyYc0zpLRKPRLzXddQrzuw=; b=N/qGSmdPO/1L0/+2CGzW49PQn+HMqoqKgzjQybyA3cTm8HVBJdfMLx4w4tZFcAFYYZXejM 3xL1Vx+GtRukAy3b2h1/a3jzGjwLJupJwXYcMthuTbQt+pZjnkveb0FaVBam0c7IFB22c7 wg1ZOYjGbPTjVx4lHcKpqLX1goNdu++DdQO0xFBPbO/tiWqAnj5lEHLwLj1vjB0xS5DJYx X0CyxKBjuj6EDQbXNjx+PXEatTZeoAB3XRA3r5YrwrMtZwC+ZYqji9qvDSRWg64Kxy9iAg Eup9o5/H9GYRofh8EbEPFllc5jrkexap02zTe+1JM5HS+LDZKzXBqReYLSqePw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665576167; a=rsa-sha256; cv=none; b=cFsKeT2kW+SHfcxQEgVDk5YZBxkztmzn9GFeYIoSjwSvTTqexOtaqOjreT7kEhaOsJSmjP HQkT1vwpLtjxKzLbTDPBZ7mbqD8F4dOETDJseSS16+KjfMrU1hIM23f70HbQl3FuMBOvK8 prKYMbuJ+ZjjDIXlVzFAlO9oE0pAIBN59alefTIWfNt5ppQDZbbZksosxCEPS6kxuMFLo1 XrpDJ3V2Fj++Rwd/hsdI6FwRToOvPLFqGOj3czPl6OyGLK24WwiUDR9Eftrw7oG+1zGFC5 6AF7d25Z/GOabpNqVk0Bvir8dfruSOhyIIhKyRONujDmc2qAXaa+GOXtwuQQmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=66dad2db0a484d65df331df76db0b68ef518f4db commit 66dad2db0a484d65df331df76db0b68ef518f4db Author: Kevin Bowling AuthorDate: 2022-10-12 12:01:12 +0000 Commit: Kevin Bowling CommitDate: 2022-10-12 12:01:12 +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. --- 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 211ccad78d4a..f809c216edd7 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1626,24 +1626,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");