qcom: vpu: fix SC7280 VPU Gen2 firmware and add compatibility symlink

The earlier upstreamed firmware (vpu20_p1_gen2) for the SC7280 VPU was
incorrectly signed with an MBNv7 header. SC7280 only supports firmware
with an MBNv6 header, but this requirement was not communicated by the
developer who had validated the binary, leading to an incompatible
firmware being published to linux-firmware.

This change adds the correct and properly tested firmware image
vpu20_p1_gen2_s6.mbn, which is signed with an MBNv6 header and works on
SC7280 hardware.

Since some existing code references the older firmware name
vpu20_p1_gen2, add a compatibility link in WHENCE to preserve backwards
compatibility.

Signed-off-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>

diff --git a/WHENCE b/WHENCE
index 151daf289aa2f3d90bdedbfe852c33f15a908847..476d7b154a2cded5aaedf9350175c1cf35d198ed 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -6568,9 +6568,10 @@ https://developer.qualcomm.com/hardware/dragonboard-410c/tools
 
 Driver: iris - Qualcomm Iris video codec accelerator
 
-File: qcom/vpu/vpu20_p1_gen2.mbn
+File: qcom/vpu/vpu20_p1_gen2_s6.mbn
+Link: qcom/vpu/vpu20_p1_gen2.mbn -> vpu20_p1_gen2_s6.mbn
 
-Version: VIDEO.VPU.2.4.2-00025
+Version: VIDEO.VPU.3.4-0059
 
 File: qcom/vpu/vpu30_p4_s7.mbn
 Link: qcom/vpu/vpu30_p4.mbn -> vpu30_p4_s7.mbn

diff --git a/qcom/vpu/vpu20_p1_gen2.mbn b/qcom/vpu/vpu20_p1_gen2.mbn
deleted file mode 100644 (file)
index b597455..0000000
Binary files a/qcom/vpu/vpu20_p1_gen2.mbn and /dev/null differ

diff --git a/qcom/vpu/vpu20_p1_gen2_s6.mbn b/qcom/vpu/vpu20_p1_gen2_s6.mbn
new file mode 100644 (file)
index 0000000..90875df
Binary files /dev/null and b/qcom/vpu/vpu20_p1_gen2_s6.mbn differ