summaryrefslogtreecommitdiff
path: root/include/linux/nvme.h
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew.r.wilcox@intel.com>2011-03-22 22:55:45 +0300
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2011-11-04 23:53:01 +0400
commit7f53f9d2424533256ae86f7df5661a17de743de8 (patch)
tree93dc08a0de9ac52dca9479dc6c36808f431c1988 /include/linux/nvme.h
parent8ef700678f65e2eef1c3a94cdedb79d757608392 (diff)
downloadlinux-7f53f9d2424533256ae86f7df5661a17de743de8.tar.xz
NVMe: Correct the Controller Configuration settings
The arbitration field was extended by one bit, shifting the shutdown notification bits by one. Also, the SQ/CQ entry size was made configurable for future extensions. Reported-by: Paul Luse <paul.e.luse@intel.com> Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'include/linux/nvme.h')
-rw-r--r--include/linux/nvme.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 347ad5f9a721..9d6febb91521 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -41,10 +41,12 @@ enum {
NVME_CC_MPS_SHIFT = 7,
NVME_CC_ARB_RR = 0 << 11,
NVME_CC_ARB_WRRU = 1 << 11,
- NVME_CC_ARB_VS = 3 << 11,
- NVME_CC_SHN_NONE = 0 << 13,
- NVME_CC_SHN_NORMAL = 1 << 13,
- NVME_CC_SHN_ABRUPT = 2 << 13,
+ NVME_CC_ARB_VS = 7 << 11,
+ NVME_CC_SHN_NONE = 0 << 14,
+ NVME_CC_SHN_NORMAL = 1 << 14,
+ NVME_CC_SHN_ABRUPT = 2 << 14,
+ NVME_CC_IOSQES = 6 << 16,
+ NVME_CC_IOCQES = 4 << 20,
NVME_CSTS_RDY = 1 << 0,
NVME_CSTS_CFS = 1 << 1,
NVME_CSTS_SHST_NORMAL = 0 << 2,