From b20d235e6b530850c9bb3cf3511a590eac65ad68 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 26 Jan 2024 13:17:06 +0000 Subject: [PATCH] nvme-pci: add BOGUS_NID for Intel 0a54 device --- ...-add-BOGUS_NID-for-Intel-0a54-device.patch | 32 +++++++++++++++++++ SPECS/kernel.spec | 12 +++++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 SOURCES/0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch diff --git a/SOURCES/0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch b/SOURCES/0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch new file mode 100644 index 0000000..800e26f --- /dev/null +++ b/SOURCES/0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch @@ -0,0 +1,32 @@ +From 5c3f4066462a5f6cac04d3dd81c9f551fabbc6c7 Mon Sep 17 00:00:00 2001 +From: Keith Busch +Date: Thu, 12 Oct 2023 11:13:51 -0700 +Subject: [PATCH] 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@cassens.com +Signed-off-by: Keith Busch +--- + 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 347cb5daebc3..3f0c9ee09a12 100644 +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -3329,7 +3329,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, }, +-- +2.27.0 + diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index d6e9d7a..a293309 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -161,13 +161,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.14.0 %define patchversion 5.14 -%define pkgrelease 362.13.1 +%define pkgrelease 362.13.2 %define kversion 5 %define tarfile_release 5.14.0-362.13.1.el9_3 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 362.13.1%{?buildid}%{?dist} +%define specrelease 362.13.2%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 5.14.0-362.13.1.el9_3 @@ -947,6 +947,9 @@ Source4002: gating.yaml Patch1: patch-%{patchversion}-redhat.patch %endif +# AlmaLinux patches +Patch1001: 0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch + # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch @@ -1691,6 +1694,8 @@ cp -a %{SOURCE1} . ApplyOptionalPatch patch-%{patchversion}-redhat.patch %endif +ApplyPatch 0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch + ApplyOptionalPatch linux-kernel-test.patch # END OF PATCH APPLICATIONS @@ -3736,6 +3741,9 @@ fi # # %changelog +* Fri Jan 26 2024 Andrew Lukoshko [5.14.0-362.13.2.el9_3] +- nvme-pci: add BOGUS_NID for Intel 0a54 device + * Fri Nov 24 2023 Jan Stancek [5.14.0-362.13.1.el9_3] - cifs: Fix UAF in cifs_demultiplex_thread() (Scott Mayhew) [RHEL-15169 RHEL-15173 RHEL-15170 RHEL-15174] {CVE-2023-1192} - iommu: Optimise PCI SAC address trick (Jerry Snitselaar) [RHEL-15381 RHEL-11705]