diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/nvme.h | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index a19304fefa7..c96ab0f5ef6 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h | |||
@@ -153,11 +153,11 @@ struct nvme_common_command { | |||
153 | __u8 flags; | 153 | __u8 flags; |
154 | __u16 command_id; | 154 | __u16 command_id; |
155 | __le32 nsid; | 155 | __le32 nsid; |
156 | __u64 rsvd2; | 156 | __u32 cdw2[2]; |
157 | __le64 metadata; | 157 | __le64 metadata; |
158 | __le64 prp1; | 158 | __le64 prp1; |
159 | __le64 prp2; | 159 | __le64 prp2; |
160 | __u32 rsvd10[6]; | 160 | __u32 cdw10[6]; |
161 | }; | 161 | }; |
162 | 162 | ||
163 | struct nvme_rw_command { | 163 | struct nvme_rw_command { |
@@ -388,17 +388,29 @@ struct nvme_user_io { | |||
388 | __u16 appmask; | 388 | __u16 appmask; |
389 | }; | 389 | }; |
390 | 390 | ||
391 | struct nvme_dlfw { | 391 | struct nvme_admin_cmd { |
392 | __u8 opcode; | ||
393 | __u8 flags; | ||
394 | __u16 rsvd1; | ||
395 | __u32 nsid; | ||
396 | __u32 cdw2; | ||
397 | __u32 cdw3; | ||
398 | __u64 metadata; | ||
392 | __u64 addr; | 399 | __u64 addr; |
393 | __u32 length; /* In dwords */ | 400 | __u32 metadata_len; |
394 | __u32 offset; /* In dwords */ | 401 | __u32 data_len; |
402 | __u32 cdw10; | ||
403 | __u32 cdw11; | ||
404 | __u32 cdw12; | ||
405 | __u32 cdw13; | ||
406 | __u32 cdw14; | ||
407 | __u32 cdw15; | ||
408 | __u32 timeout_ms; | ||
409 | __u32 result; | ||
395 | }; | 410 | }; |
396 | 411 | ||
397 | #define NVME_IOCTL_IDENTIFY_NS _IOW('N', 0x40, struct nvme_id_ns) | 412 | #define NVME_IOCTL_ID _IO('N', 0x40) |
398 | #define NVME_IOCTL_IDENTIFY_CTRL _IOW('N', 0x41, struct nvme_id_ctrl) | 413 | #define NVME_IOCTL_ADMIN_CMD _IOWR('N', 0x41, struct nvme_admin_cmd) |
399 | #define NVME_IOCTL_GET_RANGE_TYPE _IOW('N', 0x42, struct nvme_lba_range_type) | 414 | #define NVME_IOCTL_SUBMIT_IO _IOW('N', 0x42, struct nvme_user_io) |
400 | #define NVME_IOCTL_SUBMIT_IO _IOW('N', 0x43, struct nvme_user_io) | ||
401 | #define NVME_IOCTL_DOWNLOAD_FW _IOW('N', 0x44, struct nvme_dlfw) | ||
402 | #define NVME_IOCTL_ACTIVATE_FW _IO('N', 0x45) | ||
403 | 415 | ||
404 | #endif /* _LINUX_NVME_H */ | 416 | #endif /* _LINUX_NVME_H */ |