drm/i915/huc: Reorganize HuC authentication
Subsystems (2)
PATCH v9 1/1 drm/i915/huc: Reorganize HuC authentication
Prepared intel_auth_huc to separate HuC specific functionality from GuC send action. Created new header intel_huc.h to group HuC specific declarations.
v2: Changed argument preparation for AUTHENTICATE_HUC. s/intel_auth_huc/intel_huc_auth. Deferred creation of intel_huc.h to later patch.
v3: Rebase as intel_guc.h is removed. Added param description to intel_huc_auth. (Michal)
v4: Rebase as intel_guc.h is added again. :)
v5: Rebase w.r.t removal of GuC code restructuring.
v6-v7: Rebase.
v8: Tagged subject as drm/i915/huc. (Michal Wajdeczko) Added kernel-doc description to intel_huc_auth and intel_guc_auth_huc. s/dev_priv/i915 and removed unnecessary variable offset. (Joonas)
v9: Rebase. Had conflict with i915_modparams change.
--- drivers/gpu/drm/i915/intel_huc.c | 38 ++++++++++++++++++-------------------- drivers/gpu/drm/i915/intel_uc.c | 23 ++++++++++++++++++++++- drivers/gpu/drm/i915/intel_uc.h | 3 ++- 3 files changed, 42 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/intel_huc.c +18 -20
@@ -225,19 +225,22 @@ void intel_huc_init_hw(struct intel_huc *huc) }/** -* intel_guc_auth_huc() - authenticate ucode -* @dev_priv: the drm_i915_device +* intel_huc_auth() - Authenticate HuC uCode +* @huc: intel_huc structure +* +* Called after HuC and GuC firmware loading during intel_uc_init_hw(). * -* Triggers a HuC fw authentication request to the GuC via intel_guc_action_ -* authenticate_huc interface. +* This function pins HuC firmware image object into GGTT. +* Then it invokes GuC action to authenticate passing the offset to RSA +* signature through intel_guc_auth_huc(). It then waits for 50ms for +* firmware verification ACK and unpins the object. */ -void intel_guc_auth_huc (struct drm_i915_private *dev_priv) +void intel_huc_auth (struct intel_huc *huc) { -struct intel_guc *guc = &dev_priv->guc; -struct intel_huc *huc = &dev_priv->huc; +struct drm_i915_private *i915 =huc_to_i915 (huc); +struct intel_guc *guc = &i915->guc;struct i915_vma *vma;int ret; -u32 data[2 ];if (huc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return ;
@@ -250,23 +253,19 @@ 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)); + 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; }/* Check authentication status, it should be done by now */ - ret =intel_wait_for_register (dev_priv, -HUC_STATUS2 , -HUC_FW_VERIFIED , -HUC_FW_VERIFIED , -50 ); - + ret =intel_wait_for_register (i915, +HUC_STATUS2 , +HUC_FW_VERIFIED , +HUC_FW_VERIFIED , +50 );if (ret) {DRM_ERROR ("HuC: Authentication failed %d\n" , ret); goto out;
@@ -275,4 +274,3 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv) out:i915_vma_unpin (vma); } -
drivers/gpu/drm/i915/intel_uc.c +22 -1
@@ -328,6 +328,27 @@ static void guc_disable_communication(struct intel_guc *guc) guc->send = intel_guc_send_nop; } +/** +* intel_guc_auth_huc() - Send action to GuC to authenticate HuC ucode +* @guc: intel_guc structure +* @rsa_offset: rsa offset w.r.t ggtt base of huc vma +* +* Triggers a HuC firmware authentication request to the GuC via intel_guc_send +* INTEL_GUC_ACTION_AUTHENTICATE_HUC interface. This function is invoked by +* intel_huc_auth(). +* +* Return: non-zero code on error +*/ +int intel_guc_auth_huc (struct intel_guc *guc,u32 rsa_offset) +{ +u32 action[] = { +INTEL_GUC_ACTION_AUTHENTICATE_HUC , + rsa_offset + }; + +return intel_guc_send (guc, action,ARRAY_SIZE (action)); +} +int intel_uc_init_hw (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc;
@@ -390,7 +411,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_huc_auth (&dev_priv->huc);if (i915_modparams.enable_guc_submission) {if (i915_modparams.guc_log_level >=0 )gen9_enable_guc_interrupts (dev_priv);
drivers/gpu/drm/i915/intel_uc.h +2 -1
@@ -211,6 +211,7 @@ struct intel_huc {int intel_guc_sample_forcewake (struct intel_guc *guc);int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len);int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len); +int intel_guc_auth_huc (struct intel_guc *guc,u32 rsa_offset);static inline int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len) {
@@ -254,6 +255,6 @@ 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); +void intel_huc_auth (struct intel_huc *huc);#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v9,1/1] drm/i915/huc: Reorganize HuC authentication
== Series Details ==
== Series Details ==
Series: series starting with [v9,1/1] drm/i915/huc: Reorganize HuC authentication
URL : https://patchwork.freedesktop.org/series/30874/
State : success
== Summary ==
Series 30874v1 series starting with [v9,1/1] drm/i915/huc: Reorganize HuC authentication
https://patchwork.freedesktop.org/api/1.0/series/30874/revisions/1/mbox/
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:444s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:477s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:417s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:501s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:277s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:503s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:499s fi-cfl-s total:289 pass:223 dwarn:34 dfail:0 fail:0 skip:32 time:546s fi-cnl-y total:289 pass:257 dwarn:0 dfail:0 fail:5 skip:27 time:652s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:422s fi-glk-1 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:566s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:424s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:405s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:432s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:491s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:465s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:469s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:572s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:591s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:546s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:453s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:747s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:488s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:473s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:567s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:413s
077859d4d305f5c8a746f8b773b5f5efb600a5ce drm-tip: 2017y-09m-26d-05h-24m-44s UTC integration manifest 6dcca2c848ca drm/i915/huc: Reorganize HuC authentication
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5811/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: ✓ Fi.CI.BAT: success for series starting with [v9,1/1] drm/i915/huc: Reorganize HuC authentication
Quoted 5 lines · Patchwork
== Series Details ==
Series: series starting with [v9,1/1] drm/i915/huc: Reorganize HuC authentication
URL : https://patchwork.freedesktop.org/series/30874/
State : success
This has been merged, thanks for the patch and reviews.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines · Sagar Arun Kamble
Prepared
intel_auth_hucto separate HuC specific functionality from GuC send action. Created new headerintel_huc.hto group HuC specific declarations.v2: Changed argument preparation for
AUTHENTICATE_HUC. s/intel_auth_huc/intel_huc_auth. Deferred creation ofintel_huc.hto later patch.v3: Rebase as
intel_guc.his removed. Added param description tointel_huc_auth. (Michal)v4: Rebase as
intel_guc.his added again. :)v5: Rebase w.r.t removal of GuC code restructuring.
v6-v7: Rebase.
v8: Tagged subject as drm/i915/huc. (Michal Wajdeczko) Added kernel-doc description to
intel_huc_authandintel_guc_auth_huc. s/dev_priv/i915 and removed unnecessary variable offset. (Joonas)
Quoted 7 lines
v9: Rebase. Had conflict with
i915_modparamschange.Cc Joonas Lahtinen <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Michał Winiarski <[email protected]>Reviewed-by Michal Wajdeczko <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Sagar Arun Kamble (2017-09-26 08:17:16)
Quoted 21 lines
Prepared
intel_auth_hucto separate HuC specific functionality from GuC send action. Created new headerintel_huc.hto group HuC specific declarations.v2: Changed argument preparation for
AUTHENTICATE_HUC. s/intel_auth_huc/intel_huc_auth. Deferred creation ofintel_huc.hto later patch.v3: Rebase as
intel_guc.his removed. Added param description tointel_huc_auth. (Michal)v4: Rebase as
intel_guc.his added again. :)v5: Rebase w.r.t removal of GuC code restructuring.
v6-v7: Rebase.
v8: Tagged subject as drm/i915/huc. (Michal Wajdeczko) Added kernel-doc description to
intel_huc_authandintel_guc_auth_huc. s/dev_priv/i915 and removed unnecessary variable offset. (Joonas)
Quoted 7 lines
v9: Rebase. Had conflict with
i915_modparamschange.Cc Joonas Lahtinen <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Michał Winiarski <[email protected]>Reviewed-by Michal Wajdeczko <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>
Lgtm,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx