[PATCH 2/3] drm/xe/pf: Restart VFs provisioning after GT reset

[Piotr Piórkowski]

Michal Wajdeczko <michal.wajdeczko at intel.com> wrote on pon [2024-lip-01 12:27:37 +0200]:
> Any prior configurations pushed to the GuC are lost when the GT
> is reset. Push again all non-empty VF configurations to the GuC
> as part of the GuC reset procedure.
> 
> This will also help restore early manual provisioning, when the
> PF was in the meantime suspended and then resumed.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_gt.c                 |  3 +++
>  drivers/gpu/drm/xe/xe_gt_sriov_pf.c        | 12 +++++++++
>  drivers/gpu/drm/xe/xe_gt_sriov_pf.h        |  5 ++++
>  drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 30 ++++++++++++++++++++++
>  drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h |  2 ++
>  5 files changed, 52 insertions(+)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index 759634cff1d8..29e8ea94d05e 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -683,6 +683,9 @@ static int do_gt_restart(struct xe_gt *gt)
>  	/* Restore GT freq to expected values */
>  	xe_gt_sanitize_freq(gt);
>  
> +	if (IS_SRIOV_PF(gt_to_xe(gt)))
> +		xe_gt_sriov_pf_restart(gt);
> +
>  	return 0;
>  }
>  
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf.c
> index 7decf71c2b7d..9dbba9ab7a9a 100644
> --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf.c
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf.c
> @@ -8,6 +8,7 @@
>  #include "regs/xe_sriov_regs.h"
>  
>  #include "xe_gt_sriov_pf.h"
> +#include "xe_gt_sriov_pf_config.h"
>  #include "xe_gt_sriov_pf_helpers.h"
>  #include "xe_gt_sriov_pf_service.h"
>  #include "xe_mmio.h"
> @@ -82,3 +83,14 @@ void xe_gt_sriov_pf_init_hw(struct xe_gt *gt)
>  
>  	xe_gt_sriov_pf_service_update(gt);
>  }
> +
> +/**
> + * xe_gt_sriov_pf_restart - Restart SR-IOV support after a GT reset.
> + * @gt: the &xe_gt
> + *
> + * This function can only be called on PF.
> + */
> +void xe_gt_sriov_pf_restart(struct xe_gt *gt)
> +{
> +	xe_gt_sriov_pf_config_restart(gt);
> +}
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf.h b/drivers/gpu/drm/xe/xe_gt_sriov_pf.h
> index 37d7d6c3df03..f0cb726a6919 100644
> --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf.h
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf.h
> @@ -11,6 +11,7 @@ struct xe_gt;
>  #ifdef CONFIG_PCI_IOV
>  int xe_gt_sriov_pf_init_early(struct xe_gt *gt);
>  void xe_gt_sriov_pf_init_hw(struct xe_gt *gt);
> +void xe_gt_sriov_pf_restart(struct xe_gt *gt);
>  #else
>  static inline int xe_gt_sriov_pf_init_early(struct xe_gt *gt)
>  {
> @@ -20,6 +21,10 @@ static inline int xe_gt_sriov_pf_init_early(struct xe_gt *gt)
>  static inline void xe_gt_sriov_pf_init_hw(struct xe_gt *gt)
>  {
>  }
> +
> +static inline void xe_gt_sriov_pf_restart(struct xe_gt *gt)
> +{
> +}
>  #endif
>  
>  #endif
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
> index 810b579a0025..db6c213da847 100644
> --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
> @@ -1970,6 +1970,36 @@ bool xe_gt_sriov_pf_config_is_empty(struct xe_gt *gt, unsigned int vfid)
>  	return empty;
>  }
>  
> +/**
> + * xe_gt_sriov_pf_config_restart - Restart SR-IOV configurations after a GT reset.
> + * @gt: the &xe_gt
> + *
> + * Any prior configurations pushed to GuC are lost when the GT is reset.
> + * Push again all non-empty VF configurations to the GuC.
> + *
> + * This function can only be called on PF.
> + */
> +void xe_gt_sriov_pf_config_restart(struct xe_gt *gt)
> +{
> +	unsigned int n, total_vfs = xe_sriov_pf_get_totalvfs(gt_to_xe(gt));
> +	unsigned int fail = 0, skip = 0;
> +
> +	for (n = 1; n <= total_vfs; n++) {
> +		if (xe_gt_sriov_pf_config_is_empty(gt, n))
> +			skip++;
> +		else if (xe_gt_sriov_pf_config_push(gt, n, false))
> +			fail++;
> +	}
> +
> +	if (fail)
> +		xe_gt_sriov_notice(gt, "Failed to push %u of %u VF%s configurations\n",
> +				   fail, total_vfs - skip, str_plural(total_vfs));
> +
> +	if (fail != total_vfs)
> +		xe_gt_sriov_dbg(gt, "pushed %u skip %u of %u VF%s configurations\n",
> +				total_vfs - skip - fail, skip, total_vfs, str_plural(total_vfs));
> +}
> +
>  /**
>   * xe_gt_sriov_pf_config_print_ggtt - Print GGTT configurations.
>   * @gt: the &xe_gt
> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h
> index 58c8f879d7ab..c0e6e4743dc2 100644
> --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h
> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h
> @@ -55,6 +55,8 @@ int xe_gt_sriov_pf_config_push(struct xe_gt *gt, unsigned int vfid, bool refresh
>  
>  bool xe_gt_sriov_pf_config_is_empty(struct xe_gt *gt, unsigned int vfid);
>  
> +void xe_gt_sriov_pf_config_restart(struct xe_gt *gt);
> +
>  int xe_gt_sriov_pf_config_print_ggtt(struct xe_gt *gt, struct drm_printer *p);
>  int xe_gt_sriov_pf_config_print_ctxs(struct xe_gt *gt, struct drm_printer *p);
>  int xe_gt_sriov_pf_config_print_dbs(struct xe_gt *gt, struct drm_printer *p);

LGTM:
Reviewed-by: Piotr Piórkowski <piotr.piorkowski at intel.com>

> -- 
> 2.43.0
> 

--