nvme: fix possible initialization failure for P4500/P4600 SSDs
PATCH 1/1 nvme: fix possible initialization failure for P4500/P4600 SSDs
From: Wu Zheng <[email protected]>
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.
--- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +2 -1
@@ -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, },
Signature · 1 line
2.7.4
Quoted 10 lines · Zheng Wu
From: Wu Zheng <[email protected]>
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->subnqnis not null and it's from P4500/P4600. However, multiple P4500/P4600 SSDs return the same subnqn. It causes the possible initialization failure.
Quoted 5 lines
To fix this, the flag of
NVME_QUIRK_IGNORE_DEV_SUBNQNneed to be added todriver_dataof P4500/P4600 fornvme_id_table.Signed-off-by Zheng Wu <[email protected]>Signed-off-by Ye Jinhe <[email protected]>
Looks fine.
Christoph Hellwig
AppliedThanks,
applied to nvme-5.17 after fixing up the commit message.