From nobody Sun Apr 12 04:51:07 2026 X-Original-To: dev-commits-src-main@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 4ftdRB0Xlvz6YThj for ; Sun, 12 Apr 2026 04:51:18 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftdR44vZ5z3gx0 for ; Sun, 12 Apr 2026 04:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775969472; 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=5OOJgBTtK2YGI6Zfky5ZDC3MiNqbzAXEN9g99SOP/eI=; b=obISjm0AEzY+3B1vq0RS9Cugv2hC8hj0OPY09eVvVSC4OCUGRfUY/5h0OsxZKedk7A3xWK o65Xb0IpqL6IDZyrVLHXLe9sRnGe+P6v7a0l/0HbqjAHTmswIkfn6iqancZxuDGX2AaOui Dq2WKUqya2QZziNqgWeB4ntv4CiMiYI0TuCvlHBZJpOX1WykyUouU8/RQnD+yu073XldLQ cxT9dq8e4EtYDx9NkVjOymKO/Zr0tlsVC87MQj7CASRhWcCGbFJ2lA405TKtILSeVpm05D zTAiLAFZz6lseBXdWr3qHZjvdcoAKRygRg8Obh234s+78e1zharDqfksobv22g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775969472; a=rsa-sha256; cv=none; b=czM95ycj8ek5CXfaao2r3w4/XyCUVFHu4uUlYVso6zqlFCTQ2RqhdKwECmv43REmbxYZrF PCpqiBZI60uGl7BfPjkRQHB1PSxQ0GqjP8n9zN2ISmsSI5cSnhmUcU4HgRaGdRqcM/57Go Woj6X8oNLjxpoRDRjJcmmkQrDObXc1m/tS2tjZfwbxRIw4WpaTaoJFllX0Y9/pu4jLDRpm /TDBz6+yADOb4tNctXUYW9ZOiS0UHsWZHDoTnTyINdGkghxdQV4fv+l3FCMkS9hjuso3RC MBvFIwm2Uw5OuEu5FOsKuCxCp9gK1wagdbTTlQuMoZsynfYVkkwnp+d7aC+0SQ== 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=1775969472; 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=5OOJgBTtK2YGI6Zfky5ZDC3MiNqbzAXEN9g99SOP/eI=; b=EG5gedzTrmphYxl9fQ2wkqD30kcqciqBpyaDFEeY6e4aDT17rXIig+hOqbOW58SyaYNCdm l3xUpYqjhE54KuTR6vj7M/wFebKxa2M3JQDRFNykEFUS01B8jr1YlcZ2Z1DD1uEaNyhiWo QH9Darnw3UvqR0qYeEGzP1bZJAbUXd007cz+n0kEdNDwZDz3/P+BOzxKW1yvBn6amAiLhU AEpPlj90iSyKPvjI0g1xf2iSmQKgBnTW8/CZVsWmkrWXKKsf5D323bA9mMzcdzXAuLCLWI 7DmGYrJUFtgkDMNYMVgZYtmo5wvnPLyLBZMwDO2d81Dsb8XT48UeChlSS+swmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftdR44TFnz124N for ; Sun, 12 Apr 2026 04:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 224b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 04:51:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Yuichiro NAITO From: Kevin Bowling Subject: git: 938c076b9b0b - main - ixgbe: Fix MRQC register value. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 938c076b9b0bc458a3877b52535527d37199fc09 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 04:51:07 +0000 Message-Id: <69db24bb.224b6.1969b551@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=938c076b9b0bc458a3877b52535527d37199fc09 commit 938c076b9b0bc458a3877b52535527d37199fc09 Author: Yuichiro NAITO AuthorDate: 2026-04-07 15:25:09 +0000 Commit: Kevin Bowling CommitDate: 2026-04-12 04:50:28 +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 MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/2132 --- 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 9a1ed66ad6a8..829fbba48a72 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 */