Linux-NVME Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v2] Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
@ 2019-10-31  9:34 Jian-Hong Pan
  2019-10-31 13:28 ` Bjorn Helgaas
  0 siblings, 1 reply; 4+ messages in thread
From: Jian-Hong Pan @ 2019-10-31  9:34 UTC (permalink / raw)
  To: Keith Busch, Jens Axboe, Christoph Hellwig, Sagi Grimberg, Bjorn Helgaas
  Cc: linux-pci, linux-kernel, stable, linux-nvme, Jian-Hong Pan, linux

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(-)

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


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
  2019-10-31  9:34 [PATCH v2] Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T" Jian-Hong Pan
@ 2019-10-31 13:28 ` Bjorn Helgaas
  2019-10-31 13:30   ` Christoph Hellwig
  0 siblings, 1 reply; 4+ messages in thread
From: Bjorn Helgaas @ 2019-10-31 13:28 UTC (permalink / raw)
  To: Jian-Hong Pan
  Cc: Sagi Grimberg, linux-pci, linux-kernel, linux-nvme, Jens Axboe,
	stable, Keith Busch, linux, Christoph Hellwig

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
> 

_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
  2019-10-31 13:28 ` Bjorn Helgaas
@ 2019-10-31 13:30   ` Christoph Hellwig
  2019-11-01 22:44     ` Bjorn Helgaas
  0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2019-10-31 13:30 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Sagi Grimberg, linux-pci, linux-kernel, linux-nvme, Jens Axboe,
	stable, Keith Busch, Jian-Hong Pan, linux, Christoph Hellwig

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>

_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
  2019-10-31 13:30   ` Christoph Hellwig
@ 2019-11-01 22:44     ` Bjorn Helgaas
  0 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2019-11-01 22:44 UTC (permalink / raw)
  To: Christoph Hellwig
  Cc: Sagi Grimberg, linux-pci, linux-kernel, linux-nvme, Jens Axboe,
	stable, Keith Busch, Jian-Hong Pan, linux

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.

_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-31  9:34 [PATCH v2] Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T" Jian-Hong Pan
2019-10-31 13:28 ` Bjorn Helgaas
2019-10-31 13:30   ` Christoph Hellwig
2019-11-01 22:44     ` Bjorn Helgaas

Linux-NVME Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-nvme/0 linux-nvme/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-nvme linux-nvme/ https://lore.kernel.org/linux-nvme \
		linux-nvme@lists.infradead.org
	public-inbox-index linux-nvme

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-nvme


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git