From nobody Tue Aug 11 20:47:45 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 4hKNwx74yDz6X0Ks for ; Tue, 11 Aug 2026 20:47:45 +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 4hKNwx6G50z46lY for ; Tue, 11 Aug 2026 20:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786481265; 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=1z1LfKnR7enfcTWRf0KfJKnR+f1YZ2kef6dj78UOQGo=; b=oo7Cz+AOyYogwcWnQiNzHnZ3ZZSTkMc9fM2epYuijjalk5gAaDfeTz8516G8wFmv/97CPg WWIQGEnWDvMVGodRM5OPwZolpp3cfar9IF1BGS2josyvdCAs4N5ZcvG7OSkXpYfmV0Cik6 DyS0YyUN5fYFCG99543tkgJ/t/JYs4JKOwmZSSjp8MyCwi4fOSXg4z4QV7NzYyp1hryOyO Ci8dQ9ex5f21/+6vMfYDZGfi/uo8XnZxU8h4XPOQAjKqE2rZY5MIdbsZP5Gc0ZzCP9Hk+M LWm/IjT3f58i95VTdi/d0UmomJoLSE2dyM114zOA9kIDQGlDTXzkO+f/gdZkuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786481265; a=rsa-sha256; cv=none; b=V5feXb4XxJvdP7aQNPFY3nOlqVW17w+pL11P0pGygESbGAJRVO6ht8Mqy6nDgySJW9oBBQ 4KkAlMmWnXWojEd8zWXMRZwujDfISsozxvJOvVfaNNcFv4uKfdyxA9k3HWuNmDhG7f1Djz 166c4tkyIUHG6IcSwykoeFvsZ51Vh+wCY3tR1g2JHeEjUFpRoFdZ8HmG5h7GdO7M2Vp5hs gXjSpOleINU5EZ8oeXenBC2gaOvBHTdRwDFufa/DFf3i+EVxe1qw42b00iK89MZp8SzHC0 SJgbwa4wp4wBnh46yNOU0C5INhXv3jolZI+eVmcx5R4gKW9R1S386e7saLtFSA== 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=1786481265; 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=1z1LfKnR7enfcTWRf0KfJKnR+f1YZ2kef6dj78UOQGo=; b=rg866YJzPjgrsc05kb2LMACh9TjAQw+4p1Ujy6ncML22BqGmWLyZMkPrpLZJCjmi6cQqYY nYQAIfkZ0GIsKuG0iOddwDUdHJys9xFpvF6lFmZwRlOMN7xdAjN8sqbg3E2GqSZ3ekOf2k 1aeJ+wlv7Uda1LbDO8BAl/1XOBkSwqfhKOPSZfX4KGZBuKUqNxcoABUGIfGD7AjdH6w3A/ wejV52+HOi78Tlfkncwrf56khUahBeq5ik6x4Cu0yAolPhVNVdNAbRDbVPT3TT6l4aRGC6 CG7mf7mR87C1ZcnO30amofZuVueNT1P5QhMBqCiMxiLva+6dlkD7ISZ4J/XUUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hKNwx5DkBz19cF for ; Tue, 11 Aug 2026 20:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3700e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 11 Aug 2026 20:47:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: c276a80a4e52 - main - e1000: Check PHY control register reads 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/main X-Git-Reftype: branch X-Git-Commit: c276a80a4e52c065ed631e498ed2c3d284b45c75 Auto-Submitted: auto-generated Date: Tue, 11 Aug 2026 20:47:45 +0000 Message-Id: <6a7b8a71.3700e.7bdda8b@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=c276a80a4e52c065ed631e498ed2c3d284b45c75 commit c276a80a4e52c065ed631e498ed2c3d284b45c75 Author: Kevin Bowling AuthorDate: 2026-08-11 16:19:25 +0000 Commit: Kevin Bowling CommitDate: 2026-08-11 20:47:26 +0000 e1000: Check PHY control register reads Do not modify a zero-initialized PHY control value when its preceding read failed. MFC after: 2 weeks --- sys/dev/e1000/e1000_phy.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c index e3c8383d012e..8b00a80337a1 100644 --- a/sys/dev/e1000/e1000_phy.c +++ b/sys/dev/e1000/e1000_phy.c @@ -3541,10 +3541,15 @@ static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset, **/ void e1000_power_up_phy_copper(struct e1000_hw *hw) { + s32 ret_val; u16 mii_reg = 0; /* The PHY will retain its settings across a power down/up cycle */ - hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg); + ret_val = hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg); + if (ret_val) { + DEBUGOUT("Error reading PHY control register\n"); + return; + } mii_reg &= ~MII_CR_POWER_DOWN; hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg); } @@ -3559,10 +3564,15 @@ void e1000_power_up_phy_copper(struct e1000_hw *hw) **/ void e1000_power_down_phy_copper(struct e1000_hw *hw) { + s32 ret_val; u16 mii_reg = 0; /* The PHY will retain its settings across a power down/up cycle */ - hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg); + ret_val = hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg); + if (ret_val) { + DEBUGOUT("Error reading PHY control register\n"); + return; + } mii_reg |= MII_CR_POWER_DOWN; hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg); msec_delay(1); @@ -3889,7 +3899,11 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw) return E1000_SUCCESS; /* Do not apply workaround if in PHY loopback bit 14 set */ - hw->phy.ops.read_reg(hw, PHY_CONTROL, &data); + ret_val = hw->phy.ops.read_reg(hw, PHY_CONTROL, &data); + if (ret_val) { + DEBUGOUT("Error reading PHY control register\n"); + return ret_val; + } if (data & PHY_CONTROL_LB) return E1000_SUCCESS;