Re: [PATCH 3/6] accel/ivpu: Switch to generation based FW names

[Jeffrey Hugo]

On 7/31/2023 10:12 AM, Stanislaw Gruszka wrote:

From: Jacek Lawrynowicz 

Use VPU IP generation for naming FW instead of the platform name.

Signed-off-by: Jacek Lawrynowicz 
Reviewed-by: Stanislaw Gruszka 
Signed-off-by: Stanislaw Gruszka 


Reviewed-by: Jeffrey Hugo 

[PATCH 3/6] accel/ivpu: Switch to generation based FW names

[Stanislaw Gruszka]

From: Jacek Lawrynowicz 

Use VPU IP generation for naming FW instead of the platform name.

Signed-off-by: Jacek Lawrynowicz 
Reviewed-by: Stanislaw Gruszka 
Signed-off-by: Stanislaw Gruszka 
---
 drivers/accel/ivpu/ivpu_fw.c | 21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
index 317716482a15..7caf90a169a3 100644
--- a/drivers/accel/ivpu/ivpu_fw.c
+++ b/drivers/accel/ivpu/ivpu_fw.c
@@ -43,12 +43,18 @@ static char *ivpu_firmware;
 module_param_named_unsafe(firmware, ivpu_firmware, charp, 0644);
 MODULE_PARM_DESC(firmware, "VPU firmware binary in /lib/firmware/..");
 
+/* TODO: Remove mtl_vpu.bin from names after transition to generation based FW 
names */
+static struct {
+   int gen;
+   const char *name;
+} fw_names[] = {
+   { IVPU_HW_37XX, "vpu_37xx.bin" },
+   { IVPU_HW_37XX, "mtl_vpu.bin" },
+   { IVPU_HW_37XX, "intel/vpu/vpu_37xx_v0.0.bin" },
+};
+
 static int ivpu_fw_request(struct ivpu_device *vdev)
 {
-   static const char * const fw_names[] = {
-   "mtl_vpu.bin",
-   "intel/vpu/mtl_vpu_v0.0.bin"
-   };
int ret = -ENOENT;
int i;
 
@@ -60,9 +66,12 @@ static int ivpu_fw_request(struct ivpu_device *vdev)
}
 
for (i = 0; i < ARRAY_SIZE(fw_names); i++) {
-   ret = firmware_request_nowarn(>fw->file, fw_names[i], 
vdev->drm.dev);
+   if (fw_names[i].gen != ivpu_hw_gen(vdev))
+   continue;
+
+   ret = firmware_request_nowarn(>fw->file, 
fw_names[i].name, vdev->drm.dev);
if (!ret) {
-   vdev->fw->name = fw_names[i];
+   vdev->fw->name = fw_names[i].name;
return 0;
}
}
-- 
2.25.1