From nobody Fri Oct 3 00:04:29 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 4cd86Q1NnCz6BN1Q; Fri, 03 Oct 2025 00:04:30 +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 4cd86P3RR1z3sQ0; Fri, 03 Oct 2025 00:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759449869; 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=xrnFusm0ExLH31jqJQYJzRL5DWc5fSjILpGo4rlE7F4=; b=k0wE0CqKb7f14YUxWDZEE18sx7IRTsv5i7agpZds1LjD2Opyn/tdrLH2zD27MCMVhW54L+ XZHZyq6rTHIRjY/xRq4uZ3qs+lKccuW68gmbP71hrf+387hlTdUGVe1NmRlfA2gsYNkSct KfCJKeXp3lCgMRICRgUYMU9jw9qkL7E9mg42dzsUcrTSM8Hp+4VRxXrfVAmCAIT4XsdrVk pCTVUg79B04gBaEBhJgKn8K8UKb+UPNnps+khU9feNuEr9DDkBY8snztUx5erNpjI51SwI xtCO5KqdznfBryjPd9oo6/lO4eniuWrJdv58MwJoNrF5W4mPqGpvqJnjQUvCWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759449869; 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=xrnFusm0ExLH31jqJQYJzRL5DWc5fSjILpGo4rlE7F4=; b=x9pLfU0v9EON+Hmg6axmMw7mSXs28bNF6CRlxjCfC6Oul4MCQg4URw/9jEieqtVzokinim jK1CuO37j8EQietgcsjOR4F5RA1vwlDLvooT2aTyv5koCYMa7v+ZbJ50kqO0xabwsbi3G3 V7IZ7PeVM3FtoqJljze2m+6DMVHJKqa1OvL13QaAGo1jdHbGaTT9WKZ/3qWP1vgnDWProF xwoew1xCQiIwMt8kX3StJR9u1obE9Jqor5wsb7Tc1dX758nEJXkakEExlVivvlhLlta8k6 wGq8fFY+UJwesAO3FLBd4FFeFI8xnbNrtdCA7N5bq8a80fynmPmjL62LuqJOjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759449869; a=rsa-sha256; cv=none; b=Pu7/G5WKf3Xeu8vbnbA2Ih9AKZwIODW7nxP5bpCZ30uOz4E6OBQ7Dw0YeXxbXfywiyYG9m G/CmoKciIjNZtbi9/JYTdPqIJRf72nbTGIDHrk9OBqhUwTNsoYZEDb23J2XktZFM6GpPAC qz6gAnRz2LLlClozFCPoKVXRVipK2EW4zWZ3rP6qOubdJzVf+6i1Dl+5Nso1BVSHQ8xVwD hi2+HNRFA7/fHssQQog9jysy14ooxRYjwzDdx4fVufprGixgTTEOr9vQ+1l5+eHXge1frz DWeEvno8kJNjKmhHTIKc1/NvwI+CoJX+isM2fu7zNVlIjP7MJBwgOjxDDSaFJQ== 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 4cd86P2psbzVjQ; Fri, 03 Oct 2025 00:04:29 +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 59304TKF056987; Fri, 3 Oct 2025 00:04:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59304TLU056984; Fri, 3 Oct 2025 00:04:29 GMT (envelope-from git) Date: Fri, 3 Oct 2025 00:04:29 GMT Message-Id: <202510030004.59304TLU056984@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: 5d7656a4db58 - stable/15 - cxgbe(4): Recognize the new capabilities reported by T7 firmwares 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: 5d7656a4db586fb3dbb353f2ccc852eb0f2e9ac8 Auto-Submitted: auto-generated The branch stable/15 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=5d7656a4db586fb3dbb353f2ccc852eb0f2e9ac8 commit 5d7656a4db586fb3dbb353f2ccc852eb0f2e9ac8 Author: Navdeep Parhar AuthorDate: 2025-09-29 08:51:20 +0000 Commit: Navdeep Parhar CommitDate: 2025-10-02 22:09:05 +0000 cxgbe(4): Recognize the new capabilities reported by T7 firmwares Sponsored by: Chelsio Communications (cherry picked from commit cfcf1394efb90ff05cd8acce7805145ff93ecac5) --- sys/dev/cxgbe/adapter.h | 1 + sys/dev/cxgbe/t4_main.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 5abe0de7664f..36c3b48cccbd 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -990,6 +990,7 @@ struct adapter { uint16_t nbmcaps; uint16_t linkcaps; uint16_t switchcaps; + uint16_t nvmecaps; uint16_t niccaps; uint16_t toecaps; uint16_t rdmacaps; diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 47d72175b3fa..f094fd8f1de9 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -609,6 +609,10 @@ static int t4_switchcaps_allowed = FW_CAPS_CONFIG_SWITCH_INGRESS | SYSCTL_INT(_hw_cxgbe, OID_AUTO, switchcaps_allowed, CTLFLAG_RDTUN, &t4_switchcaps_allowed, 0, "Default switch capabilities"); +static int t4_nvmecaps_allowed = 0; +SYSCTL_INT(_hw_cxgbe, OID_AUTO, nvmecaps_allowed, CTLFLAG_RDTUN, + &t4_nvmecaps_allowed, 0, "Default NVMe capabilities"); + #ifdef RATELIMIT static int t4_niccaps_allowed = FW_CAPS_CONFIG_NIC | FW_CAPS_CONFIG_NIC_HASHFILTER | FW_CAPS_CONFIG_NIC_ETHOFLD; @@ -2254,6 +2258,7 @@ struct adapter_pre_reset_state { uint16_t nbmcaps; uint16_t linkcaps; uint16_t switchcaps; + uint16_t nvmecaps; uint16_t niccaps; uint16_t toecaps; uint16_t rdmacaps; @@ -2285,6 +2290,7 @@ save_caps_and_params(struct adapter *sc, struct adapter_pre_reset_state *o) o->nbmcaps = sc->nbmcaps; o->linkcaps = sc->linkcaps; o->switchcaps = sc->switchcaps; + o->nvmecaps = sc->nvmecaps; o->niccaps = sc->niccaps; o->toecaps = sc->toecaps; o->rdmacaps = sc->rdmacaps; @@ -2323,6 +2329,7 @@ compare_caps_and_params(struct adapter *sc, struct adapter_pre_reset_state *o) COMPARE_CAPS(nbm); COMPARE_CAPS(link); COMPARE_CAPS(switch); + COMPARE_CAPS(nvme); COMPARE_CAPS(nic); COMPARE_CAPS(toe); COMPARE_CAPS(rdma); @@ -5232,6 +5239,7 @@ struct caps_allowed { uint16_t nbmcaps; uint16_t linkcaps; uint16_t switchcaps; + uint16_t nvmecaps; uint16_t niccaps; uint16_t toecaps; uint16_t rdmacaps; @@ -5335,6 +5343,7 @@ apply_cfg_and_initialize(struct adapter *sc, char *cfg_file, LIMIT_CAPS(nbm); LIMIT_CAPS(link); LIMIT_CAPS(switch); + LIMIT_CAPS(nvme); LIMIT_CAPS(nic); LIMIT_CAPS(toe); LIMIT_CAPS(rdma); @@ -5400,6 +5409,7 @@ partition_resources(struct adapter *sc) COPY_CAPS(nbm); COPY_CAPS(link); COPY_CAPS(switch); + COPY_CAPS(nvme); COPY_CAPS(nic); COPY_CAPS(toe); COPY_CAPS(rdma); @@ -5726,6 +5736,7 @@ get_params__post_init(struct adapter *sc) READ_CAPS(nbmcaps); READ_CAPS(linkcaps); READ_CAPS(switchcaps); + READ_CAPS(nvmecaps); READ_CAPS(niccaps); READ_CAPS(toecaps); READ_CAPS(rdmacaps); @@ -7612,17 +7623,18 @@ static char *caps_decoder[] = { "\20\001INGRESS\002EGRESS", /* 2: switch */ "\20\001NIC\002VM\003IDS\004UM\005UM_ISGL" /* 3: NIC */ "\006HASHFILTER\007ETHOFLD", - "\20\001TOE", /* 4: TOE */ - "\20\001RDDP\002RDMAC", /* 5: RDMA */ + "\20\001TOE\002SENDPATH", /* 4: TOE */ + "\20\001RDDP\002RDMAC\003ROCEv2", /* 5: RDMA */ "\20\001INITIATOR_PDU\002TARGET_PDU" /* 6: iSCSI */ "\003INITIATOR_CNXOFLD\004TARGET_CNXOFLD" "\005INITIATOR_SSNOFLD\006TARGET_SSNOFLD" "\007T10DIF" "\010INITIATOR_CMDOFLD\011TARGET_CMDOFLD", "\20\001LOOKASIDE\002TLSKEYS\003IPSEC_INLINE" /* 7: Crypto */ - "\004TLS_HW", + "\004TLS_HW,\005TOE_IPSEC", "\20\001INITIATOR\002TARGET\003CTRL_OFLD" /* 8: FCoE */ "\004PO_INITIATOR\005PO_TARGET", + "\20\001NVMe_TCP", /* 9: NVMe */ }; void @@ -7727,6 +7739,7 @@ t4_sysctls(struct adapter *sc) SYSCTL_CAP(nbmcaps, 0, "NBM"); SYSCTL_CAP(linkcaps, 1, "link"); SYSCTL_CAP(switchcaps, 2, "switch"); + SYSCTL_CAP(nvmecaps, 9, "NVMe"); SYSCTL_CAP(niccaps, 3, "NIC"); SYSCTL_CAP(toecaps, 4, "TCP offload"); SYSCTL_CAP(rdmacaps, 5, "RDMA");