From nobody Fri Oct 3 00:04:33 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 4cd86V23TLz6BMY3; Fri, 03 Oct 2025 00:04:34 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cd86T5vP8z3sJG; Fri, 03 Oct 2025 00:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759449873; 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=QiCTPsY+1FnR65a8wH440bQ6SOJ/9FpIc1Y+Bnz6Q3U=; b=QxtJTHZEST/RjB3EYFlZgjrBve79NbBO3m9w22YAUP/ks1qtw/f8Ged1JeykxJDPykcIzs ShPzVwHuiRXUHcItuweG6wwxNKFmfjLxZQuGg05qokWy96mM7bSSy4173k9kbKIDr08HsZ w3y0mS8adMU7iFY2veVCgZUqDlNExa4JAiqBKxkfCG4OMHeAgdIDGW3jYI8Pr3jeKJLmgk K5rKkVFGSACSjV9ED92n9I8bQJ9jj8GReL4bR3YW8uZ/RaPxEc7F5BBP3F8yi9xcWf+c6f JdpagQUN9xg16V42ERw2RhGQkQh2vamHag33RPx0m3VVPEzb5Vn1ySOV/gZo9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759449873; 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=QiCTPsY+1FnR65a8wH440bQ6SOJ/9FpIc1Y+Bnz6Q3U=; b=Adms0ssBpT8eRMl/JCZ0I2QYEmrV0xpvfbDzWKGKiL+Nb1gnVIoKka2b93h0LF9YKc1K9y +QnUWHT6C7w7lIitTFuSLx3uid56xAMI0OWEwr8kMJ72mtaljrS5bw2sg33wZ5fQE9J4vu +tC4y4VLTyTZ4blIbXon975v76v6ONvkcHz28QxeZxa6AW0mxOB6gu7wNNRrfblkNKT+7a ioTDUWBHy7W5GYXKSmANcIrlOi41UNGcYwtd0PpEVEc6LtPjPs2SPXDSjinphou2Du9fAc MGBsfprRk13HeVqa3HlNgN0dkmeltKFY5fYSFZ+Pg4lh6vPNH2Wcb1ZP/M4PzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759449873; a=rsa-sha256; cv=none; b=obNa98Ih3zuf9xEPKRudAJlqNFaoKH7UFHUgJh0oACWuQswMY2s+qVSQWSztJErUJjiS2I Ro+PEMmx5ALuyjhw1HAe6heDg01ti1iNgL9VNDjP5Pmb+wJhwvvLURjQ+7l7++8P2WTUxJ aTQySyhRfvN+RYXmfywujI4QdbTliW2kf5khUTzZZcN7N11T41dyIiFqWmqqb6kyuxhS96 uFEn3LfK4IIcrwgKVUTEoyP2qLiFWqkNib0g7Fb50lhANL9paPtENQVir/3prUw5iuQmdi cYpZJhXH/h8sT7yfhMwl0Kn5fSgxrXNuVTEE46U5ujJbukqH2Q5O8QTiuQZF8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cd86T5TRFzVfd; Fri, 03 Oct 2025 00:04:33 +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 59304XNa057127; Fri, 3 Oct 2025 00:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59304XxN057123; Fri, 3 Oct 2025 00:04:33 GMT (envelope-from git) Date: Fri, 3 Oct 2025 00:04:33 GMT Message-Id: <202510030004.59304XxN057123@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: c42d37ec215f - stable/15 - cxgbe(4): T7 TCB CPLs have queue and channel in different location 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/15 X-Git-Reftype: branch X-Git-Commit: c42d37ec215f0ebbe4832a1f78cfb0808af4d1f3 Auto-Submitted: auto-generated The branch stable/15 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=c42d37ec215f0ebbe4832a1f78cfb0808af4d1f3 commit c42d37ec215f0ebbe4832a1f78cfb0808af4d1f3 Author: Navdeep Parhar AuthorDate: 2025-09-29 09:52:55 +0000 Commit: Navdeep Parhar CommitDate: 2025-10-02 22:09:06 +0000 cxgbe(4): T7 TCB CPLs have queue and channel in different location Sponsored by: Chelsio Communications (cherry picked from commit 721033a7d96f24e80ec18ec9cc17712be55a52b7) --- sys/dev/cxgbe/t4_filter.c | 18 +++++++++++++----- sys/dev/cxgbe/tom/t4_cpl_io.c | 15 ++++++++++++--- sys/dev/cxgbe/tom/t4_tom.c | 11 +++++++++-- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/t4_filter.c b/sys/dev/cxgbe/t4_filter.c index 92f882dd38cf..4b583b67ba07 100644 --- a/sys/dev/cxgbe/t4_filter.c +++ b/sys/dev/cxgbe/t4_filter.c @@ -1397,11 +1397,19 @@ set_tcb_field(struct adapter *sc, u_int tid, uint16_t word, uint64_t mask, return (ENOMEM); bzero(req, sizeof(*req)); INIT_TP_WR_MIT_CPL(req, CPL_SET_TCB_FIELD, tid); - if (no_reply == 0) { - req->reply_ctrl = htobe16(V_QUEUENO(sc->sge.fwq.abs_id) | - V_NO_REPLY(0)); - } else - req->reply_ctrl = htobe16(V_NO_REPLY(1)); + if (no_reply) { + req->reply_ctrl = htobe16(F_NO_REPLY); + } else { + const int qid = sc->sge.fwq.abs_id; + + if (chip_id(sc) >= CHELSIO_T7) { + req->reply_ctrl = htobe16(V_T7_QUEUENO(qid) | + V_T7_REPLY_CHAN(0) | V_NO_REPLY(0)); + } else { + req->reply_ctrl = htobe16(V_QUEUENO(qid) | + V_REPLY_CHAN(0) | V_NO_REPLY(0)); + } + } req->word_cookie = htobe16(V_WORD(word) | V_COOKIE(CPL_COOKIE_HASHFILTER)); req->mask = htobe64(mask); req->val = htobe64(val); diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 402aa29c05cb..84e31efa8b58 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -2051,9 +2051,18 @@ write_set_tcb_field(struct adapter *sc, void *dst, struct toepcb *toep, } INIT_TP_WR_MIT_CPL(req, CPL_SET_TCB_FIELD, toep->tid); - req->reply_ctrl = htobe16(V_QUEUENO(toep->ofld_rxq->iq.abs_id)); - if (reply == 0) - req->reply_ctrl |= htobe16(F_NO_REPLY); + if (reply == 0) { + req->reply_ctrl = htobe16(F_NO_REPLY); + } else { + const int qid = toep->ofld_rxq->iq.abs_id; + if (chip_id(sc) >= CHELSIO_T7) { + req->reply_ctrl = htobe16(V_T7_QUEUENO(qid) | + V_T7_REPLY_CHAN(0) | V_NO_REPLY(0)); + } else { + req->reply_ctrl = htobe16(V_QUEUENO(qid) | + V_REPLY_CHAN(0) | V_NO_REPLY(0)); + } + } req->word_cookie = htobe16(V_WORD(word) | V_COOKIE(cookie)); req->mask = htobe64(mask); req->val = htobe64(val); diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 82d8f724b382..18d73afc47c5 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -494,8 +494,15 @@ send_get_tcb(struct adapter *sc, u_int tid) bzero(cpl, sizeof(*cpl)); INIT_TP_WR(cpl, tid); OPCODE_TID(cpl) = htobe32(MK_OPCODE_TID(CPL_GET_TCB, tid)); - cpl->reply_ctrl = htobe16(V_REPLY_CHAN(0) | - V_QUEUENO(sc->sge.ofld_rxq[0].iq.cntxt_id)); + if (chip_id(sc) >= CHELSIO_T7) { + cpl->reply_ctrl = + htobe16(V_T7_QUEUENO(sc->sge.ofld_rxq[0].iq.cntxt_id) | + V_T7_REPLY_CHAN(0) | V_NO_REPLY(0)); + } else { + cpl->reply_ctrl = + htobe16(V_QUEUENO(sc->sge.ofld_rxq[0].iq.cntxt_id) | + V_REPLY_CHAN(0) | V_NO_REPLY(0)); + } cpl->cookie = 0xff; commit_wrq_wr(&sc->sge.ctrlq[0], cpl, &cookie);