From nobody Mon Aug 24 00:53:28 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 4hSspx1bmCz6q20y for ; Mon, 24 Aug 2026 00:53:29 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hSspw423Wz3vgN for ; Mon, 24 Aug 2026 00:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787532808; 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=0JjpkkfYP77xV1Ks7dSivEHVah1ggcYilvcxsedDDpM=; b=rICKXWh0SQp+Ac0i3q3xV9uB07TgBkcWNVnGuNbj/HkPvZfPNr9D4XvgDPDKD62TdFqRhl Ji+KD3rPJ9fJ/a6SrL3BFbYZV5J7JdIWdgv7VC2APh9qNWrGgvWCV7N28/RK6fNp7E81BY gzgLboFeUyrqIxIHAIrpIizu3q0bCT05GRNdQPNSa31KLKOMgdDF+NkEE6d2vOcZwP/KYB SSsLBeiBCBoNEGy7xlyA38BwnYpkCD0fbrsGp42pJ92XAzS7jkDGhGDLqZm5SoWapLG71s mcJYVx7JIb9vwOGAHB2/TXqyM4xuE3m26BC3c0chmpIpYXWr2PiCBx/zNrPI/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787532808; a=rsa-sha256; cv=none; b=qdrFZaOh4NllrzAOgx461h75ZTogb8ZQgwLzLtzwX76aCoBidXUXksd8cIf3856vhVyyNf Mij9LNWAl2dY9QRCRijTFUvXvYGAF4lTlhw1WiTRSbx8DHPkd+/Df8vdYMVHb/wcyr4tTz OXcf5nSPowNk2cTH2++i5v/PwTmjC29fUJFTJSQV5+1oiyxucwq+F9/kgWtocNp6kw6cFS bL/1v3fM61mGXtUyjRke4TfZ3mtClzfs31Cznd1OsXj59H226Sw0tUhdikmyWau77IOLdE X9fuelCkfyg1TdhBbzdLbgu4/Gwsi3kt3xf6AwZfGkDYNzoencwTxtXiE5kvPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787532808; 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=0JjpkkfYP77xV1Ks7dSivEHVah1ggcYilvcxsedDDpM=; b=jyMLcXTa44RvzPI1bn39ImMrcIRINTPkgL2CLTbryGUbCis+sCOMRtIayplBPIDaTwy/32 TvxrqDNr6F+9HbY2YRLDj4g8rYpwje7uMJIYJ1bN1sf/0HDPR4flM+w9w/uVmAc9clFmY5 g12orPWJG5+ZVpyFvdY5ced5XjS0ZVxFVmRQg9JrQEVDAnAkv21DHbju6F0ROBi2fzV9Fo SXi+M41yiB2T89fccnzfZL2D1aNsQDSNfcyokRjMmnTVcsamsn/+UC0X6houCxBeAlv8IW 0MsbsVtyk1AKZRI7CKzjkS+zLTwaIMw1Lq5ckiOkmG0aKjcXCnWo0mLGrwdVlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hSspw0BbLzj62 for ; Mon, 24 Aug 2026 00:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31ef7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 00:53:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 453cc1d7d37c - stable/15 - e1000: Correct 82542 flow-control mode handling 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 453cc1d7d37c36d05595fd22cdeb7a9ec1304b13 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 00:53:28 +0000 Message-Id: <6a8b9608.31ef7.4ef1b224@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=453cc1d7d37c36d05595fd22cdeb7a9ec1304b13 commit 453cc1d7d37c36d05595fd22cdeb7a9ec1304b13 Author: Kevin Bowling AuthorDate: 2026-08-10 00:40:16 +0000 Commit: Kevin Bowling CommitDate: 2026-08-24 00:44:30 +0000 e1000: Correct 82542 flow-control mode handling The 82542-specific setup routine unconditionally reads the NVM default, overwriting a flow-control mode selected by software. It also removes transmit PAUSE support from all 82542 revisions even though the hardware restriction applies only to rev 2.0. Resolve the NVM default only when requested, scope the transmit restriction to rev 2.0, and replace integer bit masking of the enum with explicit valid mode transitions. This restores the behavior from before the Intel shared-code split and resolves -Wassign-enum. Reported by: glebius (cherry picked from commit 2f1d9ab96214db2ec6ce30c44b55a89a7eaa8f6a) --- sys/dev/e1000/e1000_82542.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/sys/dev/e1000/e1000_82542.c b/sys/dev/e1000/e1000_82542.c index e8de9086d05d..0656c6408b30 100644 --- a/sys/dev/e1000/e1000_82542.c +++ b/sys/dev/e1000/e1000_82542.c @@ -317,18 +317,43 @@ static s32 e1000_init_hw_82542(struct e1000_hw *hw) static s32 e1000_setup_link_82542(struct e1000_hw *hw) { struct e1000_mac_info *mac = &hw->mac; - s32 ret_val; + s32 ret_val = E1000_SUCCESS; DEBUGFUNC("e1000_setup_link_82542"); - ret_val = e1000_set_default_fc_generic(hw); - if (ret_val) - goto out; + if (hw->fc.requested_mode == e1000_fc_default) { + ret_val = e1000_set_default_fc_generic(hw); + if (ret_val) + goto out; + } - hw->fc.requested_mode &= ~e1000_fc_tx_pause; + /* 82542 rev 2.0 cannot transmit PAUSE frames. */ + if (hw->revision_id == E1000_REVISION_2) { + switch (hw->fc.requested_mode) { + case e1000_fc_tx_pause: + hw->fc.requested_mode = e1000_fc_none; + break; + case e1000_fc_full: + hw->fc.requested_mode = e1000_fc_rx_pause; + break; + default: + break; + } + } - if (mac->report_tx_early) - hw->fc.requested_mode &= ~e1000_fc_rx_pause; + /* Early transmit reporting is incompatible with receiving PAUSE. */ + if (mac->report_tx_early) { + switch (hw->fc.requested_mode) { + case e1000_fc_rx_pause: + hw->fc.requested_mode = e1000_fc_none; + break; + case e1000_fc_full: + hw->fc.requested_mode = e1000_fc_tx_pause; + break; + default: + break; + } + } /* * Save off the requested flow control mode for use later. Depending