[Intel-gfx] [PATCH v4 6/6] drm/i915/huc: Add BXT HuC Loading Support

[Antoine, Peter]

The number of dull conversations I have had about the format of the uC firmware names are legion.
I will be glad to never have another. It is now someones elses problem.

Thanks for the review.

Peter.

-----Original Message-----
From: Gordon, David S 
Sent: Thursday, August 11, 2016 5:31 PM
To: Antoine, Peter <peter.antoine at intel.com>; intel-gfx at lists.freedesktop.org
Subject: Re: [PATCH v4 6/6] drm/i915/huc: Add BXT HuC Loading Support

On 04/08/16 09:16, Peter Antoine wrote:
> This patch adds the HuC Loading for the BXT.
> Version 1.7 of the HuC firmware.
>
> v2: rebased.
> v3: rebased.
>     changed file name to match the install package format.
> v4: rebased.
>
> Signed-off-by: Peter Antoine <peter.antoine at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_huc_loader.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_huc_loader.c 
> b/drivers/gpu/drm/i915/intel_huc_loader.c
> index 21393ad..3588a95 100644
> --- a/drivers/gpu/drm/i915/intel_huc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_huc_loader.c
> @@ -49,6 +49,9 @@
>  #define I915_SKL_HUC_UCODE "i915/skl_huc_ver01_07_1398.bin"
>  MODULE_FIRMWARE(I915_SKL_HUC_UCODE);
>
> +#define I915_BXT_HUC_UCODE "i915/bxt_huc_ver01_07_1398.bin"
> +MODULE_FIRMWARE(I915_BXT_HUC_UCODE);

We don't really want to use this format for the firmware name.
But we'll fix that in the next version, when the naming gets unified across all the uC devices :) So

Reviewed-by: Dave Gordon <david.s.gordon at intel.com>

>  /**
>   * intel_huc_load_ucode() - DMA's the firmware
>   * @dev: the drm device
> @@ -157,6 +160,10 @@ void intel_huc_init(struct drm_device *dev)
>  		fw_path = I915_SKL_HUC_UCODE;
>  		huc_fw->major_ver_wanted = 1;
>  		huc_fw->minor_ver_wanted = 7;
> +	} else if (IS_BROXTON(dev_priv)) {
> +		fw_path = I915_BXT_HUC_UCODE;
> +		huc_fw->major_ver_wanted = 1;
> +		huc_fw->minor_ver_wanted = 7;
>  	}
>
>  	if (fw_path == NULL)
>