[Devel] [PATCH RHEL9 COMMIT] ms/nvme-pci: add BOGUS_NID for Intel 0a54 device

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.0-284.25.1.vz9.27.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-284.25.1.vz9.27.7
------>
commit 51b29da6d27db71fd5f8f559d12908f665d59ff9
Author: Keith Busch <kbusch at kernel.org>
Date:   Thu Oct 12 11:13:51 2023 -0700

    ms/nvme-pci: add BOGUS_NID for Intel 0a54 device
    
    These ones claim cmic and nmic capable, so need special consideration to ignore
    their duplicate identifiers.
    
    Link: https://bugzilla.kernel.org/show_bug.cgi?id=217981
    Reported-by: welsh at cassens.com
    Signed-off-by: Keith Busch <kbusch at kernel.org>
    
    https://pmc.acronis.work/browse/TTASK-64922
    (cherry picked from commit 5c3f4066462a5f6cac04d3dd81c9f551fabbc6c7)
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
    
    Feature: fix drivers
---
 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 343e6f735d8c..39b79981a2a3 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -3433,7 +3433,8 @@ static const struct pci_device_id nvme_id_table[] = {
 	{ PCI_VDEVICE(INTEL, 0x0a54),	/* Intel P4500/P4600 */
 		.driver_data = NVME_QUIRK_STRIPE_SIZE |
 				NVME_QUIRK_DEALLOCATE_ZEROES |
-				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
+				NVME_QUIRK_IGNORE_DEV_SUBNQN |
+				NVME_QUIRK_BOGUS_NID, },
 	{ PCI_VDEVICE(INTEL, 0x0a55),	/* Dell Express Flash P4600 */
 		.driver_data = NVME_QUIRK_STRIPE_SIZE |
 				NVME_QUIRK_DEALLOCATE_ZEROES, },