Skip to contentSkip to conversation

media: imagination: e5010: Enable autosuspend for runtime PM

PATCH In review Brandon Brnich 3 participants 4 messages Jul 22 – Aug 13

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: imagination: e5010: Enable autosuspend for runtime PM

Current implementation only has one call to turn the device on - start_streaming. This can waste power of device as the device can be in STREAM_ON state, but no buffers are actually being submitted.

e5010_init_device needs to be moved to the resume hook to ensure register state is correct during any power on. This also fixes an issue when device was never powered on, but system resumes from deep sleep. The PM framework skips the runtime resume hook since device was never on in the first place. This causes e5010_init_device to be called for a powered off device leading to invalid write and system crash.

Fixes a1e2940458853 ("media: imagination: Add E5010 JPEG Encoder driver")
---
 .../platform/imagination/e5010-jpeg-enc.c     | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)
drivers/media/platform/imagination/e5010-jpeg-enc.c +21 -26
index 42ad9ee3993b4..189c147cb9705 100644
@@ -976,6 +976,8 @@ static irqreturn_t e5010_irq(int irq, void *data)
 
 	v4l2_m2m_job_finish(e5010->m2m_dev, ctx->fh.m2m_ctx);
 	dprintk(e5010, 3, "ctx: 0x%p Finish job\n", ctx);
+	pm_runtime_mark_last_busy(e5010->dev);
+	pm_runtime_put_autosuspend(e5010->dev);
 
 job_unlock:
 	spin_unlock(&e5010->hw_lock);
@@ -1099,6 +1101,8 @@ static int e5010_probe(struct platform_device *pdev)
 		goto fail_after_v4l2_register;
 	}
 
+	pm_runtime_set_autosuspend_delay(dev, 100);
+	pm_runtime_use_autosuspend(dev);
 	pm_runtime_enable(dev);
 
 	ret = video_register_device(e5010->vdev, VFL_TYPE_VIDEO, 0);
@@ -1289,31 +1293,13 @@ static int e5010_encoder_cmd(struct file *file, void *priv,
 static int e5010_start_streaming(struct vb2_queue *q, unsigned int count)
 {
 	struct e5010_context *ctx = vb2_get_drv_priv(q);
-	int ret;
 
 	struct e5010_q_data *queue = get_queue(ctx, q->type);
 
 	v4l2_m2m_update_start_streaming_state(ctx->fh.m2m_ctx, q);
 	queue->sequence = 0;
 
-	ret = pm_runtime_resume_and_get(ctx->e5010->dev);
-	if (ret < 0) {
-		v4l2_err(&ctx->e5010->v4l2_dev, "failed to power up jpeg\n");
-		goto fail;
-	}
-
-	ret = e5010_init_device(ctx->e5010);
-	if (ret) {
-		v4l2_err(&ctx->e5010->v4l2_dev, "failed to Enable e5010 device\n");
-		goto fail;
-	}
-
 	return 0;
-
-fail:
-	e5010_vb2_buffers_return(q, VB2_BUF_STATE_QUEUED);
-
-	return ret;
 }
 
 static void e5010_stop_streaming(struct vb2_queue *q)
@@ -1329,8 +1315,6 @@ static void e5010_stop_streaming(struct vb2_queue *q)
 	    v4l2_m2m_has_stopped(ctx->fh.m2m_ctx)) {
 		v4l2_event_queue_fh(&ctx->fh, &e5010_eos_event);
 	}
-
-	pm_runtime_put_sync(ctx->e5010->dev);
 }
 
 static void e5010_device_run(void *priv)
@@ -1343,7 +1327,15 @@ static void e5010_device_run(void *priv)
 	unsigned long flags;
 	int num_planes = ctx->out_queue.fmt->num_planes;
 
+	ret = pm_runtime_resume_and_get(e5010->dev);
+	if (ret < 0) {
+		dev_err(e5010->dev, "Device failed to turn on\n");
+		v4l2_m2m_job_finish(e5010->m2m_dev, ctx->fh.m2m_ctx);
+		return;
+	}
+
 	spin_lock_irqsave(&e5010->hw_lock, flags);
