Merging upstream version 1.3.

Signed-off-by: Daniel Baumann <daniel@debian.org>
2025-02-16 10:06:51 +01:00 · 2025-02-16 10:06:51 +01:00 · ae07fb4ed6
commit ae07fb4ed6
parent 34cf2bc5f8
803 changed files with 4523 additions and 1325 deletions
--- a/doc/rst/types.rst
+++ b/doc/rst/types.rst
@ -1155,6 +1155,9 @@ power scale value
 ``NVME_CTRL_CTRATT_ELBAS``
  Extended LBA Formats supported

+``NVME_CTRL_CTRATT_FDPS``
+  Flexible Data Placement supported
+



@ -3944,6 +3947,9 @@ Supported Log Pages (Log Identifier 00h)
 ``NVME_ST_CODE_VS``
  Vendor specific.

+``NVME_ST_CODE_ABORT``
+  Abort device self-test operation.
+
 ``NVME_ST_CODE_SHIFT``
  Shift amount to get the code value from the
  :c:type:`struct nvme_st_result <nvme_st_result>`.dsts field.
@ -4775,6 +4781,35 @@ bytes, in size. This log captures the controller’s internal state.



+.. c:struct:: nvme_timestamp
+
+   Timestamp - Data Structure for Get Features
+
+**Definition**
+
+::
+
+  struct nvme_timestamp {
+    __u8 timestamp[6];
+    __u8 attr;
+    __u8 rsvd;
+  };
+
+**Members**
+
+``timestamp``
+  Timestamp value based on origin and synch field
+
+``attr``
+  Attribute
+
+``rsvd``
+  Reserved
+
+
+
+
+
 .. c:struct:: nvme_time_stamp_change_event

   Timestamp Change Event
@ -6175,6 +6210,598 @@ bytes, in size. This log captures the controller’s internal state.



