parent
cfb6944a6d
commit
13f3414808
GPG Key ID:
1EC08A25C9DB2503
@ -0,0 +1,93 @@
|
||||
From 8cf73633b3209471b169913199b79c4d1c2170b4 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Mon, 8 Apr 2024 17:49:33 +0000
|
||||
Subject: [PATCH] Enable all disabled pci devices by moving to unmaintained
|
||||
list
|
||||
|
||||
---
|
||||
kernel/rh_messages.h | 64 ++++++++++++++++++++++----------------------
|
||||
1 file changed, 32 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h
|
||||
index 5b7570edb..12a3523e4 100644
|
||||
--- a/kernel/rh_messages.h
|
||||
+++ b/kernel/rh_messages.h
|
||||
@@ -119,6 +119,38 @@ 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 },
|
||||
+ { 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 },
|
||||
@@ -272,36 +304,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 },
|
||||
- { 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.27.0
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
From 5c3f4066462a5f6cac04d3dd81c9f551fabbc6c7 Mon Sep 17 00:00:00 2001
|
||||
From: Keith Busch <kbusch@kernel.org>
|
||||
Date: Thu, 12 Oct 2023 11:13:51 -0700
|
||||
Subject: [PATCH] nvme-pci: add BOGUS_NID for Intel 0a54 device
|
||||
|
||||
These ones claim cmic and nmic capable, so need special consideration to ignore
|
||||
their duplicate identifiers.
|
||||
|
||||
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217981
|
||||
Reported-by: welsh@cassens.com
|
||||
Signed-off-by: Keith Busch <kbusch@kernel.org>
|
||||
---
|
||||
drivers/nvme/host/pci.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
|
||||
index 347cb5daebc3..3f0c9ee09a12 100644
|
||||
--- a/drivers/nvme/host/pci.c
|
||||
+++ b/drivers/nvme/host/pci.c
|
||||
@@ -3329,7 +3329,8 @@ static const struct pci_device_id nvme_id_table[] = {
|
||||
{ PCI_VDEVICE(INTEL, 0x0a54), /* Intel P4500/P4600 */
|
||||
.driver_data = NVME_QUIRK_STRIPE_SIZE |
|
||||
NVME_QUIRK_DEALLOCATE_ZEROES |
|
||||
- NVME_QUIRK_IGNORE_DEV_SUBNQN, },
|
||||
+ NVME_QUIRK_IGNORE_DEV_SUBNQN |
|
||||
+ NVME_QUIRK_BOGUS_NID, },
|
||||
{ PCI_VDEVICE(INTEL, 0x0a55), /* Dell Express Flash P4600 */
|
||||
.driver_data = NVME_QUIRK_STRIPE_SIZE |
|
||||
NVME_QUIRK_DEALLOCATE_ZEROES, },
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -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
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
From f9ab10cebe6411dd26fec2ef354db2e527386b4f Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -0,0 +1,86 @@
|
||||
From 0e54f93854865b95b50e8023645e423af634e4ec Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
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 <linux/pci.h>
|
||||
|
||||
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
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
From b4fdb240a1102876c03e0dbbef57758550e6e334 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
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
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
From 3c0cc7c69970a50fae40e8f6376fd50eb053db2d Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
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
|
||||
|
||||
Loading…
Reference in new issue