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

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

This reverts commit 881900f628c3bedf653aa677da465ab3b8eddf31.
---

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index df66f909f4f3e..fc3e0daac00e9 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2673,24 +2673,6 @@ static int nvme_pci_enable(struct nvme_dev *dev)
 			dev->q_depth);
 	}
 
-	/*
-	 * Limit q_depth for Samsung NVMe SSDs. The depth and descriptor 
-	 * size should not span a DMA page (64 x 64B) unless NVME_CAP_MQES(cap) 
-	 * already restricted it further.
-	 */
-
-	dev->admin_tagset.queue_depth = NVME_AQ_DEPTH - 1;
-
-	if (pdev->vendor == PCI_VENDOR_ID_SAMSUNG) {
-		if(pdev->device == 0xa821 || pdev->device == 0xa822) {
-			dev->q_depth = min_t(int, dev->q_depth, 64);
-			dev->admin_tagset.queue_depth = min_t(int, NVME_AQ_DEPTH, 64) - 1;
-			dev_warn(dev->dev, "detected Samsung PM172x controller, limit "
-				"IO queue depth to %u and admin queue depth to %u.\n", 
-				dev->q_depth, dev->admin_tagset.queue_depth);
-		}
-	}
-
 	if (readl(&dev->bar->vs) >= NVME_VS(1, 2))
 		dev->cmb = nvme_map_cmb(dev);