Commit e531485a authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-5.19-2022-06-23' of git://git.infradead.org/nvme into block-5.19 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.19

 - fix the mixed up CRIMS/CRWMS constants (Joel Granados)
 - add another broken identifier quirk (Leo Savernik)
 - fix up a quirk because Samsung reuses PCI IDs over different products
   (Christoph Hellwig)"

* tag 'nvme-5.19-2022-06-23' of git://git.infradead.org/nvme:
  nvme: move the Samsung X5 quirk entry to the core quirks
  nvme: fix the CRIMS and CRWMS definitions to match the spec
  nvme: add a bogus subsystem NQN quirk for Micron MTFDKBA2T0TFH
parents ca2a3343 e6487833

drivers/nvme/host/core.c

+14 −0
Original line number Diff line number Diff line
@@ -2546,6 +2546,20 @@ static const struct nvme_core_quirk_entry core_quirks[] = { 
		.vid = 0x1e0f,

		.mn = "KCD6XVUL6T40",

		.quirks = NVME_QUIRK_NO_APST,

	},

	{

		/*

		 * The external Samsung X5 SSD fails initialization without a

		 * delay before checking if it is ready and has a whole set of

		 * other problems.  To make this even more interesting, it

		 * shares the PCI ID with internal Samsung 970 Evo Plus that

		 * does not need or want these quirks.

		 */

		.vid = 0x144d,

		.mn = "Samsung Portable SSD X5",

		.quirks = NVME_QUIRK_DELAY_BEFORE_CHK_RDY |

			  NVME_QUIRK_NO_DEEPEST_PS |

			  NVME_QUIRK_IGNORE_DEV_SUBNQN,

	}

};

drivers/nvme/host/pci.c

+2 −4
Original line number Diff line number Diff line
@@ -3474,6 +3474,8 @@ static const struct pci_device_id nvme_id_table[] = { 
	{ PCI_DEVICE(0x1cc1, 0x8201),   /* ADATA SX8200PNP 512GB */

		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |

				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	 { PCI_DEVICE(0x1344, 0x5407), /* Micron Technology Inc NVMe SSD */

		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN },

	{ PCI_DEVICE(0x1c5c, 0x1504),   /* SK Hynix PC400 */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x1c5c, 0x174a),   /* SK Hynix P31 SSD */
@@ -3524,10 +3526,6 @@ 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, }

};

include/linux/nvme.h

+2 −2
Original line number Diff line number Diff line
@@ -233,8 +233,8 @@ enum { 
};



enum {

	NVME_CAP_CRMS_CRIMS	= 1ULL << 59,

	NVME_CAP_CRMS_CRWMS	= 1ULL << 60,

	NVME_CAP_CRMS_CRWMS	= 1ULL << 59,

	NVME_CAP_CRMS_CRIMS	= 1ULL << 60,

};



struct nvme_id_power_state {