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 new file mode 100644 index 0000000..69367da --- /dev/null +++ b/SOURCES/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch @@ -0,0 +1,122 @@ +From e6b210caa51bc33c46d5acfae198645a9914fa32 Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Mon, 30 Sep 2024 13:13:37 +0000 +Subject: [PATCH] Enable all disabled pci devices by moving to unmaintained + +--- + 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 b798ad5d4..c59853b47 100644 +--- a/kernel/rh_messages.h ++++ b/kernel/rh_messages.h +@@ -141,6 +141,53 @@ 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[] = { ++ { 0x10df, 0xe220, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x10df, 0x0724, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x10df, 0xe200, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x10df, 0xf011, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x10df, 0xf015, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x10df, 0xf100, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x10df, 0xfc40, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1000, 0x005b, PCI_ANY_ID, PCI_ANY_ID }, ++ { 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 }, ++ { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1000, 0x0082, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1000, 0x0083, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1000, 0x0084, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1000, 0x0085, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1000, 0x0086, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1000, 0x0087, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x177d, 0xa01e, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x177d, 0xa034, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x177d, 0x0011, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1077, 0x2031, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1077, 0x2532, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1077, 0x8031, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1924, 0x0803, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x1924, 0x0813, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1011, 0x0046, 0x103c, 0x10c2 }, + { 0x1011, 0x0046, 0x9005, 0x0364 }, + { 0x1011, 0x0046, 0x9005, 0x0365 }, +@@ -293,51 +340,4 @@ static const struct pci_device_id rh_disabled_pci_devices[] = { + {0} /* Terminating entry */ + }; + +-static const struct pci_device_id rh_unmaintained_pci_devices[] = { +- { 0x10df, 0xe220, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x10df, 0x0724, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x10df, 0xe200, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x10df, 0xf011, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x10df, 0xf015, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x10df, 0xf100, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x10df, 0xfc40, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1000, 0x005b, PCI_ANY_ID, PCI_ANY_ID }, +- { 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 }, +- { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1000, 0x0082, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1000, 0x0083, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1000, 0x0084, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1000, 0x0085, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1000, 0x0086, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1000, 0x0087, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x177d, 0xa01e, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x177d, 0xa034, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x177d, 0x0011, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1077, 0x2031, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1077, 0x2532, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1077, 0x8031, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1924, 0x0803, PCI_ANY_ID, PCI_ANY_ID }, +- { 0x1924, 0x0813, PCI_ANY_ID, PCI_ANY_ID }, +- {0} /* Terminating entry */ +-}; +- + #endif /* __RH_MESSAGES_H */ +-- +2.43.5 + diff --git a/SOURCES/0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch b/SOURCES/0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch new file mode 100644 index 0000000..b61240b --- /dev/null +++ b/SOURCES/0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch @@ -0,0 +1,39 @@ +From ac6e3b155d35bfea32b1c3c6015a18b6e5046652 Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Mon, 8 Apr 2024 13:17:47 +0000 +Subject: [PATCH 2/4] Bring back deprecated pci ids to mptsas-mptspi driver + +--- + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/fusion/mptspi.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c +index 9d2f13f12..b25686049 100644 +--- a/drivers/message/fusion/mptsas.c ++++ b/drivers/message/fusion/mptsas.c +@@ -5381,7 +5381,7 @@ static void mptsas_remove(struct pci_dev *pdev) + } + + static struct pci_device_id mptsas_pci_table[] = { +-#ifdef CONFIG_RHEL_DIFFERENCES ++#ifdef CONFIG_ALMALINUX_DIFFERENCES + { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068, + PCI_VENDOR_ID_VMWARE, PCI_ANY_ID }, + #else +diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c +index fd4a10b78..f9616de2a 100644 +--- a/drivers/message/fusion/mptspi.c ++++ b/drivers/message/fusion/mptspi.c +@@ -1238,7 +1238,7 @@ static struct spi_function_template mptspi_transport_functions = { + */ + + static struct pci_device_id mptspi_pci_table[] = { +-#ifdef CONFIG_RHEL_DIFFERENCES ++#ifdef CONFIG_ALMALINUX_DIFFERENCES + { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030, + PCI_VENDOR_ID_VMWARE, PCI_ANY_ID }, + #else +-- +2.27.0 + diff --git a/SOURCES/0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch b/SOURCES/0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch new file mode 100644 index 0000000..4960427 --- /dev/null +++ b/SOURCES/0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch @@ -0,0 +1,51 @@ +From f9ab10cebe6411dd26fec2ef354db2e527386b4f Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Mon, 8 Apr 2024 13:20:29 +0000 +Subject: [PATCH 3/4] Bring back deprecated pci ids to hpsa driver + +--- + drivers/scsi/hpsa.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c +index bd5880cbd..060bd914a 100644 +--- a/drivers/scsi/hpsa.c ++++ b/drivers/scsi/hpsa.c +@@ -82,9 +82,7 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \ + HPSA_DRIVER_VERSION); + MODULE_VERSION(HPSA_DRIVER_VERSION); + MODULE_LICENSE("GPL"); +-#ifndef CONFIG_RHEL_DIFFERENCES + MODULE_ALIAS("cciss"); +-#endif + + static int hpsa_simple_mode; + module_param(hpsa_simple_mode, int, S_IRUGO|S_IWUSR); +@@ -93,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}, +@@ -146,12 +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}, +-#ifndef CONFIG_RHEL_DIFFERENCES + {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}, +-#endif + {0,} + }; + +-- +2.27.0 + diff --git a/SOURCES/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch b/SOURCES/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch new file mode 100644 index 0000000..ead1bb5 --- /dev/null +++ b/SOURCES/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch @@ -0,0 +1,43 @@ +From 091c13878c5d53a9ca8c78d8d3dc20598ff11c88 Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Mon, 8 Apr 2024 13:22:27 +0000 +Subject: [PATCH 4/4] Bring back deprecated pci ids to qla2xxx driver + +--- + drivers/scsi/qla2xxx/qla_os.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c +index 036f26c42..1d7b684dc 100644 +--- a/drivers/scsi/qla2xxx/qla_os.c ++++ b/drivers/scsi/qla2xxx/qla_os.c +@@ -8121,7 +8121,6 @@ static const struct pci_error_handlers qla2xxx_err_handler = { + }; + + static struct pci_device_id qla2xxx_pci_tbl[] = { +-#ifndef CONFIG_RHEL_DIFFERENCES + { 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) }, +@@ -8134,18 +8133,13 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { + { 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) }, +-#endif + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) }, + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) }, +-#ifndef CONFIG_RHEL_DIFFERENCES + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8001) }, + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8021) }, +-#endif + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) }, +-#ifndef CONFIG_RHEL_DIFFERENCES + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISPF001) }, + { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) }, +-#endif + { 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 + diff --git a/SOURCES/0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch b/SOURCES/0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch new file mode 100644 index 0000000..7368f0c --- /dev/null +++ b/SOURCES/0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch @@ -0,0 +1,86 @@ +From 0e54f93854865b95b50e8023645e423af634e4ec Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Tue, 9 Apr 2024 17:27:35 +0000 +Subject: [PATCH 1/3] Bring back deprecated pci ids to lpfc driver + +--- + drivers/scsi/lpfc/lpfc_ids.h | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h +index 85fc52038..0b1616e93 100644 +--- a/drivers/scsi/lpfc/lpfc_ids.h ++++ b/drivers/scsi/lpfc/lpfc_ids.h +@@ -24,7 +24,6 @@ + #include + + const struct pci_device_id lpfc_id_table[] = { +-#ifndef CONFIG_RHEL_DIFFERENCES + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER, + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY, +@@ -55,13 +54,10 @@ const struct pci_device_id lpfc_id_table[] = { + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP, + PCI_ANY_ID, PCI_ANY_ID, }, +-#endif + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID, + PCI_ANY_ID, PCI_ANY_ID, }, +-#ifndef CONFIG_RHEL_DIFFERENCES + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB, + PCI_ANY_ID, PCI_ANY_ID, }, +-#endif + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR, + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP, +@@ -72,7 +68,6 @@ 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, }, +-#ifndef CONFIG_RHEL_DIFFERENCES + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY, + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101, +@@ -83,7 +78,6 @@ const struct pci_device_id lpfc_id_table[] = { + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S, + PCI_ANY_ID, PCI_ANY_ID, }, +-#endif + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT, + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID, +@@ -96,7 +90,6 @@ 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, }, +-#ifndef CONFIG_RHEL_DIFFERENCES + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF, + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF, +@@ -107,23 +100,18 @@ const struct pci_device_id lpfc_id_table[] = { + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT, + PCI_ANY_ID, PCI_ANY_ID, }, +-#endif + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON, + PCI_ANY_ID, PCI_ANY_ID, }, +-#ifndef CONFIG_RHEL_DIFFERENCES + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS, + PCI_ANY_ID, PCI_ANY_ID, }, +-#endif + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC, + PCI_ANY_ID, PCI_ANY_ID, }, +-#ifndef CONFIG_RHEL_DIFFERENCES + {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, }, +-#endif + {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, +-- +2.27.0 + diff --git a/SOURCES/0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch b/SOURCES/0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch new file mode 100644 index 0000000..f96c7c0 --- /dev/null +++ b/SOURCES/0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch @@ -0,0 +1,32 @@ +From b4fdb240a1102876c03e0dbbef57758550e6e334 Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Tue, 9 Apr 2024 17:35:14 +0000 +Subject: [PATCH 2/3] Bring back deprecated pci ids to qla4xxx driver + +--- + drivers/scsi/qla4xxx/ql4_os.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c +index c72c44087..2dd7a9b0d 100644 +--- a/drivers/scsi/qla4xxx/ql4_os.c ++++ b/drivers/scsi/qla4xxx/ql4_os.c +@@ -9865,7 +9865,6 @@ static struct pci_device_id qla4xxx_pci_tbl[] = { + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + }, +-#ifndef CONFIG_RHEL_DIFFERENCES + { + .vendor = PCI_VENDOR_ID_QLOGIC, + .device = PCI_DEVICE_ID_QLOGIC_ISP8022, +@@ -9884,7 +9883,6 @@ static struct pci_device_id qla4xxx_pci_tbl[] = { + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + }, +-#endif + {0, 0}, + }; + MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); +-- +2.27.0 + diff --git a/SOURCES/0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch b/SOURCES/0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch new file mode 100644 index 0000000..4b068d6 --- /dev/null +++ b/SOURCES/0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch @@ -0,0 +1,30 @@ +From 3c0cc7c69970a50fae40e8f6376fd50eb053db2d Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Tue, 9 Apr 2024 17:36:30 +0000 +Subject: [PATCH 3/3] Bring back deprecated pci ids to be2iscsi driver + +--- + drivers/scsi/be2iscsi/be_main.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c +index 9079d4d83..3b4778ac4 100644 +--- a/drivers/scsi/be2iscsi/be_main.c ++++ b/drivers/scsi/be2iscsi/be_main.c +@@ -384,13 +384,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[] = { +-#ifndef CONFIG_RHEL_DIFFERENCES + { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) }, + { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) }, + { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) }, + { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) }, + { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) }, +-#endif + { PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) }, + { 0 } + }; +-- +2.27.0 + diff --git a/SOURCES/0101-patch-5.14-bluetooth-hci_sysfs-Fix-attempting-to-call-device_ad.patch b/SOURCES/0101-patch-5.14-bluetooth-hci_sysfs-Fix-attempting-to-call-device_ad.patch new file mode 100644 index 0000000..2a69141 --- /dev/null +++ b/SOURCES/0101-patch-5.14-bluetooth-hci_sysfs-Fix-attempting-to-call-device_ad.patch @@ -0,0 +1,51 @@ +bluetooth: hci_sysfs: Fix attempting to call device_add multiple times + +device_add shall not be called multiple times as stated in its +documentation: + + 'Do not call this routine or device_register() more than once for + any device structure' + +Syzkaller reports a bug as follows [1]: +------------[ cut here ]------------ +kernel BUG at lib/list_debug.c:33! +invalid opcode: 0000 [#1] PREEMPT SMP KASAN +[...] +Call Trace: + + __list_add include/linux/list.h:69 [inline] + list_add_tail include/linux/list.h:102 [inline] + kobj_kset_join lib/kobject.c:164 [inline] + kobject_add_internal+0x18f/0x8f0 lib/kobject.c:214 + kobject_add_varg lib/kobject.c:358 [inline] + kobject_add+0x150/0x1c0 lib/kobject.c:410 + device_add+0x368/0x1e90 drivers/base/core.c:3452 + hci_conn_add_sysfs+0x9b/0x1b0 net/bluetooth/hci_sysfs.c:53 + hci_le_cis_estabilished_evt+0x57c/0xae0 net/bluetooth/hci_event.c:6799 + hci_le_meta_evt+0x2b8/0x510 net/bluetooth/hci_event.c:7110 + hci_event_func net/bluetooth/hci_event.c:7440 [inline] + hci_event_packet+0x63d/0xfd0 net/bluetooth/hci_event.c:7495 + hci_rx_work+0xae7/0x1230 net/bluetooth/hci_core.c:4007 + process_one_work+0x991/0x1610 kernel/workqueue.c:2289 + worker_thread+0x665/0x1080 kernel/workqueue.c:2436 + kthread+0x2e4/0x3a0 kernel/kthread.c:376 + ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:306 + + +Link: https://syzkaller.appspot.com/bug?id=da3246e2d33afdb92d66bc166a0934c5b146404a +Signed-off-by: Luiz Augusto von Dentz +Tested-by: Hawkins Jiawei +--- +diff -ruN linux-5.14.0-427.18.orig/net/bluetooth/hci_sysfs.c linux-5.14.0-427.18/net/bluetooth/hci_sysfs.c +--- linux-5.14.0-427.18.orig/net/bluetooth/hci_sysfs.c ++++ linux-5.14.0-427.18/net/bluetooth/hci_sysfs.c +@@ -48,6 +48,9 @@ void hci_conn_add_sysfs(struct hci_conn *conn) + + bt_dev_dbg(hdev, "conn %p", conn); + ++ if (device_is_registered(&conn->dev)) ++ return; ++ + if (device_is_registered(&conn->dev)) + return; + diff --git a/SOURCES/0201-5.14.0-mic-fix.patch b/SOURCES/0201-5.14.0-mic-fix.patch new file mode 100644 index 0000000..582ef55 --- /dev/null +++ b/SOURCES/0201-5.14.0-mic-fix.patch @@ -0,0 +1,24 @@ +From 05fe12c0546f92c86ebec7d4432e696486a22a05 Mon Sep 17 00:00:00 2001 +From: tigro +Date: Wed, 9 Oct 2024 17:47:23 +0300 +Subject: [PATCH] Added Inferit Compact support + +--- + sound/pci/hda/patch_conexant.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c +index e8209178d..995b6312e 100644 +--- a/sound/pci/hda/patch_conexant.c ++++ b/sound/pci/hda/patch_conexant.c +@@ -1085,6 +1085,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { + SND_PCI_QUIRK(0x103c, 0x8457, "HP Z2 G4 mini", CXT_FIXUP_HP_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x103c, 0x8458, "HP Z2 G4 mini premium", CXT_FIXUP_HP_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN), ++ SND_PCI_QUIRK(0x14f1, 0x0226, "Inferit Compact", CXT_FIXUP_HP_GATE_MIC), + SND_PCI_QUIRK(0x14f1, 0x0265, "SWS JS201D", CXT_PINCFG_SWS_JS201D), + SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO), + SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410), +-- +2.46.2 + diff --git a/SOURCES/msvsphereca1.x509 b/SOURCES/msvsphereca1.x509 new file mode 100644 index 0000000..e9e1c19 Binary files /dev/null and b/SOURCES/msvsphereca1.x509 differ diff --git a/SOURCES/msvspheredup1.x509 b/SOURCES/msvspheredup1.x509 new file mode 100644 index 0000000..3919acb Binary files /dev/null and b/SOURCES/msvspheredup1.x509 differ diff --git a/SOURCES/msvsphereima.x509 b/SOURCES/msvsphereima.x509 new file mode 100644 index 0000000..7361aee Binary files /dev/null and b/SOURCES/msvsphereima.x509 differ diff --git a/SOURCES/msvspherepatch1.x509 b/SOURCES/msvspherepatch1.x509 new file mode 100644 index 0000000..375fe9b Binary files /dev/null and b/SOURCES/msvspherepatch1.x509 differ diff --git a/SOURCES/x509.genkey.centos b/SOURCES/x509.genkey.centos index c91af3b..b1d1678 100644 --- a/SOURCES/x509.genkey.centos +++ b/SOURCES/x509.genkey.centos @@ -5,9 +5,9 @@ prompt = no x509_extensions = myexts [ req_distinguished_name ] -O = The CentOS Project -CN = CentOS Stream kernel signing key -emailAddress = security@centos.org +O = NCSD LLC +CN = MSVSphere kernel signing key +emailAddress = security@msvsphere.ru [ myexts ] basicConstraints=critical,CA:FALSE diff --git a/SOURCES/x509.genkey.rhel b/SOURCES/x509.genkey.rhel index b1bbe38..b1d1678 100644 --- a/SOURCES/x509.genkey.rhel +++ b/SOURCES/x509.genkey.rhel @@ -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 = NCSD LLC +CN = MSVSphere kernel signing key +emailAddress = security@msvsphere.ru [ myexts ] basicConstraints=critical,CA:FALSE diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index c98c13d..1c380b5 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -792,11 +792,7 @@ BuildRequires: tpm2-tools # For Azure CVM specific udev rules BuildRequires: WALinuxAgent-cvm # For UKI sb cert -%if 0%{?centos} -BuildRequires: centos-sb-certs >= 9.0-23 -%else -BuildRequires: redhat-sb-certs >= 9.4-0.1 -%endif +BuildRequires: sphere-sb-certs >= 9.4-0.1 %endif # Because this is the kernel, it's hard to get a single upstream URL @@ -822,20 +818,7 @@ Source2: kernel.changelog %define secureboot_ca_0 %{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer %define secureboot_key_0 %{_datadir}/pki/sb-certs/secureboot-kernel-%{_arch}.cer - -%if 0%{?centos} -%define pesign_name_0 centossecureboot201 -%else -%ifarch x86_64 aarch64 -%define pesign_name_0 redhatsecureboot501 -%endif -%ifarch s390x -%define pesign_name_0 redhatsecureboot302 -%endif -%ifarch ppc64le -%define pesign_name_0 redhatsecureboot701 -%endif -%endif +%define pesign_name_0 spheresecureboot001 # signkernel %endif @@ -914,19 +897,13 @@ Source84: mod-internal.list Source85: mod-partner.list Source86: mod-kvm.list -Source100: rheldup3.x509 -Source101: rhelkpatch1.x509 -Source102: rhelimaca1.x509 -Source103: rhelima.x509 -Source104: rhelima_centos.x509 -Source105: nvidiagpuoot001.x509 +Source100: msvspheredup1.x509 +Source101: msvspherepatch1.x509 +Source102: msvsphereca1.x509 +Source103: msvsphereima.x509 +#Source105: nvidiagpuoot001.x509 -%if 0%{?centos} -%define ima_signing_cert %{SOURCE104} -%else %define ima_signing_cert %{SOURCE103} -%endif - %define ima_cert_name ima.cer Source150: dracut-virt.conf @@ -974,6 +951,21 @@ Source4002: gating.yaml Patch1: patch-%{patchversion}-redhat.patch %endif +# 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 +Patch2003: 0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch +Patch2004: 0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch +Patch2005: 0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch +Patch2006: 0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch +Patch2007: 0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch + +# Backported by Inferit +Patch3001: 0101-patch-5.14-bluetooth-hci_sysfs-Fix-attempting-to-call-device_ad.patch + +# Inferit hardware support +Patch3101: 0201-5.14.0-mic-fix.patch + # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch @@ -1249,11 +1241,11 @@ Summary: gcov graph and source files for coverage data collection.\ %{nil} %package -n kernel-abi-stablelists -Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists +Summary: The MSVSphere kernel ABI symbol stablelists AutoReqProv: no %description -n kernel-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 MSVSphere +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} @@ -1262,8 +1254,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 MSVSphere +kernel, suitable for the kabi-dw tool. %endif # @@ -1362,7 +1354,7 @@ Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?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 MSVSphere internal usage.\ %{nil} %if %{with_realtime} @@ -1542,7 +1534,7 @@ Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1} AutoReq: no\ AutoProv: yes\ %description %{?1:%{1}-}modules-partner\ -This package provides kernel modules for the %{?2:%{2} }kernel package for Red Hat partners usage.\ +This package provides kernel modules for the %{?2:%{2} }kernel package for MSVSphere partners usage.\ %{nil} # Now, each variant package. @@ -1711,6 +1703,17 @@ cp -a %{SOURCE1} . %if !%{nopatches} +ApplyPatch 0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch +ApplyPatch 0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch +ApplyPatch 0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch +ApplyPatch 0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch +ApplyPatch 0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch +ApplyPatch 0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch +ApplyPatch 0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch + +ApplyPatch 0101-patch-5.14-bluetooth-hci_sysfs-Fix-attempting-to-call-device_ad.patch +ApplyPatch 0201-5.14.0-mic-fix.patch + ApplyOptionalPatch patch-%{patchversion}-redhat.patch %endif @@ -1791,8 +1794,7 @@ done openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem openssl x509 -inform der -in %{SOURCE102} -out rhelimaca1.pem -openssl x509 -inform der -in %{SOURCE105} -out nvidiagpuoot001.pem -cat rheldup3.pem rhelkpatch1.pem rhelimaca1.pem nvidiagpuoot001.pem > ../certs/rhel.pem +cat rheldup3.pem rhelkpatch1.pem rhelimaca1.pem > ../certs/rhel.pem %if %{signkernel} %ifarch s390x ppc64le openssl x509 -inform der -in %{secureboot_ca_0} -out secureboot.pem @@ -1808,7 +1810,7 @@ done # Adjust FIPS module name for RHEL %if 0%{?rhel} for i in *.config; do - sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API"/' $i + sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="MSVSphere %{rhel} - Kernel Cryptographic API"/' $i done %endif @@ -1827,17 +1829,17 @@ RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specver cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} -# We may want to override files from the primary target in case of building -# against a flavour of it (eg. centos not rhel), thus override it here if -# necessary -if [ "%{primary_target}" == "rhel" ]; then -%if 0%{?centos} - echo "Updating scripts/sources to centos version" - RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh centos -%else - echo "Not updating scripts/sources to centos version" -%endif -fi +## We may want to override files from the primary target in case of building +## against a flavour of it (eg. centos not rhel), thus override it here if +## necessary +#if [ "%{primary_target}" == "rhel" ]; then +#%if 0%{?centos} +# echo "Updating scripts/sources to centos version" +# RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh centos +#%else +# echo "Not updating scripts/sources to centos version" +#%endif +#fi # end of kernel config %endif @@ -2586,7 +2588,7 @@ BuildKernel() { # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete - # Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel + # MSVSphere UEFI Secure Boot CA cert, which can be used to authenticate the kernel mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer %if %{signkernel} install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer @@ -3792,6 +3794,9 @@ fi # # %changelog +* Wed Oct 9 2024 Arkady L. Shane [5.14.0-503.el9] +- Debranding for MSVSphere 9.5 + * Thu Aug 22 2024 Lucas Zampieri [5.14.0-503.el9] - Revert "Merge: scsi: fnic: driver update" (John Meneghini) [RHEL-36420] - dev/parport: fix the array out-of-bounds risk (CKI Backport Bot) [RHEL-54990] {CVE-2024-42301}