[PATCH] nvme: fix possible initialization failure for P4500/P4600 SSDs

[Zheng Wu <wu.zheng@intel.com>]

From: Wu Zheng <wu.zheng@intel.com>

Subnqn isn't supported in P4500/P4600 SSDs.
It's a fixed unavailable value in each P4500/P4600 SSD.

Multiple SSDs need to return the different subnqn when SSDs are initialization.
To P4500/P4600 SSDs, in nvme_init_subnqn, id->subnqn is not null and
it's from P4500/P4600. However, multiple P4500/P4600 SSDs return the same subnqn.
It causes the possible initialization failure.

To fix this, the flag of NVME_QUIRK_IGNORE_DEV_SUBNQN need to be added to
driver_data of P4500/P4600 for nvme_id_table.

Signed-off-by: Zheng Wu <wu.zheng@intel.com>
Signed-off-by: Ye Jinhe <jinhe.ye@intel.com>
---
 drivers/nvme/host/pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index ca2ee80..953ea3d 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -3326,7 +3326,8 @@ static const struct pci_device_id nvme_id_table[] = {
 				NVME_QUIRK_DEALLOCATE_ZEROES, },
 	{ PCI_VDEVICE(INTEL, 0x0a54),	/* Intel P4500/P4600 */
 		.driver_data = NVME_QUIRK_STRIPE_SIZE |
-				NVME_QUIRK_DEALLOCATE_ZEROES, },
+				NVME_QUIRK_DEALLOCATE_ZEROES |
+				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
 	{ PCI_VDEVICE(INTEL, 0x0a55),	/* Dell Express Flash P4600 */
 		.driver_data = NVME_QUIRK_STRIPE_SIZE |
 				NVME_QUIRK_DEALLOCATE_ZEROES, },
-- 
2.7.4