diff mbox series

[2/6] accel/ivpu: Prevent runtime suspend during context abort work

Message ID 20250204084622.2422544-3-jacek.lawrynowicz@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series accel/ivpu: Changes for 6.15 2025-02-04 | expand

Commit Message

Jacek Lawrynowicz Feb. 4, 2025, 8:46 a.m. UTC 
From: Andrzej Kacprowski <Andrzej.Kacprowski@intel.com>

Increment the runtime PM counter when entering
ivpu_context_abort_work_fn() to prevent the device
from suspending while the function is executing.

Reviewed-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Signed-off-by: Andrzej Kacprowski <Andrzej.Kacprowski@intel.com>
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
---
 drivers/accel/ivpu/ivpu_job.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Jeffrey Hugo Feb. 14, 2025, 4:49 p.m. UTC | #1 
On 2/4/2025 1:46 AM, Jacek Lawrynowicz wrote:
> From: Andrzej Kacprowski <Andrzej.Kacprowski@intel.com>
> 
> Increment the runtime PM counter when entering
> ivpu_context_abort_work_fn() to prevent the device
> from suspending while the function is executing.

Why should suspend be prevented during the abort fn?

-Jeff
Jacek Lawrynowicz Feb. 17, 2025, 3:33 p.m. UTC | #2 
Hi,

On 2/14/2025 5:49 PM, Jeffrey Hugo wrote:
> On 2/4/2025 1:46 AM, Jacek Lawrynowicz wrote:
>> From: Andrzej Kacprowski <Andrzej.Kacprowski@intel.com>
>>
>> Increment the runtime PM counter when entering
>> ivpu_context_abort_work_fn() to prevent the device
>> from suspending while the function is executing.
> 
> Why should suspend be prevented during the abort fn?

ivpu_context_abort_work_fn() executes a pair of reset/resume engine IPC commands that always have to be paired.
Suspend/resume between them cases related FW state to be lost and resume engine then fails.

Jacek
Jeffrey Hugo Feb. 18, 2025, 3:48 p.m. UTC | #3 
On 2/17/2025 8:33 AM, Jacek Lawrynowicz wrote:
> Hi,
> 
> On 2/14/2025 5:49 PM, Jeffrey Hugo wrote:
>> On 2/4/2025 1:46 AM, Jacek Lawrynowicz wrote:
>>> From: Andrzej Kacprowski <Andrzej.Kacprowski@intel.com>
>>>
>>> Increment the runtime PM counter when entering
>>> ivpu_context_abort_work_fn() to prevent the device
>>> from suspending while the function is executing.
>>
>> Why should suspend be prevented during the abort fn?
> 
> ivpu_context_abort_work_fn() executes a pair of reset/resume engine IPC commands that always have to be paired.
> Suspend/resume between them cases related FW state to be lost and resume engine then fails.

This feels like relevant information that should be included in the 
commit text as justification for making this change.

Assuming such an update,
Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
diff mbox series

Patch

diff --git a/drivers/accel/ivpu/ivpu_job.c b/drivers/accel/ivpu/ivpu_job.c
index c1013f511efa6..004059e4f1e89 100644
--- a/drivers/accel/ivpu/ivpu_job.c
+++ b/drivers/accel/ivpu/ivpu_job.c
@@ -8,6 +8,7 @@ 
 #include <linux/bitfield.h>
 #include <linux/highmem.h>
 #include <linux/pci.h>
+#include <linux/pm_runtime.h>
 #include <linux/module.h>
 #include <uapi/drm/ivpu_accel.h>
 
@@ -965,6 +966,9 @@  void ivpu_context_abort_work_fn(struct work_struct *work)
 	unsigned long ctx_id;
 	unsigned long id;
 
+	if (drm_WARN_ON(&vdev->drm, pm_runtime_get_if_active(vdev->drm.dev) <= 0))
+		return;
+
 	if (vdev->fw->sched_mode == VPU_SCHEDULING_MODE_HW)
 		ivpu_jsm_reset_engine(vdev, 0);
 
@@ -987,7 +991,7 @@  void ivpu_context_abort_work_fn(struct work_struct *work)
 	ivpu_mmu_discard_events(vdev);
 
 	if (vdev->fw->sched_mode != VPU_SCHEDULING_MODE_HW)
-		return;
+		goto runtime_put;
 
 	ivpu_jsm_hws_resume_engine(vdev, 0);
 	/*
@@ -1000,4 +1004,8 @@  void ivpu_context_abort_work_fn(struct work_struct *work)
 		if (job->file_priv->aborted)
 			ivpu_job_signal_and_destroy(vdev, job->job_id, DRM_IVPU_JOB_STATUS_ABORTED);
 	mutex_unlock(&vdev->submitted_jobs_lock);
+
+runtime_put:
+	pm_runtime_mark_last_busy(vdev->drm.dev);
+	pm_runtime_put_autosuspend(vdev->drm.dev);
 }