From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: "open list:NVM EXPRESS DRIVER" <linux-nvme@lists.infradead.org>,
Sagi Grimberg <sagi@grimberg.me>,
alan.adamson@oracle.com, LKML <linux-kernel@vger.kernel.org>,
Yi Zhang <yi.zhang@redhat.com>, Keith Busch <kbusch@kernel.org>,
axboe@fb.com, Christoph Hellwig <hch@lst.de>,
abhijeet.rao@intel.com, monish.kumar.r@intel.com
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>, stable@vger.kernel.org
Subject: [PATCH] Revert "nvme-pci: add quirks for Samsung X5 SSDs"
Date: Thu, 9 Jun 2022 10:40:51 +0200 [thread overview]
Message-ID: <20220609084051.4445-1-Jason@zx2c4.com> (raw)
In-Reply-To: <CAHmME9o-orF52HzkT80054e3Op5fLOcTHb-KHpvvU7H3FpAJ7A@mail.gmail.com>
This reverts commit bc360b0b1611566e1bd47384daf49af6a1c51837.
This matches the hardware identifier of the Samsung 970 EVO Plus, a very
popular internal laptop NVMe drive, which is not the Samsung X5, an
external thunderbolt drive. In particular, this causes:
1) a 2.3 second boot time delay; and
2) disabling of deep power saving states.
So just revert this until whatever funny business can be worked out
regarding Samsung's PCI IDs.
Fixes: bc360b0b1611 ("nvme-pci: add quirks for Samsung X5 SSDs")
Cc: stable@vger.kernel.org
Cc: Monish Kumar R <monish.kumar.r@intel.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
drivers/nvme/host/pci.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 48f4f6eb877b..47b9e3e0ea5a 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -3483,10 +3483,7 @@ static const struct pci_device_id nvme_id_table[] = {
NVME_QUIRK_128_BYTES_SQES |
NVME_QUIRK_SHARED_TAGS |
NVME_QUIRK_SKIP_CID_GEN },
- { PCI_DEVICE(0x144d, 0xa808), /* Samsung X5 */
- .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY|
- NVME_QUIRK_NO_DEEPEST_PS |
- NVME_QUIRK_IGNORE_DEV_SUBNQN, },
+
{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
{ 0, }
};
--
2.35.1
next prev parent reply other threads:[~2022-06-09 8:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAHj4cs_iC+FE8ZAXXZPeia1V3ZX7zRbeASdOP_8c7DLiFozNfA@mail.gmail.com>
2022-04-05 20:00 ` [bug report]nvme0: Admin Cmd(0x6), I/O Error (sct 0x0 / sc 0x2) MORE DNR observed during blktests Jason A. Donenfeld
2022-04-05 20:48 ` Alan Adamson
2022-06-09 8:20 ` 2 second nvme initialization delay regression in 5.18 [Was: Re: [bug report]nvme0: Admin Cmd(0x6), I/O Error (sct 0x0 / sc 0x2) MORE DNR observed during blktests] Jason A. Donenfeld
2022-06-09 8:34 ` Jason A. Donenfeld
2022-06-09 8:40 ` Jason A. Donenfeld [this message]
2022-06-09 9:32 ` R, Monish Kumar
2022-06-09 9:38 ` Jason A. Donenfeld
2022-06-10 6:14 ` Christoph Hellwig
2022-06-10 9:19 ` Jason A. Donenfeld
2022-06-13 6:36 ` R, Monish Kumar
2022-06-13 12:20 ` Jason A. Donenfeld
2022-06-13 13:02 ` R, Monish Kumar
2022-06-13 13:55 ` Christoph Hellwig
2022-06-15 10:27 ` Pankaj Raghav
2022-06-15 11:31 ` Christoph Hellwig
2022-06-20 3:36 ` onenowy
2022-06-20 7:09 ` Christoph Hellwig
2022-06-20 4:34 ` SungHwan Jung
2022-06-10 12:05 ` Pankaj Raghav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220609084051.4445-1-Jason@zx2c4.com \
--to=jason@zx2c4.com \
--cc=abhijeet.rao@intel.com \
--cc=alan.adamson@oracle.com \
--cc=axboe@fb.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=monish.kumar.r@intel.com \
--cc=sagi@grimberg.me \
--cc=stable@vger.kernel.org \
--cc=yi.zhang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).