+.. c:enum:: nvme_fdp_ruh_type
+
+   Reclaim Unit Handle Type
+
+**Constants**
+
+``NVME_FDP_RUHT_INITIALLY_ISOLATED``
+  Initially Isolated
+
+``NVME_FDP_RUHT_PERSISTENTLY_ISOLATED``
+  Persistently Isolated
+
+
+
+
+.. c:struct:: nvme_fdp_ruh_desc
+
+   Reclaim Unit Handle Descriptor
+
+**Definition**
+
+::
+
+  struct nvme_fdp_ruh_desc {
+    __u8 ruht;
+    __u8 rsvd1[3];
+  };
+
+**Members**
+
+``ruht``
+  Reclaim Unit Handle Type
+
+``rsvd1``
+  Reserved
+
+
+
+
+
+.. c:enum:: nvme_fdp_config_fdpa
+
+   FDP Attributes
+
+**Constants**
+
+``NVME_FDP_CONFIG_FDPA_RGIF_SHIFT``
+  Reclaim Group Identifier Format Shift
+
+``NVME_FDP_CONFIG_FDPA_RGIF_MASK``
+  Reclaim Group Identifier Format Mask
+
+``NVME_FDP_CONFIG_FDPA_FDPVWC_SHIFT``
+  FDP Volatile Write Cache Shift
+
+``NVME_FDP_CONFIG_FDPA_FDPVWC_MASK``
+  FDP Volatile Write Cache Mask
+
+``NVME_FDP_CONFIG_FDPA_VALID_SHIFT``
+  FDP Configuration Valid Shift
+
+``NVME_FDP_CONFIG_FDPA_VALID_MASK``
+  FDP Configuration Valid Mask
+
+
+
+
+.. c:struct:: nvme_fdp_config_desc
+
+   FDP Configuration Descriptor
+
+**Definition**
+
+::
+
+  struct nvme_fdp_config_desc {
+    __u16 size;
+    __u8 fdpa;
+    __u8 vss;
+    __u32 nrg;
+    __u16 nruh;
+    __u16 maxpids;
+    __u32 nnss;
+    __u64 runs;
+    __u32 erutl;
+    __u8 rsvd28[36];
+    struct nvme_fdp_ruh_desc ruhs[];
+  };
+
+**Members**
+
+``size``
+  Descriptor size
+
+``fdpa``
+  FDP Attributes (:c:type:`enum nvme_fdp_config_fdpa <nvme_fdp_config_fdpa>`)
+
+``vss``
+  Vendor Specific Size
+
+``nrg``
+  Number of Reclaim Groups
+
+``nruh``
+  Number of Reclaim Unit Handles
+
+``maxpids``
+  Max Placement Identifiers
+
+``nnss``
+  Number of Namespaces Supported
+
+``runs``
+  Reclaim Unit Nominal Size
+
+``erutl``
+  Estimated Reclaim Unit Time Limit
+
+``rsvd28``
+  Reserved
+
+``ruhs``
+  Reclaim Unit Handle descriptors (:c:type:`struct nvme_fdp_ruh_desc <nvme_fdp_ruh_desc>`)
+
+
+
+
+
+.. c:struct:: nvme_fdp_config_log
+
+   FDP Configurations Log Page
+
+**Definition**
+
+::
+
+  struct nvme_fdp_config_log {
+    __u16 n;
+    __u8 version;
+    __u8 rsvd3;
+    __u32 size;
+    __u8 rsvd8[8];
+    struct nvme_fdp_config_desc configs[];
+  };
+
+**Members**
+
+``n``
+  Number of FDP Configurations
+
+``version``
+  Log page version
+
+``rsvd3``
+  Reserved
+
+``size``
+  Log page size in bytes
+
+``rsvd8``
+  Reserved
+
+``configs``
+  FDP Configuration descriptors (:c:type:`struct nvme_fdp_config_desc <nvme_fdp_config_desc>`)
+
+
+
+
+
+.. c:enum:: nvme_fdp_ruha
+
+   Reclaim Unit Handle Attributes
+
+**Constants**
+
+``NVME_FDP_RUHA_HOST_SHIFT``
+  Host Specified Reclaim Unit Handle Shift
+
+``NVME_FDP_RUHA_HOST_MASK``
+  Host Specified Reclaim Unit Handle Mask
+
+``NVME_FDP_RUHA_CTRL_SHIFT``
+  Controller Specified Reclaim Unit Handle Shift
+
+``NVME_FDP_RUHA_CTRL_MASK``
+  Controller Specified Reclaim Unit Handle Mask
+
+
+
+
+.. c:struct:: nvme_fdp_ruhu_desc
+
+   Reclaim Unit Handle Usage Descriptor
+
+**Definition**
+
+::
+
+  struct nvme_fdp_ruhu_desc {
+    __u8 ruha;
+    __u8 rsvd1[7];
+  };
+
+**Members**
+
+``ruha``
+  Reclaim Unit Handle Attributes (:c:type:`enum nvme_fdp_ruha <nvme_fdp_ruha>`)
+
+``rsvd1``
+  Reserved
+
+
+
+
+
+.. c:struct:: nvme_fdp_ruhu_log
+
+   Reclaim Unit Handle Usage Log Page
+
+**Definition**
+
+::
+
+  struct nvme_fdp_ruhu_log {
+    __u16 nruh;
+    __u8 rsvd2[6];
+    struct nvme_fdp_ruhu_desc ruhus[];
+  };
+
+**Members**
+
+``nruh``
+  Number of Reclaim Unit Handles
+
+``rsvd2``
+  Reserved
+
+``ruhus``
+  Reclaim Unit Handle Usage descriptors
+
+
+
+
+
+.. c:struct:: nvme_fdp_stats_log
+
+   FDP Statistics Log Page
+
+**Definition**
+
+::
+
+  struct nvme_fdp_stats_log {
+    __u8 hbmw[16];
+    __u8 mbmw[16];
+    __u8 mbe[16];
+    __u8 rsvd48[16];
+  };
+
+**Members**
+
+``hbmw``
+  Host Bytes with Metadata Written
+
+``mbmw``
+  Media Bytes with Metadata Written
+
+``mbe``
+  Media Bytes Erased
+
+``rsvd48``
+  Reserved
+
+
+
+
+
+.. c:enum:: nvme_fdp_event_type
+
+   FDP Event Types
+
+**Constants**
+
+``NVME_FDP_EVENT_RUNFW``
+  Reclaim Unit Not Fully Written
+
+``NVME_FDP_EVENT_RUTLE``
+  Reclaim Unit Time Limit Exceeded
+
+``NVME_FDP_EVENT_RESET``
+  Controller Level Reset Modified Reclaim Unit Handles
+
+``NVME_FDP_EVENT_PID``
+  Invalid Placement Identifier
+
+``NVME_FDP_EVENT_REALLOC``
+  Media Reallocated
+
+``NVME_FDP_EVENT_MODIFY``
+  Implicitly Modified Reclaim Unit Handle
+
+
+
+
+.. c:enum:: nvme_fdp_event_realloc_flags
+
+   Media Reallocated Event Type Specific Flags
+
+**Constants**
+
+``NVME_FDP_EVENT_REALLOC_F_LBAV``
+  LBA Valid
+
+
+
+
+.. c:struct:: nvme_fdp_event_realloc
+
+   Media Reallocated Event Type Specific Information
+
+**Definition**
+
+::
+
+  struct nvme_fdp_event_realloc {
+    __u8 flags;
+    __u8 rsvd1;
+    __u16 nlbam;
+    __u64 lba;
+    __u8 rsvd12[4];
+  };
+
+**Members**
+
+``flags``
+  Event Type Specific flags (:c:type:`enum nvme_fdp_event_realloc_flags <nvme_fdp_event_realloc_flags>`)
+
+``rsvd1``
+  Reserved
+
+``nlbam``
+  Number of LBAs Moved
+
+``lba``
+  Logical Block Address
+
+``rsvd12``
+  Reserved
+
+
+
+
+
+.. c:enum:: nvme_fdp_event_flags
+
+   FDP Event Flags
+
+**Constants**
+
+``NVME_FDP_EVENT_F_PIV``
+  Placement Identifier Valid
+
+``NVME_FDP_EVENT_F_NSIDV``
+  Namespace Identifier Valid
+
+``NVME_FDP_EVENT_F_LV``
+  Location Valid
+
+
+
+
+.. c:struct:: nvme_fdp_event
+
+   FDP Event
+
+**Definition**
+
+::
+
+  struct nvme_fdp_event {
+    __u8 type;
+    __u8 flags;
+    __u16 pid;
+    struct nvme_timestamp ts;
+    __u32 nsid;
+    __u8 type_specific[16];
+    __u16 rgid;
+    __u8 ruhid;
+    __u8 rsvd35[5];
+    __u8 vs[24];
+  };
+
+**Members**
+
+``type``
+  Event Type (:c:type:`enum nvme_fdp_event_type <nvme_fdp_event_type>`)
+
+``flags``
+  Event Flags (:c:type:`enum nvme_fdp_event_flags <nvme_fdp_event_flags>`)
+
+``pid``
+  Placement Identifier
+
+``ts``
+  Timestamp
+
+``nsid``
+  Namespace Identifier
+
+``type_specific``
+  Event Type Specific Information
+
+``rgid``
+  Reclaim Group Identifier
+
+``ruhid``
+  Reclaim Unit Handle Identifier
+
+``rsvd35``
+  Reserved
+
+``vs``
+  Vendor Specific
+
+
+
+
+
+.. c:struct:: nvme_fdp_events_log
+
+   FDP Events Log Page
+
+**Definition**
+
+::
+
+  struct nvme_fdp_events_log {
+    __u32 n;
+    __u8 rsvd4[60];
+    struct nvme_fdp_event events[63];
+  };
+
+**Members**
+
+``n``
+  Number of FDP Events
+
+``rsvd4``
+  Reserved
+
+``events``
+  FDP Events (:c:type:`struct nvme_fdp_event <nvme_fdp_event>`)
+
+
+
+
+
+.. c:struct:: nvme_feat_fdp_events_cdw11
+
+   FDP Events Feature Command Dword 11
+
+**Definition**
+
+::
+
+  struct nvme_feat_fdp_events_cdw11 {
+    __u16 phndl;
+    __u8 noet;
+    __u8 rsvd24;
+  };
+
+**Members**
+
+``phndl``
+  Placement Handle
+
+``noet``
+  Number of FDP Event Types
+
+``rsvd24``
+  Reserved
+
+
+
+
+
+.. c:enum:: nvme_fdp_supported_event_attributes
+
+   Supported FDP Event Attributes
+
+**Constants**
+
+``NVME_FDP_SUPP_EVENT_ENABLED_SHIFT``
+  FDP Event Enable Shift
+
+``NVME_FDP_SUPP_EVENT_ENABLED_MASK``
+  FDP Event Enable Mask
+
+
+
+
+.. c:struct:: nvme_fdp_supported_event_desc
+
+   Supported FDP Event Descriptor
+
+**Definition**
+
+::
+
+  struct nvme_fdp_supported_event_desc {
+    __u8 evt;
+    __u8 evta;
+  };
+
+**Members**
+
+``evt``
+  FDP Event Type
+
+``evta``
+  FDP Event Type Attributes (:c:type:`enum nvme_fdp_supported_event_attributes <nvme_fdp_supported_event_attributes>`)
+
+
+
+
+
+.. c:struct:: nvme_fdp_ruh_status_desc
+
+   Reclaim Unit Handle Status Descriptor
+
+**Definition**
+
+::
+
+  struct nvme_fdp_ruh_status_desc {
+    __u16 pid;
+    __u16 ruhid;
+    __u32 earutr;
+    __u64 ruamw;
+    __u8 rsvd16[16];
+  };
+
+**Members**
+
+``pid``
+  Placement Identifier
+
+``ruhid``
+  Reclaim Unit Handle Identifier
+
+``earutr``
+  Estimated Active Reclaim Unit Time Remaining
+
+``ruamw``
+  Reclaim Unit Available Media Writes
+
+``rsvd16``
+  Reserved
+
+
+
+
+
+.. c:struct:: nvme_fdp_ruh_status
+
+   Reclaim Unit Handle Status
+
+**Definition**
+
+::
+
+  struct nvme_fdp_ruh_status {
+    __u8 rsvd0[14];
+    __u16 nruhsd;
+    struct nvme_fdp_ruh_status_desc ruhss[];
+  };
+
+**Members**
+
+``rsvd0``
+  Reserved
+
+``nruhsd``
+  Number of Reclaim Unit Handle Status Descriptors
+
+``ruhss``
+  Reclaim Unit Handle Status descriptors
+
+
+
+
+
 .. c:struct:: nvme_lba_status_desc

   LBA Status Descriptor Entry
