Commit 9ebb5846 authored by Michal Wajdeczko's avatar Michal Wajdeczko
Browse files

drm/xe/pf: Fix migration initialization 



The migration support only needs to be initialized once, but it
was incorrectly called from the xe_gt_sriov_pf_init_hw(), which
is part of the reset flow and may be called multiple times.

Fixes: d86e3737 ("drm/xe/pf: Add functions to save and restore VF GuC state")
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250120232443.544-1-michal.wajdeczko@intel.com
parent cfa9d40d

drivers/gpu/drm/xe/xe_gt.c

+3 −1
Original line number Diff line number Diff line
@@ -532,8 +532,10 @@ static int all_fw_domain_init(struct xe_gt *gt) 
	if (IS_SRIOV_PF(gt_to_xe(gt)) && !xe_gt_is_media_type(gt))

		xe_lmtt_init_hw(&gt_to_tile(gt)->sriov.pf.lmtt);



	if (IS_SRIOV_PF(gt_to_xe(gt)))

	if (IS_SRIOV_PF(gt_to_xe(gt))) {

		xe_gt_sriov_pf_init(gt);

		xe_gt_sriov_pf_init_hw(gt);

	}



	xe_force_wake_put(gt_to_fw(gt), fw_ref);

drivers/gpu/drm/xe/xe_gt_sriov_pf.c

+13 −1
Original line number Diff line number Diff line
@@ -68,6 +68,19 @@ int xe_gt_sriov_pf_init_early(struct xe_gt *gt) 
	return 0;

}



/**

 * xe_gt_sriov_pf_init - Prepare SR-IOV PF data structures on PF.

 * @gt: the &xe_gt to initialize

 *

 * Late one-time initialization of the PF data.

 *

 * Return: 0 on success or a negative error code on failure.

 */

int xe_gt_sriov_pf_init(struct xe_gt *gt)

{

	return xe_gt_sriov_pf_migration_init(gt);

}



static bool pf_needs_enable_ggtt_guest_update(struct xe_device *xe)

{

	return GRAPHICS_VERx100(xe) == 1200;
@@ -90,7 +103,6 @@ void xe_gt_sriov_pf_init_hw(struct xe_gt *gt) 
		pf_enable_ggtt_guest_update(gt);



	xe_gt_sriov_pf_service_update(gt);

	xe_gt_sriov_pf_migration_init(gt);

}



static u32 pf_get_vf_regs_stride(struct xe_device *xe)

drivers/gpu/drm/xe/xe_gt_sriov_pf.h

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ struct xe_gt; 


#ifdef CONFIG_PCI_IOV

int xe_gt_sriov_pf_init_early(struct xe_gt *gt);

int xe_gt_sriov_pf_init(struct xe_gt *gt);

void xe_gt_sriov_pf_init_hw(struct xe_gt *gt);

void xe_gt_sriov_pf_sanitize_hw(struct xe_gt *gt, unsigned int vfid);

void xe_gt_sriov_pf_restart(struct xe_gt *gt);
@@ -19,6 +20,11 @@ static inline int xe_gt_sriov_pf_init_early(struct xe_gt *gt) 
	return 0;

}



static inline int xe_gt_sriov_pf_init(struct xe_gt *gt)

{

	return 0;

}



static inline void xe_gt_sriov_pf_init_hw(struct xe_gt *gt)

{

}