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

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/7061Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> #v1
Reviewed-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230816231320.1555190-1-daniele.ceraolospurio@intel.com
parent 4485bd51
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <drm/i915_component.h> #include <drm/i915_component.h>
#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_lmem.h"
#include "gt/intel_gt_print.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "gt/intel_gt.h" #include "gt/intel_gt.h"
...@@ -155,7 +156,8 @@ static int i915_pxp_tee_component_bind(struct device *i915_kdev, ...@@ -155,7 +156,8 @@ static int i915_pxp_tee_component_bind(struct device *i915_kdev,
{ {
struct drm_i915_private *i915 = kdev_to_i915(i915_kdev); struct drm_i915_private *i915 = kdev_to_i915(i915_kdev);
struct intel_pxp *pxp = i915->pxp; 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; intel_wakeref_t wakeref;
int ret = 0; int ret = 0;
...@@ -175,7 +177,7 @@ static int i915_pxp_tee_component_bind(struct device *i915_kdev, ...@@ -175,7 +177,7 @@ static int i915_pxp_tee_component_bind(struct device *i915_kdev,
/* load huc via pxp */ /* load huc via pxp */
ret = intel_huc_fw_load_and_auth_via_gsc(&uc->huc); ret = intel_huc_fw_load_and_auth_via_gsc(&uc->huc);
if (ret < 0) 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);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment