Hi, thanks for the commit.
On 05.07.2024 13:14, Alexander F. Lent wrote:
> Modules that load firmware from various paths at runtime must declare
> those paths at compile time, via the MODULE_FIRMWARE macro, so that the
> firmware paths are included in the module's metadata.
>
> The accel/ivpu driver loaded firmware but lacked this metadata,
> preventing dracut from correctly locating firmware files.
>
> Fixes: 9ab43e95f922 ("accel/ivpu: Switch to generation based FW names")
> Fixes: 02d5b0aacd05 ("accel/ivpu: Implement firmware parsing and booting")
> Signed-off-by: Alexander F. Lent <lx@xxxxxxxxxxxxxx>
> ---
> drivers/accel/ivpu/ivpu_fw.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
> index 1457300828bf..51792a00b7e3 100644
> --- a/drivers/accel/ivpu/ivpu_fw.c
> +++ b/drivers/accel/ivpu/ivpu_fw.c
> @@ -48,16 +48,26 @@ static char *ivpu_firmware;
> module_param_named_unsafe(firmware, ivpu_firmware, charp, 0644);
> MODULE_PARM_DESC(firmware, "NPU firmware binary in /lib/firmware/..");
>
> +#define IVPU_FW_PATH_37XX_BIN "vpu_37xx.bin"
> +#define IVPU_FW_PATH_37XX_V0_BIN "intel/vpu/vpu_37xx_v0.0.bin"
> +#define IVPU_FW_PATH_40XX_BIN "vpu_40xx.bin"
> +#define IVPU_FW_PATH_40XX_V0_BIN "intel/vpu/vpu_40xx_v0.0.bin"
> +
> static struct {
> int gen;
> const char *name;
> } fw_names[] = {
> - { IVPU_HW_37XX, "vpu_37xx.bin" },
> - { IVPU_HW_37XX, "intel/vpu/vpu_37xx_v0.0.bin" },
> - { IVPU_HW_40XX, "vpu_40xx.bin" },
> - { IVPU_HW_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },
> + { IVPU_HW_37XX, IVPU_FW_PATH_37XX_BIN },
> + { IVPU_HW_37XX, IVPU_FW_PATH_37XX_V0_BIN },
> + { IVPU_HW_40XX, IVPU_FW_PATH_40XX_BIN },
> + { IVPU_HW_40XX, IVPU_FW_PATH_40XX_V0_BIN },
> };
>
> +MODULE_FIRMWARE(IVPU_FW_PATH_37XX_BIN);
> +MODULE_FIRMWARE(IVPU_FW_PATH_37XX_V0_BIN);
> +MODULE_FIRMWARE(IVPU_FW_PATH_40XX_BIN);
> +MODULE_FIRMWARE(IVPU_FW_PATH_40XX_V0_BIN);
Include only V0 variants, FW names without version are used for development and they wont be included in any distribution.
I would also skip macros and just use literal strings as macros add a lot of lines that don't increase readability.
Regards,
Jacek
