From nobody Tue Aug 11 20:46:06 2026 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 4hKNv75v3Zz6X0Kh for ; Tue, 11 Aug 2026 20:46:11 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hKNv74QHwz46Qr for ; Tue, 11 Aug 2026 20:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786481171; 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=G7GhJLRJs8PC/LZDnnDPJtkLqDXPEytzYcz2RA33wBE=; b=OseN372+rsw09M4CCHiIuqnCmaC1vF7ohElgsBCpeTuYtCMFCg7RaR1gvs3jRxvHhlUi5g Qcy1MOx98g53qGiOQ7tnlCdnNfFyfTUiNzJT1bB0lc07GKXmjLJGD/twj1WJST3QzrGr2U PqFni5uETPB+aRrahU1ojdXU5EfDx12hdqu+h7uB0xjdVTO3yHQFGDV3hD3qOOPGSssF1h OXu4OhX1C0TZgj730P/wjmhAh+ozgv1V75OIwSmypTcQFCmJrQEC+1zTsx440Thg+avEV0 PDo9sQHBu16hKtpto4087/P6cZDvEQ3c/ulD8cPI3ZxtLco8W1lUhXf50HxtyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786481171; a=rsa-sha256; cv=none; b=QuA5qeAU9/3hLzx+9Di72fZGQdGq2aERmVPxjI84ewKCfTym37V+5z8naT13S+rTAkUAIx O3J84MITjhIGngSNNaw6z26wU0j8KQxxbr36Uk/6VBEq86+1UDX9SXrY4yXJC242ih8jiN W0ieoYupfkb1qU1A6YaoSsmk2Bfeu6N4TjTThLZu6Rki01xJvFCIsDzyXNc4kdeRoKLJzi 23vShvjfUSvaA3Z+CJGRgBWwXoaiQgxta6qd230eGQEK9381CSHqf0Ta02GTdgMjNxjX8M evkaTHgWFNRe48+cJ/wx/nuAQY65xEfbISJxV9b/EKWVeZUvGTV4rrkBvfXYPA== 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=1786481171; 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=G7GhJLRJs8PC/LZDnnDPJtkLqDXPEytzYcz2RA33wBE=; b=Uboi3rmoiiKIRWQ0LW8fT1F4Ywm3b26yq7yPB5bxkHwapO+sex22nEBScaL+5JGuUG4poA zN2uG4m5+hA+qlpKCRnLwqrul8Ed07xSn8u3qXsH7p5x/38Yxk+VxH80zCkmbqBOk25qI2 JhgCxHOO4X92Y9+4dCoIZXWCJ+Q19LAV6zAWN0ZfCqXrYoSUu1ka1s2smZBUVumFNVp0J5 uaRNHwp8xCflh35Ty5eBZs+AqFgMoosaIziLtrY8Bdf+4SRRL6jxgEskHAF3MNJHKPG63m Zo/zcYAuGwWHNlJYEeU73dh32PfaBOjv/jHYdgh+d7uVK8T3r5zkJ8bUpVQ8WQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hKNv73R1jz19Br for ; Tue, 11 Aug 2026 20:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37556 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 11 Aug 2026 20:46:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: e49cb7f757f6 - main - e1000: Allow more time for PCH ULP exit 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e49cb7f757f6db8976b0d247e6a897eab5867634 Auto-Submitted: auto-generated Date: Tue, 11 Aug 2026 20:46:06 +0000 Message-Id: <6a7b8a0e.37556.5128d9fd@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e49cb7f757f6db8976b0d247e6a897eab5867634 commit e49cb7f757f6db8976b0d247e6a897eab5867634 Author: Kevin Bowling AuthorDate: 2026-08-11 16:19:02 +0000 Commit: Kevin Bowling CommitDate: 2026-08-11 20:45:56 +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. MFC after: 2 weeks --- 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) {