+
 	s_vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
 	WARN_ON(!s_vb);
 	d_vb = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
@@ -1474,6 +1466,8 @@ static void e5010_device_run(void *priv)
 	e5010_reset(e5010->dev, e5010->core_base, e5010->mmu_base);
 
 no_ready_buf_err:
+	pm_runtime_mark_last_busy(e5010->dev);
+	pm_runtime_put_autosuspend(e5010->dev);
 	if (s_vb) {
 		v4l2_m2m_src_buf_remove_by_buf(ctx->fh.m2m_ctx, s_vb);
 		v4l2_m2m_buf_done(s_vb, VB2_BUF_STATE_ERROR);
@@ -1501,6 +1495,13 @@ static int e5010_runtime_resume(struct device *dev)
 		return ret;
 	}
 
+	ret = e5010_init_device(e5010);
+	if (ret) {
+		dev_err(dev, "Failed to re-enable e5010 device\n");
+		clk_disable_unprepare(e5010->clk);
+		return ret;
+	}
+
 	return 0;
 }
 
@@ -1533,12 +1534,6 @@ static int e5010_resume(struct device *dev)
 	if (ret < 0)
 		return ret;
 
-	ret = e5010_init_device(e5010);
-	if (ret) {
-		dev_err(dev, "Failed to re-enable e5010 device\n");
-		return ret;
-	}
-
 	v4l2_m2m_resume(e5010->m2m_dev);
 
 	return ret;
Signature · 1 line
2.43.0
#1 lore raw

Hi Brandon,

Thank you for the patch.

Quoting Brandon Brnich (2026-07-23 02:38:45)

Quoted 10 lines

Current implementation only has one call to turn the device on - start_streaming. This can waste power of device as the device can be in STREAM_ON state, but no buffers are actually being submitted.

e5010_init_device needs to be moved to the resume hook to ensure register state is correct during any power on. This also fixes an issue when device was never powered on, but system resumes from deep sleep. The PM framework skips the runtime resume hook since device was never on in the first place. This causes e5010_init_device to be called for a powered off device leading to invalid write and system crash.

There are two separate things be solved by this patch, one is the bug fix and the other is the good-to-have feature for autosuspending the device between buffers.

It would make it much easier to review the logic if v2 splits the two, and only keeps the Fixes tag (+cc stable) for the bug fix.

Quoted 12 lines
Fixes a1e2940458853 ("media: imagination: Add E5010 JPEG Encoder driver")
---
 .../platform/imagination/e5010-jpeg-enc.c     | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)
drivers/media/platform/imagination/e5010-jpeg-enc.c +0 -0
index 42ad9ee3993b4..189c147cb9705 100644

drivers/media/platform/imagination/e5010-jpeg-enc.c static irqreturn_t e5010_irq(int irq, void *data) · line 980

Quoted 5 lines
drivers/media/platform/imagination/e5010-jpeg-enc.c +2 -0
@@ -976,6 +976,8 @@ static irqreturn_t e5010_irq(int irq, void *data)
 
        v4l2_m2m_job_finish(e5010->m2m_dev, ctx->fh.m2m_ctx);
        dprintk(e5010, 3, "ctx: 0x%p Finish job\n", ctx);
+       pm_runtime_mark_last_busy(e5010->dev);
+       pm_runtime_put_autosuspend(e5010->dev);

The implementation of put_autosuspend() already handles mark_last_busy() since b3db492e8335 ("PM: runtime: Mark last busy stamp in
pm_runtime_put_autosuspend()")

Quoted 70 lines
drivers/media/platform/imagination/e5010-jpeg-enc.c +10 -20
 job_unlock:
        spin_unlock(&e5010->hw_lock);
@@ -1099,6 +1101,8 @@ static int e5010_probe(struct platform_device *pdev)
                goto fail_after_v4l2_register;
        }
 
