drm/xe/pf: Handle GGTT migration data as part of PF control

Connect the helpers to allow save and restore of GGTT migration data in
stop_copy / resume device state.

Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patch.msgid.link/20251112132220.516975-19-michal.winiarski@intel.com
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c
index 7527aed8c7c57facb3bf64837103d71d3a2a04f3..16524bc18b1b2be287ef9980e4dd1344af5d9982 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c
@@ -868,6 +868,18 @@ static int pf_handle_vf_save_data(struct xe_gt *gt, unsigned int vfid)
                return -EAGAIN;
        }
 
+       if (xe_gt_sriov_pf_migration_save_data_pending(gt, vfid,
+                                                      XE_SRIOV_PACKET_TYPE_GGTT)) {
+               ret = xe_gt_sriov_pf_migration_ggtt_save(gt, vfid);
+               if (ret)
+                       return ret;
+
+               xe_gt_sriov_pf_migration_save_data_complete(gt, vfid,
+                                                           XE_SRIOV_PACKET_TYPE_GGTT);
+
+               return -EAGAIN;
+       }
+
        return 0;
 }
 
@@ -1097,6 +1109,9 @@ static int pf_handle_vf_restore_data(struct xe_gt *gt, unsigned int vfid)
        int ret = 0;
 
        switch (data->hdr.type) {
+       case XE_SRIOV_PACKET_TYPE_GGTT:
+               ret = xe_gt_sriov_pf_migration_ggtt_restore(gt, vfid, data);
+               break;
        case XE_SRIOV_PACKET_TYPE_GUC:
                ret = xe_gt_sriov_pf_migration_guc_restore(gt, vfid, data);
                break;

diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c
index e3d4423df423787664a404a665d4c7788dc065e4..9143ab328e5bbdb75f299a40edb123f75d8789f5 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c
@@ -7,6 +7,9 @@
 
 #include "abi/guc_actions_sriov_abi.h"
 #include "xe_bo.h"
+#include "xe_ggtt.h"
+#include "xe_gt.h"
+#include "xe_gt_sriov_pf_config.h"
 #include "xe_gt_sriov_pf_control.h"
 #include "xe_gt_sriov_pf_helpers.h"
 #include "xe_gt_sriov_pf_migration.h"
@@ -42,6 +45,105 @@ static void pf_dump_mig_data(struct xe_gt *gt, unsigned int vfid,
        }
 }
 
