Commit 5911f200 authored Feb 01, 2011 by Shane Michael Matthews Committed by Matthew Wilcox Nov 04, 2011

NVMe: Disable the device before we write the admin queues



In case the card has been left in a partially-configured state,
write 0 to the Enable bit.

Signed-off-by: Shane Michael Matthews <shane.matthews@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>

parent 574e8b95

drivers/block/nvme.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -668,6 +668,7 @@ static int __devinit nvme_configure_admin_queue(struct nvme_dev *dev)
		dev->ctrl_config \|= (PAGE_SHIFT - 12) << NVME_CC_MPS_SHIFT;
		dev->ctrl_config \|= NVME_CC_ARB_RR \| NVME_CC_SHN_NONE;

		writel(0, &dev->bar->cc);
		writel(aqa, &dev->bar->aqa);
		writeq(nvmeq->sq_dma_addr, &dev->bar->asq);
		writeq(nvmeq->cq_dma_addr, &dev->bar->acq);

Admin message