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, } };