@ -6446,35 +7073,6 @@ bytes, in size. This log captures the controller’s internal state.



-.. c:struct:: nvme_timestamp
-
-   Timestamp - Data Structure for Get Features
-
-**Definition**
-
-::
-
-  struct nvme_timestamp {
-    __u8 timestamp[6];
-    __u8 attr;
-    __u8 rsvd;
-  };
-
-**Members**
-
-``timestamp``
-  Timestamp value based on origin and synch field
-
-``attr``
-  Attribute
-
-``rsvd``
-  Reserved
-
-
-
-
-
 .. c:struct:: nvme_lba_range_type_entry

   LBA Range Type - Data Structure Entry
@ -9884,6 +10482,18 @@ true if **status** is of the specified type and value
 ``NVME_LOG_LID_BOOT_PARTITION``
  Boot Partition

+``NVME_LOG_LID_FDP_CONFIGS``
+  FDP Configurations
+
+``NVME_LOG_LID_FDP_RUH_USAGE``
+  Reclaim Unit Handle Usage
+
+``NVME_LOG_LID_FDP_STATS``
+  FDP Statistics
+
+``NVME_LOG_LID_FDP_EVENTS``
+  FDP Events
+
 ``NVME_LOG_LID_DISCOVER``
  Discovery

@ -9983,6 +10593,12 @@ true if **status** is of the specified type and value
 ``NVME_FEAT_FID_SPINUP_CONTROL``
  Spinup Control

