From: Minwoo Im <minwoo.im@samsung.com>
Date: Tue, 18 Feb 2020 07:35:53 +0000 (+0900)
Subject: uapi: Sync up nvme_ioctl.h with kernel
X-Git-Tag: v1.11~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=845aba5fefc80c94930c918490d2830ed52dbc16;p=users%2Fhch%2Fnvme-cli.git

uapi: Sync up nvme_ioctl.h with kernel

Kernel has already updated 0x47 and 0x48 ioctl commands for 64bits
support.  This patch synced up the header file between kernel and
nvme-cli.

Signed-off-by: Minwoo Im <minwoo.im@samsung.com>
---

diff --git a/linux/nvme_ioctl.h b/linux/nvme_ioctl.h
index d25a532..d569414 100644
--- a/linux/nvme_ioctl.h
+++ b/linux/nvme_ioctl.h
@@ -54,6 +54,28 @@ struct nvme_passthru_cmd {
 	__u32	result;
 };
 
+struct nvme_passthru_cmd64 {
+    __u8    opcode;
+    __u8    flags;
+    __u16   rsvd1;
+    __u32   nsid;
+    __u32   cdw2;
+    __u32   cdw3;
+    __u64   metadata;
+    __u64   addr;
+    __u32   metadata_len;
+    __u32   data_len;
+    __u32   cdw10;
+    __u32   cdw11;
+    __u32   cdw12;
+    __u32   cdw13;
+    __u32   cdw14;
+    __u32   cdw15;
+    __u32   timeout_ms;
+    __u32   rsvd2;
+    __u64   result;
+};
+
 #define nvme_admin_cmd nvme_passthru_cmd
 
 #define NVME_IOCTL_ID		_IO('N', 0x40)
@@ -63,5 +85,7 @@ struct nvme_passthru_cmd {
 #define NVME_IOCTL_RESET	_IO('N', 0x44)
 #define NVME_IOCTL_SUBSYS_RESET	_IO('N', 0x45)
 #define NVME_IOCTL_RESCAN	_IO('N', 0x46)
+#define NVME_IOCTL_ADMIN64_CMD  _IOWR('N', 0x47, struct nvme_passthru_cmd64)
+#define NVME_IOCTL_IO64_CMD _IOWR('N', 0x48, struct nvme_passthru_cmd64)
 
 #endif /* _UAPI_LINUX_NVME_IOCTL_H */