Re: [PATCH v2 2/2] drm/xe/vf: Reset recovery_queued after issuing RESFIX_START

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

On Mon, Dec 08, 2025 at 07:27:42AM +0000, Satyanarayana K V P wrote:
> During VF_RESTORE or VF_RESUME, the GuC sends a migration interrupt and
> clears the RESFIX_START marker. If migration or resume occurs before the
> VF issues its own RESFIX_START, VF KMD may receive two back-to-back
> migration interrupts. VF then sends RESFIX_START to indicate the beginning
> of fixups and RESFIX_DONE to mark completion. However, the second
> RESFIX_START fails because the GuC is already in the RUNNING state.
> 
> Clear the recovery_queued flag after sending a RESFIX_START message to
> ignore duplicated IRQs seen before we start actual recovery.
> 
> This ensures the state is reset only after the fixup process begins,
> avoiding redundant work item queuing.
> 
> Fixes: b5fbb94341a2 ("drm/xe/vf: Introduce RESFIX start marker support")
> Signed-off-by: Satyanarayana K V P <satyanarayana.k.v.p@intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>
> Cc: Tomasz Lis <tomasz.lis@intel.com>
> 
> ---
> V1 -> V2:
> - Fixed review comments (Michal W).
> - Updated commit message.
> - Used scoped_guard for spin_lock/unlock_irq.
> ---
>  drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
> index 47612e67d462..23ab25e407dc 100644
> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
> @@ -1171,10 +1171,6 @@ static bool vf_post_migration_shutdown(struct xe_gt *gt)
>  			return true;
>  	}
>  
> -	spin_lock_irq(&gt->sriov.vf.migration.lock);
> -	gt->sriov.vf.migration.recovery_queued = false;
> -	spin_unlock_irq(&gt->sriov.vf.migration.lock);
> -
>  	xe_guc_ct_flush_and_stop(&gt->uc.guc.ct);
>  	xe_guc_submit_pause_vf(&gt->uc.guc);
>  	xe_tlb_inval_reset(&gt->tlb_inval);
> @@ -1258,7 +1254,14 @@ static int vf_post_migration_resfix_done(struct xe_gt *gt, u16 marker)
>  
>  static int vf_post_migration_resfix_start(struct xe_gt *gt, u16 marker)
>  {
> -	return vf_resfix_start(gt, marker);
> +	int err;
> +
> +	err = vf_resfix_start(gt, marker);
> +
> +	scoped_guard(spinlock_irq, &gt->sriov.vf.migration.lock)

Also you can just use guard here, but fine either way.

> +		gt->sriov.vf.migration.recovery_queued = false;
> +
> +	return  err;

Extra space.

Matt

>  }
>  
>  static u16 vf_post_migration_next_resfix_marker(struct xe_gt *gt)
> -- 
> 2.43.0
>