accel/ivpu: Add debugfs files for testing device reset

Add new debugfs files to validate device recovery functionality.

Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230524074847.866711-4-stanislaw.gruszka@linux.intel.com

diff --git a/drivers/accel/ivpu/ivpu_debugfs.c b/drivers/accel/ivpu/ivpu_debugfs.c
index a9180fae43b600f1f8fa7504f52133c44d38f697..e2502d2b53c0a44e7c441d112de828172ba2fa69 100644 (file)
--- a/drivers/accel/ivpu/ivpu_debugfs.c
+++ b/drivers/accel/ivpu/ivpu_debugfs.c
@@ -77,11 +77,31 @@ static int last_bootmode_show(struct seq_file *s, void *v)
        return 0;
 }
 
+static int reset_counter_show(struct seq_file *s, void *v)
+{
+       struct drm_info_node *node = (struct drm_info_node *)s->private;
+       struct ivpu_device *vdev = to_ivpu_device(node->minor->dev);
+
+       seq_printf(s, "%d\n", atomic_read(&vdev->pm->reset_counter));
+       return 0;
+}
+
+static int reset_pending_show(struct seq_file *s, void *v)
+{
+       struct drm_info_node *node = (struct drm_info_node *)s->private;
+       struct ivpu_device *vdev = to_ivpu_device(node->minor->dev);
+
+       seq_printf(s, "%d\n", atomic_read(&vdev->pm->in_reset));
+       return 0;
+}
+
 static const struct drm_info_list vdev_debugfs_list[] = {
        {"bo_list", bo_list_show, 0},
        {"fw_trace_capability", fw_trace_capability_show, 0},
        {"fw_trace_config", fw_trace_config_show, 0},
        {"last_bootmode", last_bootmode_show, 0},
+       {"reset_counter", reset_counter_show, 0},
+       {"reset_pending", reset_pending_show, 0},
 };
 
 static int fw_log_show(struct seq_file *s, void *v)
@@ -216,6 +236,24 @@ ivpu_reset_engine_fn(struct file *file, const char __user *user_buf, size_t size
        return size;
 }
 
+static ssize_t
+ivpu_force_recovery_fn(struct file *file, const char __user *user_buf, size_t size, loff_t *pos)
+{
+       struct ivpu_device *vdev = file->private_data;
+
+       if (!size)
+               return -EINVAL;
+
+       ivpu_pm_schedule_recovery(vdev);
+       return size;
+}
+
+static const struct file_operations ivpu_force_recovery_fops = {
+       .owner = THIS_MODULE,
+       .open = simple_open,
+       .write = ivpu_force_recovery_fn,
+};
+
 static const struct file_operations ivpu_reset_engine_fops = {
        .owner = THIS_MODULE,
        .open = simple_open,
@@ -229,6 +267,9 @@ void ivpu_debugfs_init(struct drm_minor *minor)
        drm_debugfs_create_files(vdev_debugfs_list, ARRAY_SIZE(vdev_debugfs_list),
                                 minor->debugfs_root, minor);
 
+       debugfs_create_file("force_recovery", 0200, minor->debugfs_root, vdev,
+                           &ivpu_force_recovery_fops);
+
        debugfs_create_file("fw_log", 0644, minor->debugfs_root, vdev,
                            &fw_log_fops);
        debugfs_create_file("fw_trace_destination_mask", 0200, minor->debugfs_root, vdev,

diff --git a/drivers/accel/ivpu/ivpu_pm.c b/drivers/accel/ivpu/ivpu_pm.c
index aa4d56dc52b39266173d0ec9f55c6e072d03af8b..e6f27daf5560b691a8483ff7963f89aa69dbea65 100644 (file)
--- a/drivers/accel/ivpu/ivpu_pm.c
+++ b/drivers/accel/ivpu/ivpu_pm.c
@@ -259,6 +259,7 @@ void ivpu_pm_reset_prepare_cb(struct pci_dev *pdev)
        pm_runtime_get_sync(vdev->drm.dev);
 
        ivpu_dbg(vdev, PM, "Pre-reset..\n");
+       atomic_inc(&vdev->pm->reset_counter);
        atomic_set(&vdev->pm->in_reset, 1);
        ivpu_shutdown(vdev);
        ivpu_pm_prepare_cold_boot(vdev);

diff --git a/drivers/accel/ivpu/ivpu_pm.h b/drivers/accel/ivpu/ivpu_pm.h
index baca981872551cc6e9a1380075c4fc749a735515..fd4eada1290fb4bc2f1e8e8c4a0c852d1b796e07 100644 (file)
--- a/drivers/accel/ivpu/ivpu_pm.h
+++ b/drivers/accel/ivpu/ivpu_pm.h
@@ -14,6 +14,7 @@ struct ivpu_pm_info {
        struct ivpu_device *vdev;
        struct work_struct recovery_work;
        atomic_t in_reset;
+       atomic_t reset_counter;
        bool is_warmboot;
        u32 suspend_reschedule_counter;
 };