Re: [Intel-gfx] [PATCH] drm/i915/huc: Mark firmware as failed on auth failure

[Chris Wilson]

Quoting Michal Wajdeczko (2018-02-20 22:52:55)
> If we fail to authenticate HuC firmware, we should change
> its load status to FAIL. While around, print HUC_STATUS
> on firmware verification failure.
> 
> Signed-off-by: Michal Wajdeczko 
> Cc: Rodrigo Vivi 
> Cc: Anusha Srivatsa 
> ---
>  drivers/gpu/drm/i915/intel_huc.c | 28 ++--
>  1 file changed, 18 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_huc.c 
> b/drivers/gpu/drm/i915/intel_huc.c
> index ef9a05d..c7ba6e1 100644
> --- a/drivers/gpu/drm/i915/intel_huc.c
> +++ b/drivers/gpu/drm/i915/intel_huc.c
> @@ -201,6 +201,7 @@ int intel_huc_auth(struct intel_huc *huc)
> struct intel_guc *guc = &i915->guc;
> struct i915_vma *vma;
> int ret;
> +   u32 status;

Try to keep the variables sorted by length, unless for a good reason.

>  
> if (huc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
> return -ENOEXEC;
> @@ -210,28 +211,35 @@ int intel_huc_auth(struct intel_huc *huc)
> if (IS_ERR(vma)) {
> ret = PTR_ERR(vma);
> DRM_ERROR("HuC: Failed to pin huc fw object %d\n", ret);
> -   return ret;
> +   goto fail;
> }
>  
> ret = intel_guc_auth_huc(guc,
>  guc_ggtt_offset(vma) + huc->fw.rsa_offset);
> if (ret) {
> DRM_ERROR("HuC: GuC did not ack Auth request %d\n", ret);
> -   goto out;
> +   goto fail_unpin;
> }
>  
> /* Check authentication status, it should be done by now */
> -   ret = intel_wait_for_register(i915,
> - HUC_STATUS2,
> - HUC_FW_VERIFIED,
> - HUC_FW_VERIFIED,
> - 50);
> +   ret = __intel_wait_for_register(i915,
> +   HUC_STATUS2,
> +   HUC_FW_VERIFIED,
> +   HUC_FW_VERIFIED,
> +   2, 50, &status);

We need to wait for a backmerge before we can apply.

Reviewed-by: Chris Wilson 
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915/huc: Mark firmware as failed on auth failure

[Michal Wajdeczko]

If we fail to authenticate HuC firmware, we should change
its load status to FAIL. While around, print HUC_STATUS
on firmware verification failure.

Signed-off-by: Michal Wajdeczko 
Cc: Rodrigo Vivi 
Cc: Anusha Srivatsa 
---
 drivers/gpu/drm/i915/intel_huc.c | 28 ++--
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index ef9a05d..c7ba6e1 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -201,6 +201,7 @@ int intel_huc_auth(struct intel_huc *huc)
struct intel_guc *guc = &i915->guc;
struct i915_vma *vma;
int ret;
+   u32 status;
 
if (huc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
return -ENOEXEC;
@@ -210,28 +211,35 @@ int intel_huc_auth(struct intel_huc *huc)
if (IS_ERR(vma)) {
ret = PTR_ERR(vma);
DRM_ERROR("HuC: Failed to pin huc fw object %d\n", ret);
-   return ret;
+   goto fail;
}
 
ret = intel_guc_auth_huc(guc,
 guc_ggtt_offset(vma) + huc->fw.rsa_offset);
if (ret) {
DRM_ERROR("HuC: GuC did not ack Auth request %d\n", ret);
-   goto out;
+   goto fail_unpin;
}
 
/* Check authentication status, it should be done by now */
-   ret = intel_wait_for_register(i915,
- HUC_STATUS2,
- HUC_FW_VERIFIED,
- HUC_FW_VERIFIED,
- 50);
+   ret = __intel_wait_for_register(i915,
+   HUC_STATUS2,
+   HUC_FW_VERIFIED,
+   HUC_FW_VERIFIED,
+   2, 50, &status);
if (ret) {
-   DRM_ERROR("HuC: Authentication failed %d\n", ret);
-   goto out;
+   DRM_ERROR("HuC: Firmware not verified %#x\n", status);
+   goto fail_unpin;
}
 
-out:
i915_vma_unpin(vma);
+   return 0;
+
+fail_unpin:
+   i915_vma_unpin(vma);
+fail:
+   huc->fw.load_status = INTEL_UC_FIRMWARE_FAIL;
+
+   DRM_ERROR("HuC: Authentication failed %d\n", ret);
return ret;
 }
-- 
1.9.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx