From nobody Wed Jul 17 14:24:45 2024 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 4WPJ9T2XVbz5RPx7; Wed, 17 Jul 2024 14:24:45 +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 4WPJ9T1TGbz416J; Wed, 17 Jul 2024 14:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721226285; 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=LY08AchYZqLSvS0zXoNLB47U1E4Fj1LKGJpU6Nhz6zQ=; b=c5GzfdxIzVuIBTYtljKeC/TqWSSFSgo2QSdSoGJcIbyywgLl9jjFqU38pjj1u3Ipj1LQm0 KzdLFIL38AJD1g/gNKrRKhOpr4le3NN6CbWrNWUoVXtgDrrDeiK54L2Nb13FlO6/mmojzi hnbbS6UP2EvPHHLfUZwuWpMNJE1PC36Ccjrp00VAKMmZ3eG4iPJbjYzb4UYQUk+7GFuLNF FxDNb3Qq6iDq/HEx42MqGZIpKeex5BMRF5a+q04S255nuXCX7BUVy5Llbm/u5fmgtap/Wb bCZKHfXYUNK373xmT7Bf73oVaAxA1Gx3loULIdt/kpGFL2YTZCjzjd7NjhE1mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721226285; a=rsa-sha256; cv=none; b=MCZ9DFTS4C0WlG4V2saFAO+YmTOWJtQeKwvrCRHTWAImMBCVMWlS46E8/Slld8AIIzX8lu t2hzAIee0XVJcbfjM6b8VfKH76LR4lD0o+1vONm4Et8lnoVMD6tqPVlhR3Pr0MVAQyODmw hzhY+sHt/2LZVs0fNt4PwVmz1aeztVIpgsQ6yyLPnaFy1CKgU/h+xkCs2IMWAjVY7/jLon Fc1I31XkpneYaH1jrrQhFC5T8Vn/+5eUs0/QudzuK2hlsSqkcsh1/jEWJ01jXPNTylfy7U WozUjtiSj6eaaDPKpsu+mVZommBvEpXl9MUEmCCakSb++3EdRm54alwFBPloHw== 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=1721226285; 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=LY08AchYZqLSvS0zXoNLB47U1E4Fj1LKGJpU6Nhz6zQ=; b=D3xY0wjGfqHDqH8iVQtMk+V+MCN+XeUlx0Bv40ICMZCdH8WoOn9cdIfN4ohBvBte2UXRXI A/HXc8W2N95WzjOePXhKmhW8hxpU/DEQij7AYUzWC0T5B5ikh4FAP9DnG7KsZJ/zvOCOBS yAO+rQtFyhlw314zJz5/hvEfiDa27oT0i+gSteoWYr33OP6cvDpNLiQclr5vijBEWzT8+R BKJLpPk7/2rYsgD4PAMsrXqtNdDUxTq1ksO250l9NJ7EB7FYfmvLGB7UpK39WcfoM4hf7V jEk75Lavp6gWXWv7AwIeZKdFyLxZuGoJgKDKSeAGErjEwXCnAgULanj6uktUkQ== 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 4WPJ9T12ySz1N0l; Wed, 17 Jul 2024 14:24:45 +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 46HEOjKN033453; Wed, 17 Jul 2024 14:24:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46HEOjZd033450; Wed, 17 Jul 2024 14:24:45 GMT (envelope-from git) Date: Wed, 17 Jul 2024 14:24:45 GMT Message-Id: <202407171424.46HEOjZd033450@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: 7f864af3e648 - stable/13 - cxgbe/tom: Fix the rx channel selection in options2. 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: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f864af3e648fc3fcc27d3f2b840f111deac1600 Auto-Submitted: auto-generated The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=7f864af3e648fc3fcc27d3f2b840f111deac1600 commit 7f864af3e648fc3fcc27d3f2b840f111deac1600 Author: Navdeep Parhar AuthorDate: 2024-04-15 20:04:49 +0000 Commit: Navdeep Parhar CommitDate: 2024-07-17 07:16:36 +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 1600325ca42f..7456a2d4051b 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -1051,12 +1051,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);