Fix RHEL-36117 and bump release to 553.el8_10

Reviewed-on: #4
Reviewed-by: eabdullin <eabdullin@noreply.git.almalinux.org>

SOURCES/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch

@@ -0,0 +1,45 @@
+From b69db7bed679288a9107d652fd39076dc4dea85c Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Mon, 8 Apr 2024 20:50:39 +0000
+Subject: [PATCH 1/5] Enable all disabled pci devices by moving to unmaintained
+ list
+
+---
+ kernel/rh_messages.h | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h
+index b7c3be8aa..28b0f3cad 100644
+--- a/kernel/rh_messages.h
++++ b/kernel/rh_messages.h
+@@ -149,6 +149,14 @@ static const struct pci_device_id rh_deprecated_pci_devices[] = {
+ };
+ 
+ static const struct pci_device_id rh_disabled_pci_devices[] = {
++	{0}     /* Terminating entry */
++};
++
++static const struct pci_device_id rh_unmaintained_pci_devices[] = {
++	{ 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, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID },
+ 	{ 0x1011, 0x0046, 0x103c, 0x10c2 },
+ 	{ 0x1011, 0x0046, 0x9005, 0x0364 },
+ 	{ 0x1011, 0x0046, 0x9005, 0x0365 },
+@@ -301,12 +309,4 @@ static const struct pci_device_id rh_disabled_pci_devices[] = {
+ 	{0}     /* Terminating entry */
+ };
+ 
+-static const struct pci_device_id rh_unmaintained_pci_devices[] = {
+-	{ 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, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID },
+-	{0}     /* Terminating entry */
+-};
+-
+ #endif /* __RH_MESSAGES_H */
+-- 
+2.27.0
+

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

@@ -0,0 +1,41 @@
+From 50d7888356a1ea1418f15ac75b25457b6d7b3dd8 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Mon, 8 Apr 2024 20:55:37 +0000
+Subject: [PATCH 2/5] 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 19a62e595..4ecd40872 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.27.0
+

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

@@ -0,0 +1,65 @@
+From 8a5b922edcc3b2973395d4d5407b143ae1d87552 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Mon, 8 Apr 2024 20:59:22 +0000
+Subject: [PATCH 3/5] 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 652fed3f8..4c73bf444 100644
+--- a/drivers/message/fusion/mptsas.c
++++ b/drivers/message/fusion/mptsas.c
+@@ -5353,8 +5353,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.27.0
+

SOURCES/0004-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch

@@ -0,0 +1,39 @@
+From 01c67e991c0d49e797b412d6d6f4d7a4669ec926 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Mon, 8 Apr 2024 21:01:23 +0000
+Subject: [PATCH 4/5] Bring back deprecated pci ids to hpsa driver
+
+---
+ drivers/scsi/hpsa.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
+index 544f1ab02..2fa774488 100644
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -91,6 +91,11 @@ MODULE_PARM_DESC(hpsa_simple_mode,
+ 
+ /* define the PCI info for the cards we can control */
+ static const struct pci_device_id hpsa_pci_device_id[] = {
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3223},
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3234},
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3235},
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3237},
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x323D},
+ 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3241},
+ 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3243},
+ 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3245},
+@@ -144,6 +149,10 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
+ 	{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D},
+ 	{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0088},
+ 	{PCI_VENDOR_ID_HP, 0x333f, 0x103c, 0x333f},
++	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,
++		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
++	{PCI_VENDOR_ID_COMPAQ,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,
++		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
+ 	{0,}
+ };
+ 
+-- 
+2.27.0
+

SOURCES/0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch

@@ -0,0 +1,176 @@
+From c74bb37d786dd12419fca217b53f33ca177fe96d Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Mon, 8 Apr 2024 21:07:42 +0000
+Subject: [PATCH 5/5] Bring back deprecated pci ids to qla2xxx driver
+
+---
+ drivers/scsi/qla2xxx/qla_os.c | 120 +++++++++++++++++++++++++++++++++-
+ 1 file changed, 119 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
+index 93dd9c332..8d46bbf22 100644
+--- a/drivers/scsi/qla2xxx/qla_os.c
++++ b/drivers/scsi/qla2xxx/qla_os.c
+@@ -2636,6 +2636,73 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
+ {
+ 	ha->device_type = DT_EXTENDED_IDS;
+ 	switch (ha->pdev->device) {
++	case PCI_DEVICE_ID_QLOGIC_ISP2100:
++		ha->isp_type |= DT_ISP2100;
++		ha->device_type &= ~DT_EXTENDED_IDS;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2100;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2200:
++		ha->isp_type |= DT_ISP2200;
++		ha->device_type &= ~DT_EXTENDED_IDS;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2100;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2300:
++		ha->isp_type |= DT_ISP2300;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2300;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2312:
++		ha->isp_type |= DT_ISP2312;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2300;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2322:
++		ha->isp_type |= DT_ISP2322;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		if (ha->pdev->subsystem_vendor == 0x1028 &&
++		    ha->pdev->subsystem_device == 0x0170)
++			ha->device_type |= DT_OEM_001;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2300;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP6312:
++		ha->isp_type |= DT_ISP6312;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2300;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP6322:
++		ha->isp_type |= DT_ISP6322;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2300;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2422:
++		ha->isp_type |= DT_ISP2422;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->device_type |= DT_IIDMA;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2432:
++		ha->isp_type |= DT_ISP2432;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->device_type |= DT_IIDMA;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP8432:
++		ha->isp_type |= DT_ISP8432;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->device_type |= DT_IIDMA;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP5422:
++		ha->isp_type |= DT_ISP5422;
++		ha->device_type |= DT_FWI2;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP5432:
++		ha->isp_type |= DT_ISP5432;
++		ha->device_type |= DT_FWI2;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
+ 	case PCI_DEVICE_ID_QLOGIC_ISP2532:
+ 		ha->isp_type |= DT_ISP2532;
+ 		ha->device_type |= DT_ZIO_SUPPORTED;
+@@ -2643,6 +2710,29 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
+ 		ha->device_type |= DT_IIDMA;
+ 		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
+ 		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP8001:
++		ha->isp_type |= DT_ISP8001;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->device_type |= DT_IIDMA;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP8021:
++		ha->isp_type |= DT_ISP8021;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		/* Initialize 82XX ISP flags */
++		qla82xx_init_flags(ha);
++		break;
++	 case PCI_DEVICE_ID_QLOGIC_ISP8044:
++		ha->isp_type |= DT_ISP8044;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		/* Initialize 82XX ISP flags */
++		qla82xx_init_flags(ha);
++		break;
+ 	case PCI_DEVICE_ID_QLOGIC_ISP2031:
+ 		ha->isp_type |= DT_ISP2031;
+ 		ha->device_type |= DT_ZIO_SUPPORTED;
+@@ -2659,6 +2749,9 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
+ 		ha->device_type |= DT_T10_PI;
+ 		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
+ 		break;
++	case PCI_DEVICE_ID_QLOGIC_ISPF001:
++		ha->isp_type |= DT_ISPFX00;
++		break;
+ 	case PCI_DEVICE_ID_QLOGIC_ISP2071:
+ 		ha->isp_type |= DT_ISP2071;
+ 		ha->device_type |= DT_ZIO_SUPPORTED;
+@@ -2802,9 +2895,18 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
+ 
+ 	bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);
+ 	sht = &qla2xxx_driver_template;
+-	if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2532 ||
++	if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2422 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2432 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8432 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5422 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5432 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2532 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8001 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8021 ||
+ 	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2031 ||
+ 	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8031 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISPF001 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8044 ||
+ 	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2071 ||
+ 	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2271 ||
+ 	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2261 ||
+@@ -7997,9 +8099,25 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
+ };
+ 
+ static struct pci_device_id qla2xxx_pci_tbl[] = {
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2312) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2322) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6312) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6322) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2422) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2432) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8001) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8021) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISPF001) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2071) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) },
+-- 
+2.27.0
+

