From: Boris Brezillon <boris.brezillon@collabora.com>
To: Steven Price <steven.price@arm.com>, Liviu Dudau <liviu.dudau@arm.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>,
Simona Vetter <simona@ffwll.ch>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Boris Brezillon <boris.brezillon@collabora.com>
Subject: [PATCH v2 17/17] drm/panthor: Add a debugfs knobs to simulate reset failures
Date: Tue, 11 Aug 2026 12:17:51 +0200 [thread overview]
Message-ID: <20260811-panthor-unplug-fixes-v2-17-6b583e37f9ae@collabora.com> (raw)
In-Reply-To: <20260811-panthor-unplug-fixes-v2-0-6b583e37f9ae@collabora.com>
It's almost impossible to trigger a situation where the reset
doesn't work now that the driver is more mature, so let's add two
knobs to exercise this error path:
- a knob to trigger a reset
- a knob to fake an error in the reset path
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
drivers/gpu/drm/panthor/panthor_device.c | 45 +++++++++++++++++++++++++++++++-
drivers/gpu/drm/panthor/panthor_device.h | 8 ++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panthor/panthor_device.c b/drivers/gpu/drm/panthor/panthor_device.c
index 012edf5d590c..09c9cc922e70 100644
--- a/drivers/gpu/drm/panthor/panthor_device.c
+++ b/drivers/gpu/drm/panthor/panthor_device.c
@@ -198,7 +198,10 @@ static void panthor_device_reset_work(struct work_struct *work)
panthor_hw_soft_reset(ptdev);
panthor_hw_l2_power_on(ptdev);
panthor_mmu_post_reset(ptdev);
- ret = panthor_fw_post_reset(ptdev);
+ if (ptdev->reset.fake_failure)
+ ret = -EIO;
+ else
+ ret = panthor_fw_post_reset(ptdev);
panthor_sched_post_reset(ptdev, ret != 0);
drm_dev_exit(cookie);
@@ -699,6 +702,40 @@ DEFINE_DEBUGFS_ATTRIBUTE(panthor_device_fake_unplug_failure_fops,
panthor_device_fake_unplug_failure_get,
panthor_device_fake_unplug_failure_set, "%llu\n");
+static int panthor_device_fake_fw_reset_failure_get(void *data, u64 *val)
+{
+ struct panthor_device *ptdev = data;
+
+ *val = ptdev->reset.fake_failure ? 1 : 0;
+ return 0;
+}
+
+static int panthor_device_fake_fw_reset_failure_set(void *data, u64 val)
+{
+ struct panthor_device *ptdev = data;
+
+ ptdev->reset.fake_failure = val ? true : false;
+ return 0;
+}
+
+DEFINE_DEBUGFS_ATTRIBUTE(panthor_device_fake_fw_reset_failure_fops,
+ panthor_device_fake_fw_reset_failure_get,
+ panthor_device_fake_fw_reset_failure_set, "%llu\n");
+
+static ssize_t panthor_device_reset_file_write(struct file *file,
+ const char __user *, size_t size,
+ loff_t *)
+{
+ struct panthor_device *ptdev = file_inode(file)->i_private;
+
+ panthor_device_schedule_reset(ptdev);
+ return size;
+}
+
+static const struct debugfs_short_fops panthor_device_reset_fops = {
+ .write = panthor_device_reset_file_write,
+};
+
void panthor_device_debugfs_init(struct drm_minor *minor)
{
struct panthor_device *ptdev = container_of(minor->dev, struct panthor_device, base);
@@ -706,6 +743,12 @@ void panthor_device_debugfs_init(struct drm_minor *minor)
debugfs_create_file("fake_unplug_failure", 0644,
minor->debugfs_root, ptdev,
&panthor_device_fake_unplug_failure_fops);
+ debugfs_create_file("fake_fw_reset_failure", 0644,
+ minor->debugfs_root, ptdev,
+ &panthor_device_fake_fw_reset_failure_fops);
+ debugfs_create_file("reset", 0200,
+ minor->debugfs_root, ptdev,
+ &panthor_device_reset_fops);
panthor_mmu_debugfs_init(minor);
panthor_gem_debugfs_init(minor);
}
diff --git a/drivers/gpu/drm/panthor/panthor_device.h b/drivers/gpu/drm/panthor/panthor_device.h
index b2788373bfa9..160593824ef2 100644
--- a/drivers/gpu/drm/panthor/panthor_device.h
+++ b/drivers/gpu/drm/panthor/panthor_device.h
@@ -313,6 +313,14 @@ struct panthor_device {
* all FW sections to make sure we start from a fresh state.
*/
bool fast;
+
+ /**
+ * @fake_failure: When true, pretend the FW boot in the reset path failed.
+ *
+ * This is important to check that we're doing the right thing in this very
+ * unlikely case.
+ */
+ bool fake_failure;
} reset;
/** @pm: Power management related data. */
--
2.55.0
prev parent reply other threads:[~2026-08-11 10:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-11 10:17 [PATCH v2 00/17] drm/panthor: Fix the unplug logic Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 01/17] drm/panthor: Disable reset work before unplug Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 02/17] drm/panthor: Further delay reset work enablement Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 03/17] drm/panthor: Make sure reset requests in the resume path are not lost Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 04/17] drm/panthor: Make sure reset requests in the post reset " Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 05/17] drm/panthor: Flush the cleanup_wq in the unplug path Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 06/17] drm/panthor: Drop unused vm argument passed to panthor_vm_prepare_sync_only_op_ctx() Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 07/17] drm/panthor: Move the debugfs initialization to panthor_device.c Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 08/17] drm/panthor: Split panthor_vm Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 09/17] drm/panthor: Add fine-grained restrictions on VMs Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 10/17] drm/panthor: Check AS state before disabling Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 11/17] drm/panthor: Don't pre-allocate VMAs or page tables when preparing a full VM unmap Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 12/17] drm/panthor: Make the VM cleanup path more robust against UAF Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 13/17] drm/panthor: Track user owned VMs Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 14/17] drm/panthor: Track user owned groups Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 15/17] drm/panthor: Fix the unplug logic Boris Brezillon
2026-08-11 10:17 ` [PATCH v2 16/17] drm/panthor: Add a debugfs knob to simulate unplug failures Boris Brezillon
2026-08-11 10:17 ` Boris Brezillon [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260811-panthor-unplug-fixes-v2-17-6b583e37f9ae@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=simona@ffwll.ch \
--cc=steven.price@arm.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®