| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <8f985a1b2add6fbcba354a0a3d330447380a6ccb.camel@ndufresne.ca>
Date: Tue, 16 Dec 2025 16:33:59 -0500
From: Nicolas Dufresne <nicolas@...fresne.ca>
To: Kyrie Wu <kyrie.wu@...iatek.com>, Hans Verkuil
<hverkuil-cisco@...all.nl>, Mauro Carvalho Chehab <mchehab@...nel.org>,
Rob Herring <robh@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>, Matthias Brugger
<matthias.bgg@...il.com>, AngeloGioacchino Del Regno
<angelogioacchino.delregno@...labora.com>, linux-media@...r.kernel.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-mediatek@...ts.infradead.org
Subject: Re: [PATCH v11 05/12] media: mediatek: jpeg: fix multi-core clk
suspend and resume setting
Hi,
Le mardi 02 décembre 2025 à 17:47 +0800, Kyrie Wu a écrit :
> The suspend/resume callback function is defined in the dev_pm_ops
> structure, which is defined in platform_driver. For multiple-core
> architecture, each hardware driver will register a platform_driver
> structure, so it is necessary to add a suspend/resume callback
> function for each hardware to support this operation.
>
> Fixes: 934e8bccac95 ("mtk-jpegenc: support jpegenc multi-hardware")
> Fixes: 0fa49df4222f ("media: mtk-jpegdec: support jpegdec multi-hardware")
>
> Signed-off-by: Kyrie Wu <kyrie.wu@...iatek.com>
> ---
> .../platform/mediatek/jpeg/mtk_jpeg_core.c | 28 +++----
> .../platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 75 ++++++++++++++++++-
> .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 75 ++++++++++++++++++-
> 3 files changed, 151 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> index 59fd79c89f88..e45d7e82b8a0 100644
> --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> @@ -1122,6 +1122,9 @@ static void mtk_jpeg_clk_on(struct mtk_jpeg_dev *jpeg)
> {
> int ret;
>
> + if (jpeg->variant->multi_core)
> + return;
> +
> ret = clk_bulk_prepare_enable(jpeg->variant->num_clks,
> jpeg->variant->clks);
> if (ret)
> @@ -1130,6 +1133,9 @@ static void mtk_jpeg_clk_on(struct mtk_jpeg_dev *jpeg)
>
> static void mtk_jpeg_clk_off(struct mtk_jpeg_dev *jpeg)
> {
> + if (jpeg->variant->multi_core)
> + return;
> +
> clk_bulk_disable_unprepare(jpeg->variant->num_clks,
> jpeg->variant->clks);
> }
> @@ -1658,13 +1664,6 @@ static void mtk_jpegenc_worker(struct work_struct
> *work)
> goto enc_end;
> }
>
> - ret = clk_prepare_enable(comp_jpeg[hw_id]->venc_clk.clks->clk);
> - if (ret) {
> - dev_err(jpeg->dev, "%s : %d, jpegenc clk_prepare_enable
> fail\n",
> - __func__, __LINE__);
> - goto enc_end;
> - }
> -
> v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
> v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
>
> @@ -1762,20 +1761,13 @@ static void mtk_jpegdec_worker(struct work_struct
> *work)
> jpeg_dst_buf->frame_num = ctx->total_frame_num;
>
> mtk_jpegdec_set_hw_param(ctx, hw_id, src_buf, dst_buf);
> - ret = pm_runtime_get_sync(comp_jpeg[hw_id]->dev);
> + ret = pm_runtime_resume_and_get(comp_jpeg[hw_id]->dev);
> if (ret < 0) {
> dev_err(jpeg->dev, "%s : %d, pm_runtime_get_sync fail !!!\n",
> __func__, __LINE__);
> goto dec_end;
> }
>
> - ret = clk_prepare_enable(comp_jpeg[hw_id]->jdec_clk.clks->clk);
> - if (ret) {
> - dev_err(jpeg->dev, "%s : %d, jpegdec clk_prepare_enable
> fail\n",
> - __func__, __LINE__);
> - goto clk_end;
> - }
> -
> v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
> v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
>
> @@ -1785,7 +1777,7 @@ static void mtk_jpegdec_worker(struct work_struct *work)
> &dst_buf->vb2_buf, &fb)) {
> dev_err(jpeg->dev, "%s : %d, mtk_jpeg_set_dec_dst fail\n",
> __func__, __LINE__);
> - goto setdst_end;
> + goto set_dst_fail;
> }
>
> schedule_delayed_work(&comp_jpeg[hw_id]->job_timeout_work,
> @@ -1807,9 +1799,7 @@ static void mtk_jpegdec_worker(struct work_struct *work)
>
> return;
>
> -setdst_end:
> - clk_disable_unprepare(comp_jpeg[hw_id]->jdec_clk.clks->clk);
> -clk_end:
> +set_dst_fail:
> pm_runtime_put(comp_jpeg[hw_id]->dev);
> dec_end:
> v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
> diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
> b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
> index 84d12eea35f7..5f1557dafad6 100644
> --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
> +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
> @@ -540,14 +540,13 @@ static void mtk_jpegdec_timeout_work(struct work_struct
> *work)
> v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true);
>
> mtk_jpeg_dec_reset(cjpeg->reg_base);
> - clk_disable_unprepare(cjpeg->jdec_clk.clks->clk);
> - pm_runtime_put(cjpeg->dev);
> cjpeg->hw_state = MTK_JPEG_HW_IDLE;
> atomic_inc(&master_jpeg->hw_rdy);
> wake_up(&master_jpeg->hw_wq);
> v4l2_m2m_buf_done(src_buf, buf_state);
> mtk_jpegdec_put_buf(cjpeg);
> jpeg_buf_queue_dec(ctx);
> + pm_runtime_put(cjpeg->dev);
> }
>
> static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq, void *priv)
> @@ -589,12 +588,11 @@ static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq,
> void *priv)
> v4l2_m2m_buf_done(src_buf, buf_state);
> mtk_jpegdec_put_buf(jpeg);
> jpeg_buf_queue_dec(ctx);
> - pm_runtime_put(ctx->jpeg->dev);
> - clk_disable_unprepare(jpeg->jdec_clk.clks->clk);
>
> jpeg->hw_state = MTK_JPEG_HW_IDLE;
> wake_up(&master_jpeg->hw_wq);
> atomic_inc(&master_jpeg->hw_rdy);
> + pm_runtime_put(jpeg->dev);
>
> return IRQ_HANDLED;
> }
> @@ -677,15 +675,84 @@ static int mtk_jpegdec_hw_probe(struct platform_device
> *pdev)
>
> platform_set_drvdata(pdev, dev);
> pm_runtime_enable(&pdev->dev);
> + ret = devm_clk_bulk_get(dev->dev,
> + jpegdec_clk->clk_num,
> + jpegdec_clk->clks);
> + if (ret) {
> + dev_err(&pdev->dev, "Failed to init clk\n");
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static void mtk_jpeg_clk_on(struct mtk_jpegdec_comp_dev *jpeg)
> +{
> + int ret;
> +
> + ret = clk_bulk_prepare_enable(jpeg->jdec_clk.clk_num,
> + jpeg->jdec_clk.clks);
> + if (ret)
> + dev_err(jpeg->dev, "%s : %d, jpegdec clk_prepare_enable
> fail\n",
> + __func__, __LINE__);
> +}
> +
> +static void mtk_jpeg_clk_off(struct mtk_jpegdec_comp_dev *jpeg)
> +{
> + clk_bulk_disable_unprepare(jpeg->jdec_clk.clk_num,
> + jpeg->jdec_clk.clks);
> +}
> +
> +static __maybe_unused int mtk_jpegdec_pm_suspend(struct device *dev)
Its used its passed to mtk_jpegdec_pm_ops structure. Same below. Unless you had
the intention to ifdef that structure and you forgot.
> +{
> + struct mtk_jpegdec_comp_dev *jpeg = dev_get_drvdata(dev);
> +
> + mtk_jpeg_clk_off(jpeg);
>
> return 0;
> }
>
> +static __maybe_unused int mtk_jpegdec_pm_resume(struct device *dev)
> +{
> + struct mtk_jpegdec_comp_dev *jpeg = dev_get_drvdata(dev);
> +
> + mtk_jpeg_clk_on(jpeg);
> +
> + return 0;
> +}
> +
> +static __maybe_unused int mtk_jpegdec_suspend(struct device *dev)
> +{
> + struct mtk_jpegdec_comp_dev *jpeg = dev_get_drvdata(dev);
> +
> + v4l2_m2m_suspend(jpeg->master_dev->m2m_dev);
> + return pm_runtime_force_suspend(dev);
> +}
> +
> +static __maybe_unused int mtk_jpegdec_resume(struct device *dev)
> +{
> + struct mtk_jpegdec_comp_dev *jpeg = dev_get_drvdata(dev);
> + int ret;
> +
> + ret = pm_runtime_force_resume(dev);
> + if (ret < 0)
> + return ret;
> +
> + v4l2_m2m_resume(jpeg->master_dev->m2m_dev);
> + return ret;
> +}
> +
> +static const struct dev_pm_ops mtk_jpegdec_pm_ops = {
> + SET_SYSTEM_SLEEP_PM_OPS(mtk_jpegdec_suspend, mtk_jpegdec_resume)
> + SET_RUNTIME_PM_OPS(mtk_jpegdec_pm_suspend, mtk_jpegdec_pm_resume,
> NULL)
> +};
> +
> static struct platform_driver mtk_jpegdec_hw_driver = {
> .probe = mtk_jpegdec_hw_probe,
> .driver = {
> .name = "mtk-jpegdec-hw",
> .of_match_table = mtk_jpegdec_hw_ids,
> + .pm = &mtk_jpegdec_pm_ops,
> },
> };
>
> diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> index 1862444f35f5..785db5ba4770 100644
> --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> @@ -271,14 +271,13 @@ static void mtk_jpegenc_timeout_work(struct work_struct
> *work)
> v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true);
>
> mtk_jpeg_enc_reset(cjpeg->reg_base);
> - clk_disable_unprepare(cjpeg->venc_clk.clks->clk);
> - pm_runtime_put(cjpeg->dev);
> cjpeg->hw_state = MTK_JPEG_HW_IDLE;
> atomic_inc(&master_jpeg->hw_rdy);
> wake_up(&master_jpeg->hw_wq);
> v4l2_m2m_buf_done(src_buf, buf_state);
> mtk_jpegenc_put_buf(cjpeg);
> jpeg_buf_queue_enc(ctx);
> + pm_runtime_put(cjpeg->dev);
> }
>
> static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
> @@ -313,12 +312,11 @@ static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq,
> void *priv)
> v4l2_m2m_buf_done(src_buf, buf_state);
> mtk_jpegenc_put_buf(jpeg);
> jpeg_buf_queue_enc(ctx);
> - pm_runtime_put(ctx->jpeg->dev);
> - clk_disable_unprepare(jpeg->venc_clk.clks->clk);
>
> jpeg->hw_state = MTK_JPEG_HW_IDLE;
> wake_up(&master_jpeg->hw_wq);
> atomic_inc(&master_jpeg->hw_rdy);
> + pm_runtime_put(jpeg->dev);
>
> return IRQ_HANDLED;
> }
> @@ -399,15 +397,84 @@ static int mtk_jpegenc_hw_probe(struct platform_device
> *pdev)
>
> platform_set_drvdata(pdev, dev);
> pm_runtime_enable(&pdev->dev);
> + ret = devm_clk_bulk_get(dev->dev,
> + jpegenc_clk->clk_num,
> + jpegenc_clk->clks);
> + if (ret) {
> + dev_err(&pdev->dev, "Failed to init clk\n");
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static void mtk_jpeg_clk_on(struct mtk_jpegenc_comp_dev *jpeg)
> +{
> + int ret;
> +
> + ret = clk_bulk_prepare_enable(jpeg->venc_clk.clk_num,
> + jpeg->venc_clk.clks);
> + if (ret)
> + dev_err(jpeg->dev, "%s : %d, jpegenc clk_prepare_enable
> fail\n",
> + __func__, __LINE__);
> +}
> +
> +static void mtk_jpeg_clk_off(struct mtk_jpegenc_comp_dev *jpeg)
> +{
> + clk_bulk_disable_unprepare(jpeg->venc_clk.clk_num,
> + jpeg->venc_clk.clks);
> +}
> +
> +static __maybe_unused int mtk_jpegenc_pm_suspend(struct device *dev)
> +{
> + struct mtk_jpegenc_comp_dev *jpeg = dev_get_drvdata(dev);
> +
> + mtk_jpeg_clk_off(jpeg);
This is the only call to that function, move the code here.
>
> return 0;
> }
>
> +static __maybe_unused int mtk_jpegenc_pm_resume(struct device *dev)
> +{
> + struct mtk_jpegenc_comp_dev *jpeg = dev_get_drvdata(dev);
> +
> + mtk_jpeg_clk_on(jpeg);
This is the only call to that function, move the code here. Decides if the ret
value should be passed or not too, add a comment if not.
Its worrying not too, since usually if the clock are not running, we risk
hanging the CPU writing to registers.
> +
> + return 0;
> +}
> +
> +static __maybe_unused int mtk_jpegenc_suspend(struct device *dev)
> +{
> + struct mtk_jpegenc_comp_dev *jpeg = dev_get_drvdata(dev);
> +
> + v4l2_m2m_suspend(jpeg->master_dev->m2m_dev);
> + return pm_runtime_force_suspend(dev);
> +}
> +
> +static __maybe_unused int mtk_jpegenc_resume(struct device *dev)
> +{
> + struct mtk_jpegenc_comp_dev *jpeg = dev_get_drvdata(dev);
> + int ret;
> +
> + ret = pm_runtime_force_resume(dev);
> + if (ret < 0)
> + return ret;
> +
> + v4l2_m2m_resume(jpeg->master_dev->m2m_dev);
> + return ret;
> +}
> +
> +static const struct dev_pm_ops mtk_jpegenc_pm_ops = {
> + SET_SYSTEM_SLEEP_PM_OPS(mtk_jpegenc_suspend, mtk_jpegenc_resume)
> + SET_RUNTIME_PM_OPS(mtk_jpegenc_pm_suspend, mtk_jpegenc_pm_resume,
> NULL)
> +};
> +
> static struct platform_driver mtk_jpegenc_hw_driver = {
> .probe = mtk_jpegenc_hw_probe,
> .driver = {
> .name = "mtk-jpegenc-hw",
> .of_match_table = mtk_jpegenc_drv_ids,
> + .pm = &mtk_jpegenc_pm_ops,
> },
> };
>
Looks like the right way though,looking forward an update.
Nicolas
Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)
Powered by blists - more mailing lists