Re: [PATCH 4/5] staging: media: atomisp: sh_css_firmware: determine firmware version at runtime

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On 4/25/23 09:48, Kate Hsuan wrote:
> The firmware version of ISP2401 and 2400 is determined at runtime.
> 
> Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>

Regards,

Hans


> ---
>  .../media/atomisp/pci/sh_css_firmware.c        | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/staging/media/atomisp/pci/sh_css_firmware.c b/drivers/staging/media/atomisp/pci/sh_css_firmware.c
> index e7ef578db8ab..49ee88fe151d 100644
> --- a/drivers/staging/media/atomisp/pci/sh_css_firmware.c
> +++ b/drivers/staging/media/atomisp/pci/sh_css_firmware.c
> @@ -56,11 +56,8 @@ static struct firmware_header *firmware_header;
>   * which will be replaced with the actual RELEASE_VERSION
>   * during package generation. Please do not modify
>   */
> -#ifdef ISP2401
> -static const char *release_version = STR(irci_stable_candrpv_0415_20150521_0458);
> -#else
> -static const char *release_version = STR(irci_stable_candrpv_0415_20150423_1753);
> -#endif
> +static const char *release_version_2401 = STR(irci_stable_candrpv_0415_20150521_0458);
> +static const char *release_version_2400 = STR(irci_stable_candrpv_0415_20150423_1753);
>  
>  #define MAX_FW_REL_VER_NAME	300
>  static char FW_rel_ver_name[MAX_FW_REL_VER_NAME] = "---";
> @@ -191,8 +188,14 @@ sh_css_load_blob_info(const char *fw, const struct ia_css_fw_info *bi,
>  bool
>  sh_css_check_firmware_version(struct device *dev, const char *fw_data)
>  {
> +	const char *release_version;
>  	struct sh_css_fw_bi_file_h *file_header;
>  
> +	if (IS_ISP2401)
> +		release_version = release_version_2401;
> +	else
> +		release_version = release_version_2400;
> +
>  	firmware_header = (struct firmware_header *)fw_data;
>  	file_header = &firmware_header->file_header;
>  
> @@ -225,6 +228,7 @@ sh_css_load_firmware(struct device *dev, const char *fw_data,
>  		     unsigned int fw_size)
>  {
>  	unsigned int i;
> +	const char *release_version;
>  	struct ia_css_fw_info *binaries;
>  	struct sh_css_fw_bi_file_h *file_header;
>  	int ret;
> @@ -234,6 +238,10 @@ sh_css_load_firmware(struct device *dev, const char *fw_data,
>  	binaries = &firmware_header->binary_header;
>  	strscpy(FW_rel_ver_name, file_header->version,
>  		min(sizeof(FW_rel_ver_name), sizeof(file_header->version)));
> +	if (IS_ISP2401)
> +		release_version = release_version_2401;
> +	else
> +		release_version = release_version_2400;
>  	ret = sh_css_check_firmware_version(dev, fw_data);
>  	if (ret) {
>  		IA_CSS_ERROR("CSS code version (%s) and firmware version (%s) mismatch!",





[Index of Archives]     [Linux Driver Development]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux