diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2011-03-22 15:55:45 -0400 |
|---|---|---|
| committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2011-11-04 15:53:01 -0400 |
| commit | 7f53f9d2424533256ae86f7df5661a17de743de8 (patch) | |
| tree | 93dc08a0de9ac52dca9479dc6c36808f431c1988 /include | |
| parent | 8ef700678f65e2eef1c3a94cdedb79d757608392 (diff) | |
| download | linux-stable-7f53f9d2424533256ae86f7df5661a17de743de8.tar.gz linux-stable-7f53f9d2424533256ae86f7df5661a17de743de8.tar.bz2 linux-stable-7f53f9d2424533256ae86f7df5661a17de743de8.zip | |
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')
| -rw-r--r-- | include/linux/nvme.h | 10 |
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, |