From: Keith Busch <keith.busch@intel.com>
Date: Tue, 25 Jun 2013 21:15:23 +0000 (-0600)
Subject: NVMe: Update nvme_id_power_state with latest spec
X-Git-Tag: v3.12-rc1~98^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=685585c25e8269cc355b59d1cd6fc65b8c5c4878;p=thirdparty%2Flinux.git

NVMe: Update nvme_id_power_state with latest spec

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
---

diff --git a/include/uapi/linux/nvme.h b/include/uapi/linux/nvme.h
index 31ed566f81f6e..989c04e0c5631 100644
--- a/include/uapi/linux/nvme.h
+++ b/include/uapi/linux/nvme.h
@@ -23,7 +23,8 @@
 
 struct nvme_id_power_state {
 	__le16			max_power;	/* centiwatts */
-	__u16			rsvd2;
+	__u8			rsvd2;
+	__u8			flags;
 	__le32			entry_lat;	/* microseconds */
 	__le32			exit_lat;	/* microseconds */
 	__u8			read_tput;
@@ -33,6 +34,11 @@ struct nvme_id_power_state {
 	__u8			rsvd16[16];
 };
 
+enum {
+	NVME_PS_FLAGS_MAX_POWER_SCALE	= 1 << 0,
+	NVME_PS_FLAGS_NON_OP_STATE	= 1 << 1,
+};
+
 struct nvme_id_ctrl {
 	__le16			vid;
 	__le16			ssvid;