From: Ashok Vairavan <ashok.vairavan@oracle.com>
Date: Mon, 13 Mar 2017 01:45:28 +0000 (-0700)
Subject: Revert "NVMe: reduce admin queue depth as workaround for Samsung EPIC SQ errata"
X-Git-Tag: v4.1.12-102.0.20170601_1400~207
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bfc71eb5cffd0fb058dca40b6268c710c51b9abf;p=users%2Fjedix%2Flinux-maple.git

Revert "NVMe: reduce admin queue depth as workaround for Samsung EPIC SQ errata"

This reverts commit ab4538cd6fb47c5a3475d0652830a1d4c8c46167.
---

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 9d6a9952116f1..fb44925c39a70 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1692,6 +1692,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
 	if (!dev->admin_q) {
 		dev->admin_tagset.ops = &nvme_mq_admin_ops;
 		dev->admin_tagset.nr_hw_queues = 1;
+		dev->admin_tagset.queue_depth = NVME_AQ_DEPTH - 1;
 		dev->admin_tagset.reserved_tags = 1;
 		dev->admin_tagset.timeout = ADMIN_TIMEOUT;
 		dev->admin_tagset.numa_node = dev_to_node(dev->dev);
@@ -1751,7 +1752,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
 
 	nvmeq = dev->queues[0];
 	if (!nvmeq) {
-		nvmeq = nvme_alloc_queue(dev, 0, dev->admin_tagset.queue_depth + 1);
+		nvmeq = nvme_alloc_queue(dev, 0, NVME_AQ_DEPTH);
 		if (!nvmeq)
 			return -ENOMEM;
 	}