Skip to content

Commit 6e03c13

Browse files
committed
drm/xe/pf: Don't save GuC VF migration data on pause
In upcoming changes, the GuC VF migration data will be handled as part of separate SAVE/RESTORE states in VF control state machine. Remove it from PAUSE state. Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Link: https://patch.msgid.link/20251112132220.516975-15-michal.winiarski@intel.com Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
1 parent cea084e commit 6e03c13

2 files changed

Lines changed: 2 additions & 39 deletions

File tree

drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ static const char *control_bit_to_string(enum xe_gt_sriov_control_bits bit)
184184
CASE2STR(PAUSE_SEND_PAUSE);
185185
CASE2STR(PAUSE_WAIT_GUC);
186186
CASE2STR(PAUSE_GUC_DONE);
187-
CASE2STR(PAUSE_SAVE_GUC);
188187
CASE2STR(PAUSE_FAILED);
189188
CASE2STR(PAUSED);
190189
CASE2STR(SAVE_WIP);
@@ -454,8 +453,7 @@ static void pf_enter_vf_ready(struct xe_gt *gt, unsigned int vfid)
454453
* : PAUSE_GUC_DONE o-----restart
455454
* : | :
456455
* : | o---<--busy :
457-
* : v / / :
458-
* : PAUSE_SAVE_GUC :
456+
* : / :
459457
* : / :
460458
* : / :
461459
* :....o..............o...............o...........:
@@ -475,7 +473,6 @@ static void pf_exit_vf_pause_wip(struct xe_gt *gt, unsigned int vfid)
475473
pf_escape_vf_state(gt, vfid, XE_GT_SRIOV_STATE_PAUSE_SEND_PAUSE);
476474
pf_escape_vf_state(gt, vfid, XE_GT_SRIOV_STATE_PAUSE_WAIT_GUC);
477475
pf_escape_vf_state(gt, vfid, XE_GT_SRIOV_STATE_PAUSE_GUC_DONE);
478-
pf_escape_vf_state(gt, vfid, XE_GT_SRIOV_STATE_PAUSE_SAVE_GUC);
479476
}
480477
}
481478

@@ -506,41 +503,12 @@ static void pf_enter_vf_pause_rejected(struct xe_gt *gt, unsigned int vfid)
506503
pf_enter_vf_pause_failed(gt, vfid);
507504
}
508505

509-
static void pf_enter_vf_pause_save_guc(struct xe_gt *gt, unsigned int vfid)
510-
{
511-
if (!pf_enter_vf_state(gt, vfid, XE_GT_SRIOV_STATE_PAUSE_SAVE_GUC))
512-
pf_enter_vf_state_machine_bug(gt, vfid);
513-
}
514-
515-
static bool pf_exit_vf_pause_save_guc(struct xe_gt *gt, unsigned int vfid)
516-
{
517-
int err;
518-
519-
if (!pf_exit_vf_state(gt, vfid, XE_GT_SRIOV_STATE_PAUSE_SAVE_GUC))
520-
return false;
521-
522-
err = xe_gt_sriov_pf_migration_save_guc_state(gt, vfid);
523-
if (err) {
524-
/* retry if busy */
525-
if (err == -EBUSY) {
526-
pf_enter_vf_pause_save_guc(gt, vfid);
527-
return true;
528-
}
529-
/* give up on error */
530-
if (err == -EIO)
531-
pf_enter_vf_mismatch(gt, vfid);
532-
}
533-
534-
pf_enter_vf_pause_completed(gt, vfid);
535-
return true;
536-
}
537-
538506
static bool pf_exit_vf_pause_guc_done(struct xe_gt *gt, unsigned int vfid)
539507
{
540508
if (!pf_exit_vf_state(gt, vfid, XE_GT_SRIOV_STATE_PAUSE_GUC_DONE))
541509
return false;
542510

543-
pf_enter_vf_pause_save_guc(gt, vfid);
511+
pf_enter_vf_pause_completed(gt, vfid);
544512
return true;
545513
}
546514

@@ -1984,9 +1952,6 @@ static bool pf_process_vf_state_machine(struct xe_gt *gt, unsigned int vfid)
19841952
if (pf_exit_vf_pause_guc_done(gt, vfid))
19851953
return true;
19861954

1987-
if (pf_exit_vf_pause_save_guc(gt, vfid))
1988-
return true;
1989-
19901955
if (pf_check_vf_state(gt, vfid, XE_GT_SRIOV_STATE_SAVE_WAIT_DATA)) {
19911956
xe_gt_sriov_dbg_verbose(gt, "VF%u in %s\n", vfid,
19921957
control_bit_to_string(XE_GT_SRIOV_STATE_SAVE_WAIT_DATA));

drivers/gpu/drm/xe/xe_gt_sriov_pf_control_types.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
* @XE_GT_SRIOV_STATE_PAUSE_SEND_PAUSE: indicates that the PF is about to send a PAUSE command.
2929
* @XE_GT_SRIOV_STATE_PAUSE_WAIT_GUC: indicates that the PF awaits for a response from the GuC.
3030
* @XE_GT_SRIOV_STATE_PAUSE_GUC_DONE: indicates that the PF has received a response from the GuC.
31-
* @XE_GT_SRIOV_STATE_PAUSE_SAVE_GUC: indicates that the PF needs to save the VF GuC state.
3231
* @XE_GT_SRIOV_STATE_PAUSE_FAILED: indicates that a VF pause operation has failed.
3332
* @XE_GT_SRIOV_STATE_PAUSED: indicates that the VF is paused.
3433
* @XE_GT_SRIOV_STATE_SAVE_WIP: indicates that VF save operation is in progress.
@@ -71,7 +70,6 @@ enum xe_gt_sriov_control_bits {
7170
XE_GT_SRIOV_STATE_PAUSE_SEND_PAUSE,
7271
XE_GT_SRIOV_STATE_PAUSE_WAIT_GUC,
7372
XE_GT_SRIOV_STATE_PAUSE_GUC_DONE,
74-
XE_GT_SRIOV_STATE_PAUSE_SAVE_GUC,
7573
XE_GT_SRIOV_STATE_PAUSE_FAILED,
7674
XE_GT_SRIOV_STATE_PAUSED,
7775

0 commit comments

Comments
 (0)