diff mbox series

[v2] drm/i915/huc: silence injected failure in the load via GSC path

Message ID 20230816231320.1555190-1-daniele.ceraolospurio@intel.com (mailing list archive)
State New, archived
Headers show
Series [v2] drm/i915/huc: silence injected failure in the load via GSC path | expand

Commit Message

Daniele Ceraolo Spurio Aug. 16, 2023, 11:13 p.m. UTC 
If we can't load the HuC due to an injected failure, we don't want
to throw and error and trip CI. Using the gt_probe_error macro for
logging ensure that the error is only printed if it wasn't explicitly
injected.

v2: keep the line to less than 100 characters (checkpatch).

Link: https://gitlab.freedesktop.org/drm/intel/-/issues/7061
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> #v1
---
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

John Harrison Sept. 7, 2023, 9:13 p.m. UTC | #1 
On 8/16/2023 16:13, Daniele Ceraolo Spurio wrote:
> If we can't load the HuC due to an injected failure, we don't want
> to throw and error and trip CI. Using the gt_probe_error macro for
> logging ensure that the error is only printed if it wasn't explicitly
> injected.
>
> v2: keep the line to less than 100 characters (checkpatch).
>
> Link: https://gitlab.freedesktop.org/drm/intel/-/issues/7061
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> #v1
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>

Although aren't we supposed to be using %pe / PTR_ERR(ret) these days? 
Not a blocker but for future reference.

John.

> ---
>   drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
> index f89a1f80f50e..bb58fa9579b8 100644
> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
> @@ -9,6 +9,7 @@
>   #include <drm/i915_component.h>
>   
>   #include "gem/i915_gem_lmem.h"
> +#include "gt/intel_gt_print.h"
>   
>   #include "i915_drv.h"
>   #include "gt/intel_gt.h"
> @@ -156,7 +157,8 @@ static int i915_pxp_tee_component_bind(struct device *i915_kdev,
>   {
>   	struct drm_i915_private *i915 = kdev_to_i915(i915_kdev);
>   	struct intel_pxp *pxp = i915->pxp;
> -	struct intel_uc *uc = &pxp->ctrl_gt->uc;
> +	struct intel_gt *gt = pxp->ctrl_gt;
> +	struct intel_uc *uc = &gt->uc;
>   	intel_wakeref_t wakeref;
>   	int ret = 0;
>   
> @@ -176,7 +178,7 @@ static int i915_pxp_tee_component_bind(struct device *i915_kdev,
>   			/* load huc via pxp */
>   			ret = intel_huc_fw_load_and_auth_via_gsc(&uc->huc);
>   			if (ret < 0)
> -				drm_err(&i915->drm, "failed to load huc via gsc %d\n", ret);
> +				gt_probe_error(gt, "failed to load huc via gsc %d\n", ret);
>   		}
>   	}
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
index f89a1f80f50e..bb58fa9579b8 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
@@ -9,6 +9,7 @@ 
 #include <drm/i915_component.h>
 
 #include "gem/i915_gem_lmem.h"
+#include "gt/intel_gt_print.h"
 
 #include "i915_drv.h"
 #include "gt/intel_gt.h"
@@ -156,7 +157,8 @@  static int i915_pxp_tee_component_bind(struct device *i915_kdev,
 {
 	struct drm_i915_private *i915 = kdev_to_i915(i915_kdev);
 	struct intel_pxp *pxp = i915->pxp;
-	struct intel_uc *uc = &pxp->ctrl_gt->uc;
+	struct intel_gt *gt = pxp->ctrl_gt;
+	struct intel_uc *uc = &gt->uc;
 	intel_wakeref_t wakeref;
 	int ret = 0;
 
@@ -176,7 +178,7 @@  static int i915_pxp_tee_component_bind(struct device *i915_kdev,
 			/* load huc via pxp */
 			ret = intel_huc_fw_load_and_auth_via_gsc(&uc->huc);
 			if (ret < 0)
-				drm_err(&i915->drm, "failed to load huc via gsc %d\n", ret);
+				gt_probe_error(gt, "failed to load huc via gsc %d\n", ret);
 		}
 	}