GuC Fixes, HuC auth. reorg and v9+ logging change
Subsystems (2)
v5 cover GuC Fixes, HuC auth. reorg and v9+ logging change
Dropped a patch to remove i915_guc_log_unregister and a patch to adjust naming of GuC suspend/resume helpers.
Sagar Arun Kamble (7):
drm/i915: Create uc runtime and system suspend/resume helpers drm/i915/guc: Update GuC ggtt.invalidate/interrupts/communication
across RPM suspend/resume
drm/i915/guc: Update GuC suspend functionality in intel_uc_suspend
path
drm/i915/guc: Disable GuC submission and suspend it prior to i915
reset
drm/i915/guc: Fix GuC cleanup in unload path drm/i915/guc: Enable default/critical logging in GuC by default from
GuC v9
drm/i915: Reorganize HuC authentication
drivers/gpu/drm/i915/i915_drv.c | 25 +++++-- drivers/gpu/drm/i915/i915_gem.c | 9 ++- drivers/gpu/drm/i915/i915_guc_submission.c | 19 +++-- drivers/gpu/drm/i915/intel_guc_fwif.h | 4 +- drivers/gpu/drm/i915/intel_guc_log.c | 13 +++- drivers/gpu/drm/i915/intel_huc.c | 22 ++---- drivers/gpu/drm/i915/intel_uc.c | 108 +++++++++++++++++++++++++---- drivers/gpu/drm/i915/intel_uc.h | 12 +++- 8 files changed, 165 insertions(+), 47 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 1/7 drm/i915: Create uc runtime and system suspend/resume helpers
Prepared generic helpers intel_uc_suspend, intel_uc_resume, intel_uc_runtime_suspend, intel_uc_runtime_resume. Added error handling to all the calls for suspend/resume.
v2: Rebase w.r.t removal of GuC code restructuring.
--- drivers/gpu/drm/i915/i915_drv.c | 23 ++++++++++++++++++++--- drivers/gpu/drm/i915/i915_gem.c | 7 ++++++- drivers/gpu/drm/i915/intel_uc.c | 20 ++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 4 ++++ 4 files changed, 50 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +20 -3
@@ -1691,7 +1691,15 @@ static int i915_drm_resume(struct drm_device *dev) }mutex_unlock (&dev->struct_mutex); -intel_guc_resume (dev_priv); +/* +* NB: Full gem reinitialization is being done above, hence +* intel_uc_resume will be of no use. Currently intel_uc_resume +* is nop. If full reinitialization is removed, will need to put +* functionality to resume from sleep in intel_uc_resume. +*/ + ret =intel_uc_resume (dev_priv); +if (ret) +DRM_ERROR ("failed to resume uc\n" );intel_modeset_init_hw (dev);
@@ -2493,7 +2501,12 @@ static int intel_runtime_suspend(struct device *kdev)*/ i915_gem_runtime_suspend (dev_priv); -intel_guc_suspend (dev_priv); + ret =intel_uc_runtime_suspend (dev_priv); +if (ret) { +DRM_ERROR ("uc runtime suspend failed, disabling it(%d)\n" , ret); +enable_rpm_wakeref_asserts (dev_priv); +return ret; + }intel_runtime_pm_disable_interrupts (dev_priv);
@@ -2578,7 +2591,11 @@ static int intel_runtime_resume(struct device *kdev)if (intel_uncore_unclaimed_mmio (dev_priv))DRM_DEBUG_DRIVER ("Unclaimed access during suspend, bios?\n" ); -intel_guc_resume (dev_priv); + ret =intel_uc_runtime_resume (dev_priv); +if (ret) { +DRM_ERROR ("uc runtime resume failed (%d)\n" , ret); +return ret; + }if (IS_GEN9_LP (dev_priv)) {bxt_disable_dc9 (dev_priv);
drivers/gpu/drm/i915/i915_gem.c +6 -1
@@ -4539,7 +4539,11 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)i915_gem_contexts_lost (dev_priv);mutex_unlock (&dev->struct_mutex); -intel_guc_suspend (dev_priv); + ret =intel_uc_suspend (dev_priv); +if (ret) { +DRM_ERROR ("uc suspend failed (%d)\n" , ret); + goto out; + }cancel_delayed_work_sync (&dev_priv->gpu_error.hangcheck_work);cancel_delayed_work_sync (&dev_priv->gt.retire_work);
@@ -4583,6 +4587,7 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv) err_unlock:mutex_unlock (&dev->struct_mutex); +out:intel_runtime_pm_put (dev_priv);return ret; }
drivers/gpu/drm/i915/intel_uc.c +20 -0
@@ -537,3 +537,23 @@ int intel_guc_sample_forcewake(struct intel_guc *guc)return intel_guc_send (guc, action,ARRAY_SIZE (action)); } + +int intel_uc_runtime_suspend (struct drm_i915_private *dev_priv) +{ +return intel_guc_suspend (dev_priv); +} + +int intel_uc_runtime_resume (struct drm_i915_private *dev_priv) +{ +return intel_guc_resume (dev_priv); +} + +int intel_uc_suspend (struct drm_i915_private *dev_priv) +{ +return intel_guc_suspend (dev_priv); +} + +int intel_uc_resume (struct drm_i915_private *dev_priv) +{ +return 0 ; +}
drivers/gpu/drm/i915/intel_uc.h +4 -0
@@ -208,6 +208,10 @@ struct intel_huc {void intel_uc_fini_fw (struct drm_i915_private *dev_priv);int intel_uc_init_hw (struct drm_i915_private *dev_priv);void intel_uc_fini_hw (struct drm_i915_private *dev_priv); +int intel_uc_runtime_suspend (struct drm_i915_private *dev_priv); +int intel_uc_runtime_resume (struct drm_i915_private *dev_priv); +int intel_uc_suspend (struct drm_i915_private *dev_priv); +int intel_uc_resume (struct drm_i915_private *dev_priv);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);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 2/7 drm/i915/guc: Update GuC ggtt.invalidate/interrupts/communication across RPM suspend/resume
In reply to Sagar Arun KambleApart from configuring interrupts, we need to update the ggtt invalidate interface and GuC communication on suspend. This functionality can be reused for other suspend and reset paths.
v2: Rebase w.r.t removal of GuC code restructuring.
v3: Removed GuC specific helpers as tasks other than send H2G for sleep/resume are to be done from uc generic functions. (Michal)
--- drivers/gpu/drm/i915/i915_guc_submission.c | 5 ---- drivers/gpu/drm/i915/intel_uc.c | 39 ++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +0 -5
@@ -1219,8 +1219,6 @@ int intel_guc_suspend(struct drm_i915_private *dev_priv)if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return 0 ; -gen9_disable_guc_interrupts (dev_priv); - ctx = dev_priv->kernel_context; data[0 ] =INTEL_GUC_ACTION_ENTER_S_STATE ;
@@ -1245,9 +1243,6 @@ int intel_guc_resume(struct drm_i915_private *dev_priv)if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return 0 ; -if (i915.guc_log_level >=0 ) -gen9_enable_guc_interrupts (dev_priv); - ctx = dev_priv->kernel_context; data[0 ] =INTEL_GUC_ACTION_EXIT_S_STATE ;
drivers/gpu/drm/i915/intel_uc.c +37 -2
@@ -540,12 +540,47 @@ int intel_guc_sample_forcewake(struct intel_guc *guc)int intel_uc_runtime_suspend (struct drm_i915_private *dev_priv) { -return intel_guc_suspend (dev_priv); +int ret; + +if (!i915.enable_guc_loading) +return 0 ; + + ret =intel_guc_suspend (dev_priv); +if (ret) { +DRM_ERROR ("GuC runtime suspend failed (%d)\n" , ret); +return ret; + } + +i915_ggtt_disable_guc (dev_priv); +gen9_disable_guc_interrupts (dev_priv); +guc_disable_communication (&dev_priv->guc); + +return 0 ; }int intel_uc_runtime_resume (struct drm_i915_private *dev_priv) { -return intel_guc_resume (dev_priv); +int ret; + +if (!i915.enable_guc_loading) +return 0 ; + + ret =guc_enable_communication (&dev_priv->guc); +if (ret) { +DRM_ERROR ("GuC enable communication failed (%d)\n" , ret); +return ret; + } +if (i915.guc_log_level >=0 ) +gen9_enable_guc_interrupts (dev_priv); +i915_ggtt_enable_guc (dev_priv); + + ret =intel_guc_resume (dev_priv); +if (ret) { +DRM_ERROR ("GuC runtime resume failed (%d)\n" , ret); +return ret; + } + +return 0 ; }int intel_uc_suspend (struct drm_i915_private *dev_priv)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 3/7 drm/i915/guc: Update GuC suspend functionality in intel_uc_suspend path
In reply to Sagar Arun KambleWith this patch we disable GuC submission in i915_drm_suspend. This will destroy the client which will be setup back again. We also reuse the complete sanitization done via intel_uc_runtime_suspend in this path. Post drm resume this state is recreated by intel_uc_init_hw hence we need not have similar reuse for intel_uc_resume.
This also fixes issue where intel_uc_fini_hw was being called after GPU reset happening in i915_gem_suspend in i915_driver_unload.
v2: Rebase w.r.t removal of GuC code restructuring. Added struct_mutex protection for i915_guc_submission_disable.
v3: Rebase w.r.t updated GuC suspend function name.
v4: Added lockdep assert in i915_guc_submission_enable/disable. Refined intel_uc_suspend to remove unnecessary locals and simplify return. (Michal Winiarski)
--- drivers/gpu/drm/i915/i915_guc_submission.c | 12 ++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 11 +++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +12 -0
@@ -1148,6 +1148,12 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)sizeof (struct guc_wq_item ) * I915_NUM_ENGINES > GUC_WQ_SIZE); +/* +* Assert that drm.struct_mutex is held. +* Needed for GuC client vma binding. +*/ +lockdep_assert_held (&dev_priv->drm.struct_mutex); +if (!client) { client = guc_client_alloc(dev_priv, INTEL_INFO(dev_priv)->ring_mask,
@@ -1197,6 +1203,12 @@ void i915_guc_submission_disable(struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc; +/* +* Assert that drm.struct_mutex is held. +* Needed for GuC client vma unbinding. +*/ +lockdep_assert_held (&dev_priv->drm.struct_mutex); +guc_interrupts_release (dev_priv);/* Revert back to manual ELSP submission */
drivers/gpu/drm/i915/intel_uc.c +7 -4
@@ -446,9 +446,6 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)if (!i915.enable_guc_loading)return ; -if (i915.enable_guc_submission) -i915_guc_submission_disable (dev_priv); -guc_disable_communication (&dev_priv->guc);if (i915.enable_guc_submission) {
@@ -585,7 +582,13 @@ int intel_uc_runtime_resume(struct drm_i915_private *dev_priv)int intel_uc_suspend (struct drm_i915_private *dev_priv) { -return intel_guc_suspend (dev_priv); +if (i915.enable_guc_submission) { +mutex_lock (&dev_priv->drm.struct_mutex); +i915_guc_submission_disable (dev_priv); +mutex_unlock (&dev_priv->drm.struct_mutex); + } + +return intel_uc_runtime_suspend (dev_priv); }int intel_uc_resume (struct drm_i915_private *dev_priv)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 4/7 drm/i915/guc: Disable GuC submission and suspend it prior to i915 reset
In reply to Sagar Arun KambleBefore i915 reset, we need to disable GuC submission and suspend GuC operations as it is recreated during intel_uc_init_hw. We can't reuse the intel_uc_suspend functionality as reset path already holds struct_mutex.
v2: Rebase w.r.t removal of GuC code restructuring. Updated reset_prepare function as struct_mutex is not needed.
v3: Fixed typo in commit message. Made return from intel_uc_reset_prepare simpler. (Michal)
--- drivers/gpu/drm/i915/i915_gem.c | 2 ++ drivers/gpu/drm/i915/intel_uc.c | 8 ++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 11 insertions(+)
drivers/gpu/drm/i915/i915_gem.c +2 -0
@@ -2847,6 +2847,8 @@ int i915_gem_reset_prepare(struct drm_i915_private *dev_priv)i915_gem_revoke_fences (dev_priv); +intel_uc_reset_prepare (dev_priv); +return err; }
drivers/gpu/drm/i915/intel_uc.c +8 -0
@@ -595,3 +595,11 @@ int intel_uc_resume(struct drm_i915_private *dev_priv) {return 0 ; } + +int intel_uc_reset_prepare (struct drm_i915_private *dev_priv) +{ +if (i915.enable_guc_submission) +i915_guc_submission_disable (dev_priv); + +return intel_uc_runtime_suspend (dev_priv); +}
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -212,6 +212,7 @@ struct intel_huc {int intel_uc_runtime_resume (struct drm_i915_private *dev_priv);int intel_uc_suspend (struct drm_i915_private *dev_priv);int intel_uc_resume (struct drm_i915_private *dev_priv); +int intel_uc_reset_prepare (struct drm_i915_private *dev_priv);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);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 5/7 drm/i915/guc: Fix GuC cleanup in unload path
In reply to Sagar Arun KambleWe ensure that GuC is completely suspended and client is destroyed in i915_gem_suspend during i915_driver_unload. So now intel_uc_fini_hw should just take care of cleanup,
hence s/intel_uc_fini_hw/intel_uc_cleanup. Correspondingly
we also updated as s/i915_guc_submission_fini/i915_guc_submission_cleanup Other functionality to disable communication, disable interrupts and update of ggtt.invalidate is taken care by intel_uc_suspend. With this patch we are also doing guc_free_load_err_log only if i915.enable_guc_loading is set.
v2: Rebase w.r.t removal of GuC code restructuring.
v3: Removed intel_guc_cleanup. (Michal)
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 16 +++++----------- drivers/gpu/drm/i915/intel_uc.h | 4 ++-- 4 files changed, 9 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -602,7 +602,7 @@ static void i915_gem_fini(struct drm_i915_private *dev_priv)i915_gem_drain_workqueue (dev_priv);mutex_lock (&dev_priv->drm.struct_mutex); -intel_uc_fini_hw (dev_priv); +intel_uc_cleanup (dev_priv);i915_gem_cleanup_engines (dev_priv);i915_gem_contexts_fini (dev_priv);i915_gem_cleanup_userptr (dev_priv);
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
@@ -1050,7 +1050,7 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)return ret; } -void i915_guc_submission_fini (struct drm_i915_private *dev_priv) +void i915_guc_submission_cleanup (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc;
drivers/gpu/drm/i915/intel_uc.c +5 -11
@@ -418,7 +418,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)guc_capture_load_err_log (guc); err_submission:if (i915.enable_guc_submission) -i915_guc_submission_fini (dev_priv); +i915_guc_submission_cleanup (dev_priv); err_guc:i915_ggtt_disable_guc (dev_priv);
@@ -439,21 +439,15 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)return ret; } -void intel_uc_fini_hw (struct drm_i915_private *dev_priv) +void intel_uc_cleanup (struct drm_i915_private *dev_priv) { -guc_free_load_err_log (&dev_priv->guc); -if (!i915.enable_guc_loading)return ; -guc_disable_communication (&dev_priv->guc); - -if (i915.enable_guc_submission) { -gen9_disable_guc_interrupts (dev_priv); -i915_guc_submission_fini (dev_priv); - } +guc_free_load_err_log (&dev_priv->guc); -i915_ggtt_disable_guc (dev_priv); +if (i915.enable_guc_submission) +i915_guc_submission_cleanup (dev_priv); }int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len)
drivers/gpu/drm/i915/intel_uc.h +2 -2
@@ -207,7 +207,7 @@ struct intel_huc {void intel_uc_init_fw (struct drm_i915_private *dev_priv);void intel_uc_fini_fw (struct drm_i915_private *dev_priv);int intel_uc_init_hw (struct drm_i915_private *dev_priv); -void intel_uc_fini_hw (struct drm_i915_private *dev_priv); +void intel_uc_cleanup (struct drm_i915_private *dev_priv);int intel_uc_runtime_suspend (struct drm_i915_private *dev_priv);int intel_uc_runtime_resume (struct drm_i915_private *dev_priv);int intel_uc_suspend (struct drm_i915_private *dev_priv);
@@ -238,7 +238,7 @@ static inline void intel_guc_notify(struct intel_guc *guc)int i915_guc_submission_init (struct drm_i915_private *dev_priv);int i915_guc_submission_enable (struct drm_i915_private *dev_priv);void i915_guc_submission_disable (struct drm_i915_private *dev_priv); -void i915_guc_submission_fini (struct drm_i915_private *dev_priv); +void i915_guc_submission_cleanup (struct drm_i915_private *dev_priv);struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size);/* intel_guc_log.c */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 5/7] drm/i915/guc: Fix GuC cleanup in unload path
Quoted 63 lines · Sagar Arun Kamble
We ensure that GuC is completely suspended and client is destroyed in
i915_gem_suspendduringi915_driver_unload. So nowintel_uc_fini_hwshould just take care of cleanup,
hence s/intel_uc_fini_hw/intel_uc_cleanup. Correspondingly
we also updated as s/i915_guc_submission_fini/i915_guc_submission_cleanup Other functionality to disable communication, disable interrupts and update of ggtt.invalidate is taken care byintel_uc_suspend. With this patch we are also doingguc_free_load_err_logonly if i915.enable_guc_loading is set.v2: Rebase w.r.t removal of GuC code restructuring.
v3: Removed
intel_guc_cleanup. (Michal)Cc Michal Wajdeczko <[email protected]>Cc Michał Winiarski <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 16 +++++----------- drivers/gpu/drm/i915/intel_uc.h | 4 ++-- 4 files changed, 9 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_drv.c +1
-1@@ -602,7 +602,7 @@ static void i915_gem_fini(struct drm_i915_private *dev_priv)i915_gem_drain_workqueue (dev_priv);mutex_lock (&dev_priv->drm.struct_mutex); -intel_uc_fini_hw (dev_priv); +intel_uc_cleanup (dev_priv);i915_gem_cleanup_engines (dev_priv);i915_gem_contexts_fini (dev_priv);i915_gem_cleanup_userptr (dev_priv);drivers/gpu/drm/i915/i915_guc_submission.c +1
-1@@ -1050,7 +1050,7 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)return ret; } -void i915_guc_submission_fini (struct drm_i915_private *dev_priv) +void i915_guc_submission_cleanup (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc;drivers/gpu/drm/i915/intel_uc.c +1
-1@@ -418,7 +418,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)guc_capture_load_err_log (guc); err_submission:if (i915.enable_guc_submission) -i915_guc_submission_fini (dev_priv); +i915_guc_submission_cleanup (dev_priv); err_guc:i915_ggtt_disable_guc (dev_priv);
drivers/gpu/drm/i915/intel_uc.c int intel_uc_init_hw(struct drm_i915_private · line 445
Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.c +1
-3@@ -439,21 +439,15 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)return ret; } -void intel_uc_fini_hw (struct drm_i915_private *dev_priv) +void intel_uc_cleanup (struct drm_i915_private *dev_priv) { -guc_free_load_err_log (&dev_priv->guc); -
This should stay here, as we turn off "enable_guc_loading" flag on any guc load failure.
Quoted 36 lines
drivers/gpu/drm/i915/intel_uc.c +3
-7if (!i915.enable_guc_loading)return ; -guc_disable_communication (&dev_priv->guc); - -if (i915.enable_guc_submission) { -gen9_disable_guc_interrupts (dev_priv); -i915_guc_submission_fini (dev_priv); - } +guc_free_load_err_log (&dev_priv->guc); -i915_ggtt_disable_guc (dev_priv); +if (i915.enable_guc_submission) +i915_guc_submission_cleanup (dev_priv); }int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len)drivers/gpu/drm/i915/intel_uc.h +2
-2@@ -207,7 +207,7 @@ struct intel_huc {void intel_uc_init_fw (struct drm_i915_private *dev_priv);void intel_uc_fini_fw (struct drm_i915_private *dev_priv);int intel_uc_init_hw (struct drm_i915_private *dev_priv); -void intel_uc_fini_hw (struct drm_i915_private *dev_priv); +void intel_uc_cleanup (struct drm_i915_private *dev_priv);int intel_uc_runtime_suspend (struct drm_i915_private *dev_priv);int intel_uc_runtime_resume (struct drm_i915_private *dev_priv);int intel_uc_suspend (struct drm_i915_private *dev_priv);@@ -238,7 +238,7 @@ static inline void intel_guc_notify(struct intel_guc *guc)int i915_guc_submission_init (struct drm_i915_private *dev_priv);int i915_guc_submission_enable (struct drm_i915_private *dev_priv);void i915_guc_submission_disable (struct drm_i915_private *dev_priv); -void i915_guc_submission_fini (struct drm_i915_private *dev_priv); +void i915_guc_submission_cleanup (struct drm_i915_private *dev_priv);struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size);
Quoted 1 line
/*
intel_guc_log.c*/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 5/7] drm/i915/guc: Fix GuC cleanup in unload path
Quoted 68 lines · Michal Wajdeczko
Quoted 66 lines · Sagar Arun Kamble
We ensure that GuC is completely suspended and client is destroyed in
i915_gem_suspendduringi915_driver_unload. So nowintel_uc_fini_hwshould just take care of cleanup,
hence s/intel_uc_fini_hw/intel_uc_cleanup. Correspondingly
we also updated as s/i915_guc_submission_fini/i915_guc_submission_cleanup Other functionality to disable communication, disable interrupts and update of ggtt.invalidate is taken care byintel_uc_suspend. With this patch we are also doingguc_free_load_err_logonly if i915.enable_guc_loading is set.v2: Rebase w.r.t removal of GuC code restructuring.
v3: Removed
intel_guc_cleanup. (Michal)Cc Michal Wajdeczko <[email protected]>Cc Michał Winiarski <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/i915_drv.c | 2 +-drivers/gpu/drm/i915/i915_guc_submission.c| 2 +- drivers/gpu/drm/i915/intel_uc.c | 16 +++++----------- drivers/gpu/drm/i915/intel_uc.h | 4 ++--4 files changed, 9 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_drv.c +1
-1@@ -602,7 +602,7 @@ static void i915_gem_fini(struct drm_i915_private *dev_priv) i915_gem_drain_workqueue(dev_priv); mutex_lock(&dev_priv->drm.struct_mutex); - intel_uc_fini_hw(dev_priv); + intel_uc_cleanup(dev_priv); i915_gem_cleanup_engines(dev_priv); i915_gem_contexts_fini(dev_priv); i915_gem_cleanup_userptr(dev_priv);drivers/gpu/drm/i915/i915_guc_submission.c +1
-1@@ -1050,7 +1050,7 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv) return ret; } -void i915_guc_submission_fini (struct drm_i915_private *dev_priv) +void i915_guc_submission_cleanup (struct drm_i915_private *dev_priv) { struct intel_guc *guc = &dev_priv->guc;drivers/gpu/drm/i915/intel_uc.c +0
-0@@ -418,7 +418,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) guc_capture_load_err_log(guc);err_submission:
if (i915.enable_guc_submission)
-i915_guc_submission_fini(dev_priv);
+i915_guc_submission_cleanup(dev_priv);
err_guc:
i915_ggtt_disable_guc(dev_priv);drivers/gpu/drm/i915/intel_uc.c +0
-0@@ -439,21 +439,15 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) return ret; }
Quoted 9 lines
drivers/gpu/drm/i915/intel_uc.c int intel_uc_init_hw(struct drm_i915_private *dev_priv) · line 445
Quoted 5 lines
drivers/gpu/drm/i915/intel_uc.c +1
-3-void intel_uc_fini_hw (struct drm_i915_private *dev_priv) +void intel_uc_cleanup (struct drm_i915_private *dev_priv) { - guc_free_load_err_log(&dev_priv->guc); -This should stay here, as we turn off "
enable_guc_loading" flag on any guc load failure.
Ah. right. Will update. Thanks for catching this Michal.
Quoted 28 lines
Quoted 28 lines
drivers/gpu/drm/i915/intel_uc.c +3
-7if (!i915.enable_guc_loading) return; - guc_disable_communication(&dev_priv->guc); - - if (i915.enable_guc_submission) { - gen9_disable_guc_interrupts(dev_priv); - i915_guc_submission_fini(dev_priv); - } + guc_free_load_err_log(&dev_priv->guc); - i915_ggtt_disable_guc(dev_priv); + if (i915.enable_guc_submission) + i915_guc_submission_cleanup(dev_priv); }int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len)drivers/gpu/drm/i915/intel_uc.h +1
-1@@ -207,7 +207,7 @@ struct intel_huc { void intel_uc_init_fw(struct drm_i915_private *dev_priv); void intel_uc_fini_fw(struct drm_i915_private *dev_priv); int intel_uc_init_hw(struct drm_i915_private *dev_priv); -void intel_uc_fini_hw (struct drm_i915_private *dev_priv); +void intel_uc_cleanup (struct drm_i915_private *dev_priv); int intel_uc_runtime_suspend(struct drm_i915_private *dev_priv); int intel_uc_runtime_resume(struct drm_i915_private *dev_priv); int intel_uc_suspend(struct drm_i915_private *dev_priv);@@ -238,7 +238,7 @@ static inline void intel_guc_notify(struct
Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.h static inline void intel_guc_notify(struct intel_guc *guc) · line 244
Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.h +1
-1intel_guc *guc) int i915_guc_submission_init(struct drm_i915_private *dev_priv); int i915_guc_submission_enable(struct drm_i915_private *dev_priv); void i915_guc_submission_disable(struct drm_i915_private *dev_priv); -void i915_guc_submission_fini (struct drm_i915_private *dev_priv); +void i915_guc_submission_cleanup (struct drm_i915_private *dev_priv); struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size);/* intel_guc_log.c */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 6/7 drm/i915/guc: Enable default/critical logging in GuC by default from GuC v9
In reply to Sagar Arun KambleWith GuC v9, new type of Default/critical logging in GuC to enable capturing minimal important logs in production systems efficiently. This patch enables this logging in GuC by default always. It should be noted that streaming support with half-full interrupt mechanism that is present for normal logging is not present for this type of logging.
v2: Emulated GuC critical logging through i915.guc_log_level.
v3: Commit message update. Enable default/critical logging in GuC always. Fixed RPM wake during guc_log_unregister in the unload path.
v4: Moved RPM wake change to separate patch. Removed GUC_DEBUG_RESERVED and updated name of new bit to be version agnostic. Updated parameter to struct intel_guc * and name of macro NEEDS_GUC_CRITICAL_LOGGING. Removed explicit clearing of GUC_CRITICAL_LOGGING_DISABLED from params[GUC_CTL_DEBUG] as it is unnecessary. (Michal Wajdeczko)
v5: Removed GUC_CRITICAL_LOGGING_DISABLED. Added HAS_GUC check to GUC_NEEDS_CRITICAL_LOGGING. (Michal Wajdeczko)
v6: More refined version of GUC_NEEDS_CRITICAL_LOGGING. Commit message update. (Michal Wajdeczko)
--- drivers/gpu/drm/i915/intel_guc_fwif.h | 4 ++-- drivers/gpu/drm/i915/intel_guc_log.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_guc_fwif.h +2 -2
@@ -127,7 +127,6 @@#define GUC_PROFILE_ENABLED (1 << 7)#define GUC_WQ_TRACK_ENABLED (1 << 8)#define GUC_ADS_ENABLED (1 << 9) -#define GUC_DEBUG_RESERVED (1 << 10)#define GUC_ADS_ADDR_SHIFT 11#define GUC_ADS_ADDR_MASK 0xfffff800
@@ -539,7 +538,8 @@ struct guc_log_buffer_state { u32 logging_enabled:1; u32 reserved1:3; u32 verbosity:4; - u32 reserved2:24; + u32 critical_logging_enabled:1; + u32 reserved2:23; };u32 value; } __packed;
drivers/gpu/drm/i915/intel_guc_log.c +12 -1
@@ -586,10 +586,18 @@ void intel_guc_log_destroy(struct intel_guc *guc)i915_vma_unpin_and_release (&guc->log.vma); } +/* +* Critical logging in GuC is to be enabled always from GuC v9+. +* (for KBL - v9.39+) +*/ +#define GUC_NEEDS_CRITICAL_LOGGING (guc) \ + (HAS_GUC(guc_to_i915(guc)) && \ + (guc->fw.major_ver_found >= 9) && \ + (guc->fw.minor_ver_found >= (IS_KABYLAKE(guc_to_i915(guc)) ? 39 : 0))) +int i915_guc_log_control (struct drm_i915_private *dev_priv,u64 control_val) {struct intel_guc *guc = &dev_priv->guc; -union guc_log_control log_param;int ret;
@@ -603,6 +611,9 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)if (!log_param.logging_enabled && (i915.guc_log_level <0 ))return 0 ; +if (GUC_NEEDS_CRITICAL_LOGGING (guc)) + log_param.critical_logging_enabled =1 ; + ret =guc_log_control (guc, log_param.value);if (ret <0 ) {DRM_DEBUG_DRIVER ("guc_logging_control action failed %d\n" , ret);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 7/7 drm/i915: Reorganize HuC authentication
In reply to Sagar Arun KamblePrepared 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.
--- drivers/gpu/drm/i915/intel_huc.c | 22 +++++++--------------- drivers/gpu/drm/i915/intel_uc.c | 20 +++++++++++++++++++- drivers/gpu/drm/i915/intel_uc.h | 3 ++- 3 files changed, 28 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_huc.c +7 -15
@@ -225,19 +225,16 @@ void intel_huc_init_hw(struct intel_huc *huc) }/** -* intel_guc_auth_huc() - authenticate ucode -* @dev_priv: the drm_i915_device -* -* Triggers a HuC fw authentication request to the GuC via intel_guc_action_ -* authenticate_huc interface. +* intel_huc_auth() - authenticate ucode +* @huc: intel_huc structure */ -void intel_guc_auth_huc (struct drm_i915_private *dev_priv) +void intel_huc_auth (struct intel_huc *huc) { +struct drm_i915_private *dev_priv =huc_to_i915 (huc);struct intel_guc *guc = &dev_priv->guc; -struct intel_huc *huc = &dev_priv->huc;struct i915_vma *vma; +u32 offset;int ret; -u32 data[2 ];if (huc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return ;
@@ -250,11 +247,8 @@ 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)); + offset =guc_ggtt_offset (vma) + huc->fw.rsa_offset; + ret =intel_guc_auth_huc (guc, offset);if (ret) {DRM_ERROR ("HuC: GuC did not ack Auth request %d\n" , ret); goto out;
@@ -266,7 +260,6 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv)HUC_FW_VERIFIED ,HUC_FW_VERIFIED , 50); -if (ret) {DRM_ERROR ("HuC: Authentication failed %d\n" , ret); goto out;
@@ -275,4 +268,3 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv) out:i915_vma_unpin (vma); } -
drivers/gpu/drm/i915/intel_uc.c +19 -1
@@ -328,6 +328,24 @@ static void guc_disable_communication(struct intel_guc *guc) guc->send = intel_guc_send_nop; } +/** +* intel_guc_auth_huc() - authenticate ucode +* @guc: struct intel_guc* +* @offset: rsa offset w.r.t ggtt base of huc vma +* +* triggers a huc fw authentication request to the guc via intel_guc_send +* authenticate_huc interface. +*/ +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 +408,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.enable_guc_submission) {if (i915.guc_log_level >=0 )gen9_enable_guc_interrupts (dev_priv);
drivers/gpu/drm/i915/intel_uc.h +2 -1
@@ -216,6 +216,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) {
@@ -259,6 +260,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 GuC Fixes, HuC auth. reorg and v9+ logging change
In reply to Sagar Arun Kamble== Series Details ==
== Series Details ==
Series: GuC Fixes, HuC auth. reorg and v9+ logging change
URL : https://patchwork.freedesktop.org/series/30715/
State : success
== Summary ==
Series 30715v1 GuC Fixes, HuC auth. reorg and v9+ logging change
https://patchwork.freedesktop.org/api/1.0/series/30715/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test gem_exec_store:
Subgroup basic-all:
dmesg-warn -> PASS (fi-kbl-7500u) fdo#102849
Subgroup basic-default:
dmesg-warn -> PASS (fi-kbl-7500u)
Test gem_exec_suspend:
Subgroup basic-s3:
incomplete -> PASS (fi-kbl-7500u) fdo#102850
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
pass -> FAIL (fi-snb-2600) fdo#100215
Test pm_rpm:
Subgroup basic-rte:
dmesg-warn -> PASS (fi-cfl-s) fdo#102294
Test drv_module_reload:
Subgroup basic-reload:
dmesg-warn -> PASS (fi-glk-1) fdo#102777 +1fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102849 https://bugs.freedesktop.org/show_bug.cgi?id=102849
fdo#102850 https://bugs.freedesktop.org/show_bug.cgi?id=102850
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294
fdo#102777 https://bugs.freedesktop.org/show_bug.cgi?id=102777
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:437s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:463s 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:525s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:280s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:502s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:503s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:490s fi-cfl-s total:289 pass:223 dwarn:34 dfail:0 fail:0 skip:32 time:536s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:419s fi-glk-1 total:289 pass:259 dwarn:1 dfail:0 fail:0 skip:29 time:563s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:423s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:406s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:434s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:493s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:463s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:466s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:576s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:590s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:543s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:451s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:749s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:491s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:472s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:562s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:1 skip:39 time:421s
35f6d27736f70caa580b7a6030528afa765bd76a drm-tip: 2017y-09m-21d-16h-20m-08s UTC integration manifest 66bd299d7929 drm/i915: Reorganize HuC authenticationa35f1f2c2730 drm/i915/guc: Enable default/critical logging in GuC by default from GuC v9 4088180e3981 drm/i915/guc: Fix GuC cleanup in unload path1aec8f8ec406 drm/i915/guc: Disable GuC submission and suspend it prior to i915 reset 835c4f0a6210 drm/i915/guc: Update GuC suspend functionality in intel_uc_suspend path 397306dd2c1e drm/i915/guc: Update GuC ggtt.invalidate/interrupts/communication across RPM suspend/resume 2324cb04633c drm/i915: Create uc runtime and system suspend/resume helpers
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5784/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx