Re: [PATCH] accel/ivpu: Use firmware names from upstream repo

[Lizhi Hou]

On 5/6/25 02:20, Jacek Lawrynowicz wrote:

Use FW names from linux-firmware repo instead of deprecated ones.

Fixes: c140244f0cfb ("accel/ivpu: Add initial Panther Lake support")
Cc: <sta...@vger.kernel.org> # v6.13+
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynow...@linux.intel.com>
---
  drivers/accel/ivpu/ivpu_fw.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
index ccaaf6c100c02..9db741695401e 100644
--- a/drivers/accel/ivpu/ivpu_fw.c
+++ b/drivers/accel/ivpu/ivpu_fw.c
@@ -55,18 +55,18 @@ static struct {
        int gen;
        const char *name;
  } fw_names[] = {
-       { IVPU_HW_IP_37XX, "vpu_37xx.bin" },
+       { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v1.bin" },

What if old only vpu_37xx.bin is installed but not intel/vpu/vpu_37xx_v1?

Maybe just put *_v1 line in front without removing { ..., "vpu_37xx.bin"} ?


Thanks,

Lizhi

        { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v0.0.bin" },
-       { IVPU_HW_IP_40XX, "vpu_40xx.bin" },
+       { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v1.bin" },
        { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },
-       { IVPU_HW_IP_50XX, "vpu_50xx.bin" },
+       { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v1.bin" },
        { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v0.0.bin" },
  };

/* Production fw_names from the table above */

-MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin");
-MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin");
-MODULE_FIRMWARE("intel/vpu/vpu_50xx_v0.0.bin");
+MODULE_FIRMWARE("intel/vpu/vpu_37xx_v1.bin");
+MODULE_FIRMWARE("intel/vpu/vpu_40xx_v1.bin");
+MODULE_FIRMWARE("intel/vpu/vpu_50xx_v1.bin");

static int ivpu_fw_request(struct ivpu_device *vdev)

  {