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>

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index d3eeca5a3c4c..014a7f6e39bc 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -905,6 +905,7 @@ static int __devinit nvme_configure_admin_queue(struct nvme_dev *dev)
         dev->ctrl_config = NVME_CC_ENABLE | NVME_CC_CSS_NVM;
         dev->ctrl_config |= (PAGE_SHIFT - 12) << NVME_CC_MPS_SHIFT;
         dev->ctrl_config |= NVME_CC_ARB_RR | NVME_CC_SHN_NONE;
+        dev->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES;
 
         writel(0, &dev->bar->cc);
         writel(aqa, &dev->bar->aqa);