@@ -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-
538506static 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 ));
0 commit comments