25 changed files with 760 additions and 1078 deletions
--- a/config.yaml
+++ b/config.yaml
@ -1,6 +1,45 @@
 actions:
+  - add_files:
+      - type: "patch"
+        name: "0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch"
+        number: 2001
+      - type: "patch"
+        name: "0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch"
+        number: 2002
+      - type: "patch"
+        name: "0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch"
+        number: 2003
+      - type: "patch"
+        name: "0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch"
+        number: 2004
+      - type: "patch"
+        name: "0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch"
+        number: 2005
+      - type: "patch"
+        name: "0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch"
+        number: 2006
+      - type: "patch"
+        name: "0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch"
+        number: 2007
+      - type: "source"
+        name: "almalinuxdup1.x509"
+        number: 100
+      - type: "source"
+        name: "almalinuxkpatch1.x509"
+        number: 101
+      - type: "source"
+        name: "almalinuximaca1.x509"
+        number: 102
+      - type: "source"
+        name: "almalinuxima.x509"
+        number: 103
+      - type: "patch"
+        name: "ppc64le-kvm-support.patch"
+        number: "Latest"
+        modify_spec: false
+
  - replace:
-      - target: "kernel*.config"
+      - target: "kernel*rhel.config"
        find: |
              # CONFIG_BE2NET_BE2 is not set
              # CONFIG_BE2NET_BE3 is not set
@ -8,11 +47,21 @@ actions:
              CONFIG_BE2NET_BE2=y
              CONFIG_BE2NET_BE3=y
        count: 1
-      - target: "kernel*.config"
+      - target: "kernel*rhel.config"
        find: "# CONFIG_MLX4_CORE_GEN2 is not set"
        replace: "CONFIG_MLX4_CORE_GEN2=y"
        count: 1
-      - target: "x509.genkey"
+      - target: "x509.genkey.centos"
+        find: |
+              O = The CentOS Project
+              CN = CentOS Stream kernel signing key
+              emailAddress = security@centos.org
+        replace: |
+              O = AlmaLinux
+              CN = AlmaLinux kernel signing key
+              emailAddress = security@almalinux.org
+        count: 1
+      - target: "x509.genkey.rhel"
        find: |
              O = Red Hat
              CN = Red Hat Enterprise Linux kernel signing key
@ -28,65 +77,39 @@ actions:
        count: 2
      - target: "spec"
        find: |
-              %define make_target Image.gz
-              %define kernel_image arch/arm64/boot/Image.gz
-        replace: |
-              %define make_target Image
-              %define kernel_image arch/arm64/boot/Image
-        count: 1
-      - target: "spec"
-        find: |
-              Source10: redhatsecurebootca3.cer
-              Source11: centossecurebootca2.cer
-              Source12: centossecureboot201.cer
-              Source13: redhatsecureboot501.cer
-              Source14: redhatsecureboot302.cer
-              Source15: redhatsecureboot303.cer
-              Source16: redhatsecurebootca7.cer
              %if 0%{?centos}
-              %define secureboot_ca_0  %{SOURCE11}
-              %define secureboot_key_0 %{SOURCE12}
              %define pesign_name_0 centossecureboot201
              %else
-        replace: |
-              Source10: almalinuxsecurebootca0.cer
-              Source11: almalinuxsecurebootca0.cer
-        count: 1
-      - target: "spec"
-        find: |
              %ifarch x86_64 aarch64
-              %define secureboot_ca_0 %{SOURCE10}
-              %define secureboot_key_0 %{SOURCE13}
              %define pesign_name_0 redhatsecureboot501
              %endif
-        replace: |
-              %define secureboot_ca_0 %{SOURCE10}
-              %define secureboot_ca_1 %{SOURCE11}
-              %define secureboot_ca_2 %{SOURCE11}
-
-              %define secureboot_key_0 %{SOURCE10}
-              %define pesign_name_0 almalinuxsecurebootca0
+              %ifarch s390x
+              %define pesign_name_0 redhatsecureboot302
+              %endif
+              %ifarch ppc64le
+              %define pesign_name_0 redhatsecureboot701
+              %endif
+              %endif
+        replace: "%define pesign_name_0 almalinuxsecurebootca0"
        count: 1
      - target: "spec"
-        find: |
-              Source100: rheldup3.x509
-              Source101: rhelkpatch1.x509
+        find: "Source103: almalinuxima.x509"
        replace: |
-              # Source100: rheldup3.x509
-              # Source101: rhelkpatch1.x509
+              Source103: almalinuxima.x509
+              Source104: almalinuxima.x509
        count: 1
      - target: "spec"
-        find: |
-              This is the package which provides the Linux %{name} for Red Hat Enterprise
-              Linux. It is based on upstream Linux at version %{version} and maintains kABI
+        find: "Summary: Various documentation bits found in the kernel source"
        replace: |
-              This is the package which provides the Linux %{name} for AlmaLinux.
-              It is based on upstream Linux at version %{version} and maintains kABI
+              Summary: Various documentation bits found in the kernel source
+              BuildArch: noarch
        count: 1
      - target: "spec"
