forked from rpms/kernel
Merge pull request 'Bring back deprecated PCI ids to AlmaLinux 9 kernel' (#2) from alukoshko/kernel:a9-beta into a9-beta
Reviewed-on: rpms/kernel#2
This commit is contained in:
Andrew Lukoshko
commit
be76e3b710
@ -0,0 +1,34 @@
|
||||
From ba8964be0a76357470f8e4e9d281508fe6a105f3 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Sat, 16 Mar 2024 17:01:57 +0000
|
||||
Subject: [PATCH 1/6] 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 c6f5726f3..0a60d06cb 100644
|
||||
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
||||
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
||||
@@ -12090,7 +12090,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[] = {
|
||||
|
||||
{0} /* Terminating entry */
|
||||
@@ -12166,7 +12166,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
u16 hba_mpi_version;
|
||||
int iopoll_q_count = 0;
|
||||
|
||||
-#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,34 @@
|
||||
From 36abb41a110ce30c8c747fcf80ec5083f7ff04b2 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Sat, 16 Mar 2024 17:04:20 +0000
|
||||
Subject: [PATCH 2/6] Bring back deprecated pci ids to megaraid_sas driver
|
||||
|
||||
---
|
||||
drivers/scsi/megaraid/megaraid_sas_base.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
|
||||
index 186ede480..7a14915b2 100644
|
||||
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
|
||||
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
|
||||
@@ -144,7 +144,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance,
|
||||
static void
|
||||
megasas_set_ld_removed_by_fw(struct megasas_instance *instance);
|
||||
|
||||
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||||
static const struct pci_device_id rh_deprecated_pci_table[] = {
|
||||
|
||||
{0} /* Terminating entry */
|
||||
@@ -7500,7 +7500,7 @@ static int megasas_probe_one(struct pci_dev *pdev,
|
||||
struct megasas_instance *instance;
|
||||
u16 control = 0;
|
||||
|
||||
-#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,57 @@
|
||||
From 6de734334d2f24565419104a4deb8678739ab0bc Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Sat, 16 Mar 2024 17:11:39 +0000
|
||||
Subject: [PATCH 3/6] Bring back deprecated pci ids to mptsas-mptspi driver
|
||||
|
||||
---
|
||||
drivers/message/fusion/mptsas.c | 4 ++--
|
||||
drivers/message/fusion/mptspi.c | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
|
||||
index e52f5cdaf..3177c2dee 100644
|
||||
--- a/drivers/message/fusion/mptsas.c
|
||||
+++ b/drivers/message/fusion/mptsas.c
|
||||
@@ -5163,7 +5163,7 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
int error=0;
|
||||
int r;
|
||||
|
||||
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||||
mark_driver_unmaintained(MYNAM);
|
||||
#endif
|
||||
|
||||
@@ -5385,7 +5385,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 1c226920c..beb7a4b35 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
|
||||
@@ -1540,7 +1540,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
|
||||
scsi_scan_host(sh);
|
||||
|
||||
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||||
add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
|
||||
pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n");
|
||||
#endif
|
||||
--
|
||||
2.39.3
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From b4f063cda0c06e2287078e2ada97af3fa22cc0f7 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Sun, 17 Mar 2024 08:11:19 +0000
|
||||
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 5abecd08e..09eb5b697 100644
|
||||
--- a/drivers/scsi/aacraid/linit.c
|
||||
+++ b/drivers/scsi/aacraid/linit.c
|
||||
@@ -71,7 +71,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 */
|
||||
@@ -1669,7 +1669,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
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
From c4727beb6250488a5695176d8a74a3808e3002bd Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Sun, 17 Mar 2024 08:13:24 +0000
|
||||
Subject: [PATCH 5/6] Bring back deprecated pci ids to hpsa driver
|
||||
|
||||
---
|
||||
drivers/scsi/hpsa.c | 12 +++++-------
|
||||
1 file changed, 5 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
|
||||
index be8998227..9cb979301 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,}
|
||||
};
|
||||
|
||||
@@ -8673,9 +8674,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_unmaintained(hpsa_pci_device_id, pdev);
|
||||
-#endif
|
||||
|
||||
if (number_of_controllers == 0)
|
||||
printk(KERN_INFO DRIVER_NAME "\n");
|
||||
--
|
||||
2.39.3
|
||||
|
||||
@ -0,0 +1,58 @@
|
||||
From 74611a3e4e28c65a563e6e14319d7247e47df9e5 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Sun, 17 Mar 2024 08:47:50 +0000
|
||||
Subject: [PATCH 6/6] Bring back deprecated pci ids to qla2xxx driver
|
||||
|
||||
---
|
||||
drivers/scsi/qla2xxx/qla_os.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
|
||||
index b7150d64d..76711803a 100644
|
||||
--- a/drivers/scsi/qla2xxx/qla_os.c
|
||||
+++ b/drivers/scsi/qla2xxx/qla_os.c
|
||||
@@ -2869,7 +2869,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[] = {
|
||||
{ 0 }
|
||||
};
|
||||
@@ -2926,7 +2926,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;
|
||||
|
||||
@@ -8110,7 +8110,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
|
||||
};
|
||||
|
||||
static struct pci_device_id qla2xxx_pci_tbl[] = {
|
||||
-#ifndef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifndef CONFIG_ALMALINUX_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) },
|
||||
@@ -8126,12 +8126,12 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {
|
||||
#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
|
||||
+#ifndef CONFIG_ALMALINUX_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
|
||||
+#ifndef CONFIG_ALMALINUX_DIFFERENCES
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISPF001) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) },
|
||||
#endif
|
||||
--
|
||||
2.39.3
|
||||
|
||||
@ -953,6 +953,14 @@ Source4002: gating.yaml
|
||||
Patch1: patch-%{patchversion}-redhat.patch
|
||||
%endif
|
||||
|
||||
# Bring back deprecated PCI ids #CFHack #CFHack2024
|
||||
Patch2001: 0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
|
||||
Patch2002: 0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
|
||||
Patch2003: 0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
|
||||
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
|
||||
|
||||
# empty final patch to facilitate testing of kernel patches
|
||||
Patch999999: linux-kernel-test.patch
|
||||
|
||||
@ -1689,6 +1697,13 @@ cp -a %{SOURCE1} .
|
||||
|
||||
%if !%{nopatches}
|
||||
|
||||
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
|
||||
|
||||
ApplyOptionalPatch patch-%{patchversion}-redhat.patch
|
||||
%endif
|
||||
|
||||
@ -3744,6 +3759,14 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Sat Mar 16 2024 Andrew Lukoshko <alukoshko@almalinux.org> [5.14.0-362.2.1.el9_3]
|
||||
- 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
|
||||
|
||||
* Fri Sep 08 2023 Jan Stancek <jstancek@redhat.com> [5.14.0-362.2.1.el9_3]
|
||||
- PCI: hv: Fix a crash in hv_pci_restore_msi_msg() during hibernation (Vitaly Kuznetsov) [2211797]
|
||||
- rhel: Re-add can-dev features that were removed accidentally (Radu Rendec) [2213891]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user