Re: [PATCH v2 3/4] drm/xe: Extract xe_gt_idle() helper

["Ghimiray, Himal Prasad" <himal.prasad.ghimiray@xxxxxxxxx>]

On 19-04-2024 14:28, Aravind Iddamsetty wrote:

> This would be used in other places outside of gt_reset path.
>
> v2:
> 1. Add kernel doc for xe_gt_idle (Michal)
> 2. fix return as no actual error is reported by xe_uc_stop (Himal)
>
> Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
> Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
> Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@xxxxxxxxx>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> Signed-off-by: Aravind Iddamsetty <aravind.iddamsetty@xxxxxxxxxxxxxxx>
> ---
>  drivers/gpu/drm/xe/xe_gt.c | 28 ++++++++++++++++++----------
>  drivers/gpu/drm/xe/xe_gt.h |  1 +
>  2 files changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index 491d0413de15..a24340219c30 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -629,6 +629,23 @@ static int do_gt_restart(struct xe_gt *gt)
>  	return 0;
>  }
>  
> +/**
> + * xe_gt_idle: Idle the GT.
> + * @gt: The gt object
> + *
> + * Typically called before initiating any resets.
> + *
> + */
> +void xe_gt_idle(struct xe_gt *gt)
> +{
> +	xe_gt_sanitize(gt);
> +	xe_uc_gucrc_disable(&gt->uc);
> +	xe_uc_stop_prepare(&gt->uc);
> +	xe_gt_pagefault_reset(gt);
> +	xe_uc_stop(&gt->uc);
>

The cleanup of xe_uc_stop to return void needs to be addressed independently of the patch.

This patch LGTM

Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@xxxxxxxxx>

> +	xe_gt_tlb_invalidation_reset(gt);
> +}
> +
>  static int gt_reset(struct xe_gt *gt)
>  {
>  	int err;
> @@ -645,21 +662,12 @@ static int gt_reset(struct xe_gt *gt)
>  	}
>  
>  	xe_pm_runtime_get(gt_to_xe(gt));
> -	xe_gt_sanitize(gt);
>  
>  	err = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
>  	if (err)
>  		goto err_msg;
>  
> -	xe_uc_gucrc_disable(&gt->uc);
> -	xe_uc_stop_prepare(&gt->uc);
> -	xe_gt_pagefault_reset(gt);
> -
> -	err = xe_uc_stop(&gt->uc);
> -	if (err)
> -		goto err_out;
> -
> -	xe_gt_tlb_invalidation_reset(gt);
> +	xe_gt_idle(gt);
>  
>  	err = do_gt_reset(gt);
>  	if (err)
> diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h
> index ed6ea8057e35..dcc1023d20e8 100644
> --- a/drivers/gpu/drm/xe/xe_gt.h
> +++ b/drivers/gpu/drm/xe/xe_gt.h
> @@ -43,6 +43,7 @@ int xe_gt_resume(struct xe_gt *gt);
>  void xe_gt_reset_async(struct xe_gt *gt);
>  void xe_gt_sanitize(struct xe_gt *gt);
>  void xe_gt_remove(struct xe_gt *gt);
> +void xe_gt_idle(struct xe_gt *gt);
>  
>  /**
>   * xe_gt_any_hw_engine_by_reset_domain - scan the list of engines and return the
>