Re: [PATCH v2 02/11] drm/xe: Reset tlb fence timeout on invalid seqno received

[Matthew Brost <matthew.brost@intel.com>]

On Thu, Nov 27, 2025 at 07:02:03AM +0800, Brian Nguyen wrote:
> TLB_INVALIDATION_SEQNO_INVALID are now used to indicate in progress
> multi-step TLB invalidations, so reset tdr to ensure that action
> won't prematurely trigger when G2H actions are still ongoing.
> 
> v2: Remove lock from xe_tlb_inval_reset_timeout. (Matthew B)
> 
> Signed-off-by: Brian Nguyen <brian3.nguyen@intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>

You can probably just squash the first patch into this one, this series
seems more likely merge before my series which added the first patch.

This LGTM:
Reviewed-by: Matthew Brost <matthew.brost@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_guc_tlb_inval.c |  3 +--
>  drivers/gpu/drm/xe/xe_tlb_inval.c     | 20 ++++++++++++++++++++
>  2 files changed, 21 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_tlb_inval.c b/drivers/gpu/drm/xe/xe_guc_tlb_inval.c
> index f10ecfb49735..848d3493df10 100644
> --- a/drivers/gpu/drm/xe/xe_guc_tlb_inval.c
> +++ b/drivers/gpu/drm/xe/xe_guc_tlb_inval.c
> @@ -234,8 +234,7 @@ int xe_guc_tlb_inval_done_handler(struct xe_guc *guc, u32 *msg, u32 len)
>  	if (unlikely(len != 1))
>  		return -EPROTO;
>  
> -	if (msg[0] != TLB_INVALIDATION_SEQNO_INVALID)
> -		xe_tlb_inval_done_handler(&gt->tlb_inval, msg[0]);
> +	xe_tlb_inval_done_handler(&gt->tlb_inval, msg[0]);
>  
>  	return 0;
>  }
> diff --git a/drivers/gpu/drm/xe/xe_tlb_inval.c b/drivers/gpu/drm/xe/xe_tlb_inval.c
> index 918a59e686ea..a122fbb9fc4a 100644
> --- a/drivers/gpu/drm/xe/xe_tlb_inval.c
> +++ b/drivers/gpu/drm/xe/xe_tlb_inval.c
> @@ -199,6 +199,20 @@ void xe_tlb_inval_reset(struct xe_tlb_inval *tlb_inval)
>  	mutex_unlock(&tlb_inval->seqno_lock);
>  }
>  
> +/**
> + * xe_tlb_inval_reset_timeout() - Reset TLB inval fence timeout
> + * @tlb_inval: TLB invalidation client
> + *
> + * Reset the TLB invalidation timeout timer.
> + */
> +static void xe_tlb_inval_reset_timeout(struct xe_tlb_inval *tlb_inval)
> +{
> +	lockdep_assert_held(&tlb_inval->pending_lock);
> +
> +	mod_delayed_work(system_wq, &tlb_inval->fence_tdr,
> +			 tlb_inval->ops->timeout_delay(tlb_inval));
> +}
> +
>  static bool xe_tlb_inval_seqno_past(struct xe_tlb_inval *tlb_inval, int seqno)
>  {
>  	int seqno_recv = READ_ONCE(tlb_inval->seqno_recv);
> @@ -360,6 +374,12 @@ void xe_tlb_inval_done_handler(struct xe_tlb_inval *tlb_inval, int seqno)
>  	 * process_g2h_msg().
>  	 */
>  	spin_lock_irqsave(&tlb_inval->pending_lock, flags);
> +	if (seqno == TLB_INVALIDATION_SEQNO_INVALID) {
> +		xe_tlb_inval_reset_timeout(tlb_inval);
> +		spin_unlock_irqrestore(&tlb_inval->pending_lock, flags);
> +		return;
> +	}
> +
>  	if (xe_tlb_inval_seqno_past(tlb_inval, seqno)) {
>  		spin_unlock_irqrestore(&tlb_inval->pending_lock, flags);
>  		return;
> -- 
> 2.52.0
>