From nobody Wed May 1 00:15:00 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 4VTcyX5LVxz5KBYM; Wed, 1 May 2024 00:15:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VTcyX4rykz4mFQ; Wed, 1 May 2024 00:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714522500; 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=2NJv4HfKmds8JinPpN8ZJO0tcawXczjSIXJdpi8h1zk=; b=pOnJIDLs05V3GA5rdeI/U5aBsTiOa9TpAEMjZHQggJR8OxfhW2jjpq6NnQewgWiPlJvaI8 YqXMl7VQd4xxJlWIJSNRQSD9KMSRncJTGVqzpW/ki7Xej6RLw+G217v2m1RLXqwI8v9nE6 wO3F+f8+o0bZJzSv9bbFN06Ux6KLOY+m06OTtbo7Ki3Pr0V38XcYwAyYbeSetwq2DwHBY8 0PsyxVjG3tcvsK+rv0LVGZZnMdCfVcag/KUFNq+LkXwQ/StlShpthWgeCy39aFrjQi/AQT pbbCzD562RaidgAsEzdpDkbUYftra4ASR3TImF9MPZY8xQXcRLAT1YbrN2+u0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714522500; a=rsa-sha256; cv=none; b=b5knQRtWQ0NGYsWS3eNP+7YmZvXvlzvn9NWzd8VphJbMZCQO9zMFmj5cP5hYNzrxC78QmT 5bupvShA5kWSLFyfyJTt16U/+bpJVjFLWvQCdfzB1H76ao9OKTgCPNSCWjgE88iubGfRBw cxXmQ5BFEWpsOMYqIl6D/uTYcm6guZOu8/4wYHBq8i5QjotFTUIBTH19ChMZ6n+wMbY7xL LC81JUxC1XCksH5tkVB1bKpKg2uo5d902XcMKz0Dv6MGUmj+d1KwOrwECJQTgcQbgxOKmU u6La8R1NNKGhcCBmzziPLXUhC8eouzlAtcQdDs5F4Ifugicm+y4QhhkcUzATJA== 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=1714522500; 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=2NJv4HfKmds8JinPpN8ZJO0tcawXczjSIXJdpi8h1zk=; b=t8Qyd8q67MASw7Y+NpTEtTMmNjSnS5ofiWCXaUzpDJlUDBLoBj1Y5j7FIfNJx3nAjZ5Om6 fY3FUwaOSivh44e7PIFr84x1yaVNYlNfcX2qCmcDrsZf2/DuE1J1EcPRlnCRLPhBIJAAII b5PNcjjVCSiXsI+W8nCbEPtTprsWQsz2/7flpw0gtqSmDZq29Gm5kBTzCWaFKXbqCaKKDJ APipbOywiUXYIl/k1EzVHsdKUYJVLQfoV0KuqZgAIepkTINy6ymtm22sbBdlBX4yv/nXDG vohyUOkAZoIt0Nwo1f7V2Ub/7jFZhFbOPScPD9mDPP83xrsmsYtKEupB/8cT+A== 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 4VTcyX4RZFzx32; Wed, 1 May 2024 00:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4410F0rP002196; Wed, 1 May 2024 00:15:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4410F06v002193; Wed, 1 May 2024 00:15:00 GMT (envelope-from git) Date: Wed, 1 May 2024 00:15:00 GMT Message-Id: <202405010015.4410F06v002193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: c6c6d4aff90d - main - 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/main X-Git-Reftype: branch X-Git-Commit: c6c6d4aff90da83a292b4c2bbbe1f4d6e01cd82e Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=c6c6d4aff90da83a292b4c2bbbe1f4d6e01cd82e commit c6c6d4aff90da83a292b4c2bbbe1f4d6e01cd82e Author: Navdeep Parhar AuthorDate: 2024-04-15 20:04:49 +0000 Commit: Navdeep Parhar CommitDate: 2024-05-01 00:07:15 +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. MFC after: 1 week Sponsored by: Chelsio Communications --- 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);