SOURCES/0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch

@@ -0,0 +1,408 @@
+From 1642dcf67a557b42609a3756e2be7537762c38ea Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Tue, 9 Apr 2024 21:02:31 +0000
+Subject: [PATCH] Bring back deprecated pci ids to lpfc driver
+
+---
+ drivers/scsi/lpfc/lpfc_attr.c |   6 ++
+ drivers/scsi/lpfc/lpfc_els.c  |   9 +++
+ drivers/scsi/lpfc/lpfc_hw.h   |  39 +++++++++-
+ drivers/scsi/lpfc/lpfc_ids.h  |  62 ++++++++++++++++
+ drivers/scsi/lpfc/lpfc_init.c | 136 +++++++++++++++++++++++++++++++++-
+ 5 files changed, 249 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
+index 8b15088a1..385ade242 100644
+--- a/drivers/scsi/lpfc/lpfc_attr.c
++++ b/drivers/scsi/lpfc/lpfc_attr.c
+@@ -7493,6 +7493,12 @@ lpfc_get_hba_function_mode(struct lpfc_hba *phba)
+ 	switch (phba->pcidev->device) {
+ 	case PCI_DEVICE_ID_SKYHAWK:
+ 	case PCI_DEVICE_ID_SKYHAWK_VF:
++	case PCI_DEVICE_ID_LANCER_FCOE:
++	case PCI_DEVICE_ID_LANCER_FCOE_VF:
++	case PCI_DEVICE_ID_ZEPHYR_DCSP:
++	case PCI_DEVICE_ID_HORNET:
++	case PCI_DEVICE_ID_TIGERSHARK:
++	case PCI_DEVICE_ID_TOMCAT:
+ 		phba->hba_flag |= HBA_FCOE_MODE;
+ 		break;
+ 	default:
+diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
+index 89d9f7fdb..700fe69a4 100644
+--- a/drivers/scsi/lpfc/lpfc_els.c
++++ b/drivers/scsi/lpfc/lpfc_els.c
+@@ -4608,6 +4608,15 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+ 	case IOSTAT_LOCAL_REJECT:
+ 		switch ((irsp->un.ulpWord[4] & IOERR_PARAM_MASK)) {
+ 		case IOERR_LOOP_OPEN_FAILURE:
++			if (cmd == ELS_CMD_FLOGI) {
++				if (PCI_DEVICE_ID_HORNET ==
++					phba->pcidev->device) {
++					phba->fc_topology = LPFC_TOPOLOGY_LOOP;
++					phba->pport->fc_myDID = 0;
++					phba->alpa_map[0] = 0;
++					phba->alpa_map[1] = 0;
++				}
++			}
+ 			if (cmd == ELS_CMD_PLOGI && cmdiocb->retry == 0)
+ 				delay = 1000;
+ 			retry = 1;
+diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
+index 474c594f8..240b688e1 100644
+--- a/drivers/scsi/lpfc/lpfc_hw.h
++++ b/drivers/scsi/lpfc/lpfc_hw.h
+@@ -1713,25 +1713,55 @@ struct lpfc_fdmi_reg_portattr {
+ 
+ /* Start FireFly Register definitions */
+ #define PCI_VENDOR_ID_EMULEX        0x10df
++#define PCI_DEVICE_ID_FIREFLY       0x1ae5
++#define PCI_DEVICE_ID_PROTEUS_VF    0xe100
++#define PCI_DEVICE_ID_BALIUS        0xe131
++#define PCI_DEVICE_ID_PROTEUS_PF    0xe180
+ #define PCI_DEVICE_ID_LANCER_FC     0xe200
++#define PCI_DEVICE_ID_LANCER_FC_VF  0xe208
+ #define PCI_DEVICE_ID_LANCER_FCOE   0xe260
++#define PCI_DEVICE_ID_LANCER_FCOE_VF 0xe268
+ #define PCI_DEVICE_ID_LANCER_G6_FC  0xe300
+ #define PCI_DEVICE_ID_LANCER_G7_FC  0xf400
+ #define PCI_DEVICE_ID_LANCER_G7P_FC 0xf500
+ #define PCI_DEVICE_ID_SAT_SMB       0xf011
+ #define PCI_DEVICE_ID_SAT_MID       0xf015
++#define PCI_DEVICE_ID_RFLY          0xf095
++#define PCI_DEVICE_ID_PFLY          0xf098
++#define PCI_DEVICE_ID_LP101         0xf0a1
++#define PCI_DEVICE_ID_TFLY          0xf0a5
++#define PCI_DEVICE_ID_BSMB          0xf0d1
+ #define PCI_DEVICE_ID_BMID          0xf0d5
+ #define PCI_DEVICE_ID_ZSMB          0xf0e1
+ #define PCI_DEVICE_ID_ZMID          0xf0e5
++#define PCI_DEVICE_ID_NEPTUNE       0xf0f5
++#define PCI_DEVICE_ID_NEPTUNE_SCSP  0xf0f6
++#define PCI_DEVICE_ID_NEPTUNE_DCSP  0xf0f7
+ #define PCI_DEVICE_ID_SAT           0xf100
+ #define PCI_DEVICE_ID_SAT_SCSP      0xf111
+ #define PCI_DEVICE_ID_SAT_DCSP      0xf112
+ #define PCI_DEVICE_ID_FALCON        0xf180
++#define PCI_DEVICE_ID_SUPERFLY      0xf700
++#define PCI_DEVICE_ID_DRAGONFLY     0xf800
++#define PCI_DEVICE_ID_CENTAUR       0xf900
++#define PCI_DEVICE_ID_PEGASUS       0xf980
++#define PCI_DEVICE_ID_THOR          0xfa00
++#define PCI_DEVICE_ID_VIPER         0xfb00
++#define PCI_DEVICE_ID_LP10000S      0xfc00
++#define PCI_DEVICE_ID_LP11000S      0xfc10
++#define PCI_DEVICE_ID_LPE11000S     0xfc20
+ #define PCI_DEVICE_ID_SAT_S         0xfc40
++#define PCI_DEVICE_ID_PROTEUS_S     0xfc50
++#define PCI_DEVICE_ID_HELIOS        0xfd00
++#define PCI_DEVICE_ID_HELIOS_SCSP   0xfd11
++#define PCI_DEVICE_ID_HELIOS_DCSP   0xfd12
+ #define PCI_DEVICE_ID_ZEPHYR        0xfe00
++#define PCI_DEVICE_ID_HORNET        0xfe05
+ #define PCI_DEVICE_ID_ZEPHYR_SCSP   0xfe11
+ #define PCI_DEVICE_ID_ZEPHYR_DCSP   0xfe12
+ #define PCI_VENDOR_ID_SERVERENGINE  0x19a2
++#define PCI_DEVICE_ID_TIGERSHARK    0x0704
++#define PCI_DEVICE_ID_TOMCAT        0x0714
+ #define PCI_DEVICE_ID_SKYHAWK       0x0724
+ #define PCI_DEVICE_ID_SKYHAWK_VF    0x072c
+ 
+@@ -4365,11 +4395,16 @@ struct lpfc_sli2_slim {
+ static inline int
+ lpfc_is_LC_HBA(unsigned short device)
+ {
+-	if ((device == PCI_DEVICE_ID_BMID) ||
++	if ((device == PCI_DEVICE_ID_TFLY) ||
++	    (device == PCI_DEVICE_ID_PFLY) ||
++	    (device == PCI_DEVICE_ID_LP101) ||
++	    (device == PCI_DEVICE_ID_BMID) ||
++	    (device == PCI_DEVICE_ID_BSMB) ||
+ 	    (device == PCI_DEVICE_ID_ZMID) ||
+ 	    (device == PCI_DEVICE_ID_ZSMB) ||
+ 	    (device == PCI_DEVICE_ID_SAT_MID) ||
+-	    (device == PCI_DEVICE_ID_SAT_SMB))
++	    (device == PCI_DEVICE_ID_SAT_SMB) ||
++	    (device == PCI_DEVICE_ID_RFLY))
+ 		return 1;
+ 	else
+ 		return 0;
+diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h
+index a77e0fac0..4e9b02a78 100644
+--- a/drivers/scsi/lpfc/lpfc_ids.h
++++ b/drivers/scsi/lpfc/lpfc_ids.h
+@@ -24,10 +24,44 @@
+ #include <linux/pci.h>
+ 
+ const struct pci_device_id lpfc_id_table[] = {
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_THOR,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PEGASUS,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_CENTAUR,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_DRAGONFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SUPERFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_RFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_SCSP,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_DCSP,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_SCSP,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,
+@@ -36,6 +70,16 @@ const struct pci_device_id lpfc_id_table[] = {
+ 		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP10000S,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP11000S,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
+@@ -48,10 +92,28 @@ const struct pci_device_id lpfc_id_table[] = {
+ 		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_S,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TIGERSHARK,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC_VF,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G6_FC,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
+diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
+index 82d25ea51..f4f49aa2a 100644
+--- a/drivers/scsi/lpfc/lpfc_init.c
++++ b/drivers/scsi/lpfc/lpfc_init.c
+@@ -2482,9 +2482,83 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
+ 	vp = &phba->vpd;
+ 
+ 	switch (dev_id) {
++	case PCI_DEVICE_ID_FIREFLY:
++		m = (typeof(m)){"LP6000", "PCI",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_SUPERFLY:
++		if (vp->rev.biuRev >= 1 && vp->rev.biuRev <= 3)
++			m = (typeof(m)){"LP7000", "PCI", ""};
++		else
++			m = (typeof(m)){"LP7000E", "PCI", ""};
++		m.function = "Obsolete, Unsupported Fibre Channel Adapter";
++		break;
++	case PCI_DEVICE_ID_DRAGONFLY:
++		m = (typeof(m)){"LP8000", "PCI",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_CENTAUR:
++		if (FC_JEDEC_ID(vp->rev.biuRev) == CENTAUR_2G_JEDEC_ID)
++			m = (typeof(m)){"LP9002", "PCI", ""};
++		else
++			m = (typeof(m)){"LP9000", "PCI", ""};
++		m.function = "Obsolete, Unsupported Fibre Channel Adapter";
++		break;
++	case PCI_DEVICE_ID_RFLY:
++		m = (typeof(m)){"LP952", "PCI",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_PEGASUS:
++		m = (typeof(m)){"LP9802", "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_THOR:
++		m = (typeof(m)){"LP10000", "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_VIPER:
++		m = (typeof(m)){"LPX1000",  "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_PFLY:
++		m = (typeof(m)){"LP982", "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_TFLY:
++		m = (typeof(m)){"LP1050", "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_HELIOS:
++		m = (typeof(m)){"LP11000", "PCI-X2",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_HELIOS_SCSP:
++		m = (typeof(m)){"LP11000-SP", "PCI-X2",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_HELIOS_DCSP:
++		m = (typeof(m)){"LP11002-SP",  "PCI-X2",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_NEPTUNE:
++		m = (typeof(m)){"LPe1000", "PCIe",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_NEPTUNE_SCSP:
++		m = (typeof(m)){"LPe1000-SP", "PCIe",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_NEPTUNE_DCSP:
++		m = (typeof(m)){"LPe1002-SP", "PCIe",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
+ 	case PCI_DEVICE_ID_BMID:
+ 		m = (typeof(m)){"LP1150", "PCI-X2", "Fibre Channel Adapter"};
+ 		break;
++	case PCI_DEVICE_ID_BSMB:
++		m = (typeof(m)){"LP111", "PCI-X2",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
+ 	case PCI_DEVICE_ID_ZEPHYR:
+ 		m = (typeof(m)){"LPe11000", "PCIe", "Fibre Channel Adapter"};
+ 		break;
+@@ -2501,6 +2575,22 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
+ 	case PCI_DEVICE_ID_ZSMB:
+ 		m = (typeof(m)){"LPe111", "PCIe", "Fibre Channel Adapter"};
+ 		break;
++	case PCI_DEVICE_ID_LP101:
++		m = (typeof(m)){"LP101", "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_LP10000S:
++		m = (typeof(m)){"LP10000-S", "PCI",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_LP11000S:
++		m = (typeof(m)){"LP11000-S", "PCI-X2",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_LPE11000S:
++		m = (typeof(m)){"LPe11000-S", "PCIe",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
+ 	case PCI_DEVICE_ID_SAT:
+ 		m = (typeof(m)){"LPe12000", "PCIe", "Fibre Channel Adapter"};
+ 		break;
+@@ -2519,17 +2609,54 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
+ 	case PCI_DEVICE_ID_SAT_S:
+ 		m = (typeof(m)){"LPe12000-S", "PCIe", "Fibre Channel Adapter"};
+ 		break;
++	case PCI_DEVICE_ID_HORNET:
++		m = (typeof(m)){"LP21000", "PCIe",
++				"Obsolete, Unsupported FCoE Adapter"};
++		GE = 1;
++		break;
++	case PCI_DEVICE_ID_PROTEUS_VF:
++		m = (typeof(m)){"LPev12000", "PCIe IOV",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_PROTEUS_PF:
++		m = (typeof(m)){"LPev12000", "PCIe IOV",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_PROTEUS_S:
++		m = (typeof(m)){"LPemv12002-S", "PCIe IOV",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_TIGERSHARK:
++		oneConnect = 1;
++		m = (typeof(m)){"OCe10100", "PCIe", "FCoE"};
++		break;
++	case PCI_DEVICE_ID_TOMCAT:
++		oneConnect = 1;
++		m = (typeof(m)){"OCe11100", "PCIe", "FCoE"};
++		break;
+ 	case PCI_DEVICE_ID_FALCON:
+ 		m = (typeof(m)){"LPSe12002-ML1-E", "PCIe",
+ 				"EmulexSecure Fibre"};
+ 		break;
++	case PCI_DEVICE_ID_BALIUS:
++		m = (typeof(m)){"LPVe12002", "PCIe Shared I/O",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
+ 	case PCI_DEVICE_ID_LANCER_FC:
+ 		m = (typeof(m)){"LPe16000", "PCIe", "Fibre Channel Adapter"};
+ 		break;
++	case PCI_DEVICE_ID_LANCER_FC_VF:
++		m = (typeof(m)){"LPe16000", "PCIe",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
+ 	case PCI_DEVICE_ID_LANCER_FCOE:
++		oneConnect = 1;
++		m = (typeof(m)){"OCe15100", "PCIe", "FCoE"};
++		break;
++	case PCI_DEVICE_ID_LANCER_FCOE_VF:
+ 		oneConnect = 1;
+ 		m = (typeof(m)){"OCe15100", "PCIe",
+-				"Obsolete, Unsupported FCoE Adapter"};
++				"Obsolete, Unsupported FCoE"};
+ 		break;
+ 	case PCI_DEVICE_ID_LANCER_G6_FC:
+ 		m = (typeof(m)){"LPe32000", "PCIe", "Fibre Channel Adapter"};
+@@ -7619,6 +7746,13 @@ lpfc_sli_driver_resource_setup(struct lpfc_hba *phba)
+ 	if (rc)
+ 		return -ENODEV;
+ 
++	if (phba->pcidev->device == PCI_DEVICE_ID_HORNET) {
++		phba->menlo_flag |= HBA_MENLO_SUPPORT;
++		/* check for menlo minimum sg count */
++		if (phba->cfg_sg_seg_cnt < LPFC_DEFAULT_MENLO_SG_SEG_CNT)
++			phba->cfg_sg_seg_cnt = LPFC_DEFAULT_MENLO_SG_SEG_CNT;
++	}
++
+ 	if (!phba->sli.sli3_ring)
+ 		phba->sli.sli3_ring = kcalloc(LPFC_SLI3_MAX_RING,
+ 					      sizeof(struct lpfc_sli_ring),
+-- 
+2.27.0
+

SOURCES/0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch

@@ -0,0 +1,41 @@
+From c706b20bc89820ccc3c34e566d709f3f55c46624 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Tue, 9 Apr 2024 21:04:46 +0000
+Subject: [PATCH] Bring back deprecated pci ids to qla4xxx driver
+
+---
+ drivers/scsi/qla4xxx/ql4_os.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
+index b609f0c34..edf148fc7 100644
+--- a/drivers/scsi/qla4xxx/ql4_os.c
++++ b/drivers/scsi/qla4xxx/ql4_os.c
+@@ -9855,6 +9855,24 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
+ 		.subvendor	= PCI_ANY_ID,
+ 		.subdevice	= PCI_ANY_ID,
+ 	},
++	{
++		.vendor         = PCI_VENDOR_ID_QLOGIC,
++		.device         = PCI_DEVICE_ID_QLOGIC_ISP8022,
++		.subvendor      = PCI_ANY_ID,
++		.subdevice      = PCI_ANY_ID,
++	},
++	{
++		.vendor		= PCI_VENDOR_ID_QLOGIC,
++		.device		= PCI_DEVICE_ID_QLOGIC_ISP8324,
++		.subvendor	= PCI_ANY_ID,
++		.subdevice	= PCI_ANY_ID,
++	},
++	{
++		.vendor		= PCI_VENDOR_ID_QLOGIC,
++		.device		= PCI_DEVICE_ID_QLOGIC_ISP8042,
++		.subvendor	= PCI_ANY_ID,
++		.subdevice	= PCI_ANY_ID,
++	},
+ 	{0, 0},
+ };
+ MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
+-- 
+2.27.0
+

SOURCES/0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch

@@ -0,0 +1,28 @@
+From 46c5a63208e3eb337da2ca8b1456a50707655e24 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Tue, 9 Apr 2024 21:07:06 +0000
+Subject: [PATCH] Bring back deprecated pci ids to be2iscsi driver
+
+---
+ drivers/scsi/be2iscsi/be_main.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
+index 885c351fb..2d04e67e7 100644
+--- a/drivers/scsi/be2iscsi/be_main.c
++++ b/drivers/scsi/be2iscsi/be_main.c
+@@ -375,6 +375,11 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
+ 
+ /*------------------- PCI Driver operations and data ----------------- */
+ static const struct pci_device_id beiscsi_pci_id_table[] = {
++	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },
++	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
++	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },
++	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },
++	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) },
+ 	{ PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) },
+ 	{ 0 }
+ };
+-- 
+2.27.0
+

SOURCES/RHEL-36117.patch

@@ -0,0 +1,26 @@
+diff -Naur linux-4.18.0-552.3.1.el8_10/include/linux/cpuhotplug.h linux-4.18.0-553.4.1.el8_10/include/linux/cpuhotplug.h
+--- linux-4.18.0-552.3.1.el8_10/include/linux/cpuhotplug.h	2024-05-11 16:20:25
++++ linux-4.18.0-553.4.1.el8_10/include/linux/cpuhotplug.h	2024-05-15 17:42:15
+@@ -151,7 +151,9 @@
+ 	 * the other CPUHP states are not changed or broken.
+ 	 */
+ 	RH_KABI_BROKEN_INSERT_ENUM(CPUHP_AP_SCHED_WAIT_EMPTY)
++#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
+ 	RH_KABI_BROKEN_INSERT_ENUM(CPUHP_AP_HYPERV_ONLINE)
++#endif
+ 	CPUHP_AP_SMPBOOT_THREADS,
+ 	RH_KABI_BROKEN_REMOVE_ENUM(CPUHP_AP_X86_VDSO_VMA_ONLINE)
+ 	CPUHP_AP_IRQ_AFFINITY_ONLINE,
+@@ -165,7 +167,12 @@
+ 	CPUHP_AP_PERF_X86_CQM_ONLINE,
+ 	CPUHP_AP_PERF_X86_CSTATE_ONLINE,
+ 	/* kABI: CPUHP_AP_PERF_X86_IDXD_ONLINE, */
++#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
++	/* Compensate for the addition of CPUHP_AP_HYPERV_ONLINE */
++	RH_KABI_BROKEN_REMOVE_ENUM(CPUHP_AP_PERF_S390_CF_ONLINE)
++#else
+ 	CPUHP_AP_PERF_S390_CF_ONLINE,
++#endif
+ 	/* kABI: CPUHP_AP_PERF_S390_CFD_ONLINE, */
+ 	CPUHP_AP_PERF_S390_SF_ONLINE,
+ 	CPUHP_AP_PERF_ARM_CCI_ONLINE,

SOURCES/almalinux.pem

@@ -0,0 +1,46 @@
+-----BEGIN CERTIFICATE-----
+MIID3zCCAsegAwIBAgIQY4iebPtuT3OKR2M/jWZWEzANBgkqhkiG9w0BAQsFADBg
+MSUwIwYJKoZIhvcNAQkBFhZzZWN1cml0eUBhbG1hbGludXgub3JnMRIwEAYDVQQK
+EwlBbG1hTGludXgxIzAhBgNVBAMTGkFsbWFMaW51eCBTZWN1cmUgQm9vdCBDQSAx
+MB4XDTIxMDExNDIxMDcxOVoXDTM2MDExMTIxMDcxOVowaTElMCMGCSqGSIb3DQEJ
+ARYWc2VjdXJpdHlAYWxtYWxpbnV4Lm9yZzESMBAGA1UEChMJQWxtYUxpbnV4MSww
+KgYDVQQDEyNBbG1hTGludXggRHJpdmVyIHVwZGF0ZSBzaWduaW5nIGtleTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7kGZShKo5uegg6T4U/wR9UeyCa
+qTtx+OvzUMKT8l5+R5WfBgQU8sDrIqX3Vv3tD6UeOUyFIQ40iGESdDhWnAFynJX4
+v0k81KxJ+rVFAt5EJBeGw7U2qdpn8hzJG2dVANZ1gXJWGhC95Muif5q8fL7BJdU4
+RufixfKWq6WHAalwHaiTCbA+/Ft6TLyZcA62glKkmBn7uWn83tlMfVqC4EN2NfQb
+//C2MFCbm43BoKmgrMV0J3Pu8un3QZ4ukDDhJJ9eHfSqscq9SHPjqd0RM6TRcFXW
+BzmTpG7MOJRvk4ypQSHxxc4jK5MVOqzel+2UPB2ihkvvnK9hdsvvI/bal/sCAwEA
+AaOBizCBiDAfBgNVHSMEGDAWgBSY0u339QWy5Y/vkiTSvJ6Ffy5GkzAVBglghkgB
+hvhCAQEBAf8EBQMDAPABMB8GA1UdJQQYMBYGCCsGAQUFBwMDBgorBgEEAZIIEAEC
+MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUe4Y+AkDtIIq2uBuKbyhgwPTox9Yw
+DQYJKoZIhvcNAQELBQADggEBAHoPojMTRdFO050Ihrmr8jkdOweiOSBtlAZkLGd2
+lTybNp2Xi1lQ8SqsqU/NFs/KUPVFykmjmLeqNWC9QoKdrVGzoD9MOHprRxe6gC8k
+sHzBCFqdx3B+qbeSxBUN2QLIydzM6C23qf1TjBCeEDtRrvcvupFTlOBxiOJrIwbp
+dJD1JfjbgxfvLzg7PaJPi5Ev6B3gY4ybCnKQmor029Z3R4zw3miPpZVA04xt3Z9e
+m45Jjv86u10wjLmGRgfMmYT43jiMbOwlG1N8OikvgIHwlZtWxUpL1t/mEYtMMkTv
+R//lA5z5dqXiDCPdTwHhSjEfBFWGLl7ciYt6rYkpdlqnYdk=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2DCCAsCgAwIBAgIQHDEXJMuZQ/m5MXRiSmLMljANBgkqhkiG9w0BAQsFADBg
+MSUwIwYJKoZIhvcNAQkBFhZzZWN1cml0eUBhbG1hbGludXgub3JnMRIwEAYDVQQK
+EwlBbG1hTGludXgxIzAhBgNVBAMTGkFsbWFMaW51eCBTZWN1cmUgQm9vdCBDQSAx
+MB4XDTIxMDExNDIxMDgwMFoXDTM2MDExMTIxMDgwMFowYjElMCMGCSqGSIb3DQEJ
+ARYWc2VjdXJpdHlAYWxtYWxpbnV4Lm9yZzESMBAGA1UEChMJQWxtYUxpbnV4MSUw
+IwYDVQQDExxBbG1hTGludXgga3BhdGNoIHNpZ25pbmcga2V5MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxncKQ7a49o5IUwqPB1axIzopNdGoSoERVuUd
+hdHAZLB2MGIuU2fGCuZ4iD2Pwk+t2KsgR1y58pmHyRBCLi2tYfEdDB8LUzUY3P+8
+Wxm2+zz8TPJUIcvPE4rHEb0vV4nTzwjpG4BTBwLkYRj+AxGbzWEy5Eetxzq5Ji+V
+TMuTzRKshHEGNs3tFRPbSssc50NH+OuVKpzJAIqBmz7Gca9RqhK9ARK1p3aDEoR+
+pYw4zRjIczc3s57WeuQxRMvFK5j48U0hpEUh+eQn1m40Bus3e7i4YTskwgKN5Vq3
+lGlEdBoK4utuoHPj3JYh97hOii/kulOa9j5xeNe5z/6QByMxpwIDAQABo4GLMIGI
+MB8GA1UdIwQYMBaAFJjS7ff1BbLlj++SJNK8noV/LkaTMBUGCWCGSAGG+EIBAQEB
+/wQFAwMA8AEwHwYDVR0lBBgwFgYIKwYBBQUHAwMGCisGAQQBkggQAQIwDgYDVR0P
+AQH/BAQDAgSwMB0GA1UdDgQWBBRpptnu0/Yg1cLhOh0hHEZRClrZ9TANBgkqhkiG
+9w0BAQsFAAOCAQEAMDiuS0CD31MtO1Sn4HRYvai2LFdKpUKAEXVy9hsN+AfbcMcl
+2sF/w49o43cMNIFoWKhMWZMOjCj/DGQY7ehNH3DRaTl7DNCu6y7mBNJPU+iPcE4r
+92SBWIxUNi7YVbsc1evKBOnrtq6xd5BUJQx1cVGmSBI9dnd4tDBB2+KjpmdhzZK5
+V1KQz1ilz5g2FNyEj6L7hnpkGUeMYnuM49YL7JP8QNtaKUBBA3BR4S7de+Tu070h
+pEhvE539I6B+wmgV/bio20TUpQ5W2eH+5YUHVIZa5pZ30tVkm21iNB7eccbM4NYc
+IRmwIsesuROtaM1e0lHoxKdW0N2xOSkhSY6oyQ==
+-----END CERTIFICATE-----

SOURCES/debrand-rh-i686-cpu.patch

@@ -0,0 +1,11 @@
+--- a/arch/x86/boot/main.c	2019-03-13 04:04:53.000000000 -0700
++++ b/arch/x86/boot/main.c	2019-05-25 14:31:21.043272496 -0700
+@@ -147,7 +147,7 @@ void main(void)
+ 
+ 	/* Make sure we have all the proper CPU support */
+ 	if (validate_cpu()) {
+-		puts("This processor is not supported in this version of RHEL.\n");
++		puts("This processor is not supported in this version of AlmaLinux.\n");
+ 		die();
+ 	}
+ 

SOURCES/debrand-rh_taint.patch

@@ -0,0 +1,81 @@
+--- a/kernel/rh_taint.c	2020-10-16 10:41:51.000000000 -0500
++++ b/kernel/rh_taint.c	2020-11-19 10:50:24.853039167 -0600
+@@ -2,12 +2,12 @@
+ #include <linux/module.h>
+ 
+ /*
+- * The following functions are used by Red Hat to indicate to users that
+- * hardware and drivers are unsupported, or have limited support in RHEL major
++ * The following functions are used by AlmaLinux to indicate to users that
++ * hardware and drivers are unsupported, or have limited support in AlmaLinux major
+  * and minor releases.  These functions output loud warning messages to the end
+  * user and should be USED WITH CAUTION.
+  *
+- * Any use of these functions _MUST_ be documented in the RHEL Release Notes,
++ * Any use of these functions _MUST_ be documented in the AlmaLinux Release Notes,
+  * and have approval of management.
+  */
+ 
+@@ -16,15 +16,15 @@
+  * @msg: Hardware name, class, or type
+  *
+  * Called to mark a device, class of devices, or types of devices as not having
+- * support in any RHEL minor release.  This does not TAINT the kernel.  Red Hat
+- * will not fix bugs against this hardware in this minor release.  Red Hat may
++ * support in any AlmaLinux minor release.  This does not TAINT the kernel.  AlmaLinux
++ * will not fix bugs against this hardware in this minor release.  AlmaLinux may
+  * declare support in a future major or minor update release.  This cannot be
+  * used to mark drivers unsupported.
+  */
+ void mark_hardware_unsupported(const char *msg)
+ {
+ 	/* Print one single message */
+-	pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://catalog.redhat.com for certified hardware.\n", msg);
++	pr_crit("Warning: %s - this hardware has not undergone testing by AlmaLinux and might not be certified.\n", msg);
+ }
+ EXPORT_SYMBOL(mark_hardware_unsupported);
+ 
+@@ -35,12 +35,12 @@ EXPORT_SYMBOL(mark_hardware_unsupported)
+  * Called to minimize the support status of a previously supported device in
+  * a minor release.  This does not TAINT the kernel.  Marking hardware
+  * deprecated is usually done in conjunction with the hardware vendor.  Future
+- * RHEL major releases may not include this driver.  Driver updates and fixes
++ * AlmaLinux major releases may not include this driver.  Driver updates and fixes
+  * for this device will be limited to critical issues in future minor releases.
+  */
+ void mark_hardware_deprecated(const char *msg)
+ {
+-	pr_crit("Warning: %s - this hardware is not recommended for new deployments. It continues to be supported in this RHEL release, but it is likely to be removed in the next major release. Driver updates and fixes for this device will be limited to critical issues. Please contact Red Hat Support or your device's hardware vendor for additional information.\n", msg);
++	pr_crit("Warning: %s - this hardware is not recommended for new deployments. It continues to be supported in this AlmaLinux release, but it is likely to be removed in the next major release. Driver updates and fixes for this device will be limited to critical issues. Please contact AlmaLinux Support or your device's hardware vendor for additional information.\n", msg);
+ }
+ EXPORT_SYMBOL(mark_hardware_deprecated);
+ 
+@@ -50,9 +50,9 @@ EXPORT_SYMBOL(mark_hardware_deprecated);
+  *
+  * Called to minimize the support status of a new driver.  This does TAINT the
+  * kernel.  Calling this function indicates that the driver or subsystem has
+- * had limited testing and is not marked for full support within this RHEL
+- * minor release.  The next RHEL minor release may contain full support for
+- * this driver.  Red Hat does not guarantee that bugs reported against this
++ * had limited testing and is not marked for full support within this AlmaLinux
++ * minor release.  The next AlmaLinux minor release may contain full support for
++ * this driver.  AlmaLinux does not guarantee that bugs reported against this
+  * driver or subsystem will be resolved.
+  */
+ void mark_tech_preview(const char *msg, struct module *mod)
+@@ -81,13 +81,13 @@ EXPORT_SYMBOL(mark_tech_preview);
+  * mark_driver_unsupported - drivers that we know we don't want to support
+  * @name: the name of the driver
+  *
+- * In some cases Red Hat has chosen to build a driver for internal QE
++ * In some cases AlmaLinux has chosen to build a driver for internal QE
+  * use. Use this function to mark those drivers as unsupported for
+  * customers.
+  */
+ void mark_driver_unsupported(const char *name)
+ {
+-	pr_crit("Warning: %s - This driver has not undergone sufficient testing by Red Hat for this release and therefore cannot be used in production systems.\n",
++	pr_crit("Warning: %s - This driver has not undergone sufficient testing by AlmaLinux for this release and therefore cannot be used in production systems.\n",
+ 	        name ? name : "kernel");
+ }
+ EXPORT_SYMBOL(mark_driver_unsupported);

SOURCES/debrand-single-cpu.patch

@@ -0,0 +1,11 @@
+--- a/arch/x86/kernel/setup.c	2019-03-13 04:04:53.000000000 -0700
++++ b/arch/x86/kernel/setup.c	2019-05-27 08:35:54.580595314 -0700
+@@ -900,7 +900,7 @@ static void rh_check_supported(void)
+ 	if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) &&
+ 	    !guest && is_kdump_kernel()) {
+ 		pr_crit("Detected single cpu native boot.\n");
+-		pr_crit("Important:  In Red Hat Enterprise Linux 8, single threaded, single CPU 64-bit physical systems are unsupported by Red Hat. Please contact your Red Hat support representative for a list of certified and supported systems.");
++		pr_crit("Important:  In AlmaLinux 8, single threaded, single CPU 64-bit physical systems are unsupported. Please see https://www.almalinux.org for more information");
+ 	}
+ 
+ 	/*

SOURCES/kernel-aarch64-debug.config

@@ -1166,7 +1166,7 @@
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
-# CONFIG_MLX4_CORE_GEN2 is not set
+CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MMA7455_I2C is not set

SOURCES/kernel-aarch64.config

@@ -1224,7 +1224,7 @@
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
-# CONFIG_MLX4_CORE_GEN2 is not set
+CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MMA7455_I2C is not set

SOURCES/kernel-ppc64le-debug.config

@@ -1047,7 +1047,7 @@
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MHI_BUS_EP is not set
 # CONFIG_MINIX_FS is not set
-# CONFIG_MLX4_CORE_GEN2 is not set
+CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLXBF_BOOTCTL is not set

SOURCES/kernel-ppc64le.config

@@ -1107,7 +1107,7 @@
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MHI_BUS_EP is not set
 # CONFIG_MINIX_FS is not set
-# CONFIG_MLX4_CORE_GEN2 is not set
+CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLXBF_BOOTCTL is not set

SOURCES/kernel-s390x-debug.config

@@ -1119,7 +1119,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISDN_HFCMULTI is not set
-# CONFIG_MLX4_CORE_GEN2 is not set
+CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLXBF_BOOTCTL is not set

SOURCES/kernel-s390x-zfcpdump.config

@@ -1277,7 +1277,7 @@
 # CONFIG_MISC_FILESYSTEMS is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISDN_HFCMULTI is not set
-# CONFIG_MLX4_CORE_GEN2 is not set
+CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLXBF_BOOTCTL is not set

SOURCES/kernel-s390x.config

@@ -1180,7 +1180,7 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISDN_HFCMULTI is not set
-# CONFIG_MLX4_CORE_GEN2 is not set
+CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLXBF_BOOTCTL is not set

SOURCES/kernel-x86_64-debug.config

@@ -1054,7 +1054,7 @@
 # CONFIG_MICROCODE_LATE_LOADING is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_MK8 is not set
-# CONFIG_MLX4_CORE_GEN2 is not set
+CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLXBF_BOOTCTL is not set

SOURCES/kernel-x86_64.config

@@ -1113,7 +1113,7 @@
 # CONFIG_MICROCODE_LATE_LOADING is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_MK8 is not set
-# CONFIG_MLX4_CORE_GEN2 is not set
+CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLXBF_BOOTCTL is not set

SOURCES/x509.genkey

@@ -5,9 +5,9 @@ prompt = no
 x509_extensions = myexts
 
 [ req_distinguished_name ]
-O = Red Hat
-CN = Red Hat Enterprise Linux kernel signing key
-emailAddress = secalert@redhat.com
+O = AlmaLinux
+CN = AlmaLinux kernel signing key
+emailAddress = security@almalinux.org
 
 [ myexts ]
 basicConstraints=critical,CA:FALSE

SPECS/kernel.spec

@@ -38,10 +38,11 @@
 # define buildid .local
 
 %define specversion 4.18.0
-%define pkgrelease 552.el8
+%define pkgrelease 553.el8_10
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 552%{?dist}
+%define specrelease 553%{?dist}
+%define tarfile_release 552.el8
 
 %define pkg_release %{specrelease}%{?buildid}
 
@@ -217,14 +218,14 @@
 %define with_bpftool 1
 %endif
 
-%ifnarch noarch
+%ifnarch x86_64
 %define with_kernel_abi_stablelists 0
 %endif
 
 # Overrides for generic default options
 
 # only package docs noarch
-%ifnarch noarch
+%ifnarch x86_64
 %define with_doc 0
 %define doc_build_fail true
 %endif
@@ -346,7 +347,6 @@ Requires: rt-setup
 %endif
 %endif
 
-
 #
 # List the packages used during the kernel build
 #
@@ -434,7 +434,7 @@ BuildRequires: xmlto
 BuildRequires: asciidoc
 %endif
 
-Source0: linux-%{specversion}-%{pkgrelease}.tar.xz
+Source0: linux-%{specversion}-%{tarfile_release}.tar.xz
 
 Source9: x509.genkey
 
@@ -446,37 +446,15 @@ Source9: x509.genkey
 %define signing_key_filename kernel-signing-s390.cer
 %endif
 
-Source10: redhatsecurebootca3.cer
-Source11: centossecurebootca2.cer
-Source12: centossecureboot201.cer
-Source13: redhatsecureboot501.cer
-Source14: redhatsecureboot302.cer
-Source15: redhatsecureboot303.cer
-Source16: redhatsecurebootca7.cer
-%if 0%{?centos}
-%define secureboot_ca_0  %{SOURCE11}
-%define secureboot_key_0 %{SOURCE12}
-%define pesign_name_0 centossecureboot201
-%else
+Source10: almalinuxsecurebootca0.cer
+Source11: almalinuxsecurebootca0.cer
 
-%ifarch x86_64 aarch64
 %define secureboot_ca_0 %{SOURCE10}
-%define secureboot_key_0 %{SOURCE13}
-%define pesign_name_0 redhatsecureboot501
-%endif
+%define secureboot_ca_1 %{SOURCE11}
+%define secureboot_ca_2 %{SOURCE11}
 
-%ifarch s390x
-%define secureboot_ca_0 %{SOURCE10}
-%define secureboot_key_0 %{SOURCE14}
-%define pesign_name_0 redhatsecureboot302
-%endif
-
-%ifarch ppc64le
-%define secureboot_ca_0 %{SOURCE16}
-%define secureboot_key_0 %{SOURCE15}
-%define pesign_name_0 redhatsecureboot701
-%endif
-%endif
+%define secureboot_key_0 %{SOURCE10}
+%define pesign_name_0 almalinuxsecurebootca0
 
 Source17: mod-blacklist.sh
 Source18: mod-sign.sh
@@ -505,8 +483,8 @@ Source43: generate_bls_conf.sh
 
 Source44: mod-internal.list
 
-Source100: rheldup3.x509
-Source101: rhelkpatch1.x509
+# Source100: rheldup3.x509
+# Source101: rhelkpatch1.x509
 
 %if %{with_kabichk}
 Source200: check-kabi
@@ -539,18 +517,36 @@ Source4000: gating.yaml
 # rpminspect config
 Source4001: rpminspect.yaml
 
+Source9000: almalinux.pem
+
 ## Patches needed for building this package
 
 # empty final patch to facilitate testing of kernel patches
 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-Enable-all-disabled-pci-devices-by-moving-to-unmaint.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
+Patch2004: 0004-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
+Patch2005: 0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
+Patch2006: 0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
+Patch2007: 0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
+Patch2008: 0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
+
+# RHEL-36117 patch that makes difference between 4.18.0-552.el8 and 4.18.0-553.el8_10
+Patch2009: RHEL-36117.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/%{name}-%{KVERREL}-root
 
 %description
-This is the package which provides the Linux %{name} for Red Hat Enterprise
-Linux. It is based on upstream Linux at version %{version} and maintains kABI
+This is the package which provides the Linux %{name} for AlmaLinux.
+It is based on upstream Linux at version %{version} and maintains kABI
 compatibility of a set of approved symbols, however it is heavily modified with
 backports and fixes pulled from newer upstream Linux %{name} releases. This means
 this is not a %{version} kernel anymore: it includes several components which come
@@ -558,7 +554,7 @@ from newer upstream linux versions, while maintaining a well tested and stable
 core. Some of the components/backports that may be pulled in are: changes like
 updates to the core kernel (eg.: scheduler, cgroups, memory management, security
 fixes and features), updates to block layer, supported filesystems, major driver
-updates for supported hardware in Red Hat Enterprise Linux, enhancements for
+updates for supported hardware in AlmaLinux, enhancements for
 enterprise customers, etc.
 
 #
@@ -597,6 +593,7 @@ AutoProv: yes\
 %package doc
 Summary: Various documentation bits found in the kernel source
 Group: Documentation
+BuildArch: noarch
 %description doc
 This package contains documentation files from the kernel
 source. Various bits of information about the Linux kernel and the
@@ -806,14 +803,15 @@ kernel-gcov includes the gcov graph and source files for gcov coverage collectio
 %endif
 
 %package -n %{name}-abi-stablelists
-Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists
+Summary: The AlmaLinux kernel ABI symbol stablelists
 Group: System Environment/Kernel
 AutoReqProv: no
+BuildArch: noarch
 Obsoletes: %{name}-abi-whitelists < %{specversion}-%{pkg_release}
 Provides: %{name}-abi-whitelists
 %description -n %{name}-abi-stablelists
-The kABI package contains information pertaining to the Red Hat Enterprise
-Linux kernel ABI, including lists of kernel symbols that are needed by
+The kABI package contains information pertaining to the AlmaLinux
+kernel ABI, including lists of kernel symbols that are needed by
 external Linux kernel modules, and a yum plugin to aid enforcement.
 
 %if %{with_kabidw_base}
@@ -822,8 +820,8 @@ Summary: The baseline dataset for kABI verification using DWARF data
 Group: System Environment/Kernel
 AutoReqProv: no
 %description kernel-kabidw-base-internal
-The package contains data describing the current ABI of the Red Hat Enterprise
-Linux kernel, suitable for the kabi-dw tool.
+The package contains data describing the current ABI of the AlmaLinux
+kernel, suitable for the kabi-dw tool.
 %endif
 
 #
@@ -897,7 +895,7 @@ Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 AutoReq: no\
 AutoProv: yes\
 %description %{?1:%{1}-}modules-internal\
-This package provides kernel modules for the %{?2:%{2} }kernel package for Red Hat internal usage.\
+This package provides kernel modules for the %{?2:%{2} }kernel package for AlmaLinux internal usage.\
 %{nil}
 
 #
@@ -988,6 +986,11 @@ Summary: %{variant_summary}\
 Group: System Environment/Kernel\
 Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 Provides: installonlypkg(kernel)\
+%if "%{?1}" == ""\
+Provides: almalinux(kernel-sig-key) = 202303\
+Conflicts: shim-ia32 <= 15.6-1.el8.alma\
+Conflicts: shim-x64 <= 15.6-1.el8.alma\
+%endif\
 %{expand:%%kernel_reqprovconf}\
 %if %{?1:1} %{!?1:0} \
 %{expand:%%kernel_meta_package %{?1:%{1}}}\
@@ -1094,11 +1097,26 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n %{name}-%{specversion}-%{pkgrelease} -c
-mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL}
+%setup -q -n %{name}-%{specversion}-%{tarfile_release} -c
+cp -v %{SOURCE9000} linux-%{specversion}-%{tarfile_release}/certs/rhel.pem
+mv linux-%{specversion}-%{tarfile_release} linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 
+ApplyOptionalPatch debrand-single-cpu.patch
+ApplyOptionalPatch debrand-rh-i686-cpu.patch
+
+ApplyPatch 0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch
+ApplyPatch 0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
+ApplyPatch 0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
+ApplyPatch 0004-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
+ApplyPatch 0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
+ApplyPatch 0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
+ApplyPatch 0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
+ApplyPatch 0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
+
+ApplyPatch RHEL-36117.patch
+
 ApplyOptionalPatch linux-kernel-test.patch
 
 # END OF PATCH APPLICATIONS
@@ -1169,9 +1187,9 @@ done
 # Add DUP and kpatch certificates to system trusted keys for RHEL
 %if 0%{?rhel}
 %if %{signkernel}%{signmodules}
-openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
-openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
-cat rheldup3.pem rhelkpatch1.pem > ../certs/rhel.pem
+# openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
+# openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
+# cat rheldup3.pem rhelkpatch1.pem > ../certs/rhel.pem
 %ifarch ppc64le
 openssl x509 -inform der -in %{secureboot_ca_0} -out secureboot.pem
 cat secureboot.pem >> ../certs/rhel.pem
@@ -2695,6 +2713,9 @@ fi
 #
 #
 %changelog
+* Wed May 22 2024 Andrew Lukoshko <alukoshko@almalinux.org> [4.18.0-553.el8_10]
+- cpuhotplug: Fix kABI breakage caused by CPUHP_AP_HYPERV_ONLINE (Vitaly Kuznetsov) [RHEL-36117]
+
 * Sun Apr 07 2024 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-552.el8]
 - i40e: Enforce software interrupt during busy-poll exit (Ivan Vecera) [RHEL-26248]
 - i40e: Remove _t suffix from enum type names (Ivan Vecera) [RHEL-26248]
@@ -2867,6 +2888,16 @@ fi
 - NFSv4.1: fix zero value filehandle in post open getattr (Scott Mayhew) [RHEL-7994]
 - NFSv4.1: use EXCHGID4_FLAG_USE_PNFS_DS for DS server (Scott Mayhew) [RHEL-7994]
 
+* Wed Mar 13 2024 Andrew Lukoshko <alukoshko@almalinux.org> [4.18.0-544.el8]
+- hpsa: bring back deprecated PCI ids #CFHack #CFHack2024
+- mptsas: bring back deprecated PCI ids #CFHack #CFHack2024
+- megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024
+- qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024
+- qla4xxx: bring back deprecated PCI ids
+- lpfc: bring back deprecated PCI ids
+- be2iscsi: bring back deprecated PCI ids
+- kernel/rh_messages.h: enable all disabled pci devices by moving to unmaintained
+
 * Thu Feb 22 2024 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-544.el8]
 - ext4: fix kernel BUG in 'ext4_write_inline_data_end()' (Carlos Maiolino) [RHEL-23386] {CVE-2021-33631}
 - i2c: designware: Disable TX_EMPTY irq while waiting for block length byte (Charles Mirabile) [RHEL-24019]