From 6bcbe27d6622b80fea879096fe99b30e72b4202b Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 9 Apr 2024 18:04:15 +0000 Subject: [PATCH] Bring back deprecated pci ids to lpfc, qla4xxx, be2iscsi drivers --- ...ck-deprecated-pci-ids-to-lpfc-driver.patch | 86 +++++++++++++++++++ ...deprecated-pci-ids-to-qla4xxx-driver.patch | 32 +++++++ ...eprecated-pci-ids-to-be2iscsi-driver.patch | 30 +++++++ SPECS/kernel.spec | 9 ++ 4 files changed, 157 insertions(+) create mode 100644 SOURCES/0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch create mode 100644 SOURCES/0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch create mode 100644 SOURCES/0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch 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/SPECS/kernel.spec b/SPECS/kernel.spec index b866e98..7268761 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -966,6 +966,9 @@ 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 # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch @@ -1704,6 +1707,9 @@ 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 ApplyOptionalPatch patch-%{patchversion}-redhat.patch %endif @@ -3769,6 +3775,9 @@ fi - hpsa: bring back deprecated PCI ids #CFHack #CFHack2024 - mptsas: bring back deprecated PCI ids #CFHack #CFHack2024 - qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024 +- qla4xxx: bring back deprecated PCI ids +- lpfc: bring back deprecated PCI ids +- be2iscsi: bring back deprecated PCI ids - nvme-pci: add BOGUS_NID for Intel 0a54 device - kernel/rh_messages.h: empty rh_disabled_pci_devices and rh_unmaintained_pci_devices lists