+static ssize_t pf_migration_ggtt_size(struct xe_gt *gt, unsigned int vfid)
+{
+       if (!xe_gt_is_main_type(gt))
+               return 0;
+
+       return xe_gt_sriov_pf_config_ggtt_save(gt, vfid, NULL, 0);
+}
+
+static int pf_save_vf_ggtt_mig_data(struct xe_gt *gt, unsigned int vfid)
+{
+       struct xe_sriov_packet *data;
+       size_t size;
+       int ret;
+
+       size = pf_migration_ggtt_size(gt, vfid);
+       xe_gt_assert(gt, size);
+
+       data = xe_sriov_packet_alloc(gt_to_xe(gt));
+       if (!data)
+               return -ENOMEM;
+
+       ret = xe_sriov_packet_init(data, gt->tile->id, gt->info.id,
+                                  XE_SRIOV_PACKET_TYPE_GGTT, 0, size);
+       if (ret)
+               goto fail;
+
+       ret = xe_gt_sriov_pf_config_ggtt_save(gt, vfid, data->vaddr, size);
+       if (ret)
+               goto fail;
+
+       pf_dump_mig_data(gt, vfid, data, "GGTT data save");
+
+       ret = xe_gt_sriov_pf_migration_save_produce(gt, vfid, data);
+       if (ret)
+               goto fail;
+
+       return 0;
+
+fail:
+       xe_sriov_packet_free(data);
+       xe_gt_sriov_err(gt, "Failed to save VF%u GGTT data (%pe)\n", vfid, ERR_PTR(ret));
+       return ret;
+}
+
+static int pf_restore_vf_ggtt_mig_data(struct xe_gt *gt, unsigned int vfid,
+                                      struct xe_sriov_packet *data)
+{
+       int ret;
+
+       pf_dump_mig_data(gt, vfid, data, "GGTT data restore");
+
+       ret = xe_gt_sriov_pf_config_ggtt_restore(gt, vfid, data->vaddr, data->hdr.size);
+       if (ret) {
+               xe_gt_sriov_err(gt, "Failed to restore VF%u GGTT data (%pe)\n",
+                               vfid, ERR_PTR(ret));
+               return ret;
+       }
+
+       return 0;
+}
+
+/**
+ * xe_gt_sriov_pf_migration_ggtt_save() - Save VF GGTT migration data.
+ * @gt: the &xe_gt
+ * @vfid: the VF identifier (can't be 0)
+ *
+ * This function is for PF only.
+ *
+ * Return: 0 on success or a negative error code on failure.
+ */
+int xe_gt_sriov_pf_migration_ggtt_save(struct xe_gt *gt, unsigned int vfid)
+{
+       xe_gt_assert(gt, IS_SRIOV_PF(gt_to_xe(gt)));
+       xe_gt_assert(gt, vfid != PFID);
+       xe_gt_assert(gt, vfid <= xe_sriov_pf_get_totalvfs(gt_to_xe(gt)));
+
+       return pf_save_vf_ggtt_mig_data(gt, vfid);
+}
+
+/**
+ * xe_gt_sriov_pf_migration_ggtt_restore() - Restore VF GGTT migration data.
+ * @gt: the &xe_gt
+ * @vfid: the VF identifier (can't be 0)
+ * @data: the &xe_sriov_packet containing migration data
+ *
+ * This function is for PF only.
+ *
+ * Return: 0 on success or a negative error code on failure.
+ */
+int xe_gt_sriov_pf_migration_ggtt_restore(struct xe_gt *gt, unsigned int vfid,
+                                         struct xe_sriov_packet *data)
+{
+       xe_gt_assert(gt, IS_SRIOV_PF(gt_to_xe(gt)));
+       xe_gt_assert(gt, vfid != PFID);
+       xe_gt_assert(gt, vfid <= xe_sriov_pf_get_totalvfs(gt_to_xe(gt)));
+
+       return pf_restore_vf_ggtt_mig_data(gt, vfid, data);
+}
+
 /* Return: number of dwords saved/restored/required or a negative error code on failure */
 static int guc_action_vf_save_restore(struct xe_guc *guc, u32 vfid, u32 opcode,
                                      u64 addr, u32 ndwords)
@@ -281,6 +383,13 @@ ssize_t xe_gt_sriov_pf_migration_size(struct xe_gt *gt, unsigned int vfid)
                size += sizeof(struct xe_sriov_packet_hdr);
        total += size;
 
+       size = pf_migration_ggtt_size(gt, vfid);
+       if (size < 0)
+               return size;
+       if (size > 0)
+               size += sizeof(struct xe_sriov_packet_hdr);
+       total += size;
+
        return total;
 }
 
@@ -346,6 +455,9 @@ void xe_gt_sriov_pf_migration_save_init(struct xe_gt *gt, unsigned int vfid)
 
        xe_gt_assert(gt, pf_migration_guc_size(gt, vfid) > 0);
        pf_migration_save_data_todo(gt, vfid, XE_SRIOV_PACKET_TYPE_GUC);
+
+       if (pf_migration_ggtt_size(gt, vfid) > 0)
+               pf_migration_save_data_todo(gt, vfid, XE_SRIOV_PACKET_TYPE_GGTT);
 }
 
 /**

diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.h b/drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.h
index 1cba651b521fe0fef878aaca57c5f867c1ef3395..2d221b6409b3301f4706231d82e872a1c5d7d5f8 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.h
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.h
@@ -19,6 +19,9 @@ int xe_gt_sriov_pf_migration_init(struct xe_gt *gt);
 int xe_gt_sriov_pf_migration_guc_save(struct xe_gt *gt, unsigned int vfid);
 int xe_gt_sriov_pf_migration_guc_restore(struct xe_gt *gt, unsigned int vfid,
                                         struct xe_sriov_packet *data);
+int xe_gt_sriov_pf_migration_ggtt_save(struct xe_gt *gt, unsigned int vfid);
+int xe_gt_sriov_pf_migration_ggtt_restore(struct xe_gt *gt, unsigned int vfid,
+                                         struct xe_sriov_packet *data);
 
 ssize_t xe_gt_sriov_pf_migration_size(struct xe_gt *gt, unsigned int vfid);