+       pm_runtime_set_autosuspend_delay(dev, 100);
+       pm_runtime_use_autosuspend(dev);
        pm_runtime_enable(dev);
 
        ret = video_register_device(e5010->vdev, VFL_TYPE_VIDEO, 0);
@@ -1289,31 +1293,13 @@ static int e5010_encoder_cmd(struct file *file, void *priv,
 static int e5010_start_streaming(struct vb2_queue *q, unsigned int count)
 {
        struct e5010_context *ctx = vb2_get_drv_priv(q);
-       int ret;
 
        struct e5010_q_data *queue = get_queue(ctx, q->type);
 
        v4l2_m2m_update_start_streaming_state(ctx->fh.m2m_ctx, q);
        queue->sequence = 0;
 
-       ret = pm_runtime_resume_and_get(ctx->e5010->dev);
-       if (ret < 0) {
-               v4l2_err(&ctx->e5010->v4l2_dev, "failed to power up jpeg\n");
-               goto fail;
-       }
-
-       ret = e5010_init_device(ctx->e5010);
-       if (ret) {
-               v4l2_err(&ctx->e5010->v4l2_dev, "failed to Enable e5010 device\n");
-               goto fail;
-       }
-
        return 0;
-
-fail:
-       e5010_vb2_buffers_return(q, VB2_BUF_STATE_QUEUED);
-
-       return ret;
 }
 
 static void e5010_stop_streaming(struct vb2_queue *q)
@@ -1329,8 +1315,6 @@ static void e5010_stop_streaming(struct vb2_queue *q)
            v4l2_m2m_has_stopped(ctx->fh.m2m_ctx)) {
                v4l2_event_queue_fh(&ctx->fh, &e5010_eos_event);
        }
-
-       pm_runtime_put_sync(ctx->e5010->dev);
 }
 
 static void e5010_device_run(void *priv)
@@ -1343,7 +1327,15 @@ static void e5010_device_run(void *priv)
        unsigned long flags;
        int num_planes = ctx->out_queue.fmt->num_planes;
 
+       ret = pm_runtime_resume_and_get(e5010->dev);
+       if (ret < 0) {
+               dev_err(e5010->dev, "Device failed to turn on\n");
+               v4l2_m2m_job_finish(e5010->m2m_dev, ctx->fh.m2m_ctx);
+               return;
+       }
+
        spin_lock_irqsave(&e5010->hw_lock, flags);
+
        s_vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
        WARN_ON(!s_vb);
        d_vb = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

drivers/media/platform/imagination/e5010-jpeg-enc.c static void e5010_device_run(void *priv) · line 1470

Quoted 5 lines
drivers/media/platform/imagination/e5010-jpeg-enc.c +2 -0
@@ -1474,6 +1466,8 @@ static void e5010_device_run(void *priv)
        e5010_reset(e5010->dev, e5010->core_base, e5010->mmu_base);
 
 no_ready_buf_err:
+       pm_runtime_mark_last_busy(e5010->dev);
+       pm_runtime_put_autosuspend(e5010->dev);

Same here.

Thanks,
Jai

Quoted 34 lines
drivers/media/platform/imagination/e5010-jpeg-enc.c +7 -6
        if (s_vb) {
                v4l2_m2m_src_buf_remove_by_buf(ctx->fh.m2m_ctx, s_vb);
                v4l2_m2m_buf_done(s_vb, VB2_BUF_STATE_ERROR);
@@ -1501,6 +1495,13 @@ static int e5010_runtime_resume(struct device *dev)
                return ret;
        }
 
+       ret = e5010_init_device(e5010);
+       if (ret) {
+               dev_err(dev, "Failed to re-enable e5010 device\n");
+               clk_disable_unprepare(e5010->clk);
+               return ret;
+       }
+
        return 0;
 }
 
@@ -1533,12 +1534,6 @@ static int e5010_resume(struct device *dev)
        if (ret < 0)
                return ret;
 
-       ret = e5010_init_device(e5010);
-       if (ret) {
-               dev_err(dev, "Failed to re-enable e5010 device\n");
-               return ret;
-       }
-
        v4l2_m2m_resume(e5010->m2m_dev);
 
        return ret;
