From nobody Tue Aug 25 00:42:56 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 4hTTXK6P5vz6pNhn for ; Tue, 25 Aug 2026 00:42:57 +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 4hTTXJ5z2Sz3GPv for ; Tue, 25 Aug 2026 00:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787618576; 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=O/JlKVTPs9TDohxV6xyhkkdZQjpQDPjxCEBJfOAMAPU=; b=kWDFq0Xy1zfy63bhhLFwdnJYQHAE63NABmVSeVjcU/HFj1NKpc+wgEMV4d11a3oyv1mwAM G5+psmLWedNpqD9QNzJaiy1Kd25CyE3VHesbhwoZjKMnsvKkgsFthAmpQq928tjgNI0+U3 Fsb/Ux0ubNFuHBMkbxxDon+calYT4nkIPIjQk/u9TsIEOU+vealWWqbB2IKGR+kU56OpMP QsUPhLzoNzGzckws9UECCCQn0dz66AQ3dga9j9IeuOeCORhfTBxpnrPKp4B8UxqXn0UsLX BihYEH63pcCcbfW9zW5VDPuLkc+DNyXDfW1bKsn23zq4cBitaI0eAQE5UsaSIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787618576; a=rsa-sha256; cv=none; b=KqI8z0z1A5NXD8TN0Yci4TJAva/huLQq0n1fIoHuHenM5DHrOJmyySAHClGk0PLBROmtUO 2w0su0UlGySAlkiRXA5LnVIYzSyrWJj6UW3xLvrbcoS6rmBpuLTFIsYh/L3V8WAUJjPVu7 hJo79cGjoqJeEsaiCI2LfeK3RN/rHPPuuBsAIXcDF14b4t/Kdw2w8JCQEBbXf+QT858zdK 1jPbtG0ALBVjhTY46CCTvqtf8Udu3M0/AdtMQCO+t+vxbFVJzeXIscQe/kgsny7BFOlypZ 7IfVJ/7fwfCYC3+qFJHzbPJzNmAG9Y5Hu10sxmoDK0YYCEfTbYK9Rqrhtol1wA== 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=1787618576; 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=O/JlKVTPs9TDohxV6xyhkkdZQjpQDPjxCEBJfOAMAPU=; b=B9/i0TlvLILkIu3uk0HDjyJkHivKSaTNgdN+1eMkxj5vg8QH7LsRGMWPBiScec4B2KC5vg e8w6cIsCWgn+fWGODz0Y3s8nFzU2WaeClWxwta0jN6jlZnr2Tf3Li0ie3X8vMuvKIy6b+c +sqH/vAKvzfFj8un61XpCabuj1BX/zMmh+gmVObQ6d/ajTQL5hknj0fcQHI15Jru6Ap2lt H7UdYjRsUsx7BAxn4ZX7eC5I0PkEc92BNkSpVYdiOvTF9fr2fVN0Whz7/JXyMAL6e7+CjD jf5yAzZv9PRLa8RcuSVex2Ucayu2Vrw/wZ2g4nMYPfCFPlzwmtEmyuUGtrhxhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTTXJ52dDzCnh for ; Tue, 25 Aug 2026 00:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40a1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 00:42:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: e2a0b3b1b7a3 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: e2a0b3b1b7a36fb971a384c8f2f5aa21db9e6f3c Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 00:42:56 +0000 Message-Id: <6a8ce510.40a1b.51402af@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e2a0b3b1b7a36fb971a384c8f2f5aa21db9e6f3c commit e2a0b3b1b7a36fb971a384c8f2f5aa21db9e6f3c Author: Kevin Bowling AuthorDate: 2026-08-11 19:36:08 +0000 Commit: Kevin Bowling CommitDate: 2026-08-25 00:41:28 +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++; }