[kernel-snaps-uc22/main][PATCH] trim-firmware: copy pnvm settings

[Dimitri John Ledkov]

BugLink: https://bugs.launchpad.net/bugs/1999396

iwlwifi driver loads pnvm settings from a UEFI variable, and if
absent, fallsback to loading settings from a firmware file. At the
moment these are not declared by the module. Add custom logic to check
and copy pnvm settings for any matching iwlwifi ucode files.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
---
 trim-firmware | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/trim-firmware b/trim-firmware
index c590aa2114..148c964572 100755
--- a/trim-firmware
+++ b/trim-firmware
@@ -100,6 +100,16 @@ if [ -d "${DESTDIR}"/modules/*/kernel/sound/soc/sof/intel/ ] && \
     cp -r "${DESTDIR}"/firmware/intel/sof-tplg "${DESTDIR}"/firmware.new/intel/
 fi
 
+# Undeclared PNVM fallback settings LP: #1999396
+for ucode in "${DESTDIR}"/firmware/iwlwifi-*.ucode; do
+	if [ -e $ucode ]; then
+		pnvm_file=$(basename $ucode | sed -n 's/\(iwlwifi-.*\)-[0-9]*.ucode/\1.pnvm/p')
+		if [ -e "${DESTDIR}"/firmware/$pnvm_file ]; then
+			cp "${DESTDIR}"/firmware/$pnvm_file "${DESTDIR}"/firmware.new/$pnvm_file
+		fi
+	fi
+done
+
 # Switch to the new firmware directory
 rm -rf "${DESTDIR}"/firmware
 mv "${DESTDIR}"/firmware.new "${DESTDIR}"/firmware
-- 
2.34.1