-        find: "Red Hat Enterprise Linux"
-        replace: "AlmaLinux"
-        count: 2
+        find: "Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists"
+        replace: |
+              Summary: The AlmaLinux kernel ABI symbol stablelists
+              BuildArch: noarch
+        count: 1
      - target: "spec"
        find: |
              The kABI package contains information pertaining to the Red Hat Enterprise
@ -108,79 +131,227 @@ actions:
        replace: "This package provides kernel modules for the %{?2:%{2} }kernel package for AlmaLinux internal usage.\\"
        count: 1
      - target: "spec"
-        find: |
-              Summary: %{variant_summary}\
-              Group: System Environment/Kernel\
-              Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
-              Provides: installonlypkg(kernel)\
+        find: "%{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\\"
        replace: |
-              Summary: %{variant_summary}\
-              Group: System Environment/Kernel\
-              Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
-              Provides: installonlypkg(kernel)\
-              %if "%{?1}" == ""\
+              %if "%{1}" == "rt" || "%{?1}" == ""\
              Provides: almalinux(kernel-sig-key) = 202303\
-              Conflicts: shim-ia32 < 15.8-4.el8_9.alma.2\
-              Conflicts: shim-x64 < 15.8-4.el8_9.alma.2\
+              Conflicts: shim-ia32 < 15.8-4.el9_3.alma.2\
+              Conflicts: shim-x64 < 15.8-4.el9_3.alma.2\
              %endif\
+              %{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
        count: 1
      - target: "spec"
-        find: "%setup -q -n %{name}-%{specversion}-%{pkgrelease} -c"
-        replace: |
-              %setup -q -n %{name}-%{specversion}-%{pkgrelease} -c
-              cp -v %{SOURCE9000} linux-%{specversion}-%{pkgrelease}/certs/rhel.pem
+        find: "  sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME=\"Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API\"/' $i"
+        replace: "  sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME=\"AlmaLinux %{rhel} - Kernel Cryptographic API\"/' $i"
+        count: 1
+      - target: "spec"
+        find: "SBATsuffix=\"centos\""
+        replace: "SBATsuffix=\"rhel\""
        count: 1
      - target: "spec"
        find: |
-              openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
-              openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
-              cat rheldup3.pem rhelkpatch1.pem > ../certs/rhel.pem
+              linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
+              linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
+              kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com
        replace: |
-              # openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
-              # openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
-              # cat rheldup3.pem rhelkpatch1.pem > ../certs/rhel.pem
+              linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
+              linux,1,AlmaLinux,linux,$KernelVer,mailto:security@almalinux.org
+              linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
+              linux.almalinux,1,AlmaLinux,linux,$KernelVer,mailto:security@almalinux.org
+              kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com
+              kernel-uki-virt.almalinux,1,AlmaLinux,kernel-uki-virt,$KernelVer,mailto:security@almalinux.org
+        count: 1
+      - target: "spec"
+        find: "UKI_secureboot_name=centossecureboot204"
+        replace: "UKI_secureboot_name=alsecureboot001"
+        count: 1
+      - target: "spec"
+        find: "UKI_secureboot_name=redhatsecureboot504"
+        replace: "UKI_secureboot_name=alsecureboot001"
+        count: 1
+      - target: "spec"
+        find: "# Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel"
+        replace: "# AlmaLinux UEFI Secure Boot CA cert, which can be used to authenticate the kernel"
        count: 1
      - target: "spec"
        find: |
-              Summary: The AlmaLinux kernel ABI symbol stablelists
-              Group: System Environment/Kernel
-              AutoReqProv: no
+              # kernel-64k (aarch64 kernel with 64K page_size)
+              %define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1}
        replace: |
-              Summary: The AlmaLinux kernel ABI symbol stablelists
-              Group: System Environment/Kernel
-              AutoReqProv: no
-              BuildArch: noarch
+              # kernel-64k (aarch64 kernel with 64K page_size)
+              %define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1}
+              # kernel-kvm ppc64le kernel with kvm support)
+              %define with_ppc_kvm %{?_without_ppc_kvm: 0} %{?!_without_ppc_kvm: 1}
        count: 1
      - target: "spec"
        find: |
-              Summary: Various documentation bits found in the kernel source
-              Group: Documentation
+              # 64k variant only for aarch64
+              %ifnarch aarch64
+              %define with_arm64_64k 0
+              %define with_realtime_arm64_64k 0
+              %endif
        replace: |
