Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
authorJian-Hong Pan <jian-hong@endlessm.com>
Thu, 31 Oct 2019 09:34:09 +0000 (17:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Dec 2019 18:55:25 +0000 (19:55 +0100)
commit 655e7aee1f0398602627a485f7dca6c29cc96cae upstream.

Since e045fa29e893 ("PCI/MSI: Fix incorrect MSI-X masking on resume") is
merged, we can revert the previous quirk now.

This reverts commit 19ea025e1d28c629b369c3532a85b3df478cc5c6.

Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=204887
Fixes: 19ea025e1d28 ("nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T")
Link: https://lore.kernel.org/r/20191031093408.9322-1-jian-hong@endlessm.com
Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/nvme/host/core.c

index 297fb4d8d41ca595b21fa9035cd737974df91ffd..af3212aec87193b15165141e3e1a7aa1dc81efc9 100644 (file)
@@ -2406,16 +2406,6 @@ static const struct nvme_core_quirk_entry core_quirks[] = {
                .vid = 0x14a4,
                .fr = "22301111",
                .quirks = NVME_QUIRK_SIMPLE_SUSPEND,
-       },
-       {
-               /*
-                * This Kingston E8FK11.T firmware version has no interrupt
-                * after resume with actions related to suspend to idle
-                * https://bugzilla.kernel.org/show_bug.cgi?id=204887
-                */
-               .vid = 0x2646,
-               .fr = "E8FK11.T",
-               .quirks = NVME_QUIRK_SIMPLE_SUSPEND,
        }
 };