From nobody Sun Apr 19 10:41:14 2026 X-Original-To: dev-commits-src-branches@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 4fz4sk3m4Hz6bNCH for ; Sun, 19 Apr 2026 10:41:14 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fz4sk2ntHz49V4 for ; Sun, 19 Apr 2026 10:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776595274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V0N9OcL5MQHdPzVINUjS6GqBwCI+DZ8S1pMSbwgCIjs=; b=ayXzGdo1qkK3vYp0BN2QkelZ8PFa24z7NWqfbt9yo4xeCJ8BUWULuiCUCXlaLtFavF86z5 KskN2JGCwLUsK4G4wsKwpRMX9BW2xyduWk5A6PaVDugdEpvACqGgeDc7ibuHyK9Sx2kn2Z GJ8cAM0rKr/y171J5M2jnpyHJeys58R7v9s71oEX85Gt53OHyhlg/R73j1fLnMBx4MUD+7 8/GHHutkN3chIx0v+1P99IUBWYTPJfkUlEDQYdYyN7tFKucBRPirmjsQrWdIW8X9ZTy5D0 3pws8fM4KGZgmafH0WgevGS+VfotAEm3NBThjCiuaUE9C6OESzeNhOLdbkvHyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776595274; a=rsa-sha256; cv=none; b=P3ITSjTINiBCNeIx7VqUr6DvnYGbCIIKADAEZuD3S9Yx8DppH96HiM20pfNXaefSpnH51N YIQh01lQ8PWGESAQ9xJKl8rUciLpGSysfhGbnE/hDvOIY+1GL27bIacXHgjGy31HYy781P Hd7bBeCzAZN3SWqyNo+3FNEZZwi6Z+W1UCZ52c5PI3JWi9MTnQN9XT6sL92ombczvznm3R aFTkQZn1GTbr4L9BPIZIJfi8doe8fo2wX6zh2v7b+ymGjFEDFIwIJSCIGvOAqth8MOUk5E Xyxj6D3PF8lB/UIr5hKm3p39pGNV14BBGfpXvcWagwcN5vk1YxqPznZSC5kUww== 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=1776595274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V0N9OcL5MQHdPzVINUjS6GqBwCI+DZ8S1pMSbwgCIjs=; b=ONOWrfC/bchNgl5d0uC0JuMZzfc6Q101m73Tt8XxdjsAq8X9JmkK+t/b6xhPIzz/omG1Lx d0QoSLA6ZZAy4UJNI+ViCMvl2Iedqtdja6UdfPlc5U0x0WJ0Dz6GqKbkChDkHpWgbwGiXI W0kjZ0xZABk8TG9guowcP1/zX2XBTYUgiYEqzQVHIz9N4sbHFU5Ja/67Apo8IiRvL+OC8j fqTjfaxhVVioE2WWMWft3+lzJhSBoT2Xt39xe4yfbhcntke9Q+nHJ+IiFrwH/dWG5QUW91 PYNWy4HhYl9E7HfbV/RXnem8lAEtEAlphpIhKkeOfTRGrw8C8xTTol2To6d3bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fz4sk12Svz1Lby for ; Sun, 19 Apr 2026 10:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3324c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 19 Apr 2026 10:41:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Yuichiro NAITO From: Kevin Bowling Subject: git: d1160074500d - stable/14 - ixgbe: Fix MRQC register value. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: d1160074500d66d402951e93c35bab7dc4fc4b04 Auto-Submitted: auto-generated Date: Sun, 19 Apr 2026 10:41:14 +0000 Message-Id: <69e4b14a.3324c.d117768@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d1160074500d66d402951e93c35bab7dc4fc4b04 commit d1160074500d66d402951e93c35bab7dc4fc4b04 Author: Yuichiro NAITO AuthorDate: 2026-04-07 15:25:09 +0000 Commit: Kevin Bowling CommitDate: 2026-04-19 10:41:02 +0000 ixgbe: Fix MRQC register value. Focus on the MRQE field of the MRQC register, which is 4 bits wide, and we use these 3 types of values. - IXGBE_MRQC_RSSEN 0x1 (non VF mode) - IXGBE_MRQC_VMDQRSS32EN 0xA (less than 33 VFs) - IXGBE_MRQC_VMDQRSS64EN 0xB (less than 65 VFs) If we always take a bitwise OR with IXGBE_MRQC_RSSEN, IXGBE_MRQC_VMDQRSS32EN will never be chosen. Select these 3 types of values for the proper case. Signed-off-by: Yuichiro NAITO Pull Request: https://github.com/freebsd/freebsd-src/pull/2132 (cherry picked from commit 938c076b9b0bc458a3877b52535527d37199fc09) --- sys/dev/ixgbe/if_ix.c | 4 ++-- sys/dev/ixgbe/if_sriov.c | 2 +- sys/dev/ixgbe/ixgbe_sriov.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 7f234ce45dbd..1f41eca6ffcd 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -709,7 +709,7 @@ ixgbe_initialize_rss_mapping(struct ixgbe_softc *sc) RSS_HASHTYPE_RSS_TCP_IPV6_EX; } - mrqc = IXGBE_MRQC_RSSEN; + mrqc = ixgbe_get_mrqc(sc->iov_mode); if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4; if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV4) @@ -728,7 +728,7 @@ ixgbe_initialize_rss_mapping(struct ixgbe_softc *sc) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP; if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX) mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP; - mrqc |= ixgbe_get_mrqc(sc->iov_mode); + IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc); } /* ixgbe_initialize_rss_mapping */ diff --git a/sys/dev/ixgbe/if_sriov.c b/sys/dev/ixgbe/if_sriov.c index 1998cdb016f7..47f1a1279e2f 100644 --- a/sys/dev/ixgbe/if_sriov.c +++ b/sys/dev/ixgbe/if_sriov.c @@ -170,7 +170,7 @@ ixgbe_get_mrqc(int iov_mode) mrqc = IXGBE_MRQC_VMDQRSS32EN; break; case IXGBE_NO_VM: - mrqc = 0; + mrqc = IXGBE_MRQC_RSSEN; break; default: panic("Unexpected SR-IOV mode %d", iov_mode); diff --git a/sys/dev/ixgbe/ixgbe_sriov.h b/sys/dev/ixgbe/ixgbe_sriov.h index e5a78a7220cc..3c456ee819f2 100644 --- a/sys/dev/ixgbe/ixgbe_sriov.h +++ b/sys/dev/ixgbe/ixgbe_sriov.h @@ -94,7 +94,7 @@ u32 ixgbe_get_mrqc(int); #define ixgbe_align_all_queue_indices(_a) #define ixgbe_vf_que_index(_a, _b, _c) (_c) #define ixgbe_get_mtqc(_a) IXGBE_MTQC_64Q_1PB -#define ixgbe_get_mrqc(_a) 0 +#define ixgbe_get_mrqc(_a) IXGBE_MRQC_RSSEN #endif /* PCI_IOV */