This is a note to let you know that I've just added the patch titled
nvme-pci: add BOGUS_NID for Intel 0a54 device
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nvme-pci-add-bogus_nid-for-intel-0a54-device.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5c3f4066462a5f6cac04d3dd81c9f551fabbc6c7 Mon Sep 17 00:00:00 2001
From: Keith Busch <kbusch@xxxxxxxxxx>
Date: Thu, 12 Oct 2023 11:13:51 -0700
Subject: nvme-pci: add BOGUS_NID for Intel 0a54 device
From: Keith Busch <kbusch@xxxxxxxxxx>
commit 5c3f4066462a5f6cac04d3dd81c9f551fabbc6c7 upstream.
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@xxxxxxxxxxx
Signed-off-by: Keith Busch <kbusch@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/nvme/host/pci.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -3439,7 +3439,8 @@ static const struct pci_device_id nvme_i
{ 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, },
Patches currently in stable-queue which might be from kbusch@xxxxxxxxxx are
queue-6.1/nvme-sanitize-metadata-bounce-buffer-for-reads.patch
queue-6.1/nvmet-auth-complete-a-request-only-after-freeing-the-dhchap-pointers.patch
queue-6.1/nvme-rdma-do-not-try-to-stop-unallocated-queues.patch
queue-6.1/nvmet-tcp-fix-a-possible-uaf-in-queue-intialization-setup.patch
queue-6.1/nvme-pci-add-bogus_nid-for-intel-0a54-device.patch
