* [CI 1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw
@ 2017-01-20 19:23 Michał Winiarski
2017-01-20 19:23 ` [CI 2/3] drm/i915/huc: Assert that HuC vma is placed in GuC accessible range Michał Winiarski
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Michał Winiarski @ 2017-01-20 19:23 UTC (permalink / raw)
To: intel-gfx
HuC authentication is called even if HuC firmware is not present in the
system, leading to NULL ptr dereference on not allocated gem_object.
Let's avoid trying to authenticate HuC if its firmware is not loaded
successfully.
Fixes: dac84a388528 ("drm/i915/huc: Support HuC authentication")
v2: Check inside the auth function, split the assert (Michał)
v3: Oops, hit send before compiling, s/huc_fw/huc->fw
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
drivers/gpu/drm/i915/intel_huc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index 897ef31..5edd4f7 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -299,6 +299,9 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
int ret;
u32 data[2];
+ if (huc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
+ return;
+
vma = i915_gem_object_ggtt_pin(huc->fw.obj, NULL, 0, 0,
PIN_OFFSET_BIAS | GUC_WOPCM_TOP);
if (IS_ERR(vma)) {
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* [CI 2/3] drm/i915/huc: Assert that HuC vma is placed in GuC accessible range
2017-01-20 19:23 [CI 1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw Michał Winiarski
@ 2017-01-20 19:23 ` Michał Winiarski
2017-01-20 19:23 ` [CI 3/3] HAX enable guc loading for CI Michał Winiarski
2017-01-20 19:54 ` ✗ Fi.CI.BAT: failure for series starting with [CI,1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Michał Winiarski @ 2017-01-20 19:23 UTC (permalink / raw)
To: intel-gfx
HuC firmware is mapped at GuC accessible range. Let's add an assert to
verify that.
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
drivers/gpu/drm/i915/intel_huc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index 5edd4f7..c144609 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -312,7 +312,7 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
/* Specify auth action and where public signature is. */
data[0] = INTEL_GUC_ACTION_AUTHENTICATE_HUC;
- data[1] = i915_ggtt_offset(vma) + huc->fw.rsa_offset;
+ data[1] = guc_ggtt_offset(vma) + huc->fw.rsa_offset;
ret = intel_guc_send(guc, data, ARRAY_SIZE(data));
if (ret) {
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* [CI 3/3] HAX enable guc loading for CI
2017-01-20 19:23 [CI 1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw Michał Winiarski
2017-01-20 19:23 ` [CI 2/3] drm/i915/huc: Assert that HuC vma is placed in GuC accessible range Michał Winiarski
@ 2017-01-20 19:23 ` Michał Winiarski
2017-01-20 19:54 ` ✗ Fi.CI.BAT: failure for series starting with [CI,1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Michał Winiarski @ 2017-01-20 19:23 UTC (permalink / raw)
To: intel-gfx
---
drivers/gpu/drm/i915/i915_params.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 0e280fb..90d838f 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -56,7 +56,7 @@ struct i915_params i915 __read_mostly = {
.verbose_state_checks = 1,
.nuclear_pageflip = 0,
.edp_vswing = 0,
- .enable_guc_loading = 0,
+ .enable_guc_loading = 1,
.enable_guc_submission = 0,
.guc_log_level = -1,
.enable_dp_mst = true,
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* ✗ Fi.CI.BAT: failure for series starting with [CI,1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw
2017-01-20 19:23 [CI 1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw Michał Winiarski
2017-01-20 19:23 ` [CI 2/3] drm/i915/huc: Assert that HuC vma is placed in GuC accessible range Michał Winiarski
2017-01-20 19:23 ` [CI 3/3] HAX enable guc loading for CI Michał Winiarski
@ 2017-01-20 19:54 ` Patchwork
2017-01-20 20:03 ` Chris Wilson
2 siblings, 1 reply; 5+ messages in thread
From: Patchwork @ 2017-01-20 19:54 UTC (permalink / raw)
To: Michał Winiarski; +Cc: intel-gfx
== Series Details ==
Series: series starting with [CI,1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw
URL : https://patchwork.freedesktop.org/series/18320/
State : failure
== Summary ==
Series 18320v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/18320/revisions/1/mbox/
Test gem_busy:
Subgroup basic-busy-default:
pass -> FAIL (fi-ivb-3520m)
fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14
fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39
fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22
fi-bxt-t5700 total:79 pass:66 dwarn:0 dfail:0 fail:0 skip:12
fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27
fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31
fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19
fi-hsw-4770r total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19
fi-ivb-3520m total:246 pass:224 dwarn:0 dfail:0 fail:1 skip:21
fi-ivb-3770 total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21
fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21
fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13
fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20
fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21
fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13
fi-snb-2520m total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31
fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
aa012aa081f6a6d2dd5a1df0f3c3736017df0d56 drm-tip: 2017y-01m-20d-09h-33m-30s UTC integration manifest
1c4d947 HAX enable guc loading for CI
11081a4 drm/i915/huc: Assert that HuC vma is placed in GuC accessible range
d8c841a drm/i915/huc: Avoid attempting to authenticate non-existent fw
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3565/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: ✗ Fi.CI.BAT: failure for series starting with [CI,1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw
2017-01-20 19:54 ` ✗ Fi.CI.BAT: failure for series starting with [CI,1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw Patchwork
@ 2017-01-20 20:03 ` Chris Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2017-01-20 20:03 UTC (permalink / raw)
To: intel-gfx
On Fri, Jan 20, 2017 at 07:54:09PM -0000, Patchwork wrote:
> == Series Details ==
>
> Series: series starting with [CI,1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw
> URL : https://patchwork.freedesktop.org/series/18320/
> State : failure
>
> == Summary ==
>
> Series 18320v1 Series without cover letter
> https://patchwork.freedesktop.org/api/1.0/series/18320/revisions/1/mbox/
>
> Test gem_busy:
> Subgroup basic-busy-default:
> pass -> FAIL (fi-ivb-3520m)
>
> fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14
> fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39
> fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22
> fi-bxt-t5700 total:79 pass:66 dwarn:0 dfail:0 fail:0 skip:12
> fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27
> fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31
> fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19
> fi-hsw-4770r total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19
> fi-ivb-3520m total:246 pass:224 dwarn:0 dfail:0 fail:1 skip:21
> fi-ivb-3770 total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21
> fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21
> fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13
> fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20
> fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21
> fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13
> fi-snb-2520m total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31
> fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
>
> aa012aa081f6a6d2dd5a1df0f3c3736017df0d56 drm-tip: 2017y-01m-20d-09h-33m-30s UTC integration manifest
[> 1c4d947 HAX enable guc loading for CI]
> 11081a4 drm/i915/huc: Assert that HuC vma is placed in GuC accessible range
> d8c841a drm/i915/huc: Avoid attempting to authenticate non-existent fw
Applied, thanks for the patch and review.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-20 20:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-20 19:23 [CI 1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw Michał Winiarski
2017-01-20 19:23 ` [CI 2/3] drm/i915/huc: Assert that HuC vma is placed in GuC accessible range Michał Winiarski
2017-01-20 19:23 ` [CI 3/3] HAX enable guc loading for CI Michał Winiarski
2017-01-20 19:54 ` ✗ Fi.CI.BAT: failure for series starting with [CI,1/3] drm/i915/huc: Avoid attempting to authenticate non-existent fw Patchwork
2017-01-20 20:03 ` Chris Wilson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.