From nobody Tue Aug 25 00:31:47 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 4hTTHS5xbqz6pMwk for ; Tue, 25 Aug 2026 00:31:48 +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 4hTTHS0D03z49qJ for ; Tue, 25 Aug 2026 00:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787617908; 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=J730UCtwhxz9zN6b7jtK87y4ReoySt2wZ4N/nbUmqAk=; b=RjFA0JpNOrJwupcL71PusoDoFffpMV/zCPp1ptmV0CRzGY3u4at6M2kgFevM78C73b8k8U FQJL/BuOyJ2uoE/jX1KaDL014Tw4UWY/Fv1jpOC6k1Kmi049b24F7saLJersQJdV/Epji7 bBwSHfaC5Bh2VfGz1iZgAQXPnHusqyadzjsvPmrLFS1ZfbBvYqcm4nQM78RuX8Hrjg8fZk 4AvJv5CYXGfjWHMc33vPYZmI+OCbX6eyrQ5NvaoVxPKtNvE/3I2GjWaAc6QhRRrUyJufh6 tHebfnJS+Mnl6ZyhEVG5Kq/1O+em2LMFHu0256Fh4zSIIP8rGH1ZlZXU4BgoAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787617908; a=rsa-sha256; cv=none; b=cNtcKIXIV3n0YLA38r0EFBioxsk9OwDDZ0IpiWCFDf5UxBfJ1zl4UTvKGhhIEwerRealOs KRJNNdkd0L7LwNXAI21zyEb1f22du2nclXhIlyc90JRwnMwYNaVzthOVZNpffIY9MzMPxM Mtcy5O4dwlK+ilMF+GMp1KVgWW1wVLPlJBcq/8KwEu/3c+VNlRzBH9N0v4b1HPJmHHlbC+ Fm6BMfe7NwVpEO6zGjzyBv+1KCfoNfprV5oURk7NV3EVzZScCaQeNWn3ot6hwDapn9iQu4 JCa4OW8bknIAlONtnSt4D4NRyBDUK831R7ospdTL8flmPFsLp2AqTqDhU3VaYA== 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=1787617908; 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=J730UCtwhxz9zN6b7jtK87y4ReoySt2wZ4N/nbUmqAk=; b=ZgZJaRfTRXgEIGs0LAO4iHwA2YM3JZqvqsKcYgMM//gjoqpXiSfGaFgp3ibik034LckUy6 CadwhuVeyttxDpeJOIhgTxdB6mpKYVmNADuneGPvOTn8JiJ6l/uJTaRfOLyuwYOk5Z9l/S MgBgnD3jVLMFbH7oBaNe89KRfZhDv7TOaQesEk2U15SYJXCxbz+NbdZSxfJ7j11tnWePhD Fm1WfnZOIH081BQii4gxuQPP3VtapObW5J9OvcRPb+sDBAALRiYFEb/j9h5gxOmniuCGic mRt7cXyu4qF8rKi0tzyj13HjJtCSEX7thsmzJl3tDnhN4QTbbcpHAgHbCGNukw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTTHR611LzCDy for ; Tue, 25 Aug 2026 00:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f9de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 00:31:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 43c32e31aa58 - stable/15 - ixgbe: Use unsigned register bitmap shifts 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: 43c32e31aa58c57ab50e7cde187c320d90a45a3e Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 00:31:47 +0000 Message-Id: <6a8ce273.3f9de.35f252b8@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=43c32e31aa58c57ab50e7cde187c320d90a45a3e commit 43c32e31aa58c57ab50e7cde187c320d90a45a3e Author: Kevin Bowling AuthorDate: 2026-08-11 19:36:08 +0000 Commit: Kevin Bowling CommitDate: 2026-08-25 00:29:47 +0000 ixgbe: Use unsigned register bitmap shifts VLAN, VMDq, and VF reset bit indices can reach 31. Use unsigned values when constructing their 32-bit register masks so the shifts do not operate on signed integers. (cherry picked from commit bf6feffef6c16559333048859b24547acea3dba5) --- sys/dev/ixgbe/ixgbe_82598.c | 6 +++--- sys/dev/ixgbe/ixgbe_common.c | 18 +++++++++--------- sys/dev/ixgbe/ixgbe_mbx.c | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_82598.c b/sys/dev/ixgbe/ixgbe_82598.c index f27f263dd07f..dae2fa4b7613 100644 --- a/sys/dev/ixgbe/ixgbe_82598.c +++ b/sys/dev/ixgbe/ixgbe_82598.c @@ -1025,7 +1025,7 @@ s32 ixgbe_set_vfta_82598(struct ixgbe_hw *hw, u32 vlan, u32 vind, /* Set the nibble for VMD queue index */ bits = IXGBE_READ_REG(hw, IXGBE_VFTAVIND(vftabyte, regindex)); - bits &= (~(0x0F << bitindex)); + bits &= ~(0x0FU << bitindex); bits |= (vind << bitindex); IXGBE_WRITE_REG(hw, IXGBE_VFTAVIND(vftabyte, regindex), bits); @@ -1035,10 +1035,10 @@ s32 ixgbe_set_vfta_82598(struct ixgbe_hw *hw, u32 vlan, u32 vind, bits = IXGBE_READ_REG(hw, IXGBE_VFTA(regindex)); if (vlan_on) /* Turn on this VLAN id */ - bits |= (1 << bitindex); + bits |= 1U << bitindex; else /* Turn off this VLAN id */ - bits &= ~(1 << bitindex); + bits &= ~(1U << bitindex); IXGBE_WRITE_REG(hw, IXGBE_VFTA(regindex), bits); return IXGBE_SUCCESS; diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c index dd4dbb56cc25..8a03372c86b5 100644 --- a/sys/dev/ixgbe/ixgbe_common.c +++ b/sys/dev/ixgbe/ixgbe_common.c @@ -3841,10 +3841,10 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq) mpsar_hi = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar)); } } else if (vmdq < 32) { - mpsar_lo &= ~(1 << vmdq); + mpsar_lo &= ~(1U << vmdq); IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), mpsar_lo); } else { - mpsar_hi &= ~(1 << (vmdq - 32)); + mpsar_hi &= ~(1U << (vmdq - 32)); IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), mpsar_hi); } @@ -3878,11 +3878,11 @@ s32 ixgbe_set_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq) if (vmdq < 32) { mpsar = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar)); - mpsar |= 1 << vmdq; + mpsar |= 1U << vmdq; IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), mpsar); } else { mpsar = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar)); - mpsar |= 1 << (vmdq - 32); + mpsar |= 1U << (vmdq - 32); IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), mpsar); } return IXGBE_SUCCESS; @@ -3906,11 +3906,11 @@ s32 ixgbe_set_vmdq_san_mac_generic(struct ixgbe_hw *hw, u32 vmdq) DEBUGFUNC("ixgbe_set_vmdq_san_mac"); if (vmdq < 32) { - IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), 1 << vmdq); + IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), 1U << vmdq); IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), 0); } else { IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), 0); - IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), 1 << (vmdq - 32)); + IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), 1U << (vmdq - 32)); } return IXGBE_SUCCESS; @@ -4018,7 +4018,7 @@ s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind, * bits[4-0]: which bit in the register */ regidx = vlan / 32; - vfta_delta = 1 << (vlan % 32); + vfta_delta = 1U << (vlan % 32); vfta = IXGBE_READ_REG(hw, IXGBE_VFTA(regidx)); /* @@ -4090,12 +4090,12 @@ s32 ixgbe_set_vlvf_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind, bits = IXGBE_READ_REG(hw, IXGBE_VLVFB(vlvf_index * 2 + vind / 32)); /* set the pool bit */ - bits |= 1 << (vind % 32); + bits |= 1U << (vind % 32); if (vlan_on) goto vlvf_update; /* clear the pool bit */ - bits ^= 1 << (vind % 32); + bits ^= 1U << (vind % 32); if (!bits && !IXGBE_READ_REG(hw, IXGBE_VLVFB(vlvf_index * 2 + 1 - vind / 32))) { diff --git a/sys/dev/ixgbe/ixgbe_mbx.c b/sys/dev/ixgbe/ixgbe_mbx.c index 82cbe0a18eb3..a6a2721d7132 100644 --- a/sys/dev/ixgbe/ixgbe_mbx.c +++ b/sys/dev/ixgbe/ixgbe_mbx.c @@ -861,9 +861,9 @@ static s32 ixgbe_check_for_rst_pf(struct ixgbe_hw *hw, u16 vf_id) break; } - if (vflre & (1 << vf_shift)) { + if (vflre & (1U << vf_shift)) { ret_val = IXGBE_SUCCESS; - IXGBE_WRITE_REG(hw, IXGBE_PFVFLREC(index), (1 << vf_shift)); + IXGBE_WRITE_REG(hw, IXGBE_PFVFLREC(index), 1U << vf_shift); hw->mbx.stats.rsts++; }