From nobody Wed Jul 17 14:21:49 2024 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 4WPJ662jVyz5RPgQ; Wed, 17 Jul 2024 14:21:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WPJ656N0mz4t75; Wed, 17 Jul 2024 14:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721226109; 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=Vx6TALkrbug4EAr+FpNzbAue+JzZ9dqaCOMLMF7stdI=; b=El5/wq6fzsPBJx9GlwH4nfEzFUwChfTWCM045cnlc9bPZlUVU++xX6Tu+J+iu4R1OwJRdC 5CfuV8gni6E6E74rnwx3vok0QbAgeb5S+bs+BbsyOJHR8c0TbZnsLUNvj3SBv7BesOgVhb zjBD1lGz1x0VQuFZuwVQOi2fotEZAxcKN4WnpycwdKoe6znZv2i5ULJTSKURBXf3EY09dT 7ltxUNEnopm6b+AVCKT0WVvRSW1PxtLcv4WQmWoY+4WRQO4i3BerdOhPKYGkL7M/ZZmSxk gBU46RqP6GS21MHASEunKqR4SkPWsekm5ZnbeyvN+wyPFW4Os+ngZE/+WchGbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721226109; a=rsa-sha256; cv=none; b=xWLWUnS+qlmZJb7lgpjZYq7PatnLCdy73fgZNWPY7DfGGYrgpBUCdv8GcESFCIb5NhXsAv 5+ygihm06kmrsvxmYWrMfCkdyIgdG0pT1y13bkYRBbnkwQBSCs22ayr8UmIqvn/ZyyMHm+ uc5DsyjBC7BjvY5zh0dQTIrTIjkLU1LevwbwmQs/Hqy3fm2JWjlrjAKEPkniKXRDpKf+zB XXS9T8ZGRCiy83YCe08kk4NYzlzDH/Pd3rYSpxYqRbn6DYJJV+T9zV1fuh9xWeKsN0V/Vm 1I2vCloQoo/jAdKQVcy/y7y260QMhXRPjdCSfTJDgqOXiYY5mdQl9nHREOUtIw== 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=1721226109; 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=Vx6TALkrbug4EAr+FpNzbAue+JzZ9dqaCOMLMF7stdI=; b=RNt7XsDeYXJWbg+78Wh5aea0nhNwC/ottW/gY/lGDuOjrxvFEo3PGlCy35AWqhZP6n91uY YqlFbHw3VL3jjbw/97wYAVcJ24q0u7S9+5YQ+nwu7mXtV+xFPP0e13R/lasxSMbRBbTW3y 3TwVI4sT3DKofF72jdL4/ew/o1+KM2KiyStsRRAYWbYc73O4YYSF3hsk7+V/66pjjx0pP4 qtSYBiQwJGTVs5qg867CMCJSN4mQUCOQ8DqOLrlxhs6nDF4yA3uM3LLTHQi/SruKrIJmGj AdnXtIUjXSnefaiJnIlRylSBkYqiSZbTXOdfRZEz9eyN8qxRuibbyGt6CQDkNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WPJ6560CXz1Mmv; Wed, 17 Jul 2024 14:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46HELn2W031015; Wed, 17 Jul 2024 14:21:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46HELnwx031012; Wed, 17 Jul 2024 14:21:49 GMT (envelope-from git) Date: Wed, 17 Jul 2024 14:21:49 GMT Message-Id: <202407171421.46HELnwx031012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 29791662e974 - stable/14 - cxgbe/tom: Fix the rx channel selection in options2. 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: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 29791662e9748ff82dc0daaefab9183e49d74099 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=29791662e9748ff82dc0daaefab9183e49d74099 commit 29791662e9748ff82dc0daaefab9183e49d74099 Author: Navdeep Parhar AuthorDate: 2024-04-15 20:04:49 +0000 Commit: Navdeep Parhar CommitDate: 2024-07-17 06:39:13 +0000 cxgbe/tom: Fix the rx channel selection in options2. This affects TOE operation when multiple rx c-channels are in use for offload, which is an unusual configuration. Sponsored by: Chelsio Communications (cherry picked from commit c6c6d4aff90da83a292b4c2bbbe1f4d6e01cd82e) --- sys/dev/cxgbe/tom/t4_tom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index b2d0b85e4832..ac5bba75f904 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -1200,12 +1200,14 @@ calc_options2(struct vi_info *vi, struct conn_params *cp) MPASS(cp->ecn == 0 || cp->ecn == 1); opt2 |= V_CCTRL_ECN(cp->ecn); - /* XXX: F_RX_CHANNEL for multiple rx c-chan support goes here. */ - opt2 |= V_TX_QUEUE(TX_MODQ(pi->tx_chan)); opt2 |= V_PACE(0); opt2 |= F_RSS_QUEUE_VALID; opt2 |= V_RSS_QUEUE(sc->sge.ofld_rxq[cp->rxq_idx].iq.abs_id); + if (chip_id(sc) <= CHELSIO_T6) { + MPASS(pi->rx_chan == 0 || pi->rx_chan == 1); + opt2 |= V_RX_CHANNEL(pi->rx_chan); + } MPASS(cp->cong_algo >= 0 && cp->cong_algo <= M_CONG_CNTRL); opt2 |= V_CONG_CNTRL(cp->cong_algo);