From nobody Sat Sep 26 08:23:12 2026 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 4hsLDj4fBZz6tWqp for ; Sat, 26 Sep 2026 08:23:17 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hsLDj48vjz4LbZ for ; Sat, 26 Sep 2026 08:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790410997; 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=moWZgKxi4b71Tq8dRYv+RT+JZrsFYEdKMCoeEqVChiQ=; b=qOHiofGwqkb7Ri7QEYFGoBtgOnmgjz1Yd+qEfGbKyKkeP62NZNXPkFra45mmD1i55iM52H 4i8V1a3tJDRMf8sjUhYwOTEZz1xIpbwBVCeY6mBYUG+Fy44zJlKJXgpMAW38z1RQ6VnKUC 2vu/kC56de0eNjKV2lgrIzsXk+xN9jtN+ZLf8ldCYBKN9WGpqJ36hJN0/s1skHk9aagJgM uUhPxsKNRjeyc/ENoLJKMMEIWlht8eteeK2YfdwbAQz6p1qpWWW9Zn09B9MNDOXY9MyxxF 9msNNoiuH+zKFcTmKrgurUzNeeVTZIvU+o6yh2bB3ZoLZm5waLviCmcW/LgaYw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790410997; b=EXBK3OjqksrQ4I/xCpEtCUnv0jq/cvdaTTE34nnOeFhNnWOm/zKFG8Pcj0p342kWyYMMBf k0/huWINNf/o+wyRrRj3nAOc3rWII0beEQJnCJDlp37s53Dk5Snz4e4Es3dZOwHttSxwsi H8ON2s01/u1GPyUy7L7RbdBV6oupr73JxIeGkezL46Y6eoGFVmDqepUvEXkxV5yYhhQQuM vNuIwuo47bgkdhN1/Z/Fs2PO8LURroUV1K8aGoFJ0WWSrEMEWOS7UZN8REfhaXnKDoXYK/ mKYOOKYm4pfuCq3Z5jmhsiOS2A6/Fc0jwICnc/R/ED8H4AohVOcbadwna9XwuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790410997; 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=moWZgKxi4b71Tq8dRYv+RT+JZrsFYEdKMCoeEqVChiQ=; b=Y+DyFnPaqmj9+QFsLuniTSbjWNXJCh1RCb+bnia+dJB1JjDzzMouqUsn/mhjFf6ugFQiSw yaI1gh3fPp2/DYBxWlkZ+5RO5B85SXt8zGv+1baB+jzE7PIun+MAAw2lNvX3ETLrU166mW uB9wJNmGAE0rY3we3qdGQ0s6Taq7aCkkS0da6EOyRo5YF0N0pImMO8b8deU8Kv6T9FO1rV RUJRR/LwKRK6qmDAqqpb67E65HfV/KhyyIy8X+pIv2RhxOo0iiIcQCoWDfzFBelwF2mHGn IKy4o1pQh/3BfoaikiyyPb6M4o1wwywrMYd/21Ief9WPpm8a96Hi0/MyoXIL3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hsLDj3DhHznhq for ; Sat, 26 Sep 2026 08:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d6f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 26 Sep 2026 08:23:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: 22039031a152 - main - nvme: name the reserved Identify Controller fields at bytes 102 through 110 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22039031a15238c69497bbd9d8dea3cd97ee6bc6 Auto-Submitted: auto-generated Date: Sat, 26 Sep 2026 08:23:12 +0000 Message-Id: <6ab780f0.3d6f8.3ab277da@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=22039031a15238c69497bbd9d8dea3cd97ee6bc6 commit 22039031a15238c69497bbd9d8dea3cd97ee6bc6 Author: Abdelkader Boudih AuthorDate: 2026-09-26 08:22:46 +0000 Commit: Abdelkader Boudih CommitDate: 2026-09-26 08:22:46 +0000 nvme: name the reserved Identify Controller fields at bytes 102 through 110 Bytes 102 through 110 of the I/O Command Set Independent Identify Controller data structure were reserved padding. Name them: Boot Partition Capabilities (byte 102), CXL HDM Support Information (byte 103), NVM Subsystem Shutdown Latency (bytes 107:104) and Power Loss Signaling Information (byte 110). Bytes 109:108 stay reserved. CXL HDM Support Information was added in NVM Express Base Specification 2.4, Figure 338; the others appear in 2.3, Figure 328. Report the new fields from nvmecontrol identify. Reviewed by: imp, adrian Differential Revision: https://reviews.freebsd.org/D60000 --- sbin/nvmecontrol/identify_ext.c | 11 +++++++++++ sys/dev/nvme/nvme.h | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c index 13b1d21ce97e..521151989115 100644 --- a/sbin/nvmecontrol/identify_ext.c +++ b/sbin/nvmecontrol/identify_ext.c @@ -140,6 +140,17 @@ nvme_print_controller(struct nvme_controller_data *cdata) cdata->ver & 0xff); printf("Traffic Based Keep Alive: %sSupported\n", NVMEV(NVME_CTRLR_DATA_CTRATT_TBKAS, cdata->ctratt) ? "" : "Not "); + printf("CXL HDM: %sSupported\n", + NVMEV(NVME_CTRLR_DATA_CHSI_CHS, cdata->chsi) ? "" : "Not "); + printf("NVMSS Shutdown Latency: "); + if (cdata->nssl == 0) + printf("Not Reported\n"); + else + printf("%u us\n", cdata->nssl); + printf("PLS Emergency Power Fail: %sSupported\n", + NVMEV(NVME_CTRLR_DATA_PLSI_PLSEPF, cdata->plsi) ? "" : "Not "); + printf("PLS Forced Quiescence: %sSupported\n", + NVMEV(NVME_CTRLR_DATA_PLSI_PLSFQ, cdata->plsi) ? "" : "Not "); printf("Controller Type: "); switch (cdata->cntrltype) { case 0: diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index f6ca0500ea75..5b6ee1026678 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -378,6 +378,31 @@ enum nvme_psdt { #define NVME_CTRLR_DATA_CTRATT_UUID_LIST_SHIFT (9) #define NVME_CTRLR_DATA_CTRATT_UUID_LIST_MASK (0x1) +/** BPCAP - boot partition capabilities */ +/* RPMB boot partition write protection support */ +#define NVME_CTRLR_DATA_BPCAP_RPMBBPWPS_SHIFT (0) +#define NVME_CTRLR_DATA_BPCAP_RPMBBPWPS_MASK (0x3) +/* supports Set Features boot partition write protection */ +#define NVME_CTRLR_DATA_BPCAP_SFBPWPS_SHIFT (2) +#define NVME_CTRLR_DATA_BPCAP_SFBPWPS_MASK (0x1) + +#define NVME_CTRLR_DATA_BPCAP_RPMBBPWPS_UNSPEC (0x0) +#define NVME_CTRLR_DATA_BPCAP_RPMBBPWPS_NO (0x1) +#define NVME_CTRLR_DATA_BPCAP_RPMBBPWPS_YES (0x2) + +/** CHSI - CXL HDM support information */ +/* supports CXL host managed device memory */ +#define NVME_CTRLR_DATA_CHSI_CHS_SHIFT (0) +#define NVME_CTRLR_DATA_CHSI_CHS_MASK (0x1) + +/** PLSI - power loss signaling information */ +/* supports power loss signaling with emergency power fail */ +#define NVME_CTRLR_DATA_PLSI_PLSEPF_SHIFT (0) +#define NVME_CTRLR_DATA_PLSI_PLSEPF_MASK (0x1) +/* supports power loss signaling with forced quiescence */ +#define NVME_CTRLR_DATA_PLSI_PLSFQ_SHIFT (1) +#define NVME_CTRLR_DATA_PLSI_PLSFQ_MASK (0x1) + /** OACS - optional admin command support */ /* supports security send/receive commands */ #define NVME_CTRLR_DATA_OACS_SECURITY_SHIFT (0) @@ -1230,7 +1255,19 @@ struct nvme_controller_data { /** Read Recovery Levels Supported */ uint16_t rrls; - uint8_t reserved1[9]; + /** Boot Partition Capabilities */ + uint8_t bpcap; + + /** CXL HDM Support Information */ + uint8_t chsi; + + /** NVM Subsystem Shutdown Latency */ + uint32_t nssl; + + uint8_t reserved1[2]; + + /** Power Loss Signaling Information */ + uint8_t plsi; /** Controller Type */ uint8_t cntrltype; @@ -2153,6 +2190,7 @@ void nvme_controller_data_swapbytes(struct nvme_controller_data *s __unused) s->oaes = le32toh(s->oaes); s->ctratt = le32toh(s->ctratt); s->rrls = le16toh(s->rrls); + s->nssl = le32toh(s->nssl); s->crdt1 = le16toh(s->crdt1); s->crdt2 = le16toh(s->crdt2); s->crdt3 = le16toh(s->crdt3);