From nobody Tue Aug 25 00:37:33 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 4hTTQ56tChz6pNcb for ; Tue, 25 Aug 2026 00:37:33 +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 4hTTQ54mHTz4PJT for ; Tue, 25 Aug 2026 00:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787618253; 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=ABymWNXxy/Ah5O+DBDx9TnuTtAQIproQ5QUszqAxHv8=; b=lBF0grok3vUzPs/Q3s/b1j5JtmmK+PanArcEUm4c4crble00kOQDCyD0lTFiveSGDdsvnw 7+u293ulOIsWuZESYvCgUtyHx6gYXGohdIKRARFmYJia4aifPc43ClGHfMou7rqqisV8rd Fr2GK08seEUS9ZLxgV92H0i8if5P37PqBJq6IqTA+JBSBBqHVO6Gjzdz/lpVOZKsgzu/6c HQynyhkcu5WPufwZY10c7DOenFMD/EufMXvjbzYDLGNGJ+R0knfoIfI9jGTUZyOlxBmi25 RGRcFvUSMhrbGQKmS8cN4Z3EPRK1A70Pw0GGXfbw7Ri4ABDR26vmkqy2wfUElA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787618253; a=rsa-sha256; cv=none; b=YUyE9zocmDjMCm921qlx6IlRUX8T7ygEAssNTzZvLWqvDN8dZhGBFu8V76TXTB4/w0oaC4 HjU8E/RoPmaawRazPPNz4M3DBWpYqYdw4qtrM9N9VpxLQwWeCdJzdM3VaNSaVhm+ub7Yoh wQiUEOGzLhpti9tF6B5Fq0cXckY1QE9KkJZnz9XwIc+YVSnvnJBeaKA5zOd2AO2p/VSP1+ 7SW0PgE3sKkzC0l2ee+WgKftDMCnLpajjKEpnC5KALmVJPDDlbaaTdWJ59lDmTo5thMGOT pjwjuis7FyqqBOXPwAmoG+/GB63ihzt071re/Ial4+x0ByHZgMSNSB9xvELJ3Q== 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=1787618253; 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=ABymWNXxy/Ah5O+DBDx9TnuTtAQIproQ5QUszqAxHv8=; b=qxKGsb2MgAzBAlQ4UeAPdzm20qZvvNzF3bR8UiBGci9kAnCpYRPnND1d8LXcUmhx0vqhPm UY0lFB7v/R1reYEi5oAFhz4VQPiB1ajlH92dxgobkIwLAKyDKW6ZIaJq7k5h/3LnfOS9hw 2sCkdqjNBoZa4omjWtqYRqmB2uZQXk7YYTR8bd6tk8FdphpcghGbQ9E8waBWrGgLY/RGvK wRdwnpcSU4ZUjFbPz1+VXR9oBwVaoeLtC7QhFcFnVL4eAHfN6+6g2NSFGl9un5RKsqdOR7 2H7o4T8cwr/u2gQ33gw01tuB7vDoGigk7xAnCz8xRQggYT0JPdssfycF5GcKcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTTQ53MMKzCGy for ; Tue, 25 Aug 2026 00:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d9fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 00:37:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: d68b2c74020e - stable/14 - e1000: Allow more time for PCH ULP exit 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/14 X-Git-Reftype: branch X-Git-Commit: d68b2c74020e77b42d0851bf7489624abb931a7e Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 00:37:33 +0000 Message-Id: <6a8ce3cd.3d9fc.5ad78380@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d68b2c74020e77b42d0851bf7489624abb931a7e commit d68b2c74020e77b42d0851bf7489624abb931a7e Author: Kevin Bowling AuthorDate: 2026-08-11 16:19:02 +0000 Commit: Kevin Bowling CommitDate: 2026-08-25 00:36:00 +0000 e1000: Allow more time for PCH ULP exit Firmware may take up to one second to unconfigure ULP, and affected Lenovo systems have required nearly two seconds. Allow 2.5 seconds before treating the transition as a PHY failure. This extends DPDK commit 7aa4c34581a5 using the field-tested bound from Linux commit 3cf31b1a9eff. (cherry picked from commit e49cb7f757f6db8976b0d247e6a897eab5867634) --- sys/dev/e1000/e1000_ich8lan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/e1000/e1000_ich8lan.c b/sys/dev/e1000/e1000_ich8lan.c index e7ff5a581ad1..1a3433217682 100644 --- a/sys/dev/e1000/e1000_ich8lan.c +++ b/sys/dev/e1000/e1000_ich8lan.c @@ -1504,7 +1504,7 @@ out: s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) { s32 ret_val = E1000_SUCCESS; - u8 ulp_exit_timeout = 30; + u16 ulp_exit_timeout = 250; u32 mac_reg; u32 phy_retries; u16 phy_reg; @@ -1527,9 +1527,6 @@ s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) E1000_WRITE_REG(hw, E1000_H2ME, mac_reg); } - if (hw->mac.type == e1000_pch_cnp) - ulp_exit_timeout = 100; - while (E1000_READ_REG(hw, E1000_FWSM) & E1000_FWSM_ULP_CFG_DONE) { if (i++ == ulp_exit_timeout) {