Commit 8c97eecc authored by Jeff Lien's avatar Jeff Lien Committed by Christoph Hellwig

nvme-pci: add quirk for delay before CHK RDY for WDC SN200

And increase the existing delay to cover this device as well.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJeff Lien <jeff.lien@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 619c62dc
...@@ -114,7 +114,7 @@ static inline struct nvme_request *nvme_req(struct request *req) ...@@ -114,7 +114,7 @@ static inline struct nvme_request *nvme_req(struct request *req)
* NVME_QUIRK_DELAY_BEFORE_CHK_RDY quirk enabled. The value (in ms) was * NVME_QUIRK_DELAY_BEFORE_CHK_RDY quirk enabled. The value (in ms) was
* found empirically. * found empirically.
*/ */
#define NVME_QUIRK_DELAY_AMOUNT 2000 #define NVME_QUIRK_DELAY_AMOUNT 2300
enum nvme_ctrl_state { enum nvme_ctrl_state {
NVME_CTRL_NEW, NVME_CTRL_NEW,
......
...@@ -2673,6 +2673,8 @@ static const struct pci_device_id nvme_id_table[] = { ...@@ -2673,6 +2673,8 @@ static const struct pci_device_id nvme_id_table[] = {
.driver_data = NVME_QUIRK_IDENTIFY_CNS, }, .driver_data = NVME_QUIRK_IDENTIFY_CNS, },
{ PCI_DEVICE(0x1c58, 0x0003), /* HGST adapter */ { PCI_DEVICE(0x1c58, 0x0003), /* HGST adapter */
.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, }, .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, },
{ PCI_DEVICE(0x1c58, 0x0023), /* WDC SN200 adapter */
.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, },
{ PCI_DEVICE(0x1c5f, 0x0540), /* Memblaze Pblaze4 adapter */ { PCI_DEVICE(0x1c5f, 0x0540), /* Memblaze Pblaze4 adapter */
.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, }, .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, },
{ PCI_DEVICE(0x144d, 0xa821), /* Samsung PM1725 */ { PCI_DEVICE(0x144d, 0xa821), /* Samsung PM1725 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment