From: Christoph Hellwig <hch@lst.de>
Date: Mon, 6 Jun 2016 21:20:43 +0000 (+0200)
Subject: nvme.h: add RTD3R, RTD3E and OAES fields
X-Git-Tag: v4.1.12-102.0.20170601_1400~60
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=87662b9433edf1ad0291df183f3adb6fb98c40d4;p=users%2Fjedix%2Flinux-maple.git

nvme.h: add RTD3R, RTD3E and OAES fields

These have been added in NVMe 1.2 and we'll need at least oaes for the
NVMe target driver.

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Jay Freyensee <james.p.freyensee@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit 14e974a84e831bf9a44495c7256a6846e7f77630)

Orabug: 25130845

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 7d51b2904cb7..ff5ebc378cc3 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -107,7 +107,10 @@ struct nvme_id_ctrl {
 	__u8			mdts;
 	__le16			cntlid;
 	__le32			ver;
-	__u8			rsvd84[172];
+	__le32			rtd3r;
+	__le32			rtd3e;
+	__le32			oaes;
+	__u8			rsvd96[160];
 	__le16			oacs;
 	__u8			acl;
 	__u8			aerl;