From nobody Thu Nov 20 14:52:43 2025 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 4dC1YC3zC5z6HVg7; Thu, 20 Nov 2025 14:52:47 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC1YC1S63z3JR1; Thu, 20 Nov 2025 14:52:47 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763650367; 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: in-reply-to:in-reply-to:references:references; bh=Lv2Eu1azOMqipCOQibZKVYitL/nXmGzRlWC+ezjsdrY=; b=q4RYztIY8RE0+tsoHt7bEGH9iSpuaDEdsDNiagHEGy8/XAMfg86dJURxaQo8vd9bNOz/Av HswM5ryHOpRYHbpXNMpXOREjs9DeXIdPHVLJFsMR76w1eJDmTC0sczcyEcLbrwJVa3cDqS Cx5UPazyJalHHMBYGUUCHNHoXj9EPuGH0ktCtDJTwS07QL2p/0ZerhwcYPDTlc0n863YkY vXMYtPUK9PKL6NtSZR63UyoItz6/4IPh/XJexDMICHaAIx6IvZTyHd9J/FkWk/ubmqI8GO nXB0qW+sZQzhqyvOf/0eqycmuwUvnfxFdZGBmoibBdrcyszxrnxZt/FrJRXMlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763650367; 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: in-reply-to:in-reply-to:references:references; bh=Lv2Eu1azOMqipCOQibZKVYitL/nXmGzRlWC+ezjsdrY=; b=EPmK1UgyKr1H2yV4YxdXpS/2EEyyhGcBbVs0X5HNFdVIl73xeAmZKtPGKqfCw7siQ9qHrv 9bCdero5Y+TqPHKJZscdym6iDNcMCtNtECHj8tr0/PEF0KW7EqCGJZNlTIDERRiujyTHjp uBIhvURuahLbQPFulZ4toNOCDlr2GHtLAgGe36FKV5PS60U5/oqFJEwAtcQqTDWnzljCtu hFpQkETuGdS2pWQpfnZQtAmE82N7Idm4V5F69KWiTpbtrjl7l/fWbJoKthAumSIPZ8r43o I/a55rA3Z8WqKc2Qs0Q39j4Lrjo5qphao3KrxZPQ/Z7JXw1BA8sGOA4SiP2kJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763650367; a=rsa-sha256; cv=none; b=lFli9aww+PrrmHTlbgJ2LdAETTbpqLGcjfK3uyCwy4EaQAs/OB8yJXO9Xpzbys5oGhh4zG 7pOQ+/ilTBIyr8PPepDxNOTzQ9veF2tEU/W1C6O+9++A4vDie74i94CLI0JeNAJEwKppgq 9HDMRk8Iovw03eUACnJlwBRzd9Ke/6CwqIXMlfbtgZl5LtGqhvWui25YuKrjYoETwZ8CyJ kDKWriLCdX6mir5Mao0sgLGt9QfBM3qNKU0LhszGEiKk8DNGuy5QCY+8JHC3265r/4OJkm kJ5CGHTB/y7aOPzfeMi/4x3ruq3BDH9LENcC5zpKe2tYOxezc/YbrWnhdrfVMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (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 (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R12" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dC1YB6Ydkz11Bw; Thu, 20 Nov 2025 14:52:46 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 4F0E7284F6; Thu, 20 Nov 2025 15:52:44 +0100 (CET) From: Kristof Provost To: Navdeep Parhar Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 17b4a0acfaf5 - main - cxgbe(4): T7 related updates to shared code Date: Thu, 20 Nov 2025 15:52:43 +0100 X-Mailer: MailMate (2.0r6272) Message-ID: <0DA16B91-A32E-443D-8FF3-45183117ABB6@FreeBSD.org> In-Reply-To: <202511130041.5AD0fYXA077222@gitrepo.freebsd.org> References: <202511130041.5AD0fYXA077222@gitrepo.freebsd.org> 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 MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_45391A03-D8BE-466C-AF9B-13E135D8554A_=" --=_MailMate_45391A03-D8BE-466C-AF9B-13E135D8554A_= Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 13 Nov 2025, at 1:41, Navdeep Parhar wrote: > The branch main has been updated by np: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3D17b4a0acfaf5e58a04232c756a79d= 73649ead231 > > commit 17b4a0acfaf5e58a04232c756a79d73649ead231 > Author: Navdeep Parhar > AuthorDate: 2025-10-15 19:29:06 +0000 > Commit: Navdeep Parhar > CommitDate: 2025-11-13 00:32:38 +0000 > > cxgbe(4): T7 related updates to shared code > > - Avoid some more registers with read side-effects during regdump. > - mps_tcam_size is 3x the size of T6/T5. > - Update rss_rd_row to work with T7. > > Obtained from: Chelsio Communications > MFC after: 1 week > Sponsored by: Chelsio Communications > --- > sys/dev/cxgbe/common/t4_hw.c | 98 +++++-- > sys/dev/cxgbe/common/t4_msg.h | 566 = > +++++++++++++++++++++++++++++++++------ > sys/dev/cxgbe/common/t4_regs.h | 100 ++++++- > sys/dev/cxgbe/tom/t4_cpl_io.c | 2 +- > usr.sbin/cxgbetool/reg_defs_t7.c | 126 +++++---- > 5 files changed, 723 insertions(+), 169 deletions(-) > =E2=80=A6 > +struct cpl_rx_phys_addr { > + __be32 RSS[2]; > + __be32 op_to_tid; > + __be32 pci_rlx_order_to_len; > + __be64 phys_addr; > +}; This fails to build on =E2=80=98options RSS=E2=80=99 kernels (which does = `#define = RSS 1`): --- t4_main.o --- In file included from /usr/src/sys/dev/cxgbe/t4_main.c:79: In file included from /usr/src/sys/dev/cxgbe/common/common.h:525: In file included from /usr/src/sys/dev/cxgbe/adapter.h:62: /usr/src/sys/dev/cxgbe/common/t4_msg.h:2481:16: error: expected member = name or ';' after declaration specifiers 2481 | __be32 RSS[2]; | ~~~~~~ ^ ./opt_rss.h:1:13: note: expanded from macro 'RSS' 1 | #define RSS 1 | ^ In file included from /usr/src/sys/dev/cxgbe/t4_main.c:79: In file included from /usr/src/sys/dev/cxgbe/common/common.h:525: In file included from /usr/src/sys/dev/cxgbe/adapter.h:62: /usr/src/sys/dev/cxgbe/common/t4_msg.h:2481:15: error: expected ';' at = end of declaration list 2481 | __be32 RSS[2]; | ^ | ; 2 errors generated. *** [t4_main.o] Error code 1 Something simple like this appears to be enough to fix that: diff --git a/sys/dev/cxgbe/common/t4_msg.h = b/sys/dev/cxgbe/common/t4_msg.h index 214080964fbb..19a9af25ca5d 100644 --- a/sys/dev/cxgbe/common/t4_msg.h +++ b/sys/dev/cxgbe/common/t4_msg.h @@ -2478,7 +2478,7 @@ struct cpl_rx_data_ack_core { #define F_RX_DACK_CHANGE V_RX_DACK_CHANGE(1U) struct cpl_rx_phys_addr { - __be32 RSS[2]; + __be32 rssid[2]; __be32 op_to_tid; __be32 pci_rlx_order_to_len; __be64 phys_addr; Best regards, Kristof --=_MailMate_45391A03-D8BE-466C-AF9B-13E135D8554A_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 13 Nov 2025, at 1:41, Navdeep Parhar wrote:

The branch main has been updated by= np:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3D17b4a0acfaf5e58a04232c756a79d73649ead231

commit 17b4a0acfaf5e58a04232c756a79d73649ead231
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2025-10-15 19:29:06 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2025-11-13 00:32:38 +0000

cxgbe(4): T7 related updates to shared code

- Avoid some more registers with read side-effects du= ring regdump.
- mps_tcam_size is 3x the size of T6/T5.
- Update rss_rd_row to work with T7.

Obtained from: Chelsio Communications
MFC after: 1 week
Sponsored by: Chelsio Communications
---
sys/dev/cxgbe/common/t4_hw.c | 98 +++++--
sys/dev/cxgbe/common/t4_msg.h | 566 +++++++++++++++++++++++++++++++++= ------
sys/dev/cxgbe/common/t4_regs.h | 100 ++++++-
sys/dev/cxgbe/tom/t4_cpl_io.c | 2 +-
usr.sbin/cxgbetool/reg_defs_t7.c | 126 +++++----
5 files changed, 723 insertions(+), 169 deletions(-)


=E2=80=A6

+struct cpl_rx_phys_addr {
+ __be32 RSS[2];
+ __be32 op_to_tid;
+ __be32 pci_rlx_order_to_len;
+ __be64 phys_addr;
+};

This fails to build on =E2=80=98options RSS=E2=80=99 kern= els (which does #define RSS 1):

--=
- t4_main.o ---
In file included from /usr/src/sys/dev/cxgbe/t4_main.c:79:
In file included from /usr/src/sys/dev/cxgbe/common/common.h:525:
In file included from /usr/src/sys/dev/cxgbe/adapter.h:62:
/usr/src/sys/dev/cxgbe/common/t4_msg.h:2481:16: error: expected member na=
me or ';' after declaration specifiers
 2481 |         __be32 RSS[2];
      |         ~~~~~~ ^
=2E/opt_rss.h:1:13: note: expanded from macro 'RSS'
    1 | #define RSS 1
      |             ^
In file included from /usr/src/sys/dev/cxgbe/t4_main.c:79:
In file included from /usr/src/sys/dev/cxgbe/common/common.h:525:
In file included from /usr/src/sys/dev/cxgbe/adapter.h:62:
/usr/src/sys/dev/cxgbe/common/t4_msg.h:2481:15: error: expected ';' at en=
d of declaration list
 2481 |         __be32 RSS[2];
      |               ^
      |               ;
2 errors generated.
*** [t4_main.o] Error code 1

Something simple like this appears to be enough to fix th= at:

di=
ff --git a/sys/dev/cxgbe/common/t4_msg.h b/sys/dev/cxgbe/common/t4_msg.h
index 214080964fbb..19a9af25ca5d 100644
--- a/sys/dev/cxgbe/common/t4_msg.h
+++ b/sys/dev/cxgbe/common/t4_msg.h
@@ -2478,7 +2478,7 @@ struct cpl_rx_data_ack_core {
 #define F_RX_DACK_CHANGE    V_RX_DACK_CHANGE(1U)

 struct cpl_rx_phys_addr {
-        __be32 RSS[2];
+        __be32 rssid[2];
         __be32 op_to_tid;
         __be32 pci_rlx_order_to_len;
         __be64 phys_addr;

Best regards,
Kristof

--=_MailMate_45391A03-D8BE-466C-AF9B-13E135D8554A_=--