| Message ID | 20191031093408.9322-1-jian-hong@endlessm.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 655e7aee1f0398602627a485f7dca6c29cc96cae |
| Headers | show |
| Series | [v2] Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T" | expand |
On Thu, Oct 31, 2019 at 05:34:09PM +0800, Jian-Hong Pan wrote: > Since commit 253eaf4faaaa ("PCI/MSI: Fix incorrect MSI-X masking on > resume") is merged, we can revert the previous quirk now. 253eaf4faaaa is pending on my pci/msi branch, planned to be merged during the v5.5 merge window. This revert patch must not be merged before 253eaf4faaaa. The easiest way to do that would be for me to merge this one as well; otherwise we have to try to make things happen in the right order during the merge window. If the NVMe folks ack this idea and the patch, I'd be happy to merge it. > This reverts commit 19ea025e1d28c629b369c3532a85b3df478cc5c6. > > Fixes: 19ea025e1d28 ("nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T") > Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=204887 > Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com> > Cc: stable@vger.kernel.org > --- > v2: > Re-send for mailing failure > > drivers/nvme/host/core.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index fa7ba09dca77..94bfbee1e5f7 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -2404,16 +2404,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, > } > }; > > -- > 2.23.0 >
On Thu, Oct 31, 2019 at 08:28:53AM -0500, Bjorn Helgaas wrote: > On Thu, Oct 31, 2019 at 05:34:09PM +0800, Jian-Hong Pan wrote: > > Since commit 253eaf4faaaa ("PCI/MSI: Fix incorrect MSI-X masking on > > resume") is merged, we can revert the previous quirk now. > > 253eaf4faaaa is pending on my pci/msi branch, planned to be merged > during the v5.5 merge window. > > This revert patch must not be merged before 253eaf4faaaa. The easiest > way to do that would be for me to merge this one as well; otherwise > we have to try to make things happen in the right order during the > merge window. > > If the NVMe folks ack this idea and the patch, I'd be happy to merge > it. Fine with me. Acked-by: Christoph Hellwig <hch@lst.de>
On Thu, Oct 31, 2019 at 02:30:28PM +0100, Christoph Hellwig wrote: > On Thu, Oct 31, 2019 at 08:28:53AM -0500, Bjorn Helgaas wrote: > > On Thu, Oct 31, 2019 at 05:34:09PM +0800, Jian-Hong Pan wrote: > > > Since commit 253eaf4faaaa ("PCI/MSI: Fix incorrect MSI-X masking on > > > resume") is merged, we can revert the previous quirk now. > > > > 253eaf4faaaa is pending on my pci/msi branch, planned to be merged > > during the v5.5 merge window. > > > > This revert patch must not be merged before 253eaf4faaaa. The easiest > > way to do that would be for me to merge this one as well; otherwise > > we have to try to make things happen in the right order during the > > merge window. > > > > If the NVMe folks ack this idea and the patch, I'd be happy to merge > > it. > > Fine with me. > > Acked-by: Christoph Hellwig <hch@lst.de> OK, I'll ask Linus to merge this revert after my main PCI pull request for v5.5-rc1.
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index fa7ba09dca77..94bfbee1e5f7 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2404,16 +2404,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, } };
Since commit 253eaf4faaaa ("PCI/MSI: Fix incorrect MSI-X masking on resume") is merged, we can revert the previous quirk now. This reverts commit 19ea025e1d28c629b369c3532a85b3df478cc5c6. Fixes: 19ea025e1d28 ("nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T") Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=204887 Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com> Cc: stable@vger.kernel.org --- v2: Re-send for mailing failure drivers/nvme/host/core.c | 10 ---------- 1 file changed, 10 deletions(-)