From nobody Mon Nov 10 15:51:27 2025 X-Original-To: dev-commits-src-main@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 4d4vKW5FH1z6Gt9H; Mon, 10 Nov 2025 15:51:27 +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 4d4vKW3FTQz43wx; Mon, 10 Nov 2025 15:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762789887; 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=e4ov0JTM7bhfEGFm5v97NhvQ7MXP4/ZWz+Z1D/o8Wdo=; b=HwixXMLHAuew6MwCRakQY6NAtY3deDYFkFXwXQk93/SUlveXSXJixX1EHQCRrmQwi3u3y1 zsT+AD8x5Gux/J/FwLncV5VzCLO/GBv0nQ/XJkjA7QKTill737vBNdOXgtyvCb6rrQ/mSB ImZQYXF/2J65TdKBOqP/4skBBS47hy8bppnFBm6cQHu05zEWTKMnM/RUGJGNaZcqZVLVWC 2aUQMAx+xdlPRZfajqleMHjbJwnaDXxyEsBXEXNYno4AUrY2Gpfhz3IKSW8KSLrjPmiWfj PHGokroCdz+na/J3Zl0gm5L61CsG0yYo/A+QHC4BOpQK9n7ngnaQ04GdE1vdQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762789887; 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=e4ov0JTM7bhfEGFm5v97NhvQ7MXP4/ZWz+Z1D/o8Wdo=; b=bGjsJluXFBjIAEnF327hZ7ddDJLdWh3o/stYh5+7aoCN7XlUEi007bhe4ky8AeavHpy9nE uDoHkE1m6GI+N4b63lhp2ofoS8U0rKZt9AmdEhE3ZQAELQtm8X0dTC1nphshcShja844vP RMDgydDQQW3mMdH2PNT2vHmVEmmREMuTNEnwU2aWEE1zDE7wqoe2F2E0aoYbq0Z73pTKtl T4IsEe4DiAt9fzU0fijSWkswKkdwreOp1WKP2eK223MMSKyG0Xpm+KXlr22TtTApuDP+YQ 96Fh3dZVaGsqu6pD5Cbc4IMuEmkhIBNijOb3CvL4cats1npPD4y9OhsEzEr/Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762789887; a=rsa-sha256; cv=none; b=tzeIyqDxaiKmQUFu9nCM5VfGg/mAjvIBzJcC8OI7qx8S9kKvgqNDmWmDQYUj0CG/9BItgi sX2vYLN2x0FQnUf6NWOS3+VP3J5pOdwmqodhSSsvRE6nK4FuLECcCMlss3ZpAL2ZAHWRyi mSF4h6HaYSE48YInnIdakMuqeRvHlA1NRHFAFbmnzkb1z+5vfC7BKe/vtHlxdCEspnQDcf Cd4e+0bh69MGUSKsQXXyLBrzmKPhY5ULMIo7p6tSbPgKZ922u37uSWiq6RCro9fboK9qR8 k2wqHEzAa864BueEmZ+jqak3uoyTGGMKLwH2kRCdpYTzIWr7FBpwXQu/XNfMBQ== 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 4d4vKW2ZMZz8YM; Mon, 10 Nov 2025 15:51:27 +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 5AAFpReC048155; Mon, 10 Nov 2025 15:51:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAFpRN1048152; Mon, 10 Nov 2025 15:51:27 GMT (envelope-from git) Date: Mon, 10 Nov 2025 15:51:27 GMT Message-Id: <202511101551.5AAFpRN1048152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a4cd88b604de - main - cxgbe: Add ULD_NVME for NVMe/TCP offload List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a4cd88b604def2b59b0871e612bd6ad04b22520e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a4cd88b604def2b59b0871e612bd6ad04b22520e commit a4cd88b604def2b59b0871e612bd6ad04b22520e Author: John Baldwin AuthorDate: 2025-11-10 15:50:47 +0000 Commit: John Baldwin CommitDate: 2025-11-10 15:50:47 +0000 cxgbe: Add ULD_NVME for NVMe/TCP offload NVMe/TCP offload depends on TOE similar to iSCSI and iWARP offloads. Sponsored by: Chelsio Communications --- sys/dev/cxgbe/offload.h | 3 ++- sys/dev/cxgbe/t4_main.c | 7 ++++++- sys/dev/cxgbe/tom/t4_tom.c | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h index 91a43785aaca..d63accf86e2a 100644 --- a/sys/dev/cxgbe/offload.h +++ b/sys/dev/cxgbe/offload.h @@ -196,7 +196,8 @@ enum { ULD_TOM = 0, ULD_IWARP, ULD_ISCSI, - ULD_MAX = ULD_ISCSI + ULD_NVME, + ULD_MAX = ULD_NVME }; struct adapter; diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 5bc503e48bf2..4d9c94789a37 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -13412,11 +13412,16 @@ toe_capability(struct vi_info *vi, bool enable) ("%s: TOM activated but flag not set", __func__)); } - /* Activate iWARP and iSCSI too, if the modules are loaded. */ + /* + * Activate iWARP, iSCSI, and NVMe too, if the modules + * are loaded. + */ if (!uld_active(sc, ULD_IWARP)) (void) t4_activate_uld(sc, ULD_IWARP); if (!uld_active(sc, ULD_ISCSI)) (void) t4_activate_uld(sc, ULD_ISCSI); + if (!uld_active(sc, ULD_NVME)) + (void) t4_activate_uld(sc, ULD_NVME); if (pi->uld_vis++ == 0) setbit(&sc->offload_map, pi->port_id); diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 53a945f8b4cc..8dfffd465345 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -1990,8 +1990,10 @@ t4_tom_deactivate(struct adapter *sc) if (td == NULL) return (0); /* XXX. KASSERT? */ - if (uld_active(sc, ULD_IWARP) || uld_active(sc, ULD_ISCSI)) - return (EBUSY); /* both iWARP and iSCSI rely on the TOE. */ + /* These ULDs rely on the TOE. */ + if (uld_active(sc, ULD_IWARP) || uld_active(sc, ULD_ISCSI) || + uld_active(sc, ULD_NVME)) + return (EBUSY); if (sc->offload_map != 0) { for_each_port(sc, i) {