-              Summary: Various documentation bits found in the kernel source
-              Group: Documentation
-              BuildArch: noarch
+              # 64k variant only for aarch64
+              %ifnarch aarch64
+              %define with_arm64_64k 0
+              %define with_realtime_arm64_64k 0
+              %endif
+
+              # kvm variant only for ppc64le
+              %ifnarch ppc64le
+              %define with_ppc_kvm 0
+              %endif
+        count: 1
+      - target: "spec"
+        find: |
+              %ifarch %nobuildarches
+              # disable BuildKernel commands
+              %define with_up 0
+              %define with_debug 0
+              %define with_pae 0
+              %define with_zfcpdump 0
+              %define with_arm64_64k 0
+        replace: |
+              %ifarch %nobuildarches
+              # disable BuildKernel commands
+              %define with_up 0
+              %define with_debug 0
+              %define with_pae 0
+              %define with_zfcpdump 0
+              %define with_arm64_64k 0
+              %define with_ppc_kvm 0
+        count: 1
+      - target: "spec"
+        find: |
+              Source47: kernel-aarch64-rt-debug-rhel.config
+        replace: |
+              Source47: kernel-aarch64-rt-debug-rhel.config
+
+              # PPC64le KVM support config
+              Source10001: kernel-ppc64le-kvm-rhel.config
+        count: 1
+      - target: "spec"
+        find: |
+            # END OF PATCH DEFINITIONS
+        replace: |
+            Patch11111: ppc64le-kvm-support.patch
+
+            # END OF PATCH DEFINITIONS
+        count: 1
+      - target: "spec"
+        find: |
+            %if %{with_arm64_64k}
+            %define variant_summary The Linux kernel compiled for 64k pagesize usage
+            %kernel_variant_package 64k
+            %description 64k-core
+            The kernel package contains a variant of the ARM64 Linux kernel using
+            a 64K page size.
+            %endif
+        replace: |
+            %if %{with_arm64_64k}
+            %define variant_summary The Linux kernel compiled for 64k pagesize usage
+            %kernel_variant_package 64k
+            %description 64k-core
+            The kernel package contains a variant of the ARM64 Linux kernel using
+            a 64K page size.
+            %endif
+
+            %if %{with_ppc_kvm}
+            %define variant_summary The Linux kernel compiled for KVM usage on ppc64le
+            %kernel_variant_package kvm
+            %description kvm-core
+            The kernel package contains a variant of the PPC64le Linux kernel with
+            KVM support.
+            %endif
+        count: 1
+      - target: "spec"
+        find: |
+            %if %{with_up}
+            BuildKernel %make_target %kernel_image %{_use_vdso}
+            %endif
+        replace: |
+            %if %{with_up}
+            BuildKernel %make_target %kernel_image %{_use_vdso}
+            %endif
+
+            %if %{with_ppc_kvm}
+            git apply $RPM_SOURCE_DIR/ppc64le-kvm-support.patch
+            BuildKernel %make_target %kernel_image %{_use_vdso} kvm
+            %endif
+        count: 1
+      - target: "spec"
+        find: |
+              %if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} && !%{with_up} && !%{with_arm64_64k} && !%{with_realtime}
+        replace: |
+              %if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} && !%{with_up} && !%{with_arm64_64k} && !%{with_realtime} && !%{with_ppc_kvm}
+        count: 1
+      - target: "spec"
+        find: |
+              if [ "%{with_arm64_64k}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
+                   %{modsign_cmd} certs/signing_key.pem.sign+64k-debug certs/signing_key.x509.sign+64k-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k-debug/ \
+              fi \
+        replace: |
+              if [ "%{with_arm64_64k}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
+                   %{modsign_cmd} certs/signing_key.pem.sign+64k-debug certs/signing_key.x509.sign+64k-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k-debug/ \
+              fi \
+              if [ "%{with_ppc_kvm}" -ne "0" ]; then \
+                 %{modsign_cmd} certs/signing_key.pem.sign+kvm certs/signing_key.x509.sign+kvm $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+kvm/ \
+              fi \
+        count: 1
+      - target: "spec"
+        find: |
+            %if %{with_arm64_64k}
+            %kernel_variant_preun -v 64k
+            %kernel_variant_post -v 64k
+            %endif
+        replace: |
+            %if %{with_arm64_64k}
+            %kernel_variant_preun -v 64k
+            %kernel_variant_post -v 64k
+            %endif
+
+            %if %{with_ppc_kvm}
+            %kernel_variant_preun -v kvm
+            %kernel_variant_post -v kvm
+            %endif
+        count: 1
+      - target: "spec"
+        find: |
+              %kernel_variant_files %{_use_vdso} %{with_arm64_64k} 64k
+        replace: |
+              %kernel_variant_files %{_use_vdso} %{with_arm64_64k} 64k
+              %kernel_variant_files %{_use_vdso} %{with_ppc_kvm} kvm
        count: 1

  - delete_line:
      - target: "spec"
        lines:
          - |
-             %ifarch s390x
-             %define secureboot_ca_0 %{SOURCE10}
-             %define secureboot_key_0 %{SOURCE14}
-             %define pesign_name_0 redhatsecureboot302
-             %endif
+             Source100: rheldup3.x509
+             Source101: rhelkpatch1.x509
+             Source102: rhelimaca1.x509
+             Source103: rhelima.x509
+             Source104: rhelima_centos.x509
          - |
-             %ifarch ppc64le
-             %define secureboot_ca_0 %{SOURCE16}
-             %define secureboot_key_0 %{SOURCE15}
-             %define pesign_name_0 redhatsecureboot701
-             %endif
-             %endif
-          - |
-            if [ "$KernelExtension" == "gz" ]; then
-                  gzip -f9 $SignImage
+            # We may want to override files from the primary target in case of building
+            # against a flavour of it (eg. centos not rhel), thus override it here if
+            # necessary
+            if [ "%{primary_target}" == "rhel" ]; then
+            %if 0%{?centos}
+              echo "Updating scripts/sources to centos version"
+              RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh centos
+            %else
+              echo "Not updating scripts/sources to centos version"
+            %endif
            fi
+          - |
+                if [ "$KernelExtension" == "gz" ]; then
+                    gzip -f9 $SignImage
+                fi
+
+  - run_script:
+      - script: "copy_ppc64le_config.sh"
+        cwd: "rpms"

  - changelog_entry:
      - name: "Andrei Lukoshko"
@ -199,41 +370,4 @@ actions:
        line:
          - "Use AlmaLinux OS secure boot cert"
          - "Debrand for AlmaLinux OS"
-
-  - add_files:
-      - type: "patch"
-        name: "debrand-single-cpu.patch"
-        number: 1000
-      - type: "patch"
-        name: "debrand-rh-i686-cpu.patch"
-        number: 1002
-      - type: "patch"
-        name: "0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch"
-        number: 2001
-      - type: "patch"
-        name: "0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch"
-        number: 2002
-      - type: "patch"
-        name: "0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch"
-        number: 2003
-      - type: "patch"
-        name: "0004-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch"
-        number: 2004
-      - type: "patch"
-        name: "0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch"
-        number: 2005
-      - type: "patch"
-        name: "0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch"
-        number: 2006
-      - type: "patch"
-        name: "0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch"
-        number: 2007
-      - type: "patch"
-        name: "0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch"
-        number: 2008
-      - type: "source"
-        name: "almalinux.pem"
-        number: 9000
-      - type: "source"
-        name: "almalinuxsecurebootca0.cer"
-        number: "Latest"
+          - "Add KVM support for ppc64le"
--- a/files/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch
+++ b/files/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch
@ -1,18 +1,17 @@
-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
+From 2ecae960349c68360744ed3cba0c47ad18b402cc Mon Sep 17 00:00:00 2001
+From: eabdullin <eabdullin@almalinux.org>
+Date: Tue, 11 Mar 2025 10:22:08 +0300
+Subject: [PATCH] Enable all disabled pci devices by moving to unmaintained

 ---
- kernel/rh_messages.h | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
+ kernel/rh_messages.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)

 diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h
-index b7c3be8aa..28b0f3cad 100644
+index 647d7b9a4..483824c9c 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[] = {
+@@ -123,6 +123,10 @@ static const struct pci_device_id rh_deprecated_pci_devices[] = {
 };
 
 static const struct pci_device_id rh_disabled_pci_devices[] = {
@ -20,26 +19,20 @@ index b7c3be8aa..28b0f3cad 100644
 +};
 +
 +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 },
+@@ -288,10 +292,6 @@ static const struct pci_device_id rh_disabled_pci_devices[] = {
+ 	{ 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 */
 -};
 -
- #endif /* __RH_MESSAGES_H */
+-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 },
 -- 
-2.27.0
+2.39.5 (Apple Git-154)

--- a/files/0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
+++ b/files/0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
@ -1,41 +0,0 @@
-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
-
--- a/files/0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
+++ b/files/0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
@ -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
+
--- a/files/0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
+++ b/files/0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
@ -1,17 +1,27 @@
-From 01c67e991c0d49e797b412d6d6f4d7a4669ec926 Mon Sep 17 00:00:00 2001
+From f9ab10cebe6411dd26fec2ef354db2e527386b4f 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
+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, 9 insertions(+)
+ 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 544f1ab02..2fa774488 100644
+index bd5880cbd..060bd914a 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
-@@ -91,6 +91,11 @@ MODULE_PARM_DESC(hpsa_simple_mode,
+@@ -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[] = {
@ -23,14 +33,16 @@ index 544f1ab02..2fa774488 100644
 	{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[] = {
+@@ -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},
-+	{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},
+-#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,}
 };
 
--- a/files/0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
+++ b/files/0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
@ -1,65 +0,0 @@
-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
-
--- a/files/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
+++ b/files/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
@ -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
+
--- a/files/0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
+++ b/files/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 <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
+
--- a/files/0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
+++ b/files/0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
@ -1,176 +0,0 @@
-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
-
--- a/files/0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
+++ b/files/0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
@ -1,408 +0,0 @@
-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
-
--- a/files/0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
+++ b/files/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 <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
+
--- a/files/0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
+++ b/files/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 <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
+
--- a/files/0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
+++ b/files/0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
@ -1,41 +0,0 @@
-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
-
--- a/files/0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
+++ b/files/0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
@ -1,28 +0,0 @@
-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
-
--- a/files/almalinux.pem
+++ b/files/almalinux.pem
@ -1,46 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIID3zCCAsegAwIBAgIQY4iebPtuT3OKR2M/jWZWEzANBgkqhkiG9w0BAQsFADBg
-MSUwIwYJKoZIhvcNAQkBFhZzZWN1cml0eUBhbG1hbGludXgub3JnMRIwEAYDVQQK
-EwlBbG1hTGludXgxIzAhBgNVBAMTGkFsbWFMaW51eCBTZWN1cmUgQm9vdCBDQSAx
-MB4XDTIxMDExNDIxMDcxOVoXDTM2MDExMTIxMDcxOVowaTElMCMGCSqGSIb3DQEJ
-ARYWc2VjdXJpdHlAYWxtYWxpbnV4Lm9yZzESMBAGA1UEChMJQWxtYUxpbnV4MSww
-KgYDVQQDEyNBbG1hTGludXggRHJpdmVyIHVwZGF0ZSBzaWduaW5nIGtleTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7kGZShKo5uegg6T4U/wR9UeyCa
-qTtx+OvzUMKT8l5+R5WfBgQU8sDrIqX3Vv3tD6UeOUyFIQ40iGESdDhWnAFynJX4
-v0k81KxJ+rVFAt5EJBeGw7U2qdpn8hzJG2dVANZ1gXJWGhC95Muif5q8fL7BJdU4
-RufixfKWq6WHAalwHaiTCbA+/Ft6TLyZcA62glKkmBn7uWn83tlMfVqC4EN2NfQb
-//C2MFCbm43BoKmgrMV0J3Pu8un3QZ4ukDDhJJ9eHfSqscq9SHPjqd0RM6TRcFXW
-BzmTpG7MOJRvk4ypQSHxxc4jK5MVOqzel+2UPB2ihkvvnK9hdsvvI/bal/sCAwEA
-AaOBizCBiDAfBgNVHSMEGDAWgBSY0u339QWy5Y/vkiTSvJ6Ffy5GkzAVBglghkgB
-hvhCAQEBAf8EBQMDAPABMB8GA1UdJQQYMBYGCCsGAQUFBwMDBgorBgEEAZIIEAEC
-MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUe4Y+AkDtIIq2uBuKbyhgwPTox9Yw
-DQYJKoZIhvcNAQELBQADggEBAHoPojMTRdFO050Ihrmr8jkdOweiOSBtlAZkLGd2
-lTybNp2Xi1lQ8SqsqU/NFs/KUPVFykmjmLeqNWC9QoKdrVGzoD9MOHprRxe6gC8k
-sHzBCFqdx3B+qbeSxBUN2QLIydzM6C23qf1TjBCeEDtRrvcvupFTlOBxiOJrIwbp
-dJD1JfjbgxfvLzg7PaJPi5Ev6B3gY4ybCnKQmor029Z3R4zw3miPpZVA04xt3Z9e
-m45Jjv86u10wjLmGRgfMmYT43jiMbOwlG1N8OikvgIHwlZtWxUpL1t/mEYtMMkTv
-R//lA5z5dqXiDCPdTwHhSjEfBFWGLl7ciYt6rYkpdlqnYdk=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID2DCCAsCgAwIBAgIQHDEXJMuZQ/m5MXRiSmLMljANBgkqhkiG9w0BAQsFADBg
-MSUwIwYJKoZIhvcNAQkBFhZzZWN1cml0eUBhbG1hbGludXgub3JnMRIwEAYDVQQK
-EwlBbG1hTGludXgxIzAhBgNVBAMTGkFsbWFMaW51eCBTZWN1cmUgQm9vdCBDQSAx
-MB4XDTIxMDExNDIxMDgwMFoXDTM2MDExMTIxMDgwMFowYjElMCMGCSqGSIb3DQEJ
-ARYWc2VjdXJpdHlAYWxtYWxpbnV4Lm9yZzESMBAGA1UEChMJQWxtYUxpbnV4MSUw
-IwYDVQQDExxBbG1hTGludXgga3BhdGNoIHNpZ25pbmcga2V5MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxncKQ7a49o5IUwqPB1axIzopNdGoSoERVuUd
-hdHAZLB2MGIuU2fGCuZ4iD2Pwk+t2KsgR1y58pmHyRBCLi2tYfEdDB8LUzUY3P+8
-Wxm2+zz8TPJUIcvPE4rHEb0vV4nTzwjpG4BTBwLkYRj+AxGbzWEy5Eetxzq5Ji+V
-TMuTzRKshHEGNs3tFRPbSssc50NH+OuVKpzJAIqBmz7Gca9RqhK9ARK1p3aDEoR+
-pYw4zRjIczc3s57WeuQxRMvFK5j48U0hpEUh+eQn1m40Bus3e7i4YTskwgKN5Vq3
-lGlEdBoK4utuoHPj3JYh97hOii/kulOa9j5xeNe5z/6QByMxpwIDAQABo4GLMIGI
-MB8GA1UdIwQYMBaAFJjS7ff1BbLlj++SJNK8noV/LkaTMBUGCWCGSAGG+EIBAQEB
-/wQFAwMA8AEwHwYDVR0lBBgwFgYIKwYBBQUHAwMGCisGAQQBkggQAQIwDgYDVR0P
-AQH/BAQDAgSwMB0GA1UdDgQWBBRpptnu0/Yg1cLhOh0hHEZRClrZ9TANBgkqhkiG
-9w0BAQsFAAOCAQEAMDiuS0CD31MtO1Sn4HRYvai2LFdKpUKAEXVy9hsN+AfbcMcl
-2sF/w49o43cMNIFoWKhMWZMOjCj/DGQY7ehNH3DRaTl7DNCu6y7mBNJPU+iPcE4r
-92SBWIxUNi7YVbsc1evKBOnrtq6xd5BUJQx1cVGmSBI9dnd4tDBB2+KjpmdhzZK5
-V1KQz1ilz5g2FNyEj6L7hnpkGUeMYnuM49YL7JP8QNtaKUBBA3BR4S7de+Tu070h
-pEhvE539I6B+wmgV/bio20TUpQ5W2eH+5YUHVIZa5pZ30tVkm21iNB7eccbM4NYc
-IRmwIsesuROtaM1e0lHoxKdW0N2xOSkhSY6oyQ==
-----END CERTIFICATE-----
--- a/files/almalinuxdup1.x509
+++ b/files/almalinuxdup1.x509
--- a/files/almalinuxima.x509
+++ b/files/almalinuxima.x509
--- a/files/almalinuximaca1.x509
+++ b/files/almalinuximaca1.x509
--- a/files/almalinuxkpatch1.x509
+++ b/files/almalinuxkpatch1.x509
--- a/files/almalinuxsecurebootca0.cer
+++ b/files/almalinuxsecurebootca0.cer
--- a/files/debrand-rh-i686-cpu.patch
+++ b/files/debrand-rh-i686-cpu.patch
@ -1,11 +0,0 @@
--- 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 AlmaLinux.\n");
- 		die();
- 	}
- 
--- a/files/debrand-rh_taint.patch
+++ b/files/debrand-rh_taint.patch
@ -1,81 +0,0 @@
--- a/kernel/rh_taint.c	2020-10-16 10:41:51.000000000 -0500
-+++ b/kernel/rh_taint.c	2020-11-19 10:50:24.853039167 -0600
-@@ -2,12 +2,12 @@
- #include <linux/module.h>
- 
- /*
- * The following functions are used by Red Hat to indicate to users that
- * hardware and drivers are unsupported, or have limited support in RHEL major
-+ * The following functions are used by AlmaLinux to indicate to users that
-+ * hardware and drivers are unsupported, or have limited support in AlmaLinux major
-  * and minor releases.  These functions output loud warning messages to the end
-  * user and should be USED WITH CAUTION.
-  *
- * Any use of these functions _MUST_ be documented in the RHEL Release Notes,
-+ * Any use of these functions _MUST_ be documented in the AlmaLinux Release Notes,
-  * and have approval of management.
-  */
- 
-@@ -16,15 +16,15 @@
-  * @msg: Hardware name, class, or type
-  *
-  * Called to mark a device, class of devices, or types of devices as not having
- * support in any RHEL minor release.  This does not TAINT the kernel.  Red Hat
- * will not fix bugs against this hardware in this minor release.  Red Hat may
-+ * support in any AlmaLinux minor release.  This does not TAINT the kernel.  AlmaLinux
-+ * will not fix bugs against this hardware in this minor release.  AlmaLinux may
-  * declare support in a future major or minor update release.  This cannot be
-  * used to mark drivers unsupported.
-  */
- void mark_hardware_unsupported(const char *msg)
- {
- 	/* Print one single message */
-	pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://catalog.redhat.com for certified hardware.\n", msg);
-+	pr_crit("Warning: %s - this hardware has not undergone testing by AlmaLinux and might not be certified.\n", msg);
- }
- EXPORT_SYMBOL(mark_hardware_unsupported);
- 
-@@ -35,12 +35,12 @@ EXPORT_SYMBOL(mark_hardware_unsupported)
-  * Called to minimize the support status of a previously supported device in
-  * a minor release.  This does not TAINT the kernel.  Marking hardware
-  * deprecated is usually done in conjunction with the hardware vendor.  Future
- * RHEL major releases may not include this driver.  Driver updates and fixes
-+ * AlmaLinux major releases may not include this driver.  Driver updates and fixes
-  * for this device will be limited to critical issues in future minor releases.
-  */
- void mark_hardware_deprecated(const char *msg)
- {
-	pr_crit("Warning: %s - this hardware is not recommended for new deployments. It continues to be supported in this RHEL release, but it is likely to be removed in the next major release. Driver updates and fixes for this device will be limited to critical issues. Please contact Red Hat Support or your device's hardware vendor for additional information.\n", msg);
-+	pr_crit("Warning: %s - this hardware is not recommended for new deployments. It continues to be supported in this AlmaLinux release, but it is likely to be removed in the next major release. Driver updates and fixes for this device will be limited to critical issues. Please contact AlmaLinux Support or your device's hardware vendor for additional information.\n", msg);
- }
- EXPORT_SYMBOL(mark_hardware_deprecated);
- 
-@@ -50,9 +50,9 @@ EXPORT_SYMBOL(mark_hardware_deprecated);
-  *
-  * Called to minimize the support status of a new driver.  This does TAINT the
-  * kernel.  Calling this function indicates that the driver or subsystem has
- * had limited testing and is not marked for full support within this RHEL
- * minor release.  The next RHEL minor release may contain full support for
- * this driver.  Red Hat does not guarantee that bugs reported against this
-+ * had limited testing and is not marked for full support within this AlmaLinux
-+ * minor release.  The next AlmaLinux minor release may contain full support for
-+ * this driver.  AlmaLinux does not guarantee that bugs reported against this
-  * driver or subsystem will be resolved.
-  */
- void mark_tech_preview(const char *msg, struct module *mod)
-@@ -81,13 +81,13 @@ EXPORT_SYMBOL(mark_tech_preview);
-  * mark_driver_unsupported - drivers that we know we don't want to support
-  * @name: the name of the driver
-  *
- * In some cases Red Hat has chosen to build a driver for internal QE
-+ * In some cases AlmaLinux has chosen to build a driver for internal QE
-  * use. Use this function to mark those drivers as unsupported for
-  * customers.
-  */
- void mark_driver_unsupported(const char *name)
- {
-	pr_crit("Warning: %s - This driver has not undergone sufficient testing by Red Hat for this release and therefore cannot be used in production systems.\n",
-+	pr_crit("Warning: %s - This driver has not undergone sufficient testing by AlmaLinux for this release and therefore cannot be used in production systems.\n",
- 	        name ? name : "kernel");
- }
- EXPORT_SYMBOL(mark_driver_unsupported);
--- a/files/debrand-single-cpu.patch
+++ b/files/debrand-single-cpu.patch
@ -1,11 +0,0 @@
--- 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 AlmaLinux 8, single threaded, single CPU 64-bit physical systems are unsupported. Please see https://www.almalinux.org for more information");
- 	}
- 
- 	/*
--- a/files/ppc64le-kvm-support.patch
+++ b/files/ppc64le-kvm-support.patch
@ -0,0 +1,219 @@
+From 524ab50336b1190547ceb8074260a1fbebfee0be Mon Sep 17 00:00:00 2001
+From: Sean Christopherson <seanjc@google.com>
+Date: Mon, 6 Dec 2021 20:54:14 +0100
+Subject: [PATCH 1/3] KVM: PPC: Avoid referencing userspace memory region in
+ memslot updates
+
+For PPC HV, get the number of pages directly from the new memslot instead
+of computing the same from the userspace memory region, and explicitly
+check for !DELETE instead of inferring the same when toggling mmio_update.
+The motivation for these changes is to avoid referencing the @mem param
+so that it can be dropped in a future commit.
+
+No functional change intended.
+
+Signed-off-by: Sean Christopherson <seanjc@google.com>
+Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
+Message-Id: <1e97fb5198be25f98ef82e63a8d770c682264cc9.1638817639.git.maciej.szmigiero@oracle.com>
+---
+ arch/powerpc/include/asm/kvm_ppc.h |  4 ----
+ arch/powerpc/kvm/book3s.c          |  6 ++----
+ arch/powerpc/kvm/book3s_hv.c       | 12 +++---------
+ arch/powerpc/kvm/book3s_pr.c       |  2 --
+ arch/powerpc/kvm/booke.c           |  2 --
+ arch/powerpc/kvm/powerpc.c         |  4 ++--
+ 6 files changed, 7 insertions(+), 23 deletions(-)
+
+diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
+index 5c80c4955..6874cd89d 100644
+--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
+@@ -199,12 +199,10 @@ extern void kvmppc_core_destroy_vm(struct kvm *kvm);
+ extern void kvmppc_core_free_memslot(struct kvm *kvm,
+ 				     struct kvm_memory_slot *slot);
+ extern int kvmppc_core_prepare_memory_region(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				const struct kvm_memory_slot *old,
+ 				struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change);
+ extern void kvmppc_core_commit_memory_region(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				struct kvm_memory_slot *old,
+ 				const struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change);
+@@ -274,12 +272,10 @@ struct kvmppc_ops {
+ 	int (*get_dirty_log)(struct kvm *kvm, struct kvm_dirty_log *log);
+ 	void (*flush_memslot)(struct kvm *kvm, struct kvm_memory_slot *memslot);
+ 	int (*prepare_memory_region)(struct kvm *kvm,
+-				     const struct kvm_userspace_memory_region *mem,
+ 				     const struct kvm_memory_slot *old,
+ 				     struct kvm_memory_slot *new,
+ 				     enum kvm_mr_change change);
+ 	void (*commit_memory_region)(struct kvm *kvm,
+-				     const struct kvm_userspace_memory_region *mem,
+ 				     struct kvm_memory_slot *old,
+ 				     const struct kvm_memory_slot *new,
+ 				     enum kvm_mr_change change);
+diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
+index 64fd4b3ea..cb7b5f365 100644
+--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
+@@ -847,21 +847,19 @@ void kvmppc_core_flush_memslot(struct kvm *kvm, struct kvm_memory_slot *memslot)
+ }
+ 
+ int kvmppc_core_prepare_memory_region(struct kvm *kvm,
+-				      const struct kvm_userspace_memory_region *mem,
+ 				      const struct kvm_memory_slot *old,
+ 				      struct kvm_memory_slot *new,
+ 				      enum kvm_mr_change change)
+ {
+-	return kvm->arch.kvm_ops->prepare_memory_region(kvm, mem, old, new, change);
+	return kvm->arch.kvm_ops->prepare_memory_region(kvm, old, new, change);
+ }
+ 
+ void kvmppc_core_commit_memory_region(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				struct kvm_memory_slot *old,
+ 				const struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+ {
+-	kvm->arch.kvm_ops->commit_memory_region(kvm, mem, old, new, change);
+	kvm->arch.kvm_ops->commit_memory_region(kvm, old, new, change);
+ }
+ 
+ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range)
+diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
+index 9c3c9fd5e..7f4c188f3 100644
+--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
+@@ -4777,15 +4777,12 @@ static void kvmppc_core_free_memslot_hv(struct kvm_memory_slot *slot)
+ }
+ 
+ static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				const struct kvm_memory_slot *old,
+ 				struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+ {
+-	unsigned long npages = mem->memory_size >> PAGE_SHIFT;
+-
+ 	if (change == KVM_MR_CREATE) {
+-		new->arch.rmap = vzalloc(array_size(npages,
+		new->arch.rmap = vzalloc(array_size(new->npages,
+ 					  sizeof(*new->arch.rmap)));
+ 		if (!new->arch.rmap)
+ 			return -ENOMEM;
+@@ -4797,20 +4794,17 @@ static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,
+ }
+ 
+ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				struct kvm_memory_slot *old,
+ 				const struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+ {
+-	unsigned long npages = mem->memory_size >> PAGE_SHIFT;
+-
+ 	/*
+-	 * If we are making a new memslot, it might make
+	 * If we are creating or modifying a memslot, it might make
+ 	 * some address that was previously cached as emulated
+ 	 * MMIO be no longer emulated MMIO, so invalidate
+ 	 * all the caches of emulated MMIO translations.
+ 	 */
+-	if (npages)
+	if (change != KVM_MR_DELETE)
+ 		atomic64_inc(&kvm->arch.mmio_update);
+ 
+ 	/*
+diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
+index 7891b9d0c..c0ae926af 100644
+--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
+@@ -1892,7 +1892,6 @@ static void kvmppc_core_flush_memslot_pr(struct kvm *kvm,
+ }
+ 
+ static int kvmppc_core_prepare_memory_region_pr(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				const struct kvm_memory_slot *old,
+ 				struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+@@ -1901,7 +1900,6 @@ static int kvmppc_core_prepare_memory_region_pr(struct kvm *kvm,
+ }
+ 
+ static void kvmppc_core_commit_memory_region_pr(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				struct kvm_memory_slot *old,
+ 				const struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
+index b06ca6646..6cf2db284 100644
+--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
+@@ -1806,7 +1806,6 @@ void kvmppc_core_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot)
+ }
+ 
+ int kvmppc_core_prepare_memory_region(struct kvm *kvm,
+-				      const struct kvm_userspace_memory_region *mem,
+ 				      const struct kvm_memory_slot *old,
+ 				      struct kvm_memory_slot *new,
+ 				      enum kvm_mr_change change)
+@@ -1815,7 +1814,6 @@ int kvmppc_core_prepare_memory_region(struct kvm *kvm,
+ }
+ 
+ void kvmppc_core_commit_memory_region(struct kvm *kvm,
+-				const struct kvm_userspace_memory_region *mem,
+ 				struct kvm_memory_slot *old,
+ 				const struct kvm_memory_slot *new,
+ 				enum kvm_mr_change change)
+diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
+index 818815e15..f8f39a858 100644
+--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
+@@ -686,7 +686,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
+ 				   struct kvm_memory_slot *new,
+ 				   enum kvm_mr_change change)
+ {
+-	return kvmppc_core_prepare_memory_region(kvm, mem, old, new, change);
+	return kvmppc_core_prepare_memory_region(kvm, old, new, change);
+ }
+ 
+ void kvm_arch_commit_memory_region(struct kvm *kvm,
+@@ -694,7 +694,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
+ 				   const struct kvm_memory_slot *new,
+ 				   enum kvm_mr_change change)
+ {
+-	kvmppc_core_commit_memory_region(kvm, mem, old, new, change);
+	kvmppc_core_commit_memory_region(kvm, old, new, change);
+ }
+ 
+ void kvm_arch_flush_shadow_memslot(struct kvm *kvm,
+-- 
+2.39.5 (Apple Git-154)
+
+
+From 8c62d250a23bbbb1ecd84d4d475e7623810275aa Mon Sep 17 00:00:00 2001
+From: eabdullin <eabdullin@almalinux.org>
+Date: Tue, 8 Apr 2025 10:13:43 +0300
+Subject: [PATCH 3/3] powerpc/kvm: use mmu_invalidate_seq instead of
+ mmu_notifier_seq
+
+---
+ arch/powerpc/kvm/book3s_64_vio_hv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/powerpc/kvm/book3s_64_vio_hv.c b/arch/powerpc/kvm/book3s_64_vio_hv.c
+index f38dfe195..16e5872a1 100644
+--- a/arch/powerpc/kvm/book3s_64_vio_hv.c
+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c
+@@ -488,7 +488,7 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu,
+ 	/*
+ 	 * used to check for invalidations in progress
+ 	 */
+-	mmu_seq = kvm->mmu_notifier_seq;
+	mmu_seq = kvm->mmu_invalidate_seq;
+ 	smp_rmb();
+ 
+ 	stt = kvmppc_find_table(vcpu->kvm, liobn);
+-- 
+2.39.5 (Apple Git-154)
--- a/scripts/copy_ppc64le_config.sh
+++ b/scripts/copy_ppc64le_config.sh
@ -0,0 +1,2 @@
+cp SOURCES/kernel-ppc64le-rhel.config SOURCES/kernel-ppc64le-kvm-rhel.config
+sed -i 's|# CONFIG_KVM_BOOK3S_64 is not set|CONFIG_KVM_BOOK3S_64=m\nCONFIG_KVM_BOOK3S_64_HV=m\n# CONFIG_KVM_BOOK3S_64_PR is not set\n# CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set\nCONFIG_KVM_BOOK3S_PR_POSSIBLE=y\nCONFIG_KVM_XICS=y|g' SOURCES/kernel-ppc64le-kvm-rhel.config