From 2f7287fdf8fb899f6a7027a802f3b6ce2ecbc082 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Mon, 30 Sep 2024 13:20:23 +0000 Subject: [PATCH] Drop 0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch and update 0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch --- ...led-pci-devices-by-moving-to-unmaint.patch | 45 +++++++++++++++---- ...-add-BOGUS_NID-for-Intel-0a54-device.patch | 32 ------------- SPECS/kernel.spec | 5 --- 3 files changed, 36 insertions(+), 46 deletions(-) delete mode 100644 SOURCES/0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch diff --git a/SOURCES/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch b/SOURCES/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch index 0329b3336..69367da5c 100644 --- a/SOURCES/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch +++ b/SOURCES/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch @@ -1,18 +1,17 @@ -From a84c0fed2a608f271056c7ac33abfcd276929a70 Mon Sep 17 00:00:00 2001 +From e6b210caa51bc33c46d5acfae198645a9914fa32 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko -Date: Tue, 28 May 2024 09:47:52 +0000 +Date: Mon, 30 Sep 2024 13:13:37 +0000 Subject: [PATCH] Enable all disabled pci devices by moving to unmaintained - list --- - kernel/rh_messages.h | 66 ++++++++++++++++++++++---------------------- - 1 file changed, 33 insertions(+), 33 deletions(-) + kernel/rh_messages.h | 94 ++++++++++++++++++++++---------------------- + 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h -index 2ae3f94ad..52555dbbf 100644 +index b798ad5d4..c59853b47 100644 --- a/kernel/rh_messages.h +++ b/kernel/rh_messages.h -@@ -121,6 +121,39 @@ static const struct pci_device_id rh_deprecated_pci_devices[] = { +@@ -141,6 +141,53 @@ static const struct pci_device_id rh_deprecated_pci_devices[] = { }; static const struct pci_device_id rh_disabled_pci_devices[] = { @@ -31,6 +30,20 @@ index 2ae3f94ad..52555dbbf 100644 + { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x1003, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x1004, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x1005, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x1006, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x1007, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x1008, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x1009, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x100a, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x100b, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x100c, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x100d, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x100e, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x100f, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x1010, PCI_ANY_ID, PCI_ANY_ID }, + { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID }, @@ -52,7 +65,7 @@ index 2ae3f94ad..52555dbbf 100644 { 0x1011, 0x0046, 0x103c, 0x10c2 }, { 0x1011, 0x0046, 0x9005, 0x0364 }, { 0x1011, 0x0046, 0x9005, 0x0365 }, -@@ -273,37 +306,4 @@ static const struct pci_device_id rh_disabled_pci_devices[] = { +@@ -293,51 +340,4 @@ static const struct pci_device_id rh_disabled_pci_devices[] = { {0} /* Terminating entry */ }; @@ -68,6 +81,20 @@ index 2ae3f94ad..52555dbbf 100644 - { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID }, - { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID }, - { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x1003, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x1004, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x1005, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x1006, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x1007, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x1008, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x1009, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x100a, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x100b, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x100c, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x100d, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x100e, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x100f, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x15B3, 0x1010, PCI_ANY_ID, PCI_ANY_ID }, - { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID }, - { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID }, - { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID }, @@ -91,5 +118,5 @@ index 2ae3f94ad..52555dbbf 100644 - #endif /* __RH_MESSAGES_H */ -- -2.27.0 +2.43.5 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 deleted file mode 100644 index 800e26f02..000000000 --- a/SOURCES/0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 823f5142c..6222808a8 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -961,9 +961,6 @@ Source4002: gating.yaml Patch1: patch-%{patchversion}-redhat.patch %endif -# AlmaLinux patches -Patch1001: 0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch - # Bring back deprecated PCI ids #CFHack #CFHack2024 Patch2001: 0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch Patch2002: 0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch @@ -1728,8 +1725,6 @@ ApplyPatch 0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch 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