Comment 23 for bug 1705748

Revision history for this message
Kai-Heng Feng (kaihengfeng) wrote :

Try the kernel here, it adds a delay before controller reset.

http://people.canonical.com/~khfeng/lp1705748-2/

---

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index f15f4017fb95..1dc42006a8fd 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2308,6 +2308,8 @@ static const struct pci_device_id nvme_id_table[] = {
                .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(0x144d, 0xa804), /* Samsung SM961/PM961 */
+ .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, },
        { PCI_DEVICE(0x144d, 0xa821), /* Samsung PM1725 */
                .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, },
        { PCI_DEVICE(0x144d, 0xa822), /* Samsung PM1725a */