NVMe: Update BAR structure to match the current spec

Add two reserved registers in the middle of the BAR to match the 1.0
spec plus ECN 0002.

Also rename IMC and ISC to INTMC and INTSC to conform with the spec.
We still don't need to use them :-)

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

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 8eed0e4..757faa7 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -24,10 +24,12 @@
 struct nvme_bar {
        __u64                   cap;    /* Controller Capabilities */
        __u32                   vs;     /* Version */
-       __u32                   ims;    /* Interrupt Mask Set */
-       __u32                   imc;    /* Interrupt Mask Clear */
+       __u32                   intms;  /* Interrupt Mask Set */
+       __u32                   intmc;  /* Interrupt Mask Clear */
        __u32                   cc;     /* Controller Configuration */
+       __u32                   rsvd1;  /* Reserved */
        __u32                   csts;   /* Controller Status */
+       __u32                   rsvd2;  /* Reserved */
        __u32                   aqa;    /* Admin Queue Attributes */
        __u64                   asq;    /* Admin SQ Base Address */
        __u64                   acq;    /* Admin CQ Base Address */