From 42f44e5508cc16c9e5d5d49732650a0b23101950 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 5 Jun 2025 13:14:49 -0400
Subject: [PATCH] linux-firmware: update to 20250509.

reapplies 112cfe8865a25af20d29de474450c5b5e0b1a227 with fixed ath12k firmware
---
 srcpkgs/linux-firmware/patches/ath12k.patch | 35 +++++++++++++++++++++
 srcpkgs/linux-firmware/template             | 20 +++++++++---
 srcpkgs/linux-firmware/update               |  1 -
 3 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/linux-firmware/patches/ath12k.patch
 delete mode 100644 srcpkgs/linux-firmware/update

diff --git a/srcpkgs/linux-firmware/patches/ath12k.patch b/srcpkgs/linux-firmware/patches/ath12k.patch
new file mode 100644
index 00000000000..8773332cb13
--- /dev/null
+++ b/srcpkgs/linux-firmware/patches/ath12k.patch
@@ -0,0 +1,35 @@
+From 2e91d8c3c4bd34a27177180a38f62d3ba3c96031 Mon Sep 17 00:00:00 2001
+From: Jeff Johnson <jjohnson@qti.qualcomm.com>
+Date: Fri, 23 May 2025 09:41:02 -0700
+Subject: [PATCH] ath12k: WCN7850 hw2.0: update to
+ WLAN.HMT.1.1.c5-00284.1-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
+
+Fix firmware load fail issue with some versions of WCN7850.
+
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220108
+Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2365882
+Closes: https://www.reddit.com/r/archlinux/comments/1kja6f9/ath12k_regression_on_latest_linuxfirmware_upgrade/
+Reported-by: Walt Holman <waltholman09@gmail.com>
+Closes: https://lore.kernel.org/all/CAMb39_m5Wm-5xjxYEJg4RxPZc1rdq0BkAJk_Q0B9APC3CAeORA@mail.gmail.com/
+Reported-by: Benjamin Eggerstedt <benjamin.eggerstedt@gmail.com>
+Closes: https://lore.kernel.org/all/EBAC1B61-E726-4614-9709-268CFF07007F@gmail.com/
+Fixes: aea9e010506e ("WCN7850 hw2.0: 1.1: add WLAN.HMT.1.1.c5-00284-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3")
+Signed-off-by: Jeff Johnson <jjohnson@qti.qualcomm.com>
+---
+ WHENCE                        |   2 +-
+ ath12k/WCN7850/hw2.0/amss.bin | Bin 6082624 -> 6078528 bytes
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/WHENCE b/WHENCE
+index 865552e9..93f849c4 100644
+--- a/WHENCE
++++ b/WHENCE
+@@ -3963,7 +3963,7 @@ Driver: ath12k - Qualcomm Technologies Wi-Fi 7 chipset support
+ File: ath12k/WCN7850/hw2.0/board-2.bin
+ File: ath12k/WCN7850/hw2.0/amss.bin
+ File: ath12k/WCN7850/hw2.0/m3.bin
+-Version: WLAN.HMT.1.1.c5-00284-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
++Version: WLAN.HMT.1.1.c5-00284.1-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
+ File: ath12k/WCN7850/hw2.0/Notice.txt
+ File: ath12k/QCN9274/hw2.0/board-2.bin
+ File: ath12k/QCN9274/hw2.0/firmware-2.bin
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index f535c221b15..29054e9473c 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,8 +1,7 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-reverts="20250509_1"
-version=20250311
-revision=1
+version=20250509
+revision=2
 hostmakedepends="rdfind which $(vopt_if compressed zstd)"
 depends="linux-firmware-amd>=${version}_${revision} linux-firmware-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -10,11 +9,17 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="custom:see /usr/share/licenses/linux-firmware"
 homepage="https://www.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/"
-distfiles="https://gitlab.com/kernel-firmware/linux-firmware/-/archive/${version}/linux-firmware-${version}.tar.gz"
-checksum=2a67a3fc91aea41679b8628909b0e47085e089163374f961a1ff94cd35a49ff7
+distfiles="https://gitlab.com/kernel-firmware/linux-firmware/-/archive/${version}/linux-firmware-${version}.tar.gz
+ https://gitlab.com/kernel-firmware/linux-firmware/-/raw/2e91d8c3c4bd34a27177180a38f62d3ba3c96031/ath12k/WCN7850/hw2.0/amss.bin>amss-${version}.bin"
+checksum="d990e2b1ed2aaf5d4d3bad2e3623710255ca5e62a6540e85193cc00d19d02b70
+ 8bc1952148d73c98dd620921e435668ec205b2548f1edfb86f8b8452b0807007"
 python_version=3
 nostrip=yes
 
+# include a newer version of this ath12k firmware until the fixed version is released
+# see also ath12k.patch
+skip_extraction="amss-${version}.bin"
+
 build_options="compressed"
 desc_option_compressed="compress firmware with zstd"
 
@@ -26,6 +31,11 @@ do_install() {
 		make install dedup FIRMWAREDIR=/usr/lib/firmware DESTDIR="$DESTDIR"
 	fi
 
+	# XXX: "patching" the new, fixed version of this firmware
+	vsrccopy "amss-${version}.bin" .
+	rm "${DESTDIR}"/usr/lib/firmware/ath12k/WCN7850/hw2.0/amss.bin
+	vinstall "amss-${version}.bin" 644 usr/lib/firmware/ath12k/WCN7850/hw2.0 amss.bin
+
 	for _l in LICEN* WHENCE
 	do
 		vlicense "$_l"
diff --git a/srcpkgs/linux-firmware/update b/srcpkgs/linux-firmware/update
deleted file mode 100644
index 8ec408ea6d9..00000000000
--- a/srcpkgs/linux-firmware/update
+++ /dev/null
@@ -1 +0,0 @@
-site="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/refs/tags"