[Intel-gfx] [PATCH 05/11] drm/i915: Reorganize HuC authentication
Michal Wajdeczko
michal.wajdeczko at intel.com
Sat Sep 16 11:25:51 UTC 2017
On Fri, 15 Sep 2017 23:06:23 +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.
>
> 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 | 19 +++++++++++++++++++
> drivers/gpu/drm/i915/intel_guc.h | 1 +
> drivers/gpu/drm/i915/intel_huc.c | 21 ++++++---------------
> drivers/gpu/drm/i915/intel_huc.h | 30 ++++++++++++++++++++++++++++++
> drivers/gpu/drm/i915/intel_uc.c | 3 ++-
> drivers/gpu/drm/i915/intel_uc.h | 1 -
> 6 files changed, 58 insertions(+), 17 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/intel_huc.h
>
> diff --git a/drivers/gpu/drm/i915/intel_guc.c
> b/drivers/gpu/drm/i915/intel_guc.c
> index 0767ec2..b507e71 100644
> --- a/drivers/gpu/drm/i915/intel_guc.c
> +++ b/drivers/gpu/drm/i915/intel_guc.c
> @@ -145,3 +145,22 @@ 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 data[2];
> +
> + /* Specify auth action and where public signature is. */
> + data[0] = INTEL_GUC_ACTION_AUTHENTICATE_HUC;
> + data[1] = rsa_offset;
In most of other functions we're defining guc command like this:
u32 action[];
INTEL_GUC_ACTION_AUTHENTICATE_HUC,
rsa_offset
};
> +
> + return intel_guc_send(guc, data, ARRAY_SIZE(data));
> +}
> diff --git a/drivers/gpu/drm/i915/intel_guc.h
> b/drivers/gpu/drm/i915/intel_guc.h
> index 06f2d27..34bf497 100644
> --- a/drivers/gpu/drm/i915/intel_guc.h
> +++ b/drivers/gpu/drm/i915/intel_guc.h
> @@ -42,5 +42,6 @@ static inline void intel_guc_notify(struct intel_guc
> *guc)
> 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);
> #endif
> diff --git a/drivers/gpu/drm/i915/intel_huc.c
> b/drivers/gpu/drm/i915/intel_huc.c
> index b81c6af..57fb08f 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_auth_huc() - authenticate ucode
> */
> -void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
> +void intel_auth_huc(struct intel_huc *huc)
s/intel_auth_huc/intel_huc_auth to match naming convention
> {
> + 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_huc.h
> b/drivers/gpu/drm/i915/intel_huc.h
> new file mode 100644
> index 0000000..6277e1f
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/intel_huc.h
> @@ -0,0 +1,30 @@
> +/*
> + * Copyright © 2017 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person
> obtaining a
> + * copy of this software and associated documentation files (the
> "Software"),
> + * to deal in the Software without restriction, including without
> limitation
> + * the rights to use, copy, modify, merge, publish, distribute,
> sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the
> next
> + * paragraph) shall be included in all copies or substantial portions
> of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
> SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +#ifndef _INTEL_HUC_H_
> +#define _INTEL_HUC_H_
> +
> +/* intel_huc.c */
> +void intel_auth_huc(struct intel_huc *huc);
> +
> +#endif
I would postpone creation of intel_huc.h to separate patch, as then
more related changes can be done at once.
Michal
> diff --git a/drivers/gpu/drm/i915/intel_uc.c
> b/drivers/gpu/drm/i915/intel_uc.c
> index 4f8f0ff..c7cc8c46 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -25,6 +25,7 @@
> #include "i915_drv.h"
> #include "intel_uc.h"
> #include "intel_guc.h"
> +#include "intel_huc.h"
> #include <linux/firmware.h>
> /* Cleans up uC firmware by releasing the firmware GEM obj.
> @@ -352,7 +353,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_auth_huc(&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 bbba6c4..0c44d5a 100644
> --- a/drivers/gpu/drm/i915/intel_uc.h
> +++ b/drivers/gpu/drm/i915/intel_uc.h
> @@ -241,6 +241,5 @@ static inline u32 guc_ggtt_offset(struct i915_vma
> *vma)
> /* 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);
> #endif
More information about the Intel-gfx
mailing list