On Wed, Nov 30, 2016 at 03:31:33PM -0800, Anusha Srivatsa wrote:
> From: Peter Antoine <peter.anto...@intel.com>
> 
> The HuC authentication is done by host2guc call. The HuC RSA keys
> are sent to GuC for authentication.
> 
> v2: rebased on top of drm-intel-nightly.
>     changed name format and upped version 1.7.
> v3: rebased on top of drm-intel-nightly.
> v4: changed wait_for_automic to wait_for
> v5: rebased.
> v7: rebased.
> v8: rebased.
> v9: rebased. Rename intel_huc_auh() to intel_guc_auth_huc()
> and place the prototype in intel_guc.h,correct the comments.
> v10: rebased.
> v11: rebased.
> v12: rebased on top of drm-tip
> 
> Tested-by: Xiang Haihao <haihao.xi...@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.sriva...@intel.com>
> Signed-off-by: Alex Dai <yu....@intel.com>
> Signed-off-by: Peter Antoine <peter.anto...@intel.com>
> Reviewed-by: Dave Gordon <david.s.gor...@intel.com>
> Reviewed-by: Jeff McGee <jeff.mc...@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_guc_submission.c | 63 
> ++++++++++++++++++++++++++++++
>  drivers/gpu/drm/i915/intel_guc_fwif.h      |  1 +
>  drivers/gpu/drm/i915/intel_guc_loader.c    |  2 +
>  3 files changed, 66 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c 
> b/drivers/gpu/drm/i915/i915_guc_submission.c
> index 4bae8e4..d5c205d 100644
> --- a/drivers/gpu/drm/i915/i915_guc_submission.c
> +++ b/drivers/gpu/drm/i915/i915_guc_submission.c
> @@ -26,6 +26,7 @@
>  #include <linux/relay.h>
>  #include "i915_drv.h"
>  #include "intel_uc.h"
> +#include "intel_huc.h"
>  
>  /**
>   * DOC: GuC-based command submission
> @@ -1638,3 +1639,65 @@ int i915_guc_log_control(struct drm_i915_private 
> *dev_priv, u64 control_val)
>  
>       return ret;
>  }
> +
> +/**
> + * intel_guc_auth_huc() - authenticate ucode
> + * @dev: the drm device
> + *
> + * Triggers a HuC fw authentication request to the GuC via host-2-guc
> + * interface.
> + */
> +void intel_guc_auth_huc(struct drm_device *dev)

This should belong to intel_uc.c

> +{
> +     struct drm_i915_private *dev_priv = dev->dev_private;
> +     struct intel_guc *guc = &dev_priv->guc;
> +     struct intel_huc *huc = &dev_priv->huc;
> +     struct i915_vma *vma;
> +     int ret;
> +     u32 data[2];
> +
> +     /* Bypass the case where there is no HuC firmware */
> +     if (huc->huc_fw.fetch_status == UC_FIRMWARE_NONE ||
> +         huc->huc_fw.load_status == UC_FIRMWARE_NONE)
> +             return;
> +
> +     if (guc->guc_fw.load_status != UC_FIRMWARE_SUCCESS) {
> +             DRM_ERROR("HuC: GuC fw wasn't loaded. Can't authenticate");
> +             return;
> +     }
> +
> +     if (huc->huc_fw.load_status != UC_FIRMWARE_SUCCESS) {
> +             DRM_ERROR("HuC: fw wasn't loaded. Nothing to authenticate");
> +             return;
> +     }
> +
> +     vma = i915_gem_object_ggtt_pin(huc->huc_fw.uc_fw_obj, NULL, 0, 0, 0);
> +     if (IS_ERR(vma)) {
> +             DRM_DEBUG_DRIVER("pin failed %d\n", (int)PTR_ERR(vma));
> +             return;
> +     }
> +
> +
> +     /* Invalidate GuC TLB to let GuC take the latest updates to GTT. */
> +     I915_WRITE(GEN8_GTCR, GEN8_GTCR_INVALIDATE);
> +
> +     /* Specify auth action and where public signature is. */
> +     data[0] = HOST2GUC_ACTION_AUTHENTICATE_HUC;

s/HOST2GUC/INTEL_GUC/

> +     data[1] = i915_ggtt_offset(vma) + huc->huc_fw.rsa_offset;
> +
> +     ret = host2guc_action(guc, data, ARRAY_SIZE(data));

s/host2guc_action/intel_guc_send/

> +     if (ret) {
> +             DRM_ERROR("HuC: GuC did not ack Auth request\n");
> +             goto out;
> +     }
> +
> +     /* Check authentication status, it should be done by now */
> +     ret = wait_for((I915_READ(HUC_STATUS2) & HUC_FW_VERIFIED) > 0, 50);
> +     if (ret) {
> +             DRM_ERROR("HuC: Authentication failed\n");
> +             goto out;
> +     }
> +
> +out:
> +     i915_vma_unpin(vma);
> +}
> diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h 
> b/drivers/gpu/drm/i915/intel_guc_fwif.h
> index c07d9da..e51e063 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fwif.h
> +++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
> @@ -513,6 +513,7 @@ enum intel_guc_action {
>       INTEL_GUC_ACTION_EXIT_S_STATE = 0x502,
>       INTEL_GUC_ACTION_SLPC_REQUEST = 0x3003,
>       INTEL_GUC_ACTION_UK_LOG_ENABLE_LOGGING = 0x0E000,
> +     HOST2GUC_ACTION_AUTHENTICATE_HUC = 0x4000,

s/HOST2GUC/INTEL_GUC/

>       INTEL_GUC_ACTION_LIMIT
>  };
>  
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c 
> b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 7ca5556..31d09f8 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -529,6 +529,8 @@ int intel_guc_setup(struct drm_device *dev)
>               intel_uc_fw_status_repr(guc_fw->fetch_status),
>               intel_uc_fw_status_repr(guc_fw->load_status));
>  
> +     intel_guc_auth_huc(dev);
> +

You do not have this symbol declared in any header, it's not visible in
this compilation unit.

>       if (i915.enable_guc_submission) {
>               if (i915.guc_log_level >= 0)
>                       gen9_enable_guc_interrupts(dev_priv);
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Cheers,
Arek
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to