Compare commits
No commits in common. 'c9' and 'i8-beta' have entirely different histories.
@ -1,9 +1,12 @@
|
||||
SOURCES/kernel-abi-stablelists-5.14.0-503.15.1.el9_5.tar.bz2
|
||||
SOURCES/kernel-kabi-dw-5.14.0-503.15.1.el9_5.tar.bz2
|
||||
SOURCES/linux-5.14.0-503.15.1.el9_5.tar.xz
|
||||
SOURCES/nvidiagpuoot001.x509
|
||||
SOURCES/centossecureboot201.cer
|
||||
SOURCES/centossecurebootca2.cer
|
||||
SOURCES/kernel-abi-stablelists-4.18.0-544.tar.bz2
|
||||
SOURCES/kernel-kabi-dw-4.18.0-544.tar.bz2
|
||||
SOURCES/linux-4.18.0-544.el8.tar.xz
|
||||
SOURCES/redhatsecureboot302.cer
|
||||
SOURCES/redhatsecureboot303.cer
|
||||
SOURCES/redhatsecureboot501.cer
|
||||
SOURCES/redhatsecurebootca3.cer
|
||||
SOURCES/redhatsecurebootca7.cer
|
||||
SOURCES/rheldup3.x509
|
||||
SOURCES/rhelima.x509
|
||||
SOURCES/rhelima_centos.x509
|
||||
SOURCES/rhelimaca1.x509
|
||||
SOURCES/rhelkpatch1.x509
|
||||
|
||||
@ -1,9 +1,14 @@
|
||||
0745a2f1ce0dbe34af88664c34bc1ba095963134 SOURCES/kernel-abi-stablelists-5.14.0-503.15.1.el9_5.tar.bz2
|
||||
74957b7466e5e0d320bfc3f11c66dc921d0735ef SOURCES/kernel-kabi-dw-5.14.0-503.15.1.el9_5.tar.bz2
|
||||
dfb2a0bb9ddcec0961bb0c4c32c8306761417e26 SOURCES/linux-5.14.0-503.15.1.el9_5.tar.xz
|
||||
4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509
|
||||
2ba40bf9138b48311e5aa1b737b7f0a8ad66066f SOURCES/centossecureboot201.cer
|
||||
bfdb3d7cffc43f579655af5155d50c08671d95e5 SOURCES/centossecurebootca2.cer
|
||||
ea4ae4d04a859057c2e9404179d49ebc2851a8d5 SOURCES/kernel-abi-stablelists-4.18.0-544.tar.bz2
|
||||
618f2302d26295e300718d59e8551a0cdfc98022 SOURCES/kernel-kabi-dw-4.18.0-544.tar.bz2
|
||||
731f77831a5e9794d95976010d518e80a28afd72 SOURCES/linux-4.18.0-544.el8.tar.xz
|
||||
13e5cd3f856b472fde80a4deb75f4c18dfb5b255 SOURCES/redhatsecureboot302.cer
|
||||
e89890ca0ded2f9058651cc5fa838b78db2e6cc2 SOURCES/redhatsecureboot303.cer
|
||||
ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
|
||||
cf9230e69000076727e5b784ec871d22716dc5da SOURCES/redhatsecurebootca3.cer
|
||||
905d91a282727c7f5ad433a49ac42a0772311c6a SOURCES/redhatsecurebootca7.cer
|
||||
95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
|
||||
99e571f9de4188f3b5fdf1f84ff73f6cc4bb6a0e SOURCES/rhelima.x509
|
||||
61d5a223ff0c79189505abae77e0087c4b2d2b47 SOURCES/rhelima_centos.x509
|
||||
f882610d2554fef65703e5d3c342f005af0390ad SOURCES/rhelimaca1.x509
|
||||
d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
|
||||
6fd8d9d4fd8cd8a9c40cc9d3d24a2d2501369869 SOURCES/msvspheredup1.x509
|
||||
ec8fefbe48fe852ade37c1c0683b1796605ba19f SOURCES/msvspherepatch1.x509
|
||||
|
||||
@ -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
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
From 50d7888356a1ea1418f15ac75b25457b6d7b3dd8 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
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 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);
|
||||
*/
|
||||
static struct pci_device_id megasas_pci_table[] = {
|
||||
|
||||
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)},
|
||||
+ /* xscale IOP */
|
||||
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)},
|
||||
+ /* ppc IOP */
|
||||
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078DE)},
|
||||
+ /* ppc IOP */
|
||||
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078GEN2)},
|
||||
+ /* gen2*/
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0079GEN2)},
|
||||
/* gen2*/
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0073SKINNY)},
|
||||
/* skinny*/
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0071SKINNY)},
|
||||
/* skinny*/
|
||||
+ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)},
|
||||
+ /* xscale IOP, vega */
|
||||
+ {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
|
||||
+ /* xscale IOP */
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FUSION)},
|
||||
/* Fusion */
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)},
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -0,0 +1,65 @@
|
||||
From 8a5b922edcc3b2973395d4d5407b143ae1d87552 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
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 +++++++++++-
|
||||
drivers/message/fusion/mptspi.c | 10 +++++-----
|
||||
2 files changed, 16 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
|
||||
index 652fed3f8..4c73bf444 100644
|
||||
--- a/drivers/message/fusion/mptsas.c
|
||||
+++ b/drivers/message/fusion/mptsas.c
|
||||
@@ -5353,8 +5353,18 @@ static void mptsas_remove(struct pci_dev *pdev)
|
||||
}
|
||||
|
||||
static struct pci_device_id mptsas_pci_table[] = {
|
||||
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID },
|
||||
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
|
||||
- PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
|
||||
+ PCI_ANY_ID, PCI_ANY_ID },
|
||||
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064E,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID },
|
||||
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068E,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID },
|
||||
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1078,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID },
|
||||
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID },
|
||||
{0} /* Terminating entry */
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, mptsas_pci_table);
|
||||
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
|
||||
index 08acc09f7..9a336a161 100644
|
||||
--- a/drivers/message/fusion/mptspi.c
|
||||
+++ b/drivers/message/fusion/mptspi.c
|
||||
@@ -1245,7 +1245,11 @@ static struct spi_function_template mptspi_transport_functions = {
|
||||
|
||||
static struct pci_device_id mptspi_pci_table[] = {
|
||||
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
|
||||
- PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
|
||||
+ PCI_ANY_ID, PCI_ANY_ID },
|
||||
+ { PCI_VENDOR_ID_ATTO, MPI_MANUFACTPAGE_DEVID_53C1030,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID },
|
||||
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1035,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID },
|
||||
{0} /* Terminating entry */
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
|
||||
@@ -1536,10 +1540,6 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
0, 0, 0, 0, 5);
|
||||
|
||||
scsi_scan_host(sh);
|
||||
-
|
||||
- add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
|
||||
- pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n");
|
||||
-
|
||||
return 0;
|
||||
|
||||
out_mptspi_probe:
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
From 01c67e991c0d49e797b412d6d6f4d7a4669ec926 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
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 | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
|
||||
index 544f1ab02..2fa774488 100644
|
||||
--- a/drivers/scsi/hpsa.c
|
||||
+++ b/drivers/scsi/hpsa.c
|
||||
@@ -91,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},
|
||||
@@ -144,6 +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},
|
||||
+ {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},
|
||||
{0,}
|
||||
};
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -0,0 +1,176 @@
|
||||
From c74bb37d786dd12419fca217b53f33ca177fe96d Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
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 | 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 93dd9c332..8d46bbf22 100644
|
||||
--- a/drivers/scsi/qla2xxx/qla_os.c
|
||||
+++ b/drivers/scsi/qla2xxx/qla_os.c
|
||||
@@ -2636,6 +2636,73 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
|
||||
{
|
||||
ha->device_type = DT_EXTENDED_IDS;
|
||||
switch (ha->pdev->device) {
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP2100:
|
||||
+ ha->isp_type |= DT_ISP2100;
|
||||
+ ha->device_type &= ~DT_EXTENDED_IDS;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2100;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP2200:
|
||||
+ ha->isp_type |= DT_ISP2200;
|
||||
+ ha->device_type &= ~DT_EXTENDED_IDS;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2100;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP2300:
|
||||
+ ha->isp_type |= DT_ISP2300;
|
||||
+ ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2300;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP2312:
|
||||
+ ha->isp_type |= DT_ISP2312;
|
||||
+ ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2300;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP2322:
|
||||
+ ha->isp_type |= DT_ISP2322;
|
||||
+ ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
+ if (ha->pdev->subsystem_vendor == 0x1028 &&
|
||||
+ ha->pdev->subsystem_device == 0x0170)
|
||||
+ ha->device_type |= DT_OEM_001;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2300;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP6312:
|
||||
+ ha->isp_type |= DT_ISP6312;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2300;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP6322:
|
||||
+ ha->isp_type |= DT_ISP6322;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2300;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP2422:
|
||||
+ ha->isp_type |= DT_ISP2422;
|
||||
+ ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
+ ha->device_type |= DT_FWI2;
|
||||
+ ha->device_type |= DT_IIDMA;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2400;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP2432:
|
||||
+ ha->isp_type |= DT_ISP2432;
|
||||
+ ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
+ ha->device_type |= DT_FWI2;
|
||||
+ ha->device_type |= DT_IIDMA;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2400;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP8432:
|
||||
+ ha->isp_type |= DT_ISP8432;
|
||||
+ ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
+ ha->device_type |= DT_FWI2;
|
||||
+ ha->device_type |= DT_IIDMA;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2400;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP5422:
|
||||
+ ha->isp_type |= DT_ISP5422;
|
||||
+ ha->device_type |= DT_FWI2;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2400;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP5432:
|
||||
+ ha->isp_type |= DT_ISP5432;
|
||||
+ ha->device_type |= DT_FWI2;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2400;
|
||||
+ break;
|
||||
case PCI_DEVICE_ID_QLOGIC_ISP2532:
|
||||
ha->isp_type |= DT_ISP2532;
|
||||
ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
@@ -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;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP8001:
|
||||
+ ha->isp_type |= DT_ISP8001;
|
||||
+ ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
+ ha->device_type |= DT_FWI2;
|
||||
+ ha->device_type |= DT_IIDMA;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2400;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP8021:
|
||||
+ ha->isp_type |= DT_ISP8021;
|
||||
+ ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
+ ha->device_type |= DT_FWI2;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2400;
|
||||
+ /* Initialize 82XX ISP flags */
|
||||
+ qla82xx_init_flags(ha);
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISP8044:
|
||||
+ ha->isp_type |= DT_ISP8044;
|
||||
+ ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
+ ha->device_type |= DT_FWI2;
|
||||
+ ha->fw_srisc_address = RISC_START_ADDRESS_2400;
|
||||
+ /* Initialize 82XX ISP flags */
|
||||
+ qla82xx_init_flags(ha);
|
||||
+ break;
|
||||
case PCI_DEVICE_ID_QLOGIC_ISP2031:
|
||||
ha->isp_type |= DT_ISP2031;
|
||||
ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
@@ -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;
|
||||
+ case PCI_DEVICE_ID_QLOGIC_ISPF001:
|
||||
+ ha->isp_type |= DT_ISPFX00;
|
||||
+ break;
|
||||
case PCI_DEVICE_ID_QLOGIC_ISP2071:
|
||||
ha->isp_type |= DT_ISP2071;
|
||||
ha->device_type |= DT_ZIO_SUPPORTED;
|
||||
@@ -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;
|
||||
- if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2532 ||
|
||||
+ if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2422 ||
|
||||
+ pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2432 ||
|
||||
+ pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8432 ||
|
||||
+ pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5422 ||
|
||||
+ pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5432 ||
|
||||
+ pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2532 ||
|
||||
+ pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8001 ||
|
||||
+ pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8021 ||
|
||||
pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2031 ||
|
||||
pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8031 ||
|
||||
+ pdev->device == PCI_DEVICE_ID_QLOGIC_ISPF001 ||
|
||||
+ pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8044 ||
|
||||
pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2071 ||
|
||||
pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2271 ||
|
||||
pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2261 ||
|
||||
@@ -7997,9 +8099,25 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
|
||||
};
|
||||
|
||||
static struct pci_device_id qla2xxx_pci_tbl[] = {
|
||||
+ { 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) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2312) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2322) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6312) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6322) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2422) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2432) },
|
||||
+ { 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) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8001) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8021) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISPF001) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) },
|
||||
{ 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,408 @@
|
||||
From 1642dcf67a557b42609a3756e2be7537762c38ea Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Tue, 9 Apr 2024 21:02:31 +0000
|
||||
Subject: [PATCH] Bring back deprecated pci ids to lpfc driver
|
||||
|
||||
---
|
||||
drivers/scsi/lpfc/lpfc_attr.c | 6 ++
|
||||
drivers/scsi/lpfc/lpfc_els.c | 9 +++
|
||||
drivers/scsi/lpfc/lpfc_hw.h | 39 +++++++++-
|
||||
drivers/scsi/lpfc/lpfc_ids.h | 62 ++++++++++++++++
|
||||
drivers/scsi/lpfc/lpfc_init.c | 136 +++++++++++++++++++++++++++++++++-
|
||||
5 files changed, 249 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
|
||||
index 8b15088a1..385ade242 100644
|
||||
--- a/drivers/scsi/lpfc/lpfc_attr.c
|
||||
+++ b/drivers/scsi/lpfc/lpfc_attr.c
|
||||
@@ -7493,6 +7493,12 @@ lpfc_get_hba_function_mode(struct lpfc_hba *phba)
|
||||
switch (phba->pcidev->device) {
|
||||
case PCI_DEVICE_ID_SKYHAWK:
|
||||
case PCI_DEVICE_ID_SKYHAWK_VF:
|
||||
+ case PCI_DEVICE_ID_LANCER_FCOE:
|
||||
+ case PCI_DEVICE_ID_LANCER_FCOE_VF:
|
||||
+ case PCI_DEVICE_ID_ZEPHYR_DCSP:
|
||||
+ case PCI_DEVICE_ID_HORNET:
|
||||
+ case PCI_DEVICE_ID_TIGERSHARK:
|
||||
+ case PCI_DEVICE_ID_TOMCAT:
|
||||
phba->hba_flag |= HBA_FCOE_MODE;
|
||||
break;
|
||||
default:
|
||||
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
|
||||
index 89d9f7fdb..700fe69a4 100644
|
||||
--- a/drivers/scsi/lpfc/lpfc_els.c
|
||||
+++ b/drivers/scsi/lpfc/lpfc_els.c
|
||||
@@ -4608,6 +4608,15 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
|
||||
case IOSTAT_LOCAL_REJECT:
|
||||
switch ((irsp->un.ulpWord[4] & IOERR_PARAM_MASK)) {
|
||||
case IOERR_LOOP_OPEN_FAILURE:
|
||||
+ if (cmd == ELS_CMD_FLOGI) {
|
||||
+ if (PCI_DEVICE_ID_HORNET ==
|
||||
+ phba->pcidev->device) {
|
||||
+ phba->fc_topology = LPFC_TOPOLOGY_LOOP;
|
||||
+ phba->pport->fc_myDID = 0;
|
||||
+ phba->alpa_map[0] = 0;
|
||||
+ phba->alpa_map[1] = 0;
|
||||
+ }
|
||||
+ }
|
||||
if (cmd == ELS_CMD_PLOGI && cmdiocb->retry == 0)
|
||||
delay = 1000;
|
||||
retry = 1;
|
||||
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
|
||||
index 474c594f8..240b688e1 100644
|
||||
--- a/drivers/scsi/lpfc/lpfc_hw.h
|
||||
+++ b/drivers/scsi/lpfc/lpfc_hw.h
|
||||
@@ -1713,25 +1713,55 @@ struct lpfc_fdmi_reg_portattr {
|
||||
|
||||
/* Start FireFly Register definitions */
|
||||
#define PCI_VENDOR_ID_EMULEX 0x10df
|
||||
+#define PCI_DEVICE_ID_FIREFLY 0x1ae5
|
||||
+#define PCI_DEVICE_ID_PROTEUS_VF 0xe100
|
||||
+#define PCI_DEVICE_ID_BALIUS 0xe131
|
||||
+#define PCI_DEVICE_ID_PROTEUS_PF 0xe180
|
||||
#define PCI_DEVICE_ID_LANCER_FC 0xe200
|
||||
+#define PCI_DEVICE_ID_LANCER_FC_VF 0xe208
|
||||
#define PCI_DEVICE_ID_LANCER_FCOE 0xe260
|
||||
+#define PCI_DEVICE_ID_LANCER_FCOE_VF 0xe268
|
||||
#define PCI_DEVICE_ID_LANCER_G6_FC 0xe300
|
||||
#define PCI_DEVICE_ID_LANCER_G7_FC 0xf400
|
||||
#define PCI_DEVICE_ID_LANCER_G7P_FC 0xf500
|
||||
#define PCI_DEVICE_ID_SAT_SMB 0xf011
|
||||
#define PCI_DEVICE_ID_SAT_MID 0xf015
|
||||
+#define PCI_DEVICE_ID_RFLY 0xf095
|
||||
+#define PCI_DEVICE_ID_PFLY 0xf098
|
||||
+#define PCI_DEVICE_ID_LP101 0xf0a1
|
||||
+#define PCI_DEVICE_ID_TFLY 0xf0a5
|
||||
+#define PCI_DEVICE_ID_BSMB 0xf0d1
|
||||
#define PCI_DEVICE_ID_BMID 0xf0d5
|
||||
#define PCI_DEVICE_ID_ZSMB 0xf0e1
|
||||
#define PCI_DEVICE_ID_ZMID 0xf0e5
|
||||
+#define PCI_DEVICE_ID_NEPTUNE 0xf0f5
|
||||
+#define PCI_DEVICE_ID_NEPTUNE_SCSP 0xf0f6
|
||||
+#define PCI_DEVICE_ID_NEPTUNE_DCSP 0xf0f7
|
||||
#define PCI_DEVICE_ID_SAT 0xf100
|
||||
#define PCI_DEVICE_ID_SAT_SCSP 0xf111
|
||||
#define PCI_DEVICE_ID_SAT_DCSP 0xf112
|
||||
#define PCI_DEVICE_ID_FALCON 0xf180
|
||||
+#define PCI_DEVICE_ID_SUPERFLY 0xf700
|
||||
+#define PCI_DEVICE_ID_DRAGONFLY 0xf800
|
||||
+#define PCI_DEVICE_ID_CENTAUR 0xf900
|
||||
+#define PCI_DEVICE_ID_PEGASUS 0xf980
|
||||
+#define PCI_DEVICE_ID_THOR 0xfa00
|
||||
+#define PCI_DEVICE_ID_VIPER 0xfb00
|
||||
+#define PCI_DEVICE_ID_LP10000S 0xfc00
|
||||
+#define PCI_DEVICE_ID_LP11000S 0xfc10
|
||||
+#define PCI_DEVICE_ID_LPE11000S 0xfc20
|
||||
#define PCI_DEVICE_ID_SAT_S 0xfc40
|
||||
+#define PCI_DEVICE_ID_PROTEUS_S 0xfc50
|
||||
+#define PCI_DEVICE_ID_HELIOS 0xfd00
|
||||
+#define PCI_DEVICE_ID_HELIOS_SCSP 0xfd11
|
||||
+#define PCI_DEVICE_ID_HELIOS_DCSP 0xfd12
|
||||
#define PCI_DEVICE_ID_ZEPHYR 0xfe00
|
||||
+#define PCI_DEVICE_ID_HORNET 0xfe05
|
||||
#define PCI_DEVICE_ID_ZEPHYR_SCSP 0xfe11
|
||||
#define PCI_DEVICE_ID_ZEPHYR_DCSP 0xfe12
|
||||
#define PCI_VENDOR_ID_SERVERENGINE 0x19a2
|
||||
+#define PCI_DEVICE_ID_TIGERSHARK 0x0704
|
||||
+#define PCI_DEVICE_ID_TOMCAT 0x0714
|
||||
#define PCI_DEVICE_ID_SKYHAWK 0x0724
|
||||
#define PCI_DEVICE_ID_SKYHAWK_VF 0x072c
|
||||
|
||||
@@ -4365,11 +4395,16 @@ struct lpfc_sli2_slim {
|
||||
static inline int
|
||||
lpfc_is_LC_HBA(unsigned short device)
|
||||
{
|
||||
- if ((device == PCI_DEVICE_ID_BMID) ||
|
||||
+ if ((device == PCI_DEVICE_ID_TFLY) ||
|
||||
+ (device == PCI_DEVICE_ID_PFLY) ||
|
||||
+ (device == PCI_DEVICE_ID_LP101) ||
|
||||
+ (device == PCI_DEVICE_ID_BMID) ||
|
||||
+ (device == PCI_DEVICE_ID_BSMB) ||
|
||||
(device == PCI_DEVICE_ID_ZMID) ||
|
||||
(device == PCI_DEVICE_ID_ZSMB) ||
|
||||
(device == PCI_DEVICE_ID_SAT_MID) ||
|
||||
- (device == PCI_DEVICE_ID_SAT_SMB))
|
||||
+ (device == PCI_DEVICE_ID_SAT_SMB) ||
|
||||
+ (device == PCI_DEVICE_ID_RFLY))
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h
|
||||
index a77e0fac0..4e9b02a78 100644
|
||||
--- a/drivers/scsi/lpfc/lpfc_ids.h
|
||||
+++ b/drivers/scsi/lpfc/lpfc_ids.h
|
||||
@@ -24,10 +24,44 @@
|
||||
#include <linux/pci.h>
|
||||
|
||||
const struct pci_device_id lpfc_id_table[] = {
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_THOR,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PEGASUS,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_CENTAUR,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_DRAGONFLY,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SUPERFLY,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_RFLY,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PFLY,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_SCSP,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_DCSP,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_SCSP,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,
|
||||
@@ -36,6 +70,16 @@ 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, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP10000S,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP11000S,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
|
||||
@@ -48,10 +92,28 @@ 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, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_S,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TIGERSHARK,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS,
|
||||
+ PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
+ {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, },
|
||||
{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,
|
||||
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
|
||||
index 82d25ea51..f4f49aa2a 100644
|
||||
--- a/drivers/scsi/lpfc/lpfc_init.c
|
||||
+++ b/drivers/scsi/lpfc/lpfc_init.c
|
||||
@@ -2482,9 +2482,83 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
|
||||
vp = &phba->vpd;
|
||||
|
||||
switch (dev_id) {
|
||||
+ case PCI_DEVICE_ID_FIREFLY:
|
||||
+ m = (typeof(m)){"LP6000", "PCI",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_SUPERFLY:
|
||||
+ if (vp->rev.biuRev >= 1 && vp->rev.biuRev <= 3)
|
||||
+ m = (typeof(m)){"LP7000", "PCI", ""};
|
||||
+ else
|
||||
+ m = (typeof(m)){"LP7000E", "PCI", ""};
|
||||
+ m.function = "Obsolete, Unsupported Fibre Channel Adapter";
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_DRAGONFLY:
|
||||
+ m = (typeof(m)){"LP8000", "PCI",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_CENTAUR:
|
||||
+ if (FC_JEDEC_ID(vp->rev.biuRev) == CENTAUR_2G_JEDEC_ID)
|
||||
+ m = (typeof(m)){"LP9002", "PCI", ""};
|
||||
+ else
|
||||
+ m = (typeof(m)){"LP9000", "PCI", ""};
|
||||
+ m.function = "Obsolete, Unsupported Fibre Channel Adapter";
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_RFLY:
|
||||
+ m = (typeof(m)){"LP952", "PCI",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_PEGASUS:
|
||||
+ m = (typeof(m)){"LP9802", "PCI-X",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_THOR:
|
||||
+ m = (typeof(m)){"LP10000", "PCI-X",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_VIPER:
|
||||
+ m = (typeof(m)){"LPX1000", "PCI-X",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_PFLY:
|
||||
+ m = (typeof(m)){"LP982", "PCI-X",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_TFLY:
|
||||
+ m = (typeof(m)){"LP1050", "PCI-X",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_HELIOS:
|
||||
+ m = (typeof(m)){"LP11000", "PCI-X2",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_HELIOS_SCSP:
|
||||
+ m = (typeof(m)){"LP11000-SP", "PCI-X2",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_HELIOS_DCSP:
|
||||
+ m = (typeof(m)){"LP11002-SP", "PCI-X2",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_NEPTUNE:
|
||||
+ m = (typeof(m)){"LPe1000", "PCIe",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_NEPTUNE_SCSP:
|
||||
+ m = (typeof(m)){"LPe1000-SP", "PCIe",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_NEPTUNE_DCSP:
|
||||
+ m = (typeof(m)){"LPe1002-SP", "PCIe",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
case PCI_DEVICE_ID_BMID:
|
||||
m = (typeof(m)){"LP1150", "PCI-X2", "Fibre Channel Adapter"};
|
||||
break;
|
||||
+ case PCI_DEVICE_ID_BSMB:
|
||||
+ m = (typeof(m)){"LP111", "PCI-X2",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
case PCI_DEVICE_ID_ZEPHYR:
|
||||
m = (typeof(m)){"LPe11000", "PCIe", "Fibre Channel Adapter"};
|
||||
break;
|
||||
@@ -2501,6 +2575,22 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
|
||||
case PCI_DEVICE_ID_ZSMB:
|
||||
m = (typeof(m)){"LPe111", "PCIe", "Fibre Channel Adapter"};
|
||||
break;
|
||||
+ case PCI_DEVICE_ID_LP101:
|
||||
+ m = (typeof(m)){"LP101", "PCI-X",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_LP10000S:
|
||||
+ m = (typeof(m)){"LP10000-S", "PCI",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_LP11000S:
|
||||
+ m = (typeof(m)){"LP11000-S", "PCI-X2",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_LPE11000S:
|
||||
+ m = (typeof(m)){"LPe11000-S", "PCIe",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
case PCI_DEVICE_ID_SAT:
|
||||
m = (typeof(m)){"LPe12000", "PCIe", "Fibre Channel Adapter"};
|
||||
break;
|
||||
@@ -2519,17 +2609,54 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
|
||||
case PCI_DEVICE_ID_SAT_S:
|
||||
m = (typeof(m)){"LPe12000-S", "PCIe", "Fibre Channel Adapter"};
|
||||
break;
|
||||
+ case PCI_DEVICE_ID_HORNET:
|
||||
+ m = (typeof(m)){"LP21000", "PCIe",
|
||||
+ "Obsolete, Unsupported FCoE Adapter"};
|
||||
+ GE = 1;
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_PROTEUS_VF:
|
||||
+ m = (typeof(m)){"LPev12000", "PCIe IOV",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_PROTEUS_PF:
|
||||
+ m = (typeof(m)){"LPev12000", "PCIe IOV",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_PROTEUS_S:
|
||||
+ m = (typeof(m)){"LPemv12002-S", "PCIe IOV",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_TIGERSHARK:
|
||||
+ oneConnect = 1;
|
||||
+ m = (typeof(m)){"OCe10100", "PCIe", "FCoE"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_TOMCAT:
|
||||
+ oneConnect = 1;
|
||||
+ m = (typeof(m)){"OCe11100", "PCIe", "FCoE"};
|
||||
+ break;
|
||||
case PCI_DEVICE_ID_FALCON:
|
||||
m = (typeof(m)){"LPSe12002-ML1-E", "PCIe",
|
||||
"EmulexSecure Fibre"};
|
||||
break;
|
||||
+ case PCI_DEVICE_ID_BALIUS:
|
||||
+ m = (typeof(m)){"LPVe12002", "PCIe Shared I/O",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
case PCI_DEVICE_ID_LANCER_FC:
|
||||
m = (typeof(m)){"LPe16000", "PCIe", "Fibre Channel Adapter"};
|
||||
break;
|
||||
+ case PCI_DEVICE_ID_LANCER_FC_VF:
|
||||
+ m = (typeof(m)){"LPe16000", "PCIe",
|
||||
+ "Obsolete, Unsupported Fibre Channel Adapter"};
|
||||
+ break;
|
||||
case PCI_DEVICE_ID_LANCER_FCOE:
|
||||
+ oneConnect = 1;
|
||||
+ m = (typeof(m)){"OCe15100", "PCIe", "FCoE"};
|
||||
+ break;
|
||||
+ case PCI_DEVICE_ID_LANCER_FCOE_VF:
|
||||
oneConnect = 1;
|
||||
m = (typeof(m)){"OCe15100", "PCIe",
|
||||
- "Obsolete, Unsupported FCoE Adapter"};
|
||||
+ "Obsolete, Unsupported FCoE"};
|
||||
break;
|
||||
case PCI_DEVICE_ID_LANCER_G6_FC:
|
||||
m = (typeof(m)){"LPe32000", "PCIe", "Fibre Channel Adapter"};
|
||||
@@ -7619,6 +7746,13 @@ lpfc_sli_driver_resource_setup(struct lpfc_hba *phba)
|
||||
if (rc)
|
||||
return -ENODEV;
|
||||
|
||||
+ if (phba->pcidev->device == PCI_DEVICE_ID_HORNET) {
|
||||
+ phba->menlo_flag |= HBA_MENLO_SUPPORT;
|
||||
+ /* check for menlo minimum sg count */
|
||||
+ if (phba->cfg_sg_seg_cnt < LPFC_DEFAULT_MENLO_SG_SEG_CNT)
|
||||
+ phba->cfg_sg_seg_cnt = LPFC_DEFAULT_MENLO_SG_SEG_CNT;
|
||||
+ }
|
||||
+
|
||||
if (!phba->sli.sli3_ring)
|
||||
phba->sli.sli3_ring = kcalloc(LPFC_SLI3_MAX_RING,
|
||||
sizeof(struct lpfc_sli_ring),
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
From c706b20bc89820ccc3c34e566d709f3f55c46624 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Tue, 9 Apr 2024 21:04:46 +0000
|
||||
Subject: [PATCH] Bring back deprecated pci ids to qla4xxx driver
|
||||
|
||||
---
|
||||
drivers/scsi/qla4xxx/ql4_os.c | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
|
||||
index b609f0c34..edf148fc7 100644
|
||||
--- a/drivers/scsi/qla4xxx/ql4_os.c
|
||||
+++ b/drivers/scsi/qla4xxx/ql4_os.c
|
||||
@@ -9855,6 +9855,24 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
|
||||
.subvendor = PCI_ANY_ID,
|
||||
.subdevice = PCI_ANY_ID,
|
||||
},
|
||||
+ {
|
||||
+ .vendor = PCI_VENDOR_ID_QLOGIC,
|
||||
+ .device = PCI_DEVICE_ID_QLOGIC_ISP8022,
|
||||
+ .subvendor = PCI_ANY_ID,
|
||||
+ .subdevice = PCI_ANY_ID,
|
||||
+ },
|
||||
+ {
|
||||
+ .vendor = PCI_VENDOR_ID_QLOGIC,
|
||||
+ .device = PCI_DEVICE_ID_QLOGIC_ISP8324,
|
||||
+ .subvendor = PCI_ANY_ID,
|
||||
+ .subdevice = PCI_ANY_ID,
|
||||
+ },
|
||||
+ {
|
||||
+ .vendor = PCI_VENDOR_ID_QLOGIC,
|
||||
+ .device = PCI_DEVICE_ID_QLOGIC_ISP8042,
|
||||
+ .subvendor = PCI_ANY_ID,
|
||||
+ .subdevice = PCI_ANY_ID,
|
||||
+ },
|
||||
{0, 0},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From 46c5a63208e3eb337da2ca8b1456a50707655e24 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Tue, 9 Apr 2024 21:07:06 +0000
|
||||
Subject: [PATCH] Bring back deprecated pci ids to be2iscsi driver
|
||||
|
||||
---
|
||||
drivers/scsi/be2iscsi/be_main.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
|
||||
index 885c351fb..2d04e67e7 100644
|
||||
--- a/drivers/scsi/be2iscsi/be_main.c
|
||||
+++ b/drivers/scsi/be2iscsi/be_main.c
|
||||
@@ -375,6 +375,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[] = {
|
||||
+ { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },
|
||||
+ { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
|
||||
+ { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },
|
||||
+ { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },
|
||||
+ { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) },
|
||||
{ PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) },
|
||||
{ 0 }
|
||||
};
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
RHEL_MAJOR = 9
|
||||
RHEL_MINOR = 5
|
||||
|
||||
#
|
||||
# RHEL_RELEASE
|
||||
# -------------
|
||||
#
|
||||
# Represents build number in 'release' part of RPM's name-version-release.
|
||||
# name is <package_name>, e.g. kernel
|
||||
# version is upstream kernel version this kernel is based on, e.g. 4.18.0
|
||||
# release is <RHEL_RELEASE>.<dist_tag>[<buildid>], e.g. 100.el8
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 503.15.1
|
||||
|
||||
#
|
||||
# ZSTREAM
|
||||
# -------
|
||||
#
|
||||
# This variable controls whether we use zstream numbering or not for the
|
||||
# package release. The zstream release keeps the build number of the last
|
||||
# build done for ystream for the Beta milestone, and increments a second
|
||||
# number for each build. The third number is used for branched builds
|
||||
# (eg.: for builds with security fixes or hot fixes done outside of the
|
||||
# batch release process).
|
||||
#
|
||||
# For example, with ZSTREAM unset or set to "no", all builds will contain
|
||||
# a release with only the build number, eg.: kernel-<kernel version>-X.el*,
|
||||
# where X is the build number. With ZSTREAM set to "yes", we will have
|
||||
# builds with kernel-<kernel version>-X.Y.Z.el*, where X is the last
|
||||
# RHEL_RELEASE number before ZSTREAM flag was set to yes, Y will now be the
|
||||
# build number and Z will always be 1 except if you're doing a branched build
|
||||
# (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
|
||||
# number will be incremented instead of the Y).
|
||||
#
|
||||
ZSTREAM ?= yes
|
||||
|
||||
#
|
||||
# Early y+1 numbering
|
||||
# --------------------
|
||||
#
|
||||
# In early y+1 process, RHEL_RELEASE consists of 2 numbers: x.y
|
||||
# First is RHEL_RELEASE inherited/merged from y as-is, second number
|
||||
# is incremented with each build starting from 1. After merge from y,
|
||||
# it resets back to 1. This way y+1 nvr reflects status of last merge.
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# rhel8.0 rhel-8.1
|
||||
# kernel-4.18.0-58.el8 --> kernel-4.18.0-58.1.el8
|
||||
# kernel-4.18.0-58.2.el8
|
||||
# kernel-4.18.0-59.el8 kernel-4.18.0-59.1.el8
|
||||
# kernel-4.18.0-60.el8
|
||||
# kernel-4.18.0-61.el8 --> kernel-4.18.0-61.1.el8
|
||||
#
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
EARLY_YSTREAM ?= no
|
||||
EARLY_YBUILD:=
|
||||
EARLY_YRELEASE:=
|
||||
ifneq ("$(ZSTREAM)", "yes")
|
||||
ifeq ("$(EARLY_YSTREAM)","yes")
|
||||
RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE)
|
||||
endif
|
||||
endif
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,25 +0,0 @@
|
||||
===================
|
||||
The Kernel dist-git
|
||||
===================
|
||||
|
||||
The kernel is maintained in a `source tree`_ rather than directly in dist-git.
|
||||
The specfile is maintained as a `template`_ in the source tree along with a set
|
||||
of build scripts to generate configurations, (S)RPMs, and to populate the
|
||||
dist-git repository.
|
||||
|
||||
The `documentation`_ for the source tree covers how to contribute and maintain
|
||||
the tree.
|
||||
|
||||
If you're looking for the downstream patch set it's available in the source
|
||||
tree with "git log master..ark-patches" or
|
||||
`online`_.
|
||||
|
||||
Each release in dist-git is tagged in the source repository so you can easily
|
||||
check out the source tree for a build. The tags are in the format
|
||||
name-version-release, but note release doesn't contain the dist tag since the
|
||||
source can be built in different build roots (Fedora, CentOS, etc.)
|
||||
|
||||
.. _source tree: https://gitlab.com/cki-project/kernel-ark.git
|
||||
.. _template: https://gitlab.com/cki-project/kernel-ark/-/blob/os-build/redhat/kernel.spec.template
|
||||
.. _documentation: https://gitlab.com/cki-project/kernel-ark/-/wikis/home
|
||||
.. _online: https://gitlab.com/cki-project/kernel-ark/-/commits/ark-patches
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/arch/x86/boot/main.c 2019-03-13 04:04:53.000000000 -0700
|
||||
+++ b/arch/x86/boot/main.c 2019-05-25 14:31:21.043272496 -0700
|
||||
@@ -147,7 +147,7 @@ void main(void)
|
||||
|
||||
/* Make sure we have all the proper CPU support */
|
||||
if (validate_cpu()) {
|
||||
- puts("This processor is not supported in this version of RHEL.\n");
|
||||
+ puts("This processor is not supported in this version of MSVSphere.\n");
|
||||
die();
|
||||
}
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/arch/x86/kernel/setup.c 2019-03-13 04:04:53.000000000 -0700
|
||||
+++ b/arch/x86/kernel/setup.c 2019-05-27 08:35:54.580595314 -0700
|
||||
@@ -900,7 +900,7 @@ static void rh_check_supported(void)
|
||||
if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) &&
|
||||
!guest && is_kdump_kernel()) {
|
||||
pr_crit("Detected single cpu native boot.\n");
|
||||
- pr_crit("Important: In Red Hat Enterprise Linux 8, single threaded, single CPU 64-bit physical systems are unsupported by Red Hat. Please contact your Red Hat support representative for a list of certified and supported systems.");
|
||||
+ pr_crit("Important: In MSVSphere 8, single threaded, single CPU 64-bit physical systems are unsupported. Please see https://www.almalinux.org for more information");
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1,44 +0,0 @@
|
||||
# generic + compressed please
|
||||
hostonly="no"
|
||||
compress="xz"
|
||||
|
||||
# VMs can't update microcode anyway
|
||||
early_microcode="no"
|
||||
|
||||
# modules: basics
|
||||
dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usrmount shutdown "
|
||||
|
||||
# modules: storage support
|
||||
dracutmodules+=" dm lvm rootfs-block fs-lib "
|
||||
|
||||
# modules: tpm and crypto
|
||||
dracutmodules+=" crypt crypt-loop tpm2-tss "
|
||||
|
||||
# WALinuxagent-cvm with CVM specific udev rules
|
||||
dracutmodules+=" walinuxagentcvm "
|
||||
|
||||
# modules: root disk integrity protection
|
||||
dracutmodules+=" systemd-veritysetup "
|
||||
|
||||
# drivers: virtual buses, pci
|
||||
drivers+=" virtio-pci virtio-mmio " # qemu-kvm
|
||||
drivers+=" hv-vmbus pci-hyperv " # hyperv
|
||||
drivers+=" xen-pcifront " # xen
|
||||
|
||||
# drivers: storage
|
||||
drivers+=" ahci nvme sd_mod sr_mod " # generic
|
||||
drivers+=" virtio-blk virtio-scsi " # qemu-kvm
|
||||
drivers+=" hv-storvsc " # hyperv
|
||||
drivers+=" xen-blkfront " # xen
|
||||
|
||||
# root encryption
|
||||
drivers+=" dm_crypt "
|
||||
|
||||
# root disk integrity protection
|
||||
drivers+=" dm_verity overlay "
|
||||
|
||||
# filesystems
|
||||
filesystems+=" vfat ext4 xfs overlay "
|
||||
|
||||
# systemd-pcrphase
|
||||
install_items+=" /lib/systemd/system/systemd-pcrphase-initrd.service /usr/lib/systemd/systemd-pcrphase /usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service "
|
||||
@ -0,0 +1,31 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
. /etc/os-release
|
||||
|
||||
kernelver=$1 && shift
|
||||
rootfs=$1 && shift
|
||||
variant=$1 && shift
|
||||
|
||||
output="${rootfs}/lib/modules/${kernelver}/bls.conf"
|
||||
date=$(date -u +%Y%m%d%H%M%S)
|
||||
|
||||
if [ "${variant:-5}" = "debug" ]; then
|
||||
debugname=" with debugging"
|
||||
debugid="-debug"
|
||||
else
|
||||
debugname=""
|
||||
debugid=""
|
||||
fi
|
||||
|
||||
cat >${output} <<EOF
|
||||
title ${NAME} (${kernelver}) ${VERSION}${debugname}
|
||||
version ${kernelver}${debugid}
|
||||
linux ${bootprefix}/vmlinuz-${kernelver}
|
||||
initrd ${bootprefix}/initramfs-${kernelver}.img
|
||||
options \$kernelopts
|
||||
id ${ID}-${date}-${kernelver}${debugid}
|
||||
grub_users \$grub_users
|
||||
grub_arg --unrestricted
|
||||
grub_class kernel${variant}
|
||||
EOF
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,2 +0,0 @@
|
||||
# This file is intentionally left empty in the stock kernel. Its a nicety
|
||||
# added for those wanting to do custom rebuilds with altered config opts.
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,72 +0,0 @@
|
||||
#! /usr/bin/perl
|
||||
|
||||
my @args=@ARGV;
|
||||
my %configvalues;
|
||||
my @configoptions;
|
||||
my $configcounter = 0;
|
||||
|
||||
# optionally print out the architecture as the first line of our output
|
||||
my $arch = $args[2];
|
||||
if (defined $arch) {
|
||||
print "# $arch\n";
|
||||
}
|
||||
|
||||
# first, read the override file
|
||||
|
||||
open (FILE,"$args[0]") || die "Could not open $args[0]";
|
||||
while (<FILE>) {
|
||||
my $str = $_;
|
||||
my $configname;
|
||||
|
||||
if (/\# ([\w]+) is not set/) {
|
||||
$configname = $1;
|
||||
} elsif (/^\#/) {
|
||||
# fall through on comments like 'avoid CONFIG_FOO=y'
|
||||
;
|
||||
} elsif (/([\w]+)=/) {
|
||||
$configname = $1;
|
||||
}
|
||||
|
||||
if (defined($configname) && !exists($configvalues{$configname})) {
|
||||
$configvalues{$configname} = $str;
|
||||
$configoptions[$configcounter] = $configname;
|
||||
$configcounter ++;
|
||||
}
|
||||
};
|
||||
|
||||
# now, read and output the entire configfile, except for the overridden
|
||||
# parts... for those the new value is printed.
|
||||
|
||||
open (FILE2,"$args[1]") || die "Could not open $args[1]";
|
||||
while (<FILE2>) {
|
||||
my $configname;
|
||||
|
||||
if (/\# ([\w]+) is not set/) {
|
||||
$configname = $1;
|
||||
} elsif (/^\#/) {
|
||||
# fall through on comments like 'avoid CONFIG_FOO=y'
|
||||
;
|
||||
} elsif (/([\w]+)=/) {
|
||||
$configname = $1;
|
||||
}
|
||||
|
||||
if (defined($configname) && exists($configvalues{$configname})) {
|
||||
print "$configvalues{$configname}";
|
||||
delete($configvalues{$configname});
|
||||
} else {
|
||||
print "$_";
|
||||
}
|
||||
}
|
||||
|
||||
# now print the new values from the overridden configfile
|
||||
my $counter = 0;
|
||||
|
||||
while ($counter < $configcounter) {
|
||||
my $configname = $configoptions[$counter];
|
||||
if (exists($configvalues{$configname})) {
|
||||
print "$configvalues{$configname}";
|
||||
}
|
||||
$counter++;
|
||||
}
|
||||
|
||||
1;
|
||||
@ -1,5 +0,0 @@
|
||||
kvm-amd
|
||||
kvm-intel
|
||||
kvm
|
||||
kvmgt
|
||||
ptp_kvm
|
||||
@ -1,3 +0,0 @@
|
||||
afs
|
||||
rxperf
|
||||
rxrpc
|
||||
@ -1,5 +0,0 @@
|
||||
# kgcov
|
||||
CONFIG_GCOV_KERNEL=y
|
||||
CONFIG_GCOV_PROFILE_ALL=y
|
||||
# CONFIG_GCOV_PROFILE_FTRACE is not set
|
||||
# CONFIG_OPEN_DICE is not set
|
||||
@ -1,12 +0,0 @@
|
||||
{
|
||||
"virt": {
|
||||
"common": {
|
||||
"fips-disable.addon": [
|
||||
"fips=0\n"
|
||||
],
|
||||
"fips-enable.addon": [
|
||||
"fips=1\n"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,151 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# This script inspects a given json proving a list of addons, and
|
||||
# creates an addon for each key/value pair matching the given uki, distro and
|
||||
# arch provided in input.
|
||||
#
|
||||
# Usage: python uki_create_addons.py input_json out_dir uki distro arch
|
||||
#
|
||||
# This tool requires the systemd-ukify and systemd-boot packages.
|
||||
#
|
||||
# Addon file
|
||||
#-----------
|
||||
# Each addon terminates with .addon
|
||||
# Each addon contains only two types of lines:
|
||||
# Lines beginning with '#' are description and thus ignored
|
||||
# All other lines are command line to be added.
|
||||
# The name of the end resulting addon is taken from the json hierarchy.
|
||||
# For example, and addon in json['virt']['rhel']['x86_64']['hello.addon'] will
|
||||
# result in an UKI addon file generated in out_dir called
|
||||
# hello-virt.rhel.x86_64.addon.efi
|
||||
#
|
||||
# The common key, present in any sub-dict in the provided json (except the leaf dict)
|
||||
# is used as place for default addons when the same addon is not defined deep
|
||||
# in the hierarchy. For example, if we define test.addon (text: 'test1\n') in
|
||||
# json['common']['test.addon'] = ['test1\n'] and another test.addon (text: test2) in
|
||||
# json['virt']['common']['test.addon'] = ['test2'], any other uki except virt
|
||||
# will have a test.addon.efi with text "test1", and virt will have a
|
||||
# test.addon.efi with "test2"
|
||||
#
|
||||
# sbat.conf
|
||||
#----------
|
||||
# This dict is containing the sbat string for *all* addons being created.
|
||||
# This dict is optional, but when used has to be put in a sub-dict with
|
||||
# { 'sbat' : { 'sbat.conf' : ['your text here'] }}
|
||||
# It follows the same syntax as the addon files, meaning '#' is comment and
|
||||
# the rest is taken as sbat string and feed to ukify.
|
||||
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
import collections
|
||||
import subprocess
|
||||
|
||||
|
||||
UKIFY_PATH = '/usr/lib/systemd/ukify'
|
||||
|
||||
def usage(err):
|
||||
print(f'Usage: {os.path.basename(__file__)} input_json output_dir uki distro arch')
|
||||
print(f'Error:{err}')
|
||||
sys.exit(1)
|
||||
|
||||
def check_clean_arguments(input_json, out_dir):
|
||||
# Remove end '/'
|
||||
if out_dir[-1:] == '/':
|
||||
out_dir = out_dir[:-1]
|
||||
if not os.path.isfile(input_json):
|
||||
usage(f'input_json {input_json} is not a file, or does not exist!')
|
||||
if not os.path.isdir(out_dir):
|
||||
usage(f'out_dir_dir {out_dir} is not a dir, or does not exist!')
|
||||
return out_dir
|
||||
|
||||
UKICmdlineAddon = collections.namedtuple('UKICmdlineAddon', ['name', 'cmdline'])
|
||||
uki_addons_list = []
|
||||
uki_addons = {}
|
||||
addon_sbat_string = None
|
||||
|
||||
def parse_lines(lines, rstrip=True):
|
||||
cmdline = ''
|
||||
for l in lines:
|
||||
l = l.lstrip()
|
||||
if not l:
|
||||
continue
|
||||
if l[0] == '#':
|
||||
continue
|
||||
# rstrip is used only for addons cmdline, not sbat.conf, as it replaces
|
||||
# return lines with spaces.
|
||||
if rstrip:
|
||||
l = l.rstrip() + ' '
|
||||
cmdline += l
|
||||
if cmdline == '':
|
||||
return ''
|
||||
return cmdline
|
||||
|
||||
def parse_all_addons(in_obj):
|
||||
global addon_sbat_string
|
||||
|
||||
for el in in_obj.keys():
|
||||
# addon found: copy it in our global dict uki_addons
|
||||
if el.endswith('.addon'):
|
||||
uki_addons[el] = in_obj[el]
|
||||
|
||||
if 'sbat' in in_obj and 'sbat.conf' in in_obj['sbat']:
|
||||
# sbat.conf found: override sbat with the most specific one found
|
||||
addon_sbat_string = parse_lines(in_obj['sbat']['sbat.conf'], rstrip=False)
|
||||
|
||||
def recursively_find_addons(in_obj, folder_list):
|
||||
# end of recursion, leaf directory. Search all addons here
|
||||
if len(folder_list) == 0:
|
||||
parse_all_addons(in_obj)
|
||||
return
|
||||
|
||||
# first, check for common folder
|
||||
if 'common' in in_obj:
|
||||
parse_all_addons(in_obj['common'])
|
||||
|
||||
# second, check if there is a match with the searched folder
|
||||
if folder_list[0] in in_obj:
|
||||
folder_next = in_obj[folder_list[0]]
|
||||
folder_list = folder_list[1:]
|
||||
recursively_find_addons(folder_next, folder_list)
|
||||
|
||||
def parse_in_json(in_json, uki_name, distro, arch):
|
||||
with open(in_json, 'r') as f:
|
||||
in_obj = json.load(f)
|
||||
recursively_find_addons(in_obj, [uki_name, distro, arch])
|
||||
|
||||
for addon_name, cmdline in uki_addons.items():
|
||||
addon_name = addon_name.replace(".addon","")
|
||||
addon_full_name = f'{addon_name}-{uki_name}.{distro}.{arch}.addon.efi'
|
||||
cmdline = parse_lines(cmdline).rstrip()
|
||||
if cmdline:
|
||||
uki_addons_list.append(UKICmdlineAddon(addon_full_name, cmdline))
|
||||
|
||||
def create_addons(out_dir):
|
||||
for uki_addon in uki_addons_list:
|
||||
out_path = os.path.join(out_dir, uki_addon.name)
|
||||
cmd = [
|
||||
f'{UKIFY_PATH}', 'build',
|
||||
f'--cmdline="{uki_addon.cmdline}"',
|
||||
f'--output={out_path}']
|
||||
if addon_sbat_string:
|
||||
cmd.append('--sbat="' + addon_sbat_string.rstrip() +'"')
|
||||
|
||||
subprocess.check_call(cmd, text=True)
|
||||
|
||||
if __name__ == "__main__":
|
||||
argc = len(sys.argv) - 1
|
||||
if argc != 5:
|
||||
usage('too few or too many parameters!')
|
||||
|
||||
input_json = sys.argv[1]
|
||||
out_dir = sys.argv[2]
|
||||
uki_name = sys.argv[3]
|
||||
distro = sys.argv[4]
|
||||
arch = sys.argv[5]
|
||||
|
||||
out_dir = check_clean_arguments(input_json, out_dir)
|
||||
parse_in_json(input_json, uki_name, distro, arch)
|
||||
create_addons(out_dir)
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TARGET="$1"
|
||||
|
||||
for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do
|
||||
NEW=${i%."$TARGET"}
|
||||
cp "$i" "$(basename "$NEW")"
|
||||
done
|
||||
@ -1,16 +0,0 @@
|
||||
[ req ]
|
||||
default_bits = 3072
|
||||
distinguished_name = req_distinguished_name
|
||||
prompt = no
|
||||
x509_extensions = myexts
|
||||
|
||||
[ req_distinguished_name ]
|
||||
O = Red Hat
|
||||
CN = Red Hat Enterprise Linux kernel signing key
|
||||
emailAddress = secalert@redhat.com
|
||||
|
||||
[ myexts ]
|
||||
basicConstraints=critical,CA:FALSE
|
||||
keyUsage=digitalSignature
|
||||
subjectKeyIdentifier=hash
|
||||
authorityKeyIdentifier=keyid
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue