From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 19 May 2023 01:46:42 +0000 (-0600)
Subject: Merge tag 'nvme-6.4-2023-05-18' of git://git.infradead.org/nvme into block-6.4
X-Git-Tag: v6.6.17~4652^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1878b736e88e0d30f67d7fb577816395727ef040;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'nvme-6.4-2023-05-18' of git://git.infradead.org/nvme into block-6.4

Pull NVMe fixes from Keith:

"nvme fixes for Linux 6.4

 - More device quirks (Sagi, Hristo, Adrian, Daniel)
 - Controller delete race (Maurizo)
 - Multipath cleanup fix (Christoph)"

* tag 'nvme-6.4-2023-05-18' of git://git.infradead.org/nvme:
  nvme-pci: Add quirk for Teamgroup MP33 SSD
  nvme: do not let the user delete a ctrl before a complete initialization
  nvme-multipath: don't call blk_mark_disk_dead in nvme_mpath_remove_disk
  nvme-pci: clamp max_hw_sectors based on DMA optimized limitation
  nvme-pci: add quirk for missing secondary temperature thresholds
  nvme-pci: add NVME_QUIRK_BOGUS_NID for HS-SSD-FUTURE 2048G
---

1878b736e88e0d30f67d7fb577816395727ef040
diff --cc drivers/nvme/host/pci.c
index 7f25c0f,e90f824..3224458
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@@ -3434,13 -3433,12 +3436,17 @@@ static const struct pci_device_id nvme_
  		.driver_data = NVME_QUIRK_BOGUS_NID, },
  	{ PCI_DEVICE(0x1d97, 0x2263), /* Lexar NM610 */
  		.driver_data = NVME_QUIRK_BOGUS_NID, },
 +	{ PCI_DEVICE(0x1d97, 0x1d97), /* Lexar NM620 */
 +		.driver_data = NVME_QUIRK_BOGUS_NID, },
  	{ PCI_DEVICE(0x1d97, 0x2269), /* Lexar NM760 */
 +		.driver_data = NVME_QUIRK_BOGUS_NID |
 +				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
 +	{ PCI_DEVICE(0x10ec, 0x5763), /* TEAMGROUP T-FORCE CARDEA ZERO Z330 SSD */
  		.driver_data = NVME_QUIRK_BOGUS_NID, },
+ 	{ PCI_DEVICE(0x1e4b, 0x1602), /* HS-SSD-FUTURE 2048G  */
+ 		.driver_data = NVME_QUIRK_BOGUS_NID, },
+ 	{ PCI_DEVICE(0x10ec, 0x5765), /* TEAMGROUP MP33 2TB SSD */
+ 		.driver_data = NVME_QUIRK_BOGUS_NID, },
  	{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061),
  		.driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, },
  	{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),