From nobody Tue Aug 25 00:37:34 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 4hTTQ71jdYz6pNRS for ; Tue, 25 Aug 2026 00:37:35 +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 4hTTQ665xWz4PPn for ; Tue, 25 Aug 2026 00:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787618254; 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=/hTUhhHqzfiHWAZMbYkZ+kBUEjD+t6oO7quuEqpEixA=; b=inR5RdrfEst9tDJ793RaUCElwHpzTgyoFnGOZ2dEZzl6Zjcks0jYGLmn3r3G5983yeYIIT 8YIcDIbOIamdh6UXtaPVAWlHXVMK3LNTndk6r6m28xZ1q1fe5NbeLhpzoRq1R201NF5uBs 0xCIb4QJWFIGZ1W4G8d6fK+6vdJzCBolsNU2B4WIL0Ph5iCEoVKllH9FVNQw3d34YTS340 SkCOhI3/WG4awZEq5Uov0r+3lkDdg5BqRCvNLXgMJ/K0ALaqd17eu7A2THUeCTJMH5oCtp 63uOeScVq4XHCmUxBaVz+BbvBwcP40ja8I1EPV1WINBtmR25Y+wNp5dMjAKDag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787618254; a=rsa-sha256; cv=none; b=WgaWVvy0mjb3pSnUkMvexU3gLiuQXTsmK72a6L6samwjhNXQX3MjQXy8TdRDfBGQo6pbhA Iag/imM3xwpq6jvaFQQxSVd/8uvvJnoOkg1TcuOFpoZcyjiPLlZuFMqkA3tXxvpMCouKL6 oIpR8tTxcrUKYAepjqus+5DhYWdksWkEuL4UDIyuw+1mCBaThHW1IhZV6Qsv4beDeS8glK uBxyA94SJV3sDUYWy98vgJMblmF3DsljsquXZbUOQWpxWHzrktDr2I5wO5IKcWIHha5PZe Hx2e7CF5LZJ8a+MCueu71XP6RMrecZTiBdHiSZ9YwQShsxLeHSWEdzBkQovjBw== 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=1787618254; 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=/hTUhhHqzfiHWAZMbYkZ+kBUEjD+t6oO7quuEqpEixA=; b=A3EpCFV1a0YKDQF6R2GLheK8vWJ2TGfdKhqi96ASbRtv66vSMS7DkpePLDJ5Z4Xd4KToU8 ASweVofClotHz0HAAwmTr4IO9Fnjkb5zPdY/GMczhvhwCZp3EfhQ46oMamQxG4DzExXIRx WnMn+kGId+pdmScWPCdOc91Dfg1lrXAJJfOJm135C1H0C/ADb2U1dklZm0TeAJf6QO72gq wIToDHhaToHe60Hae7mfOr8ffSUxJT3s8uvcQLmguJ2wqe+b0kc26d3q2dxr+6qR6Ah9BG XA5JT1rukhLkXtN+umhm6lm67Dox48Q/GihqtdkOrp7ecj5d7qBIkTRyJWMV0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTTQ643dnzC0X for ; Tue, 25 Aug 2026 00:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dc7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 00:37:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 1b6419428ee6 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b6419428ee6e9116f815d15993d61db832f2917 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 00:37:34 +0000 Message-Id: <6a8ce3ce.3dc7d.68c65761@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=1b6419428ee6e9116f815d15993d61db832f2917 commit 1b6419428ee6e9116f815d15993d61db832f2917 Author: Kevin Bowling AuthorDate: 2026-08-11 16:19:25 +0000 Commit: Kevin Bowling CommitDate: 2026-08-25 00:36:11 +0000 e1000: Check PHY control register reads Do not modify a zero-initialized PHY control value when its preceding read failed. (cherry picked from commit c276a80a4e52c065ed631e498ed2c3d284b45c75) --- 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;