Unverified Commit 9bb2f1d7 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Rodrigo Vivi
Browse files

drm/xe/vf: Fix signature of print functions 



We have plugged-in existing VF print functions into our GT debugfs
show helper as-is, but we missed that the helper expects functions
to return int, while they were defined as void. This can lead to
errors being reported when CFI is enabled.

Fixes: 63d8cb8f ("drm/xe/vf: Expose SR-IOV VF attributes to GT debugfs")
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Mohanram Meenakshisundaram <mohanram.meenakshisundaram@intel.com>
Reviewed-by: default avatarShuicheng Lin <shuicheng.lin@intel.com>
Link: https://patch.msgid.link/20260514155726.7165-1-michal.wajdeczko@intel.com


(cherry picked from commit 314e31c9a8a1c421ee4f7f755b9348aefbbca090)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent d3ded53f

drivers/gpu/drm/xe/xe_gt_sriov_vf.c

+18 −6
Original line number Diff line number Diff line
@@ -1137,13 +1137,15 @@ void xe_gt_sriov_vf_write32(struct xe_gt *gt, struct xe_reg reg, u32 val) 
}



/**

 * xe_gt_sriov_vf_print_config - Print VF self config.

 * xe_gt_sriov_vf_print_config() - Print VF self config.

 * @gt: the &xe_gt

 * @p: the &drm_printer

 *

 * This function is for VF use only.

 *

 * Return: always 0.

 */

void xe_gt_sriov_vf_print_config(struct xe_gt *gt, struct drm_printer *p)

int xe_gt_sriov_vf_print_config(struct xe_gt *gt, struct drm_printer *p)

{

	struct xe_gt_sriov_vf_selfconfig *config = &gt->sriov.vf.self_config;

	struct xe_device *xe = gt_to_xe(gt);
@@ -1170,16 +1172,20 @@ void xe_gt_sriov_vf_print_config(struct xe_gt *gt, struct drm_printer *p) 


	drm_printf(p, "GuC contexts:\t%u\n", config->num_ctxs);

	drm_printf(p, "GuC doorbells:\t%u\n", config->num_dbs);



	return 0;

}



/**

 * xe_gt_sriov_vf_print_runtime - Print VF's runtime regs received from PF.

 * xe_gt_sriov_vf_print_runtime() - Print VF's runtime regs received from PF.

 * @gt: the &xe_gt

 * @p: the &drm_printer

 *

 * This function is for VF use only.

 *

 * Return: always 0.

 */

void xe_gt_sriov_vf_print_runtime(struct xe_gt *gt, struct drm_printer *p)

int xe_gt_sriov_vf_print_runtime(struct xe_gt *gt, struct drm_printer *p)

{

	struct vf_runtime_reg *vf_regs = gt->sriov.vf.runtime.regs;

	unsigned int size = gt->sriov.vf.runtime.num_regs;
@@ -1188,16 +1194,20 @@ void xe_gt_sriov_vf_print_runtime(struct xe_gt *gt, struct drm_printer *p) 


	for (; size--; vf_regs++)

		drm_printf(p, "%#x = %#x\n", vf_regs->offset, vf_regs->value);



	return 0;

}



/**

 * xe_gt_sriov_vf_print_version - Print VF ABI versions.

 * xe_gt_sriov_vf_print_version() - Print VF ABI versions.

 * @gt: the &xe_gt

 * @p: the &drm_printer

 *

 * This function is for VF use only.

 *

 * Return: always 0.

 */

void xe_gt_sriov_vf_print_version(struct xe_gt *gt, struct drm_printer *p)

int xe_gt_sriov_vf_print_version(struct xe_gt *gt, struct drm_printer *p)

{

	struct xe_device *xe = gt_to_xe(gt);

	struct xe_uc_fw_version *guc_version = &gt->sriov.vf.guc_version;
@@ -1227,6 +1237,8 @@ void xe_gt_sriov_vf_print_version(struct xe_gt *gt, struct drm_printer *p) 
		   GUC_RELAY_VERSION_LATEST_MAJOR, GUC_RELAY_VERSION_LATEST_MINOR);

	drm_printf(p, "\thandshake:\t%u.%u\n",

		   pf_version->major, pf_version->minor);



	return 0;

}



static bool vf_post_migration_shutdown(struct xe_gt *gt)

drivers/gpu/drm/xe/xe_gt_sriov_vf.h

+3 −3
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ bool xe_gt_sriov_vf_sched_groups_enabled(struct xe_gt *gt); 
u32 xe_gt_sriov_vf_read32(struct xe_gt *gt, struct xe_reg reg);

void xe_gt_sriov_vf_write32(struct xe_gt *gt, struct xe_reg reg, u32 val);



void xe_gt_sriov_vf_print_config(struct xe_gt *gt, struct drm_printer *p);

void xe_gt_sriov_vf_print_runtime(struct xe_gt *gt, struct drm_printer *p);

void xe_gt_sriov_vf_print_version(struct xe_gt *gt, struct drm_printer *p);

int xe_gt_sriov_vf_print_config(struct xe_gt *gt, struct drm_printer *p);

int xe_gt_sriov_vf_print_runtime(struct xe_gt *gt, struct drm_printer *p);

int xe_gt_sriov_vf_print_version(struct xe_gt *gt, struct drm_printer *p);



int xe_gt_sriov_vf_wait_valid_ggtt(struct xe_gt *gt);

int xe_vf_migration_fixups_complete_count(struct xe_gt *gt);