From nobody Tue Aug 25 00:43:01 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 4hTTXP487Tz6pPFV for ; Tue, 25 Aug 2026 00:43:01 +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 4hTTXP1kQ5z3GSX for ; Tue, 25 Aug 2026 00:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787618581; 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=thTz4VdnfJSWMaf2JUXLyWQg1eBGGoQV1cGnLWwnpRI=; b=QmMHP9MiAz6/K7vUFiFrzvpZMzeM+mjlVOF1wg5ZD01HDN7oePqENJLziM/bgg3u4nxI92 1wzsZCUIfI8Q+45tp6P/iUMoCDK2vUfhiaWoiU5i1flFSRM0IuDjAfcZt5+90Pqo6/ArkJ EFdMhB/vg496s7sGSoMZwPlQBAgxIg4kyKMVUZe7Ty8PR6TV6GlnVAJX7XVYzAKFBTNLCO +nCs6WnukMiM6EF+z42ZroQQY+uOaHHcN3BcqOmekM7uXCeKepc22Op1lc7W1Q+f38S1iU TxEOgyYsdBlGrRtMChC1o/g+DQAmoVc4oelarm7EWlYv4KXTSMTqzso+oxdNlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787618581; a=rsa-sha256; cv=none; b=yYdOIvmPMIzFab5YtgQs2CATzfxNsXnYoG3fi8ZabcSj24jSk/yd8M7Vcpcyl4x0D7hlTR XiZ+e0VuutOO1F/ml7GPNas/OiJUGywZEhVTA8NvzFV13o6BHo66wBtKMdGzgkkFxwatXX rtjsQf0hqSGnHj8Vopg87IkYwrRHUXwI8de2LJ16MrP/S/Wchl85KBrt4Mpf1PRnhNaxax fm7UFoQGhbcD/2I7qvooP6hm7EA3+3EHYpTYlyaOXwmIW+0+0MnJ9BVa06qiohx0j4EKqd dWeP7w/I32mC0XkEMP94swYJU6Gz4WXsdnmKe5VyP/AgIRZJ11kV7/ErjF0E3Q== 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=1787618581; 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=thTz4VdnfJSWMaf2JUXLyWQg1eBGGoQV1cGnLWwnpRI=; b=jnRFZ9HSXmRXMWxFY7l9MC56CEiSLiaFmFumptdQGYMwRBx+xG1oulYxJTu7GlRvNJzecW bpY0b0irFNkIZL7kVOht+2pFyFGXpmWWyu+12+uMUJUfFIwEyK2da1OqCF9vrbuwNUDAZ3 CNo0QZyMN8z3hHF518K8HiLTAj80KXEu9B/TMwLWM/pT/wMzNQvebJFMcclnvWp9XajLBh xNOD89w5w+nbRCEm/WuliEf0LmjswneGhja0vT33YMB8GfBNRDbjwusg7yH/8evGaA3jPM ncBTbOWleDbP5WuuJnRFowXj20piWT66E/7bz096JuwujuIph3VnCP4xsPSQOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTTXP0VwCzC0w for ; Tue, 25 Aug 2026 00:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40b0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 00:43:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: b714f22fd2d4 - stable/14 - e1000: Avoid signed shifts while assembling PHY IDs 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: b714f22fd2d404a7da776fbce9177fec9f6ee6de Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 00:43:01 +0000 Message-Id: <6a8ce515.40b0a.5780e912@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b714f22fd2d404a7da776fbce9177fec9f6ee6de commit b714f22fd2d404a7da776fbce9177fec9f6ee6de Author: Kevin Bowling AuthorDate: 2026-08-11 19:40:48 +0000 Commit: Kevin Bowling CommitDate: 2026-08-25 00:42:09 +0000 e1000: Avoid signed shifts while assembling PHY IDs PHY identifier words are promoted to signed int when the cast is applied after the shift. Cast each 16-bit register value first so identifiers with their high bit set are assembled as unsigned data. (cherry picked from commit 13a7470096567480676e24545b3c1d6404f3f2ec) --- sys/dev/e1000/e1000_82571.c | 2 +- sys/dev/e1000/e1000_ich8lan.c | 2 +- sys/dev/e1000/e1000_phy.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/e1000/e1000_82571.c b/sys/dev/e1000/e1000_82571.c index fa010075f367..d02efd08a163 100644 --- a/sys/dev/e1000/e1000_82571.c +++ b/sys/dev/e1000/e1000_82571.c @@ -485,7 +485,7 @@ static s32 e1000_get_phy_id_82571(struct e1000_hw *hw) if (ret_val) return ret_val; - phy->id = (u32)(phy_id << 16); + phy->id = (u32)phy_id << 16; usec_delay(20); ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id); if (ret_val) diff --git a/sys/dev/e1000/e1000_ich8lan.c b/sys/dev/e1000/e1000_ich8lan.c index 1fbdc35e74df..eb6971b0e530 100644 --- a/sys/dev/e1000/e1000_ich8lan.c +++ b/sys/dev/e1000/e1000_ich8lan.c @@ -211,7 +211,7 @@ static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw) ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID1, &phy_reg); if (ret_val || (phy_reg == 0xFFFF)) continue; - phy_id = (u32)(phy_reg << 16); + phy_id = (u32)phy_reg << 16; ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID2, &phy_reg); if (ret_val || (phy_reg == 0xFFFF)) { diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c index 8b00a80337a1..7d12d98bffd8 100644 --- a/sys/dev/e1000/e1000_phy.c +++ b/sys/dev/e1000/e1000_phy.c @@ -238,7 +238,7 @@ s32 e1000_get_phy_id(struct e1000_hw *hw) if (ret_val) return ret_val; - phy->id = (u32)(phy_id << 16); + phy->id = (u32)phy_id << 16; usec_delay(20); ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id); if (ret_val)