forked from rpms/kernel
Update and reenable pci related patches
This commit is contained in:
parent
e3de38b7e3
commit
a4787c3965
@ -1,34 +0,0 @@
|
||||
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
|
||||
|
@ -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
|
||||
|
@ -1,14 +1,14 @@
|
||||
From 057542c13694ac90dc4531f5c0776f53a6f6e891 Mon Sep 17 00:00:00 2001
|
||||
From 50d7888356a1ea1418f15ac75b25457b6d7b3dd8 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
|
||||
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 e75f2588a..d8bd623f6 100644
|
||||
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);
|
||||
@ -37,5 +37,5 @@ index e75f2588a..d8bd623f6 100644
|
||||
/* Fusion */
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)},
|
||||
--
|
||||
2.39.3
|
||||
2.27.0
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 33e9e344ec9ffb7cf9d949c69420328df5fe4b29 Mon Sep 17 00:00:00 2001
|
||||
From 8a5b922edcc3b2973395d4d5407b143ae1d87552 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
|
||||
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 +++++++++++-
|
||||
@ -9,10 +9,10 @@ Subject: [PATCH 3/3] Bring back deprecated pci ids to mptsas-mptspi driver
|
||||
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
|
||||
index 652fed3f8..4c73bf444 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)
|
||||
@@ -5353,8 +5353,18 @@ static void mptsas_remove(struct pci_dev *pdev)
|
||||
}
|
||||
|
||||
static struct pci_device_id mptsas_pci_table[] = {
|
||||
@ -61,5 +61,5 @@ index 08acc09f7..9a336a161 100644
|
||||
|
||||
out_mptspi_probe:
|
||||
--
|
||||
2.39.3
|
||||
2.27.0
|
||||
|
||||
|
@ -1,34 +0,0 @@
|
||||
From cc44846ebd353aa4a95aaf014234dd00bdda3f93 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Sat, 16 Mar 2024 13:54:04 -0400
|
||||
Subject: [PATCH 4/6] Bring back deprecated pci ids to aacraid driver
|
||||
|
||||
---
|
||||
drivers/scsi/aacraid/linit.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
|
||||
index dffed227f..49f9d081c 100644
|
||||
--- a/drivers/scsi/aacraid/linit.c
|
||||
+++ b/drivers/scsi/aacraid/linit.c
|
||||
@@ -85,7 +85,7 @@ static LIST_HEAD(aac_devices);
|
||||
static int aac_cfg_major = AAC_CHARDEV_UNREGISTERED;
|
||||
char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
|
||||
|
||||
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||||
static const struct pci_device_id rh_deprecated_pci_table[] = {
|
||||
|
||||
{0} /* Terminating entry */
|
||||
@@ -1778,7 +1778,7 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
int mask_bits = 0;
|
||||
extern int aac_sync_mode;
|
||||
|
||||
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||||
if (pci_hw_disabled(rh_disabled_pci_table, pdev))
|
||||
return -ENODEV;
|
||||
|
||||
--
|
||||
2.39.3
|
||||
|
@ -1,14 +1,14 @@
|
||||
From ae2a3882e8ea0ef04ed2c0e29d8b725d19dfafd6 Mon Sep 17 00:00:00 2001
|
||||
From 01c67e991c0d49e797b412d6d6f4d7a4669ec926 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Sat, 16 Mar 2024 14:09:29 -0400
|
||||
Subject: [PATCH 5/6] Bring back deprecated pci ids to hpsa driver
|
||||
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 | 12 +++++++++---
|
||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||
drivers/scsi/hpsa.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
|
||||
index db7e1af75..cc592f8f9 100644
|
||||
index 544f1ab02..2fa774488 100644
|
||||
--- a/drivers/scsi/hpsa.c
|
||||
+++ b/drivers/scsi/hpsa.c
|
||||
@@ -91,6 +91,11 @@ MODULE_PARM_DESC(hpsa_simple_mode,
|
||||
@ -34,16 +34,6 @@ index db7e1af75..cc592f8f9 100644
|
||||
{0,}
|
||||
};
|
||||
|
||||
@@ -8652,9 +8661,6 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
unsigned long flags;
|
||||
u32 board_id;
|
||||
|
||||
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||||
- pci_hw_deprecated(hpsa_pci_device_id, pdev);
|
||||
-#endif
|
||||
|
||||
if (number_of_controllers == 0)
|
||||
printk(KERN_INFO DRIVER_NAME "\n");
|
||||
--
|
||||
2.39.3
|
||||
2.27.0
|
||||
|
@ -1,17 +1,17 @@
|
||||
From b4c30dab126e13e0968b01c9e0dcbda7f95cc384 Mon Sep 17 00:00:00 2001
|
||||
From c74bb37d786dd12419fca217b53f33ca177fe96d Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Sat, 16 Mar 2024 15:02:12 -0400
|
||||
Subject: [PATCH 6/6] Bring back deprecated pci ids to qla2xxx driver
|
||||
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 | 124 +++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 121 insertions(+), 3 deletions(-)
|
||||
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 9e4746639..468600adb 100644
|
||||
index 93dd9c332..8d46bbf22 100644
|
||||
--- a/drivers/scsi/qla2xxx/qla_os.c
|
||||
+++ b/drivers/scsi/qla2xxx/qla_os.c
|
||||
@@ -2620,6 +2620,73 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
|
||||
@@ -2636,6 +2636,73 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
|
||||
{
|
||||
ha->device_type = DT_EXTENDED_IDS;
|
||||
switch (ha->pdev->device) {
|
||||
@ -85,7 +85,7 @@ index 9e4746639..468600adb 100644
|
||||
case PCI_DEVICE_ID_QLOGIC_ISP2532:
|
||||
ha->isp_type |= DT_ISP2532;
|
||||
ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
@@ -2627,6 +2694,29 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
|
||||
@@ -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;
|
||||
@ -115,7 +115,7 @@ index 9e4746639..468600adb 100644
|
||||
case PCI_DEVICE_ID_QLOGIC_ISP2031:
|
||||
ha->isp_type |= DT_ISP2031;
|
||||
ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
@@ -2643,6 +2733,9 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
|
||||
@@ -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;
|
||||
@ -125,25 +125,7 @@ index 9e4746639..468600adb 100644
|
||||
case PCI_DEVICE_ID_QLOGIC_ISP2071:
|
||||
ha->isp_type |= DT_ISP2071;
|
||||
ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
@@ -2765,7 +2858,7 @@ static void qla2x00_iocb_work_fn(struct work_struct *work)
|
||||
spin_unlock_irqrestore(&vha->work_lock, flags);
|
||||
}
|
||||
|
||||
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||||
static const struct pci_device_id rh_deprecated_pci_table[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) },
|
||||
@@ -2801,7 +2894,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
struct rsp_que *rsp = NULL;
|
||||
int i;
|
||||
|
||||
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||||
if (pci_hw_disabled(rh_disabled_pci_table, pdev))
|
||||
return -ENODEV;
|
||||
|
||||
@@ -2811,9 +2904,18 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
@@ -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;
|
||||
@ -163,7 +145,7 @@ index 9e4746639..468600adb 100644
|
||||
pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2071 ||
|
||||
pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2271 ||
|
||||
pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2261 ||
|
||||
@@ -7986,9 +8088,25 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
|
||||
@@ -7997,9 +8099,25 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
|
||||
};
|
||||
|
||||
static struct pci_device_id qla2xxx_pci_tbl[] = {
|
||||
@ -190,5 +172,5 @@ index 9e4746639..468600adb 100644
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) },
|
||||
--
|
||||
2.39.3
|
||||
2.27.0
|
||||
|
@ -527,12 +527,11 @@ 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
|
||||
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-aacraid-driver.patch
|
||||
Patch2005: 0005-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
|
||||
Patch2006: 0006-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
|
||||
Patch2004: 0004-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
|
||||
Patch2005: 0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
@ -1100,12 +1099,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 0004-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch
|
||||
# ApplyOptionalPatch 0005-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
|
||||
# ApplyOptionalPatch 0006-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.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
|
||||
|
||||
ApplyOptionalPatch linux-kernel-test.patch
|
||||
|
||||
@ -2704,12 +2702,11 @@ fi
|
||||
#
|
||||
%changelog
|
||||
* Sat Mar 16 2024 Andrew Lukoshko <alukoshko@almalinux.org> [4.18.0-544.el8]
|
||||
- aacraid: bring back deprecated PCI ids #CFHack #CFHack2024
|
||||
- hpsa: bring back deprecated PCI ids #CFHack #CFHack2024
|
||||
- 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
|
||||
- qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024
|
||||
- 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}
|
||||
|
Loading…
Reference in New Issue
Block a user