Signature · 1 line
2.43.0
#2 lore raw

Hi Jai,

Thanks for the review.

Quoted 16 lines · Jai Luthra

Hi Brandon,

Thank you for the patch.

Quoting Brandon Brnich (2026-07-23 02:38:45)

Quoted 10 lines

Current implementation only has one call to turn the device on - start_streaming. This can waste power of device as the device can be in STREAM_ON state, but no buffers are actually being submitted.

e5010_init_device needs to be moved to the resume hook to ensure register state is correct during any power on. This also fixes an issue when device was never powered on, but system resumes from deep sleep. The PM framework skips the runtime resume hook since device was never on in the first place. This causes e5010_init_device to be called for a powered off device leading to invalid write and system crash.

Quoted 6 lines

There are two separate things be solved by this patch, one is the bug fix and the other is the good-to-have feature for autosuspending the device between buffers.

It would make it much easier to review the logic if v2 splits the two, and only keeps the Fixes tag (+cc stable) for the bug fix.

Understood, I will split in 2 patches for v2.

Quoted 14 lines
Quoted 14 lines
Fixes a1e2940458853 ("media: imagination: Add E5010 JPEG Encoder driver")
---
  .../platform/imagination/e5010-jpeg-enc.c     | 47 +++++++++----------
  1 file changed, 21 insertions(+), 26 deletions(-)
drivers/media/platform/imagination/e5010-jpeg-enc.c +0 -0
index 42ad9ee3993b4..189c147cb9705 100644
@@ -976,6 +976,8 @@ static irqreturn_t e5010_irq(int irq, void *data)
 
Quoted 8 lines

drivers/media/platform/imagination/e5010-jpeg-enc.c static irqreturn_t e5010_irq(int irq, void *data) · line 980

Quoted 4 lines
drivers/media/platform/imagination/e5010-jpeg-enc.c +2 -0
         v4l2_m2m_job_finish(e5010->m2m_dev, ctx->fh.m2m_ctx);
         dprintk(e5010, 3, "ctx: 0x%p Finish job\n", ctx);
+       pm_runtime_mark_last_busy(e5010->dev);
+       pm_runtime_put_autosuspend(e5010->dev);

The implementation of put_autosuspend() already handles mark_last_busy() since b3db492e8335 ("PM: runtime: Mark last busy stamp in
pm_runtime_put_autosuspend()")

Good to know! I will remove these calls in v2.

Best,
Brandon

Quoted 116 lines
Quoted 71 lines
drivers/media/platform/imagination/e5010-jpeg-enc.c +10 -20
  job_unlock:
         spin_unlock(&e5010->hw_lock);
@@ -1099,6 +1101,8 @@ static int e5010_probe(struct platform_device *pdev)
                 goto fail_after_v4l2_register;
         }
 
+       pm_runtime_set_autosuspend_delay(dev, 100);
+       pm_runtime_use_autosuspend(dev);
         pm_runtime_enable(dev);
 
         ret = video_register_device(e5010->vdev, VFL_TYPE_VIDEO, 0);
@@ -1289,31 +1293,13 @@ static int e5010_encoder_cmd(struct file *file, void *priv,
  static int e5010_start_streaming(struct vb2_queue *q, unsigned int count)
  {
         struct e5010_context *ctx = vb2_get_drv_priv(q);
-       int ret;
 
         struct e5010_q_data *queue = get_queue(ctx, q->type);
 
         v4l2_m2m_update_start_streaming_state(ctx->fh.m2m_ctx, q);
         queue->sequence = 0;
 
-       ret = pm_runtime_resume_and_get(ctx->e5010->dev);
-       if (ret < 0) {
-               v4l2_err(&ctx->e5010->v4l2_dev, "failed to power up jpeg\n");
-               goto fail;
-       }
-
-       ret = e5010_init_device(ctx->e5010);
-       if (ret) {
-               v4l2_err(&ctx->e5010->v4l2_dev, "failed to Enable e5010 device\n");
-               goto fail;
-       }
-
         return 0;
-
-fail:
-       e5010_vb2_buffers_return(q, VB2_BUF_STATE_QUEUED);
-
-       return ret;
  }
 
  static void e5010_stop_streaming(struct vb2_queue *q)
@@ -1329,8 +1315,6 @@ static void e5010_stop_streaming(struct vb2_queue *q)
             v4l2_m2m_has_stopped(ctx->fh.m2m_ctx)) {
                 v4l2_event_queue_fh(&ctx->fh, &e5010_eos_event);
         }
