forked from rpms/kernel
Update and reenable pci related patches
This commit is contained in:
parent
a5431535bb
commit
5974bbba60
@ -1,34 +0,0 @@
|
||||
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,206 @@
|
||||
From 6d54fccc87035126469abc4d856d9c138004634d Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Mon, 8 Apr 2024 13:11:50 +0000
|
||||
Subject: [PATCH 1/4] Empty rh_disabled_pci_devices and
|
||||
rh_unmaintained_pci_devices lists
|
||||
|
||||
---
|
||||
kernel/rh_messages.h | 178 -------------------------------------------
|
||||
1 file changed, 178 deletions(-)
|
||||
|
||||
diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h
|
||||
index 5b7570edb..44b4523dd 100644
|
||||
--- a/kernel/rh_messages.h
|
||||
+++ b/kernel/rh_messages.h
|
||||
@@ -119,188 +119,10 @@ static const struct pci_device_id rh_deprecated_pci_devices[] = {
|
||||
};
|
||||
|
||||
static const struct pci_device_id rh_disabled_pci_devices[] = {
|
||||
- { 0x1011, 0x0046, 0x103c, 0x10c2 },
|
||||
- { 0x1011, 0x0046, 0x9005, 0x0364 },
|
||||
- { 0x1011, 0x0046, 0x9005, 0x0365 },
|
||||
- { 0x1011, 0x0046, 0x9005, 0x1364 },
|
||||
- { 0x1028, 0x0001, 0x1028, 0x0001 },
|
||||
- { 0x1028, 0x0002, 0x1028, 0x0002 },
|
||||
- { 0x1028, 0x0002, 0x1028, 0x00d1 },
|
||||
- { 0x1028, 0x0002, 0x1028, 0x00d9 },
|
||||
- { 0x1028, 0x0003, 0x1028, 0x0003 },
|
||||
- { 0x1028, 0x0004, 0x1028, 0x00d0 },
|
||||
- { 0x1028, 0x000a, 0x1028, 0x0106 },
|
||||
- { 0x1028, 0x000a, 0x1028, 0x011b },
|
||||
- { 0x1028, 0x000a, 0x1028, 0x0121 },
|
||||
- { 0x9005, 0x0200, 0x9005, 0x0200 },
|
||||
- { 0x9005, 0x0283, 0x9005, 0x0283 },
|
||||
- { 0x9005, 0x0284, 0x9005, 0x0284 },
|
||||
- { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x9005, 0x0285, 0x1014, 0x02F2 },
|
||||
- { 0x9005, 0x0285, 0x1014, 0x0312 },
|
||||
- { 0x9005, 0x0285, 0x1028, PCI_ANY_ID },
|
||||
- { 0x9005, 0x0285, 0x1028, 0x0287 },
|
||||
- { 0x9005, 0x0285, 0x103C, 0x3227 },
|
||||
- { 0x9005, 0x0285, 0x17aa, PCI_ANY_ID },
|
||||
- { 0x9005, 0x0285, 0x17aa, 0x0286 },
|
||||
- { 0x9005, 0x0285, 0x17aa, 0x0287 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0285 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0286 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0287 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0288 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0289 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x028a },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x028b },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x028e },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x028f },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0290 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0291 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0292 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0293 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0294 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0296 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0297 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0298 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x0299 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x029a },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x02a4 },
|
||||
- { 0x9005, 0x0285, 0x9005, 0x02a5 },
|
||||
- { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x9005, 0x0286, 0x1014, 0x9540 },
|
||||
- { 0x9005, 0x0286, 0x1014, 0x9580 },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x028c },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x028d },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x029b },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x029c },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x029d },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x029e },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x029f },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x02a0 },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x02a1 },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x02a2 },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x02a3 },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x02a6 },
|
||||
- { 0x9005, 0x0286, 0x9005, 0x0800 },
|
||||
- { 0x9005, 0x0287, 0x9005, 0x0800 },
|
||||
- { 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x0222, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x0712, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x212, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x702, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x703, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x0700, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x0211, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x0710, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x0221, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0xe220, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0x1ae5, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xe100, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xe131, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xe180, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xe260, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf095, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf098, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf0a1, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf0a5, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf0d1, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf0d5, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf0e1, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf0e5, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf0f5, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf0f6, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf0f7, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf180, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf700, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf800, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf900, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xf980, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfa00, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfb00, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfc00, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfc10, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfc20, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfc50, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfd00, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfd11, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfd12, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfe00, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfe05, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfe11, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x10df, 0xfe12, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x0704, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x19a2, 0x0714, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0060, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0078, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x007C, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0411, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0413, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1028, 0x0015, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x1002, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x6340, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x634A, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x6354, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x6368, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x6372, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x6732, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x673C, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x6746, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x6750, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x675A, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x6764, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0x676E, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0064, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0065, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0070, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0072, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0074, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0076, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x0077, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1000, 0x007E, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x2422, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x2432, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x5422, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x5432, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x8001, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x8021, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x8044, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x8432, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0xF000, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x8022, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x8032, PCI_ANY_ID, PCI_ANY_ID },
|
||||
- { 0x1077, 0x8042, PCI_ANY_ID, PCI_ANY_ID },
|
||||
{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 },
|
||||
- { 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 */
|
||||
};
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
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,39 @@
|
||||
From ac6e3b155d35bfea32b1c3c6015a18b6e5046652 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
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
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
From c4727beb6250488a5695176d8a74a3808e3002bd Mon Sep 17 00:00:00 2001
|
||||
From f9ab10cebe6411dd26fec2ef354db2e527386b4f 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
|
||||
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 | 12 +++++-------
|
||||
1 file changed, 5 insertions(+), 7 deletions(-)
|
||||
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 be8998227..9cb979301 100644
|
||||
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 " \
|
||||
@ -46,16 +46,6 @@ index be8998227..9cb979301 100644
|
||||
{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
|
||||
2.27.0
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
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,43 @@
|
||||
From 091c13878c5d53a9ca8c78d8d3dc20598ff11c88 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
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
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
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
|
||||
|
||||
@ -962,12 +962,10 @@ Patch1: patch-%{patchversion}-redhat.patch
|
||||
Patch1001: 0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch
|
||||
|
||||
# Bring back deprecated PCI ids #CFHack #CFHack2024
|
||||
Patch2001: 0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
|
||||
Patch2002: 0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
|
||||
Patch2003: 0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
|
||||
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
|
||||
Patch2001: 0001-Empty-rh_disabled_pci_devices-and-rh_unmaintained_pc.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
|
||||
|
||||
# empty final patch to facilitate testing of kernel patches
|
||||
Patch999999: linux-kernel-test.patch
|
||||
@ -1702,12 +1700,10 @@ 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
|
||||
ApplyPatch 0001-Empty-rh_disabled_pci_devices-and-rh_unmaintained_pc.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
|
||||
|
||||
ApplyOptionalPatch patch-%{patchversion}-redhat.patch
|
||||
%endif
|
||||
@ -3770,13 +3766,11 @@ fi
|
||||
#
|
||||
%changelog
|
||||
* Sat Mar 16 2024 Andrew Lukoshko <alukoshko@almalinux.org> [5.14.0-427.el9]
|
||||
- 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
|
||||
- - nvme-pci: add BOGUS_NID for Intel 0a54 device
|
||||
- nvme-pci: add BOGUS_NID for Intel 0a54 device
|
||||
- kernel/rh_messages.h: empty rh_disabled_pci_devices and rh_unmaintained_pci_devices lists
|
||||
|
||||
* Thu Feb 22 2024 Scott Weaver <scweaver@redhat.com> [5.14.0-427.el9]
|
||||
- scsi: smartpqi: Fix disable_managed_interrupts (Tomas Henzl) [RHEL-26145]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user