Revert "nvme-pci: add quirks for Samsung X5 SSDs"

This reverts commit bc360b0. 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: bc360b0 ("nvme-pci: add quirks for Samsung X5 SSDs") Cc: [email protected] Cc: Monish Kumar R <[email protected]> Signed-off-by: Jason A. Donenfeld <[email protected]>
KenHV · Jun 26, 2022 · d5b577f · d5b577f
1 parent d2f0980
commit d5b577f
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
@@ -3475,10 +3475,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, }
 };