-
-       pm_runtime_put_sync(ctx->e5010->dev);
  }
 
  static void e5010_device_run(void *priv)
@@ -1343,7 +1327,15 @@ static void e5010_device_run(void *priv)
         unsigned long flags;
         int num_planes = ctx->out_queue.fmt->num_planes;
 
+       ret = pm_runtime_resume_and_get(e5010->dev);
+       if (ret < 0) {
+               dev_err(e5010->dev, "Device failed to turn on\n");
+               v4l2_m2m_job_finish(e5010->m2m_dev, ctx->fh.m2m_ctx);
+               return;
+       }
+
         spin_lock_irqsave(&e5010->hw_lock, flags);
+
         s_vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
         WARN_ON(!s_vb);
         d_vb = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

drivers/media/platform/imagination/e5010-jpeg-enc.c static void e5010_device_run(void *priv) · line 1470

Quoted 5 lines
drivers/media/platform/imagination/e5010-jpeg-enc.c +2 -0
@@ -1474,6 +1466,8 @@ static void e5010_device_run(void *priv)
         e5010_reset(e5010->dev, e5010->core_base, e5010->mmu_base);
 
  no_ready_buf_err:
+       pm_runtime_mark_last_busy(e5010->dev);
+       pm_runtime_put_autosuspend(e5010->dev);

Same here.

Thanks,
Jai

Quoted 34 lines
drivers/media/platform/imagination/e5010-jpeg-enc.c +7 -6
         if (s_vb) {
                 v4l2_m2m_src_buf_remove_by_buf(ctx->fh.m2m_ctx, s_vb);
                 v4l2_m2m_buf_done(s_vb, VB2_BUF_STATE_ERROR);
@@ -1501,6 +1495,13 @@ static int e5010_runtime_resume(struct device *dev)
                 return ret;
         }
 
+       ret = e5010_init_device(e5010);
+       if (ret) {
+               dev_err(dev, "Failed to re-enable e5010 device\n");
+               clk_disable_unprepare(e5010->clk);
+               return ret;
+       }
+
         return 0;
  }
 
@@ -1533,12 +1534,6 @@ static int e5010_resume(struct device *dev)
         if (ret < 0)
                 return ret;
 
-       ret = e5010_init_device(e5010);
-       if (ret) {
-               dev_err(dev, "Failed to re-enable e5010 device\n");
-               return ret;
-       }
-
         v4l2_m2m_resume(e5010->m2m_dev);
 
         return ret;
Signature · 1 line
2.43.0
#3 lore raw
In reply to Brandon Brnich
kernel test robot noticed the following build warnings:

Hi Brandon,

kernel test robot noticed the following build warnings:

[auto build test WARNING on linuxtv-media-pending/master] [also build test WARNING on linus/master v7.2-rc7 next-20260812] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Brandon-Brnich/media-imagination-e5010-Enable-autosuspend-for-runtime-PM/20260813-213716
base:   https://git.linuxtv.org/media-ci/media-pending.git master
patch link:    https://lore.kernel.org/r/20260722210845.723864-1-b-brnich%40ti.com
patch subject: [PATCH] media: imagination: e5010: Enable autosuspend for runtime PM
config: alpha-allmodconfig (https://download.01.org/0day-ci/archive/20260814/[email protected]/config)
compiler: alpha-linux-gcc (GCC) 16.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260814/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All warnings (new ones prefixed by >>):

>> drivers/media/platform/imagination/e5010-jpeg-enc.c:987:12: warning: 'e5010_init_device' defined but not used [-Wunused-function]
     987 | static int e5010_init_device(struct e5010_dev *e5010)
         |            ^~~~~~~~~~~~~~~~~

vim +/e5010_init_device +987 drivers/media/platform/imagination/e5010-jpeg-enc.c

a1e2940458853d Devarsh Thakkar 2024-06-19 986

a1e2940458853d Devarsh Thakkar 2024-06-19  @987  static int e5010_init_device(struct e5010_dev *e5010)
a1e2940458853d Devarsh Thakkar 2024-06-19   988  {
a1e2940458853d Devarsh Thakkar 2024-06-19   989  	int ret = 0;
a1e2940458853d Devarsh Thakkar 2024-06-19   990  
a1e2940458853d Devarsh Thakkar 2024-06-19   991  	/*TODO: Set MMU in bypass mode until support for the same is added in driver*/
a1e2940458853d Devarsh Thakkar 2024-06-19   992  	e5010_hw_bypass_mmu(e5010->mmu_base, 1);
a1e2940458853d Devarsh Thakkar 2024-06-19   993  
a1e2940458853d Devarsh Thakkar 2024-06-19   994  	if (e5010_hw_enable_auto_clock_gating(e5010->core_base, 1))
a1e2940458853d Devarsh Thakkar 2024-06-19   995  		v4l2_warn(&e5010->v4l2_dev, "failed to enable auto clock gating\n");
a1e2940458853d Devarsh Thakkar 2024-06-19   996  
a1e2940458853d Devarsh Thakkar 2024-06-19   997  	if (e5010_hw_enable_manual_clock_gating(e5010->core_base, 0))
a1e2940458853d Devarsh Thakkar 2024-06-19   998  		v4l2_warn(&e5010->v4l2_dev, "failed to disable manual clock gating\n");
a1e2940458853d Devarsh Thakkar 2024-06-19   999  
a1e2940458853d Devarsh Thakkar 2024-06-19  1000  	if (e5010_hw_enable_crc_check(e5010->core_base, 0))
a1e2940458853d Devarsh Thakkar 2024-06-19  1001  		v4l2_warn(&e5010->v4l2_dev, "failed to disable CRC check\n");
a1e2940458853d Devarsh Thakkar 2024-06-19  1002  
a1e2940458853d Devarsh Thakkar 2024-06-19  1003  	if (e5010_hw_enable_output_address_error_irq(e5010->core_base, 1))
a1e2940458853d Devarsh Thakkar 2024-06-19  1004  		v4l2_err(&e5010->v4l2_dev, "failed to enable Output Address Error interrupts\n");
a1e2940458853d Devarsh Thakkar 2024-06-19  1005  
a1e2940458853d Devarsh Thakkar 2024-06-19  1006  	ret = e5010_hw_set_input_source_to_memory(e5010->core_base, 1);
a1e2940458853d Devarsh Thakkar 2024-06-19  1007  	if (ret) {
a1e2940458853d Devarsh Thakkar 2024-06-19  1008  		v4l2_err(&e5010->v4l2_dev, "failed to set input source to memory\n");
a1e2940458853d Devarsh Thakkar 2024-06-19  1009  		return ret;
a1e2940458853d Devarsh Thakkar 2024-06-19  1010  	}
a1e2940458853d Devarsh Thakkar 2024-06-19  1011  
a1e2940458853d Devarsh Thakkar 2024-06-19  1012  	ret = e5010_hw_enable_picture_done_irq(e5010->core_base, 1);
a1e2940458853d Devarsh Thakkar 2024-06-19  1013  	if (ret)
a1e2940458853d Devarsh Thakkar 2024-06-19  1014  		v4l2_err(&e5010->v4l2_dev, "failed to enable Picture Done interrupts\n");
a1e2940458853d Devarsh Thakkar 2024-06-19  1015  
a1e2940458853d Devarsh Thakkar 2024-06-19  1016  	return ret;
a1e2940458853d Devarsh Thakkar 2024-06-19  1017  }
a1e2940458853d Devarsh Thakkar 2024-06-19  1018  

--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki