From 27f7b9928a546077789135d400aad60f4bf00094 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Tue, 22 Mar 2011 15:55:45 -0400 Subject: [PATCH] --- yaml --- r: 286289 b: refs/heads/master c: 7f53f9d2424533256ae86f7df5661a17de743de8 h: refs/heads/master i: 286287: c1fabb3a91298a098b39c43b121bec912f2d98b5 v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 1 + trunk/include/linux/nvme.h | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c62729cd1882..0b2e26ecf93e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ef700678f65e2eef1c3a94cdedb79d757608392 +refs/heads/master: 7f53f9d2424533256ae86f7df5661a17de743de8 diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c index d3eeca5a3c4c..014a7f6e39bc 100644 --- a/trunk/drivers/block/nvme.c +++ b/trunk/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); diff --git a/trunk/include/linux/nvme.h b/trunk/include/linux/nvme.h index 347ad5f9a721..9d6febb91521 100644 --- a/trunk/include/linux/nvme.h +++ b/trunk/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,