Merge branch 'for-4.11/block' into for-4.11/linus-merge

Signed-off-by: Jens Axboe <axboe@fb.com>

2 files changed, 169 insertions, 0 deletions

diff --git a/include/uapi/linux/lightnvm.h b/include/uapi/linux/lightnvm.h
index 774a43128a7a..fd19f36b3129 100644
--- a/include/uapi/linux/lightnvm.h
+++ b/include/uapi/linux/lightnvm.h
@@ -122,6 +122,44 @@ struct nvm_ioctl_dev_factory {
         __u32 flags;
 };
 
+struct nvm_user_vio {
+        __u8 opcode;
+        __u8 flags;
+        __u16 control;
+        __u16 nppas;
+        __u16 rsvd;
+        __u64 metadata;
+        __u64 addr;
+        __u64 ppa_list;
+        __u32 metadata_len;
+        __u32 data_len;
+        __u64 status;
+        __u32 result;
+        __u32 rsvd3[3];
+};
+
+struct nvm_passthru_vio {
+        __u8 opcode;
+        __u8 flags;
+        __u8 rsvd[2];
+        __u32 nsid;
+        __u32 cdw2;
+        __u32 cdw3;
+        __u64 metadata;
+        __u64 addr;
+        __u32 metadata_len;
+        __u32 data_len;
+        __u64 ppa_list;
+        __u16 nppas;
+        __u16 control;
+        __u32 cdw13;
+        __u32 cdw14;
+        __u32 cdw15;
+        __u64 status;
+        __u32 result;
+        __u32 timeout_ms;
+};
+
 /* The ioctl type, 'L', 0x20 - 0x2F documented in ioctl-number.txt */
 enum {
         /* top level cmds */
@@ -137,6 +175,11 @@ enum {
 
         /* Factory reset device */
         NVM_DEV_FACTORY_CMD,
+
+        /* Vector user I/O */
+        NVM_DEV_VIO_ADMIN_CMD = 0x41,
+        NVM_DEV_VIO_CMD = 0x42,
+        NVM_DEV_VIO_USER_CMD = 0x43,
 };
 
 #define NVM_IOCTL 'L' /* 0x4c */
@@ -154,6 +197,13 @@ enum {
 #define NVM_DEV_FACTORY         _IOW(NVM_IOCTL, NVM_DEV_FACTORY_CMD, \
                                                 struct nvm_ioctl_dev_factory)
 
+#define NVME_NVM_IOCTL_IO_VIO           _IOWR(NVM_IOCTL, NVM_DEV_VIO_USER_CMD, \
+                                                struct nvm_passthru_vio)
+#define NVME_NVM_IOCTL_ADMIN_VIO        _IOWR(NVM_IOCTL, NVM_DEV_VIO_ADMIN_CMD,\
+                                                struct nvm_passthru_vio)
+#define NVME_NVM_IOCTL_SUBMIT_VIO       _IOWR(NVM_IOCTL, NVM_DEV_VIO_CMD,\
+                                                struct nvm_user_vio)
+
 #define NVM_VERSION_MAJOR       1
 #define NVM_VERSION_MINOR       0
 #define NVM_VERSION_PATCHLEVEL  0
diff --git a/include/uapi/linux/sed-opal.h b/include/uapi/linux/sed-opal.h
new file mode 100644
index 000000000000..c72e0735532d
--- /dev/null
+++ b/include/uapi/linux/sed-opal.h
@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2016 Intel Corporation
+ *
+ * Authors:
+ *    Rafael Antognolli <rafael.antognolli@intel.com>
+ *    Scott  Bauer      <scott.bauer@intel.com>
+ *
+ * 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_SED_OPAL_H
+#define _UAPI_SED_OPAL_H
+
+#include <linux/types.h>
+
+#define OPAL_KEY_MAX 256
+#define OPAL_MAX_LRS 9
+
+enum opal_mbr {
+        OPAL_MBR_ENABLE = 0x0,
+        OPAL_MBR_DISABLE = 0x01,
+};
+
+enum opal_user {
+        OPAL_ADMIN1 = 0x0,
+        OPAL_USER1 = 0x01,
+        OPAL_USER2 = 0x02,
+        OPAL_USER3 = 0x03,
+        OPAL_USER4 = 0x04,
+        OPAL_USER5 = 0x05,
+        OPAL_USER6 = 0x06,
+        OPAL_USER7 = 0x07,
+        OPAL_USER8 = 0x08,
+        OPAL_USER9 = 0x09,
+};
+
+enum opal_lock_state {
+        OPAL_RO = 0x01, /* 0001 */
+        OPAL_RW = 0x02, /* 0010 */
+        OPAL_LK = 0x04, /* 0100 */
+};
+
+struct opal_key {
+        __u8 lr;
+        __u8 key_len;
+        __u8 __align[6];
+        __u8 key[OPAL_KEY_MAX];
+};
+
+struct opal_lr_act {
+        struct opal_key key;
+        __u32 sum;
+        __u8    num_lrs;
+        __u8 lr[OPAL_MAX_LRS];
+        __u8 align[2]; /* Align to 8 byte boundary */
+};
+
+struct opal_session_info {
+        __u32 sum;
+        __u32 who;
+        struct opal_key opal_key;
+};
+
+struct opal_user_lr_setup {
+        __u64 range_start;
+        __u64 range_length;
+        __u32 RLE; /* Read Lock enabled */
+        __u32 WLE; /* Write Lock Enabled */
+        struct opal_session_info session;
+};
+
+struct opal_lock_unlock {
+        struct opal_session_info session;
+        __u32 l_state;
+        __u8 __align[4];
+};
+
+struct opal_new_pw {
+        struct opal_session_info session;
+
+        /* When we're not operating in sum, and we first set
+         * passwords we need to set them via ADMIN authority.
+         * After passwords are changed, we can set them via,
+         * User authorities.
+         * Because of this restriction we need to know about
+         * Two different users. One in 'session' which we will use
+         * to start the session and new_userr_pw as the user we're
+         * chaning the pw for.
+         */
+        struct opal_session_info new_user_pw;
+};
+
+struct opal_mbr_data {
+        struct opal_key key;
+        __u8 enable_disable;
+        __u8 __align[7];
+};
+
+#define IOC_OPAL_SAVE               _IOW('p', 220, struct opal_lock_unlock)
+#define IOC_OPAL_LOCK_UNLOCK        _IOW('p', 221, struct opal_lock_unlock)
+#define IOC_OPAL_TAKE_OWNERSHIP     _IOW('p', 222, struct opal_key)
+#define IOC_OPAL_ACTIVATE_LSP       _IOW('p', 223, struct opal_lr_act)
+#define IOC_OPAL_SET_PW             _IOW('p', 224, struct opal_new_pw)
+#define IOC_OPAL_ACTIVATE_USR       _IOW('p', 225, struct opal_session_info)
+#define IOC_OPAL_REVERT_TPR         _IOW('p', 226, struct opal_key)
+#define IOC_OPAL_LR_SETUP           _IOW('p', 227, struct opal_user_lr_setup)
+#define IOC_OPAL_ADD_USR_TO_LR      _IOW('p', 228, struct opal_lock_unlock)
+#define IOC_OPAL_ENABLE_DISABLE_MBR _IOW('p', 229, struct opal_mbr_data)
+#define IOC_OPAL_ERASE_LR           _IOW('p', 230, struct opal_session_info)
+#define IOC_OPAL_SECURE_ERASE_LR    _IOW('p', 231, struct opal_session_info)
+
+#endif /* _UAPI_SED_OPAL_H */