+``NVME_FEAT_FID_FDP``
+  Flexible Data Placement
+
+``NVME_FEAT_FID_FDP_EVENTS``
+  FDP Events
+
 ``NVME_FEAT_FID_ENH_CTRL_METADATA``
  Enhanced Controller Metadata

@ -10212,6 +10828,18 @@ true if **status** is of the specified type and value

 ``NVME_FEAT_IOCSP_IOCSCI_MASK``

+``NVME_FEAT_FDP_ENABLED_SHIFT``
+
+``NVME_FEAT_FDP_ENABLED_MASK``
+
+``NVME_FEAT_FDP_INDEX_SHIFT``
+
+``NVME_FEAT_FDP_INDEX_MASK``
+
+``NVME_FEAT_FDP_EVENTS_ENABLE_SHIFT``
+
+``NVME_FEAT_FDP_EVENTS_ENABLE_MASK``
+



@ -10776,12 +11404,18 @@ true if **status** is of the specified type and value
 ``nvme_cmd_resv_acquire``
  Reservation Acquire

+``nvme_cmd_io_mgmt_recv``
+  I/O Management Receive
+
 ``nvme_cmd_resv_release``
  Reservation Release

 ``nvme_cmd_copy``
  Copy

+``nvme_cmd_io_mgmt_send``
+  I/O Management Send
+
 ``nvme_zns_cmd_mgmt_send``
  Zone Management Send

@ -11079,3 +11713,27 @@ true if **status** is of the specified type and value
  List the zones in the ZSO:Offline state


+
+
+.. c:enum:: nvme_io_mgmt_recv_mo
+
+   I/O Management Receive - Management Operation
+
+**Constants**
+
+``NVME_IO_MGMT_RECV_RUH_STATUS``
+  Reclaim Unit Handle Status
+
+
+
+
+.. c:enum:: nvme_io_mgmt_send_mo
+
+   I/O Management Send - Management Operation
+
+**Constants**
+
+``NVME_IO_MGMT_SEND_RUH_UPDATE``
+  Reclaim Unit Handle Update
+
+