SOURCES/0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch

@@ -0,0 +1,34 @@
+From 8d7b7932737d194297b2c6645610bb1320aafe09 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Sat, 16 Mar 2024 10:04:53 -0400
+Subject: [PATCH 1/3] Bring back deprecated pci ids to mpt3sas driver
+
+---
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+index 55b802829..fc305da99 100644
+--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
++++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+@@ -12065,7 +12065,7 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev)
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_RHEL_DIFFERENCES
++#ifdef CONFIG_ALMALINUX_DIFFERENCES
+ static const struct pci_device_id rh_deprecated_pci_table[] = {
+ 	/* Thunderbolt ~ 2208 */
+ 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1,
+@@ -12139,7 +12139,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+ 	int rv;
+ 	u16 hba_mpi_version;
+ 
+-#ifdef CONFIG_RHEL_DIFFERENCES
++#ifdef CONFIG_ALMALINUX_DIFFERENCES
+ 	if (pci_hw_disabled(rh_disabled_pci_table, pdev))
+ 		return -ENODEV;
+ 
+-- 
+2.39.3
+

SOURCES/0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch

@@ -0,0 +1,41 @@
+From 057542c13694ac90dc4531f5c0776f53a6f6e891 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Sat, 16 Mar 2024 10:11:02 -0400
+Subject: [PATCH 2/3] Bring back deprecated pci ids to megaraid_sas driver
+
+---
+ drivers/scsi/megaraid/megaraid_sas_base.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
+index e75f2588a..d8bd623f6 100644
+--- a/drivers/scsi/megaraid/megaraid_sas_base.c
++++ b/drivers/scsi/megaraid/megaraid_sas_base.c
+@@ -140,12 +140,24 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance);
+  */
+ static struct pci_device_id megasas_pci_table[] = {
+ 
++	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)},
++	/* xscale IOP */
++	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)},
++	/* ppc IOP */
++	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078DE)},
++	/* ppc IOP */
++	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078GEN2)},
++	/* gen2*/
+ 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0079GEN2)},
+ 	/* gen2*/
+ 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0073SKINNY)},
+ 	/* skinny*/
+ 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0071SKINNY)},
+ 	/* skinny*/
++	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)},
++	/* xscale IOP, vega */
++	{PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
++	/* xscale IOP */
+ 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FUSION)},
+ 	/* Fusion */
+ 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)},
+-- 
+2.39.3
+

SOURCES/0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch

@@ -0,0 +1,65 @@
+From 33e9e344ec9ffb7cf9d949c69420328df5fe4b29 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Sat, 16 Mar 2024 10:19:11 -0400
+Subject: [PATCH 3/3] Bring back deprecated pci ids to mptsas-mptspi driver
+
+---
+ drivers/message/fusion/mptsas.c | 12 +++++++++++-
+ drivers/message/fusion/mptspi.c | 10 +++++-----
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
+index a4666d02a..e4e41a5d3 100644
+--- a/drivers/message/fusion/mptsas.c
++++ b/drivers/message/fusion/mptsas.c
+@@ -5355,8 +5355,18 @@ static void mptsas_remove(struct pci_dev *pdev)
+ }
+ 
+ static struct pci_device_id mptsas_pci_table[] = {
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064,
++		PCI_ANY_ID, PCI_ANY_ID },
+ 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
+-		PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064E,
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068E,
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1078,
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP,
++		PCI_ANY_ID, PCI_ANY_ID },
+ 	{0}	/* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(pci, mptsas_pci_table);
+diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
+index 08acc09f7..9a336a161 100644
+--- a/drivers/message/fusion/mptspi.c
++++ b/drivers/message/fusion/mptspi.c
+@@ -1245,7 +1245,11 @@ static struct spi_function_template mptspi_transport_functions = {
+ 
+ static struct pci_device_id mptspi_pci_table[] = {
+ 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
+-		PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_ATTO, MPI_MANUFACTPAGE_DEVID_53C1030,
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1035,
++		PCI_ANY_ID, PCI_ANY_ID },
+ 	{0}	/* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
+@@ -1536,10 +1540,6 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+ 		    0, 0, 0, 0, 5);
+ 
+ 	scsi_scan_host(sh);
+-
+-	add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
+-	pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n");
+-
+ 	return 0;
+ 
+ out_mptspi_probe:
+-- 
+2.39.3
+

SPECS/kernel.spec

@@ -526,6 +526,11 @@ Patch999999: linux-kernel-test.patch
 Patch1000: debrand-single-cpu.patch
 Patch1002: debrand-rh-i686-cpu.patch
 
+# Bring back deprecated PCI ids #CFHack #CFHack2024
+Patch2001: 0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
+Patch2002: 0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
+Patch2003: 0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/%{name}-%{KVERREL}-root
@@ -1091,6 +1096,11 @@ cd linux-%{KVERREL}
 
 ApplyOptionalPatch debrand-single-cpu.patch
 ApplyOptionalPatch debrand-rh-i686-cpu.patch
+
+ApplyOptionalPatch 0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
+ApplyOptionalPatch 0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
+ApplyOptionalPatch 0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
+
 ApplyOptionalPatch linux-kernel-test.patch
 
 # END OF PATCH APPLICATIONS
@@ -2687,6 +2697,11 @@ fi
 #
 #
 %changelog
+* Sat Mar 16 2024 Andrew Lukoshko <alukoshko@almalinux.org> [4.18.0-513.el8]
+- mptsas: bring back deprecated PCI ids #CFHack #CFHack2024
+- mpt3sas: bring back deprecated PCI ids #CFHack #CFHack2024
+- megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024
+
 * Fri Aug 25 2023 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-513.el8]
 - redhat/configs: enable CONFIG_INET_DIAG_DESTROY (Andrea Claudi) [2230213]
 - net/sched: cls_u32: Fix reference counter leak leading to overflow (Davide Caratti) [2225202] {CVE-2023-3609}