From cfe853e837e04eff6fa4cb9273a4ae73baaf0d4a Mon Sep 17 00:00:00 2001
From: Vishal Verma <vishal.l.verma@intel.com>
Date: Wed, 27 Mar 2013 07:13:41 -0400
Subject: [PATCH] --- yaml --- r: 375037 b: refs/heads/master c:
 f8ebf8409abfdaeeb8c847381629a2a8b8e3d816 h: refs/heads/master i:   375035:
 fa9a6d8342f80644809ebf4d434aa11f5cc49e67 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/block/nvme-core.c |  1 +
 trunk/include/linux/nvme.h      | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 048f9e5a88a9..785fb989134e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13c3b0fcc8e33ba49f252378f6e7290b146042af
+refs/heads/master: f8ebf8409abfdaeeb8c847381629a2a8b8e3d816
diff --git a/trunk/drivers/block/nvme-core.c b/trunk/drivers/block/nvme-core.c
index 1f98040cf677..d0cfb85d5582 100644
--- a/trunk/drivers/block/nvme-core.c
+++ b/trunk/drivers/block/nvme-core.c
@@ -93,6 +93,7 @@ static inline void _nvme_check_size(void)
 	BUILD_BUG_ON(sizeof(struct nvme_create_sq) != 64);
 	BUILD_BUG_ON(sizeof(struct nvme_delete_queue) != 64);
 	BUILD_BUG_ON(sizeof(struct nvme_features) != 64);
+	BUILD_BUG_ON(sizeof(struct nvme_format_cmd) != 64);
 	BUILD_BUG_ON(sizeof(struct nvme_command) != 64);
 	BUILD_BUG_ON(sizeof(struct nvme_id_ctrl) != 4096);
 	BUILD_BUG_ON(sizeof(struct nvme_id_ns) != 4096);
diff --git a/trunk/include/linux/nvme.h b/trunk/include/linux/nvme.h
index 6f899add14ab..f1974cab60cf 100644
--- a/trunk/include/linux/nvme.h
+++ b/trunk/include/linux/nvme.h
@@ -393,6 +393,16 @@ struct nvme_download_firmware {
 	__u32			rsvd12[4];
 };
 
+struct nvme_format_cmd {
+	__u8			opcode;
+	__u8			flags;
+	__u16			command_id;
+	__le32			nsid;
+	__u64			rsvd2[4];
+	__le32			cdw10;
+	__u32			rsvd11[5];
+};
+
 struct nvme_command {
 	union {
 		struct nvme_common_command common;
@@ -403,6 +413,7 @@ struct nvme_command {
 		struct nvme_create_sq create_sq;
 		struct nvme_delete_queue delete_queue;
 		struct nvme_download_firmware dlfw;
+		struct nvme_format_cmd format;
 		struct nvme_dsm_cmd dsm;
 	};
 };
@@ -420,6 +431,7 @@ enum {
 	NVME_SC_FUSED_FAIL		= 0x9,
 	NVME_SC_FUSED_MISSING		= 0xa,
 	NVME_SC_INVALID_NS		= 0xb,
+	NVME_SC_CMD_SEQ_ERROR		= 0xc,
 	NVME_SC_LBA_RANGE		= 0x80,
 	NVME_SC_CAP_EXCEEDED		= 0x81,
 	NVME_SC_NS_NOT_READY		= 0x82,