[Intel-gfx] [PATCH 05/10] drm/i915: Reorganize HuC authentication

[Michal Wajdeczko]

On Sun, 17 Sep 2017 14:17:29 +0200, Sagar Arun Kamble  
<sagar.a.kamble at intel.com> wrote:

> Prepared intel_auth_huc to separate HuC specific functionality
> from GuC send action. Created new header intel_huc.h to group
> HuC specific declarations.
>
> v2: Changed argument preparation for AUTHENTICATE_HUC.
> s/intel_auth_huc/intel_huc_auth. Deferred creation of intel_huc.h
> to later patch.
>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Michał Winiarski <michal.winiarski at intel.com>
> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_guc.c | 18 ++++++++++++++++++
>  drivers/gpu/drm/i915/intel_guc.h |  1 +
>  drivers/gpu/drm/i915/intel_huc.c | 21 ++++++---------------
>  drivers/gpu/drm/i915/intel_uc.c  |  2 +-
>  drivers/gpu/drm/i915/intel_uc.h  |  2 +-
>  5 files changed, 27 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc.c  
> b/drivers/gpu/drm/i915/intel_guc.c
> index 0767ec2..b250f39 100644
> --- a/drivers/gpu/drm/i915/intel_guc.c
> +++ b/drivers/gpu/drm/i915/intel_guc.c
> @@ -145,3 +145,21 @@ int intel_guc_sample_forcewake(struct intel_guc  
> *guc)
> 	return intel_guc_send(guc, action, ARRAY_SIZE(action));
>  }
> +
> +/**
> + * intel_guc_auth_huc() - authenticate ucode
> + * @guc: struct intel_guc*
> + * @offset: rsa offset w.r.t GGTT base of huc vma
> + *
> + * Triggers a HuC fw authentication request to the GuC via  
> intel_guc_send
> + * AUTHENTICATE_HUC interface.
> + */
> +int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset)
> +{
> +	u32 action[] = {
> +		INTEL_GUC_ACTION_AUTHENTICATE_HUC,
> +		rsa_offset
> +	};
> +
> +	return intel_guc_send(guc, action, ARRAY_SIZE(action));
> +}
> diff --git a/drivers/gpu/drm/i915/intel_guc.h  
> b/drivers/gpu/drm/i915/intel_guc.h
> index 919b6e1..e7b9a8b 100644
> --- a/drivers/gpu/drm/i915/intel_guc.h
> +++ b/drivers/gpu/drm/i915/intel_guc.h
> @@ -147,6 +147,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma  
> *vma)
>  void intel_guc_init_send_regs(struct intel_guc *guc);
>  int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32  
> len);
>  int intel_guc_sample_forcewake(struct intel_guc *guc);
> +int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);
> /* intel_guc_loader.c */
>  int intel_guc_select_fw(struct intel_guc *guc);
> diff --git a/drivers/gpu/drm/i915/intel_huc.c  
> b/drivers/gpu/drm/i915/intel_huc.c
> index b81c6af..6ecf344 100644
> --- a/drivers/gpu/drm/i915/intel_huc.c
> +++ b/drivers/gpu/drm/i915/intel_huc.c
> @@ -226,19 +226,15 @@ void intel_huc_init_hw(struct intel_huc *huc)
>  }
> /**
> - * intel_guc_auth_huc() - authenticate ucode
> - * @dev_priv: the drm_i915_device
> - *
> - * Triggers a HuC fw authentication request to the GuC via  
> intel_guc_action_
> - * authenticate_huc interface.
> + * intel_huc_auth() - authenticate ucode

Add param description. With that fixed,

Reviewed-by: Michal Wajdeczko <michal.wajdeczko at intel.com>


>   */
> -void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
> +void intel_huc_auth(struct intel_huc *huc)
>  {
> +	struct drm_i915_private *dev_priv = huc_to_i915(huc);
>  	struct intel_guc *guc = &dev_priv->guc;
> -	struct intel_huc *huc = &dev_priv->huc;
>  	struct i915_vma *vma;
> +	u32 offset;
>  	int ret;
> -	u32 data[2];
> 	if (huc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
>  		return;
> @@ -251,11 +247,8 @@ void intel_guc_auth_huc(struct drm_i915_private  
> *dev_priv)
>  		return;
>  	}
> -	/* Specify auth action and where public signature is. */
> -	data[0] = INTEL_GUC_ACTION_AUTHENTICATE_HUC;
> -	data[1] = guc_ggtt_offset(vma) + huc->fw.rsa_offset;
> -
> -	ret = intel_guc_send(guc, data, ARRAY_SIZE(data));
> +	offset = guc_ggtt_offset(vma) + huc->fw.rsa_offset;
> +	ret = intel_guc_auth_huc(guc, offset);
>  	if (ret) {
>  		DRM_ERROR("HuC: GuC did not ack Auth request %d\n", ret);
>  		goto out;
> @@ -267,7 +260,6 @@ void intel_guc_auth_huc(struct drm_i915_private  
> *dev_priv)
>  				HUC_FW_VERIFIED,
>  				HUC_FW_VERIFIED,
>  				50);
> -
>  	if (ret) {
>  		DRM_ERROR("HuC: Authentication failed %d\n", ret);
>  		goto out;
> @@ -276,4 +268,3 @@ void intel_guc_auth_huc(struct drm_i915_private  
> *dev_priv)
>  out:
>  	i915_vma_unpin(vma);
>  }
> -
> diff --git a/drivers/gpu/drm/i915/intel_uc.c  
> b/drivers/gpu/drm/i915/intel_uc.c
> index 4f8f0ff..9a0006a 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -352,7 +352,7 @@ int intel_uc_init_hw(struct drm_i915_private  
> *dev_priv)
>  	if (ret)
>  		goto err_log_capture;
> -	intel_guc_auth_huc(dev_priv);
> +	intel_huc_auth(&dev_priv->huc);
>  	if (i915.enable_guc_submission) {
>  		if (i915.guc_log_level >= 0)
>  			gen9_enable_guc_interrupts(dev_priv);
> diff --git a/drivers/gpu/drm/i915/intel_uc.h  
> b/drivers/gpu/drm/i915/intel_uc.h
> index 30902f3..aad0b1c 100644
> --- a/drivers/gpu/drm/i915/intel_uc.h
> +++ b/drivers/gpu/drm/i915/intel_uc.h
> @@ -116,6 +116,6 @@ struct intel_huc {
>  /* intel_huc.c */
>  void intel_huc_select_fw(struct intel_huc *huc);
>  void intel_huc_init_hw(struct intel_huc *huc);
> -void intel_guc_auth_huc(struct drm_i915_private *dev_priv);
> +void intel_huc_auth(struct intel_huc *huc);
> #endif