nvme-pci: add NVME_QUIRK_BOGUS_NID for Micron Nitro

[ Upstream commit d5ceb4d1c50786d21de3d4b06c3f43109ec56dd8 ]

Added a quirk to fix Micron Nitro NVMe reporting duplicate NGUIDs.

Cc: <stable@vger.kernel.org>
Signed-off-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 4fa2955dbf6cc0e2c7b2e30c425da2797e7af450..278302771841043964f0bf6659dfd64b2a8275c8 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -3353,6 +3353,8 @@ static const struct pci_device_id nvme_id_table[] = {
                                NVME_QUIRK_IGNORE_DEV_SUBNQN, },
         { PCI_DEVICE(0x1344, 0x5407), /* Micron Technology Inc NVMe SSD */
                .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN },
+        { PCI_DEVICE(0x1344, 0x6001),   /* Micron Nitro NVMe */
+                .driver_data = NVME_QUIRK_BOGUS_NID, },
        { PCI_DEVICE(0x1c5c, 0x1504),   /* SK Hynix PC400 */
                .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
        { PCI_DEVICE(0x15b7, 0x2001),   /*  Sandisk Skyhawk */