import linux-firmware-20220210-107.git6342082c.el8

.gitignore

@@ -1 +1,5 @@
-SOURCES/linux-firmware-20210702.tar.xz
+SOURCES/amss.bin
+SOURCES/board-2.bin
+SOURCES/linux-firmware-20220210.tar.xz
+SOURCES/m3.bin
+SOURCES/regdb.bin

.linux-firmware.metadata

@@ -1 +1,5 @@
-46ae9dc2ac7251293164f4563d646a28ccda2f32 SOURCES/linux-firmware-20210702.tar.xz
+cd411becc8cf1cf849e76ba9163505a5916d0783 SOURCES/amss.bin
+83905fb1f7427021130d8b84e4bbade6cca9077a SOURCES/board-2.bin
+c5ca044176cc43d8a2eb1b742eb3e9a5e1978db3 SOURCES/linux-firmware-20220210.tar.xz
+e1cb30e71a2da11b20e9e8f359c1bba99a8084a5 SOURCES/m3.bin
+d8c56239c5adff3881ba0a5e770961fb63cad41d SOURCES/regdb.bin

SPECS/linux-firmware.spec

@@ -1,12 +1,12 @@
-%global checkout d79c2677
+%global checkout 6342082c
 
-%global firmware_release 104
+%global firmware_release 107
 
 %global _firmwarepath	/usr/lib/firmware
 %define _binaries_in_noarch_packages_terminate_build 0
 
 Name:		linux-firmware
-Version:	20210702
+Version:	20220210
 Release:	%{firmware_release}.git%{checkout}%{?dist}
 Summary:	Firmware files used by the Linux kernel
 License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -16,9 +16,20 @@ BuildArch:	noarch
 # Tarball created from upstream git checkout using the following steps:
 # 1) echo "/liquidio/lio_23xx_vsw.bin export-ignore" > .gitattributes # (GPL violation, see bug 1637694)
 #    This is still causing problems in RHEL9 (see bug 1959913) and because of that we should keep out of RHEL8 too
-# 2) git archive --worktree-attributes --format=tar --prefix=linux-firmware-%{checkout}/ %{checkout} | xz > linux-firmware-%{version}.tar.xz
+# 2) git archive --worktree-attributes --format=tar --prefix=linux-firmware-%%{checkout}/ %%{checkout} | xz > linux-firmware-%%{version}.tar.xz
 Source0:	%{name}-%{version}.tar.xz
 
+# zstream (or post-beta) requests
+# We usually update the whole tarball, pulling all changes from upstream.
+# But zstream requests should be handled only by updating the specific firmwares.
+# BZ#2007902 request
+Source1:	regdb.bin
+Source2:	board-2.bin
+Source3:	amss.bin
+Source4:	m3.bin
+Source5:	Notice.txt
+Source6:	WHENCE
+
 Provides:	kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
 Obsoletes:	kernel-firmware < %{version} xorg-x11-drv-ati-firmware < 6.13.0-0.22
 Obsoletes:	ueagle-atm4-firmware < 1.0-5
@@ -258,6 +269,16 @@ Firmware for Marvell Libertas SD 8787 Network Adapter
 
 %prep
 %setup -q -n linux-firmware-%{checkout}
+
+# BZ#2007902 post-beta request
+mkdir -p ath11k/WCN6855/hw2.0/
+cp %{_sourcedir}/regdb.bin ath11k/WCN6855/hw2.0/regdb.bin
+cp %{_sourcedir}/board-2.bin ath11k/WCN6855/hw2.0/board-2.bin
+cp %{_sourcedir}/amss.bin ath11k/WCN6855/hw2.0/amss.bin
+cp %{_sourcedir}/m3.bin ath11k/WCN6855/hw2.0/m3.bin
+cp %{_sourcedir}/Notice.txt ath11k/WCN6855/hw2.0/Notice.txt
+cp %{_sourcedir}/WHENCE WHENCE
+
 %if 0
 git init .
 if [ -z "$GIT_COMMITTER_NAME" ]; then
@@ -396,6 +417,8 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %{_firmwarepath}/iwlwifi-Qu*.ucode
 %{_firmwarepath}/iwlwifi-ty-a0-gf-a0-*.ucode
 %{_firmwarepath}/iwlwifi-ty-a0-gf-a0*.pnvm
+%{_firmwarepath}/iwlwifi-so-a0-*.ucode
+%{_firmwarepath}/iwlwifi-so-a0-*.pnvm
 
 %files -n libertas-usb8388-firmware
 %license WHENCE LICENCE.Marvell
@@ -423,8 +446,23 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %config(noreplace) %{_firmwarepath}/netronome/nic_AMDA*
 
 %changelog
-* Mon Nov 29 2021 Bruno Meneguele <bmeneg@redhat.com> - 20210702-104.gitd79c2677
+* Sun Apr 03 2022 Augusto Caringi <acaringi@redhat.com> - 20220209-107.git6342082c
-- Certain amdgpu firmware files cause random hangs with AMD Picasso / Raven Ridge APUs (rhbz 2018309)
+- Support QCA WCN6856 v2.1 Module: WIFI firmware (rhbz 2007902)
+
+* Thu Feb 10 2022 Augusto Caringi <acaringi@redhat.com> - 20220209-106.git6342082c
+- Update to latest upstream linux-firmware image for assorted updates
+- Include AMD GPU firmware fix (rhbz 2031172)
+- Support QCA WCN6856 v2.1 Module: Bluetooth firmware (rhbz 2007904)
+
+* Mon Dec 06 2021 Bruno Meneguele <bmeneg@redhat.com> - 20211119-105.gitf5d51956
+- Update to latest upstream linux-firmware image for assorted updates
+- Update to latest AMD GPU firmware (rhbz 1986660)
+
+* Thu Oct 07 2021 Bruno Meneguele <bmeneg@redhat.com> - 20211007-104.git7a300505
+- Update to latest upstream linux-firmware image for assorted updates
+- Certain amdgpu firmware files cause random hangs with AMD Picasso/Raven Ridge APUs (rhbz 2000879)
+- Support Intel CNVi AX211 Garfield Peak2 on ADL - Bluetooth (rhbz 1923179)
+- Support Intel CNVi AX211 Garfield Peak2 on ADL - WIFI (rhbz 1923175)
 
 * Fri Jul 02 2021 Bruno Meneguele <bmeneg@redhat.com> - 20210702-103.gitd79c2677
 - Update to latest upstream linux-firmware image for assorted updates