nvme-cli: nvme_ioctl.h: update to latest kernel version
PATCH 3/4 nvme-cli: nvme_ioctl.h: update to latest kernel version
The latest version includes 64-bit ioctl() results support. Update the header so that we can use this interface.
Signed-off-by Marta Rybczynska <[email protected]>
--- linux/nvme_ioctl.h | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-)
linux/nvme_ioctl.h +24 -10
@@ -1,22 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Definitions for the NVM Express ioctl interface * Copyright (c) 2011-2014, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. */ #ifndef _UAPI_LINUX_NVME_IOCTL_H #define _UAPI_LINUX_NVME_IOCTL_H #include <linux/types.h> -#include <sys/ioctl.h> struct nvme_user_io { __u8 opcode;
@@ -54,6 +45,27 @@ 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; +__u64 result; +}; +#define nvme_admin_cmd nvme_passthru_cmd#define NVME_IOCTL_ID _IO('N', 0x40)
@@ -63,5 +75,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 */
Signature · 7 lines
1.8.3.1 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 3 lines · ----- On 5 Nov, 2019, at 09:09, Marta Rybczynska [email protected] wrote:
The latest version includes 64-bit
ioctl()results support. Update the header so that we can use this interface.
I send it out for review, but let's wait for the final version of the patch from Charles to do the actual change.
Marta
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme