From nobody Tue Aug 25 00:31:27 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 4hTTH34Kt9z6pMWJ for ; Tue, 25 Aug 2026 00:31:27 +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 4hTTH32WqYz49Bf for ; Tue, 25 Aug 2026 00:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787617887; 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=lQipJ7dPiEPFLHRlZRneAf2X1asT6HUtZKr5rTpcRHM=; b=i/a5+VI1vtxbB9RroVTwGsmJkhFxhwRjfC5cePO/qGYNdNTw5bQnJLyRXt0SSejnfY09/X ilkU2VkQXCxdO+cQLtQhbrRLzNPjBxB6iut9Oc0EBkqqxbimDk3u1IWW7w51sczpttHMdT GryXjqrWYoDAc61VkSwRfatMEgm2iLd0RM4Gur44obVu6yovZatJFpBMtYuGdD82afrMvx MoMzF2Qzaqjwl7LrSnm4hMVnHEgg/hNt9hxLiLfC20ggIfksFO+gObYTkbXtDKx8CW6F+u pklC80Q0197BuheoG3DpQqnA6tPUoGa3v/yVE9twj5tOoZQZuPtb7wxgKHZ+mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787617887; a=rsa-sha256; cv=none; b=qYYdVwSVD1uxymGjjFgsaA68kzYT1KGDZMuBRNWfkN+qDgz+9aFiKVdP1vWCGCWImZnCQy +C/8lTcXJLOi9qZegyUOqmnwLh9hCTcCfmJdQxTxFjHbESw0FmYRZgd8MEFCDrCRHnzaOR vxoAg27NXOCtj75W5attMYbdfm6CbDGPXC1Yci9hr9rqAE84wiFiWeoUErx9gCxSHL5Ky8 Lgv+pqSDuuohj0y4INmDcdXPlxi/87lIMzExyeKDeQjNvNinthkqIrlWWI5yikaqt4tNI1 Gqlf5t9NWDXDYL0ahOag7/u7gKIsmDzseKfaMssNzHRYxF5thPSB5Li4L7uPKw== 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=1787617887; 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=lQipJ7dPiEPFLHRlZRneAf2X1asT6HUtZKr5rTpcRHM=; b=rzxGjM143CvlJYDezUnrGWElErU/nT03+0p7ihHochD4yZQ0pDQl8ZyXVGwXGn7WuAmO/H QZ/rNzZOGJ91lcNGxmIiVYtp5NtgyBjiFN5Du8BGqFYaRtQgh63Tm4rwEdi/PBEt99z2kF OsDBANh0pkvgwzYr8iYDodX7xXyplhsc3wUBQiCIqU2IRTwvXWcdEMwhAMsNsjfmZuH77c 2auw48+jTMy+tWlqIFD8bw11vqK4eXW8YvtywvkbtOVo4crrXB7saAah9qJkf1nn6Dh1i9 ylLL1/LQepqkrpJfENRsD2Z9P5YZ9LqdSWL94r8quFmlBG1uSyRlSyZzcPClRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTTH31LXszCVb for ; Tue, 25 Aug 2026 00:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f6a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 00:31:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: a603d5679b60 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: a603d5679b60684e586822eb6b35015a6b13374c Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 00:31:27 +0000 Message-Id: <6a8ce25f.3f6a5.65c7d8c@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a603d5679b60684e586822eb6b35015a6b13374c commit a603d5679b60684e586822eb6b35015a6b13374c Author: Kevin Bowling AuthorDate: 2026-08-11 16:19:02 +0000 Commit: Kevin Bowling CommitDate: 2026-08-25 00:25:20 +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) {