From 7415d4d6e38e3886c783dc0740b0f3bfef9b7328 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 17 2024 00:20:10 +0000
Subject: import linux-firmware-20200421-83.git78c0348.el7_9


---

diff --git a/.gitignore b/.gitignore
index 86c5d23..c3fd43a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ SOURCES/ibt-20-0-3.sfi
 SOURCES/ibt-20-1-3.sfi
 SOURCES/ibt-20-1-4.sfi
 SOURCES/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq
+SOURCES/iwl-20240423.tar.gz
 SOURCES/linux-firmware-20200421.tar.gz
 SOURCES/microcode_amd_fam17h.bin
 SOURCES/microcode_amd_fam19h.bin
diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata
index 3f6da8d..78c4150 100644
--- a/.linux-firmware.metadata
+++ b/.linux-firmware.metadata
@@ -15,6 +15,7 @@
 858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-20-1-3.sfi
 858beec242af187021b58b664fe694dfe2fae86e SOURCES/ibt-20-1-4.sfi
 851029db5a5467466ad0c1ddfeb21028747c27f6 SOURCES/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq
+4930deb489c50bc4beeeb07f85267cd52d794026 SOURCES/iwl-20240423.tar.gz
 0fe79d9a46eb538e59c36036ba81355473ca60a2 SOURCES/linux-firmware-20200421.tar.gz
 219ff6cb94628467afb895dcce586e462ad7a879 SOURCES/microcode_amd_fam17h.bin
 cd2ecc6b56ba93484dc0888173e81e17ac36bd96 SOURCES/microcode_amd_fam19h.bin
diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec
index d1d233e..77109b8 100644
--- a/SPECS/linux-firmware.spec
+++ b/SPECS/linux-firmware.spec
@@ -1,5 +1,5 @@
 %global checkout 78c0348
-%global firmware_release 82
+%global firmware_release 83
 
 %define _binary_payload w9.xzdio
 
@@ -57,6 +57,8 @@ Source35:	microcode_amd_fam17h.bin.asc
 Source36:	microcode_amd_fam19h.bin
 Source37:	microcode_amd_fam19h.bin.asc
 
+Source100:	iwl-20240423.tar.gz
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Provides:	kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
@@ -315,6 +317,7 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{fwdir}
 mkdir -p $RPM_BUILD_ROOT%{fwdir}/updates
 make DESTDIR=$RPM_BUILD_ROOT/ FIRMWAREDIR=%{fwdir} install
+tar --strip-components=1 -xf %{_sourcedir}/iwl-20240423.tar.gz -C $RPM_BUILD_ROOT/%{fwdir}
 
 pushd $RPM_BUILD_ROOT/%{fwdir}
 
@@ -464,6 +467,14 @@ rm -rf $RPM_BUILD_ROOT
 # Following up Fedora on where they have included iwlwifi-cc-a0* and iwlwifi-Qu* blobs
 %{fwdir}/iwlwifi-cc-a0-*.ucode
 %{fwdir}/iwlwifi-Qu*.ucode
+%{fwdir}/iwlwifi-ty-a0-gf-a0-*.ucode
+%{fwdir}/iwlwifi-ty-a0-gf-a0*.pnvm
+%{fwdir}/iwlwifi-so-a0-*.ucode
+%{fwdir}/iwlwifi-so-a0-*.pnvm
+%{fwdir}/iwlwifi-gl-*.ucode
+%{fwdir}/iwlwifi-gl-*.pnvm
+%{fwdir}/iwlwifi-ma-*.ucode
+%{fwdir}/iwlwifi-ma-*.pnvm
 
 %files -f linux-firmware.files
 %defattr(-,root,root,-)
@@ -472,10 +483,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc WHENCE LICENCE.* LICENSE.*
 
 %changelog
-* Wed Jan 24 2024 Rado Vrbovsky <rvrbovsk@redhat.com> - 20200421-80.git78c0348
+* Thu May 30 2024 Denys Vlasenko <dvlasenk@redhat.com> - 20200421-83.git78c0348
+- hw: intel: Fix protection mechanism failure for some Intel(R) PROSet/Wireless WiFi
+Resolves: RHEL-4010, RHEL-4013, RHEL-4016, RHEL-4018, RHEL-4021
+
+* Wed Jan 24 2024 Rado Vrbovsky <rvrbovsk@redhat.com> - 20200421-82.git78c0348
 - AMD: INVD instruction may lead to a loss of SEV-ES guest machine memory integrity problem (RHEL-13985)
 
-* Thu Oct 26 2023 Rado Vrbovsky <rvrbovsk@redhat.com> - 20200421-80.git78c0348
+* Thu Oct 26 2023 Rado Vrbovsky <rvrbovsk@redhat.com> - 20200421-81.git78c0348
 - Cross-Process Information Leak (RHEL-8938)
 - Return Address Predictor velunerability leading to information disclosure (RHEL-9250)