From: Wenbo Wang <wenbo.wang@memblaze.com>
Date: Thu, 8 Sep 2016 16:12:11 +0000 (-0400)
Subject: nvme/quirk: Add a delay before checking device ready for memblaze device
X-Git-Tag: v4.1.12-104.0.20170618_1145~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4644122873624cd4103e6a27f96301240b68225a;p=users%2Fjedix%2Flinux-maple.git

nvme/quirk: Add a delay before checking device ready for memblaze device

Signed-off-by: Wenbo Wang <wenbo.wang@memblaze.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit 015282c9eb6da05bfad6ff009078f91e06c0c98f)

Orabug: 26275976

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 15fa3b223b8c..57e938212a3d 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2164,6 +2164,8 @@ static const struct pci_device_id nvme_id_table[] = {
 		.driver_data = NVME_QUIRK_IDENTIFY_CNS, },
 	{ PCI_DEVICE(0x1c58, 0x0003),	/* HGST adapter */
 		.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, },
+	{ PCI_DEVICE(0x1c5f, 0x0540),	/* Memblaze Pblaze4 adapter */
+		.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, },
 	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
 	{ 0, }