drm/xe/pf: Resend PF provisioning after GT reset

[ Upstream commit 5c244eeca57ff4e47e1f60310d059346d1b86b9b ]

If we reload the GuC due to suspend/resume or GT reset then we
have to resend not only any VFs provisioning data, but also PF
configuration, like scheduling parameters (EQ, PT), as otherwise
GuC will continue to use default values.

Fixes: 411220808cee ("drm/xe/pf: Restart VFs provisioning after GT reset")
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com>
Link: https://lore.kernel.org/r/20250711193316.1920-3-michal.wajdeczko@intel.com
(cherry picked from commit 1c38dd6afa4a8ecce28e94da794fd1d205c30f51)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

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 10be109bf357fffd3b5b713848e89d00ef35c842..96289195a3d3ec4efb669a2e6b18a8c43f7ccccc 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
@@ -2356,6 +2356,21 @@ int xe_gt_sriov_pf_config_restore(struct xe_gt *gt, unsigned int vfid,
        return err;
 }
 
+static int pf_push_self_config(struct xe_gt *gt)
+{
+       int err;
+
+       err = pf_push_full_vf_config(gt, PFID);
+       if (err) {
+               xe_gt_sriov_err(gt, "Failed to push self configuration (%pe)\n",
+                               ERR_PTR(err));
+               return err;
+       }
+
+       xe_gt_sriov_dbg_verbose(gt, "self configuration completed\n");
+       return 0;
+}
+
 static void fini_config(void *arg)
 {
        struct xe_gt *gt = arg;
@@ -2379,9 +2394,17 @@ static void fini_config(void *arg)
 int xe_gt_sriov_pf_config_init(struct xe_gt *gt)
 {
        struct xe_device *xe = gt_to_xe(gt);
+       int err;
 
        xe_gt_assert(gt, IS_SRIOV_PF(xe));
 
+       mutex_lock(xe_gt_sriov_pf_master_mutex(gt));
+       err = pf_push_self_config(gt);
+       mutex_unlock(xe_gt_sriov_pf_master_mutex(gt));
+
+       if (err)
+               return err;
+
        return devm_add_action_or_reset(xe->drm.dev, fini_config, gt);
 }
 
@@ -2399,6 +2422,10 @@ 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;
 
+       mutex_lock(xe_gt_sriov_pf_master_mutex(gt));
+       pf_push_self_config(gt);
+       mutex_unlock(xe_gt_sriov_pf_master_mutex(gt));
+
        for (n = 1; n <= total_vfs; n++) {
                if (xe_gt_sriov_pf_config_is_empty(gt, n))
                        skip++;