From af9e0d79e7350e76dfabf85d28b2ad9563c27fad Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Tue, 25 Feb 2025 05:18:36 +0100
Subject: [PATCH] Update firmware for Intel Meteor Lake NPU

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
---
 .gitignore          |  2 ++
 linux-firmware.spec | 19 +++++++++++++++++--
 sources             |  2 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fae0592..4282396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /linux-firmware-*.tar.gz
 /linux-firmware-*.tar.bz2
 /linux-firmware-*.tar.xz
+/vpu_37xx_v0.0.bin
+/vpu_40xx_v0.0.bin
diff --git a/linux-firmware.spec b/linux-firmware.spec
index 0f32eb9..538e4c0 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -5,13 +5,15 @@
 
 Name:		linux-firmware
 Version:	20250212
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Firmware files used by the Linux kernel
 License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
 URL:		http://www.kernel.org/
 BuildArch:	noarch
 
 Source0:	https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz
+Source20:	vpu_37xx_v0.0.bin
+Source21:	vpu_40xx_v0.0.bin
 
 BuildRequires:	git-core
 BuildRequires:	make
@@ -308,8 +310,17 @@ make DESTDIR=%{buildroot}/ FIRMWAREDIR=%{_firmwarepath} install-xz
 make DESTDIR=%{buildroot}/ FIRMWAREDIR=%{_firmwarepath} install
 %endif
 
-#Cleanup files we don't want to ship
 pushd %{buildroot}/%{_firmwarepath}
+
+# Intel NPU
+mkdir -p intel/vpu
+# vpu_37xx_v0.0.bin
+cp %{SOURCE20} intel/vpu
+ln -s vpu_37xx_v0.0.bin intel/vpu/mtl_vpu_v0.0.bin
+# vpu_40xx_v0.0.bin
+cp %{SOURCE21} intel/vpu
+# vpu_50xx_v0.0.bin not yet available
+
 # Move amd-ucode readme to docs directory due to dracut issue (RHEL-15387)
 mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}/amd-ucode
 %if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
@@ -633,6 +644,10 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %{_firmwarepath}/v4l-cx2*
 
 %changelog
+* Tue Feb 25 2025 Denys Vlasenko <dvlasenk@redhat.com> - 20250212-14
+- accel: ivpu: Update firmware for NPU (RHEL-38586)
+Resolves: RHEL-38586
+
 * Wed Feb 12 2025 Denys Vlasenko <dvlasenk@redhat.com> - 20250212-13
 - Missing firmware for the enablement of TI AMP TAS2781 SPI driver (RHEL-78328)
 - MI325 GPU firmware (RHEL-78328)
diff --git a/sources b/sources
index 6331d8c..d66afa1 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 SHA512 (linux-firmware-20250212.tar.xz) = c182bccbeecd6919d1dbd6ebecc4e3e44294d0cf8d8459711139c50ed4fd37462a0114f89bb64870ac5a3bc91959a82690bb73ed023ac9cc3750ba77be5640fd
+SHA512 (vpu_37xx_v0.0.bin) = dc9d4023928a94519469d959d08f6394bb9a3188e4c5a3f09d61640561553d5b2999720dd5f9ba8b488d716f51844d23bc607e493a24a664054d732288d343e6
+SHA512 (vpu_40xx_v0.0.bin) = 625ac629c8ac5e16509a605c63866662c580ed3731487334160351f3468f53a93f964b3faf24556ceec5a9d116bb84735d3c665fbd65a7bc4706438a18c770d6