drm/i915: No TLB invalidation on suspended GT

In case of GT is suspended, don't allow submission of new TLB invalidation
request and cancel all pending requests. The TLB entries will be
invalidated either during GuC reload or on system resume.

Signed-off-by: Fei Yang <fei.yang@intel.com>
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
CC: John Harrison <john.c.harrison@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: Nirmoy Das <nirmoy.das@intel.com>
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231017180806.3054290-5-jonathan.cavitt@intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
index 0949628d69f8b74ab7da5e900052b51b702604c7..2b6dfe62c8f2a771d4f75348c55335434155c833 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
@@ -537,4 +537,5 @@ int intel_guc_invalidate_tlb_engines(struct intel_guc *guc);
 int intel_guc_invalidate_tlb_guc(struct intel_guc *guc);
 int intel_guc_tlb_invalidation_done(struct intel_guc *guc,
                                    const u32 *payload, u32 len);
+void wake_up_all_tlb_invalidate(struct intel_guc *guc);
 #endif

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index aba138e571960f9a278d36819b38e896dc10f08b..1b04b1692e48d168754364bf2095e88e54b8c2e8 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -1796,6 +1796,20 @@ next_context:
        intel_context_put(parent);
 }
 
+void wake_up_all_tlb_invalidate(struct intel_guc *guc)
+{
+       struct intel_guc_tlb_wait *wait;
+       unsigned long i;
+
+       if (!intel_guc_tlb_invalidation_is_available(guc))
+               return;
+
+       xa_lock_irq(&guc->tlb_lookup);
+       xa_for_each(&guc->tlb_lookup, i, wait)
+               wake_up(&wait->wq);
+       xa_unlock_irq(&guc->tlb_lookup);
+}
+
 void intel_guc_submission_reset(struct intel_guc *guc, intel_engine_mask_t stalled)
 {
        struct intel_context *ce;
@@ -1925,9 +1939,6 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc)
 
 void intel_guc_submission_reset_finish(struct intel_guc *guc)
 {
-       struct intel_guc_tlb_wait *wait;
-       unsigned long i;
-
        /* Reset called during driver load or during wedge? */
        if (unlikely(!guc_submission_initialized(guc) ||
                     intel_gt_is_wedged(guc_to_gt(guc)))) {
@@ -1951,12 +1962,7 @@ void intel_guc_submission_reset_finish(struct intel_guc *guc)
         * The full GT reset will have cleared the TLB caches and flushed the
         * G2H message queue; we can release all the blocked waiters.
         */
-       if (intel_guc_tlb_invalidation_is_available(guc)) {
-               xa_lock_irq(&guc->tlb_lookup);
-               xa_for_each(&guc->tlb_lookup, i, wait)
-                       wake_up(&wait->wq);
-               xa_unlock_irq(&guc->tlb_lookup);
-       }
+       wake_up_all_tlb_invalidate(guc);
 }
 
 static void destroyed_worker_func(struct work_struct *w);

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 18250fb64bd881f09f0c1db0ff5a49cc9344f7c0..ff6e3b2fd2a51f65f7e32a3e686e7be21d379ff7 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -688,6 +688,8 @@ void intel_uc_suspend(struct intel_uc *uc)
        /* flush the GSC worker */
        intel_gsc_uc_flush_work(&uc->gsc);
 
+       wake_up_all_tlb_invalidate(guc);
+
        if (!intel_guc_is_ready(guc)) {
                guc->interrupts.enabled = false;
                return;
@@ -736,6 +738,11 @@ static int __uc_resume(struct intel_uc *uc, bool enable_communication)
 
        intel_gsc_uc_resume(&uc->gsc);
 
+       if (intel_guc_tlb_invalidation_is_available(guc)) {
+               intel_guc_invalidate_tlb_engines(guc);
+               intel_guc_invalidate_tlb_guc(guc);
+       }
+
        return 0;
 }