Commit 2ca01fe3 authored by Matthew Auld's avatar Matthew Auld Committed by Rodrigo Vivi
Browse files

drm/xe/tlb: also update seqno_recv during reset 



We might have various kworkers waiting for TLB flushes to complete which
are not tracked with an explicit TLB fence, however at this stage that
will never happen since the CT is already disabled, so make sure we
signal them here under the assumption that we have completed a full GT
reset.

v2:
  - We need to use seqno - 1 here. After acquiring ct->lock the seqno is
    actually the next users seqno and not the pending one.

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 7b24cc3e

drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c

+22 −2
Original line number Diff line number Diff line
@@ -89,10 +89,30 @@ invalidation_fence_signal(struct xe_gt_tlb_invalidation_fence *fence) 
void xe_gt_tlb_invalidation_reset(struct xe_gt *gt)

{

	struct xe_gt_tlb_invalidation_fence *fence, *next;

	struct xe_guc *guc = &gt->uc.guc;

	int pending_seqno;



	cancel_delayed_work(&gt->tlb_invalidation.fence_tdr);

	/*

	 * CT channel is already disabled at this point. No new TLB requests can

	 * appear.

	 */



	mutex_lock(&gt->uc.guc.ct.lock);

	cancel_delayed_work(&gt->tlb_invalidation.fence_tdr);

	/*

	 * We might have various kworkers waiting for TLB flushes to complete

	 * which are not tracked with an explicit TLB fence, however at this

	 * stage that will never happen since the CT is already disabled, so

	 * make sure we signal them here under the assumption that we have

	 * completed a full GT reset.

	 */

	if (gt->tlb_invalidation.seqno == 1)

		pending_seqno = TLB_INVALIDATION_SEQNO_MAX - 1;

	else

		pending_seqno = gt->tlb_invalidation.seqno - 1;

	WRITE_ONCE(gt->tlb_invalidation.seqno_recv, pending_seqno);

	wake_up_all(&guc->ct.wq);



	list_for_each_entry_safe(fence, next,

				 &gt->tlb_invalidation.pending_fences, link)

		invalidation_fence_signal(fence);