| 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: <b1f6b8f394ccef920f8838a01967dee7e4326bf1.camel@mediatek.com>
Date: Thu, 25 Dec 2025 07:17:55 +0000
From: Kyrie Wu (吴晗) <Kyrie.Wu@...iatek.com>
To: "nicolas@...fresne.ca" <nicolas@...fresne.ca>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-mediatek@...ts.infradead.org" <linux-mediatek@...ts.infradead.org>,
"linux-media@...r.kernel.org" <linux-media@...r.kernel.org>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
"mchehab@...nel.org" <mchehab@...nel.org>,
Kyrie Wu (吴晗) <Kyrie.Wu@...iatek.com>,
"conor+dt@...nel.org" <conor+dt@...nel.org>, "robh@...nel.org"
<robh@...nel.org>, "hverkuil-cisco@...all.nl" <hverkuil-cisco@...all.nl>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>, "matthias.bgg@...il.com"
<matthias.bgg@...il.com>, "krzk+dt@...nel.org" <krzk+dt@...nel.org>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>
Subject: Re: [PATCH v11 12/12] media: mediatek: jpeg: add jpeg smmu sid
setting
On Tue, 2025-12-16 at 16:48 -0500, Nicolas Dufresne wrote:
> Hi,
>
> Le mardi 02 décembre 2025 à 17:48 +0800, Kyrie Wu a écrit :
> > Add a configuration to set jpeg dec & enc smmu sid
> >
> > Signed-off-by: Kyrie Wu <kyrie.wu@...iatek.com>
> > ---
> > .../platform/mediatek/jpeg/mtk_jpeg_core.c | 37
> > +++++++++++++++++++
> > .../platform/mediatek/jpeg/mtk_jpeg_core.h | 15 ++++++++
> > .../platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 23 ++++++++++++
> > .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 23 ++++++++++++
> > 4 files changed, 98 insertions(+)
> >
> > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> > b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> > index 10a588b92e76..625dfa8468e1 100644
> > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> > @@ -15,6 +15,7 @@
> > #include <linux/of_platform.h>
> > #include <linux/platform_device.h>
> > #include <linux/pm_runtime.h>
> > +#include <linux/regmap.h>
> > #include <linux/slab.h>
> > #include <linux/spinlock.h>
> > #include <media/v4l2-event.h>
> > @@ -1613,6 +1614,20 @@ static irqreturn_t mtk_jpeg_enc_done(struct
> > mtk_jpeg_dev *jpeg)
> > return IRQ_HANDLED;
> > }
> >
> > +static void mtk_jpeg_enc_set_smmu_sid(struct mtk_jpegenc_comp_dev
> > *jpeg)
> > +{
> > + struct mtk_jpeg_dev *mjpeg = jpeg->master_dev;
> > +
> > + if (!mjpeg->variant->support_smmu || !jpeg->smmu_regmap)
> > + return;
> > +
> > + regmap_update_bits(jpeg->smmu_regmap, JPEG_ENC_SMMU_SID,
> > + JPG_REG_GUSER_ID_MASK <<
> > + JPG_REG_ENC_GUSER_ID_SHIFT,
> > + JPG_REG_GUSER_ID_ENC_SID <<
> > + JPG_REG_ENC_GUSER_ID_SHIFT);
> > +}
> > +
> > static void mtk_jpegenc_worker(struct work_struct *work)
> > {
> > struct mtk_jpegenc_comp_dev *comp_jpeg[MTK_JPEGENC_HW_MAX];
> > @@ -1674,6 +1689,9 @@ static void mtk_jpegenc_worker(struct
> > work_struct *work)
> > jpeg_dst_buf->frame_num = ctx->total_frame_num;
> > ctx->total_frame_num++;
> > mtk_jpeg_enc_reset(comp_jpeg[hw_id]->reg_base);
> > +
> > + mtk_jpeg_enc_set_smmu_sid(comp_jpeg[hw_id]);
> > +
> > mtk_jpeg_set_enc_dst(ctx,
> > comp_jpeg[hw_id]->reg_base,
> > &dst_buf->vb2_buf);
> > @@ -1701,6 +1719,20 @@ static void mtk_jpegenc_worker(struct
> > work_struct *work)
> > v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);
> > }
> >
> > +static void mtk_jpeg_dec_set_smmu_sid(struct mtk_jpegdec_comp_dev
> > *jpeg)
> > +{
> > + struct mtk_jpeg_dev *mjpeg = jpeg->master_dev;
> > +
> > + if (!mjpeg->variant->support_smmu || !jpeg->smmu_regmap)
> > + return;
> > +
> > + regmap_update_bits(jpeg->smmu_regmap, JPEG_DEC_SMMU_SID,
> > + JPG_REG_GUSER_ID_MASK <<
> > + JPG_REG_DEC_GUSER_ID_SHIFT,
> > + JPG_REG_GUSER_ID_DEC_SID <<
> > + JPG_REG_DEC_GUSER_ID_SHIFT);
> > +}
>
> Can you deduplicate that function. Just make one, and pass the SID as
> parameter.
Dear Nicolas,
Thanks for your comments, I will refactor this function.
Regards,
Kyrie.
>
> > +
> > static void mtk_jpegdec_worker(struct work_struct *work)
> > {
> > struct mtk_jpeg_ctx *ctx = container_of(work, struct
> > mtk_jpeg_ctx,
> > @@ -1784,6 +1816,9 @@ static void mtk_jpegdec_worker(struct
> > work_struct *work)
> > jpeg_dst_buf->frame_num = ctx->total_frame_num;
> > ctx->total_frame_num++;
> > mtk_jpeg_dec_reset(comp_jpeg[hw_id]->reg_base);
> > +
> > + mtk_jpeg_dec_set_smmu_sid(comp_jpeg[hw_id]);
> > +
> > mtk_jpeg_dec_set_config(comp_jpeg[hw_id]->reg_base,
> > jpeg->variant->support_34bit,
> > &jpeg_src_buf->dec_param,
> > @@ -1943,6 +1978,7 @@ static struct mtk_jpeg_variant
> > mtk8196_jpegenc_drvdata = {
> > .cap_q_default_fourcc = V4L2_PIX_FMT_JPEG,
> > .multi_core = true,
> > .jpeg_worker = mtk_jpegenc_worker,
> > + .support_smmu = true,
> > };
> >
> > static const struct mtk_jpeg_variant mtk8195_jpegdec_drvdata = {
> > @@ -1969,6 +2005,7 @@ static const struct mtk_jpeg_variant
> > mtk8196_jpegdec_drvdata = {
> > .cap_q_default_fourcc = V4L2_PIX_FMT_YUV420M,
> > .multi_core = true,
> > .jpeg_worker = mtk_jpegdec_worker,
> > + .support_smmu = true,
> > };
> >
> > static const struct of_device_id mtk_jpeg_match[] = {
> > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
> > b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
> > index 33f7fbc4ca5e..6e8304680393 100644
> > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
> > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
> > @@ -11,6 +11,7 @@
> >
> > #include <linux/clk.h>
> > #include <linux/interrupt.h>
> > +#include <linux/mfd/syscon.h>
> > #include <media/v4l2-ctrls.h>
> > #include <media/v4l2-device.h>
> > #include <media/v4l2-fh.h>
> > @@ -34,6 +35,14 @@
> >
> > #define MTK_JPEG_MAX_EXIF_SIZE (64 * 1024)
> >
> > +#define JPEG_DEC_SMMU_SID 0
> > +#define JPEG_ENC_SMMU_SID 0
> > +#define JPG_REG_GUSER_ID_MASK 0x7
> > +#define JPG_REG_GUSER_ID_DEC_SID 0x4
> > +#define JPG_REG_GUSER_ID_ENC_SID 0x5
> > +#define JPG_REG_DEC_GUSER_ID_SHIFT 8
> > +#define JPG_REG_ENC_GUSER_ID_SHIFT 4
> > +
> > #define MTK_JPEG_ADDR_MASK GENMASK(1, 0)
> >
> > /**
> > @@ -65,6 +74,7 @@ enum mtk_jpeg_ctx_state {
> > * @multi_core: mark jpeg hw is multi_core or not
> > * @jpeg_worker: jpeg dec or enc worker
> > * @support_34bit: flag to check support for 34-bit DMA address
> > + * @support_smmu: flag to check if support smmu
> > */
> > struct mtk_jpeg_variant {
> > struct clk_bulk_data *clks;
> > @@ -82,6 +92,7 @@ struct mtk_jpeg_variant {
> > bool multi_core;
> > void (*jpeg_worker)(struct work_struct *work);
> > bool support_34bit;
> > + bool support_smmu;
> > };
> >
> > struct mtk_jpeg_src_buf {
> > @@ -150,6 +161,7 @@ struct mtk_jpegdec_clk {
> > * @hw_param: jpeg encode hw parameters
> > * @hw_state: record hw state
> > * @hw_lock: spinlock protecting the hw device
> > resource
> > + * @smmu_regmap: SMMU registers mapping
> > */
> > struct mtk_jpegenc_comp_dev {
> > struct device *dev;
> > @@ -163,6 +175,7 @@ struct mtk_jpegenc_comp_dev {
> > enum mtk_jpeg_hw_state hw_state;
> > /* spinlock protecting the hw device resource */
> > spinlock_t hw_lock;
> > + struct regmap *smmu_regmap;
> > };
> >
> > /**
> > @@ -177,6 +190,7 @@ struct mtk_jpegenc_comp_dev {
> > * @hw_param: jpeg decode hw parameters
> > * @hw_state: record hw state
> > * @hw_lock: spinlock protecting hw
> > + * @smmu_regmap: SMMU registers mapping
> > */
> > struct mtk_jpegdec_comp_dev {
> > struct device *dev;
> > @@ -190,6 +204,7 @@ struct mtk_jpegdec_comp_dev {
> > enum mtk_jpeg_hw_state hw_state;
> > /* spinlock protecting the hw device resource */
> > spinlock_t hw_lock;
> > + struct regmap *smmu_regmap;
> > };
> >
> > /**
> > 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 e453a1634f33..da753a636eaa 100644
> > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
> > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
> > @@ -624,6 +624,25 @@ static int mtk_jpegdec_hw_init_irq(struct
> > mtk_jpegdec_comp_dev *dev)
> > return 0;
> > }
> >
> > +static int mtk_jpegdec_smmu_init(struct mtk_jpegdec_comp_dev *dev)
> > +{
> > + struct mtk_jpeg_dev *master_dev = dev->master_dev;
> > +
> > + if (!master_dev->variant->support_smmu)
> > + return 0;
> > +
> > + dev->smmu_regmap =
> > + syscon_regmap_lookup_by_phandle(dev->plat_dev-
> > >dev.of_node,
> > + "mediatek,smmu-
> > config");
> > + if (IS_ERR(dev->smmu_regmap)) {
> > + return dev_err_probe(dev->dev, PTR_ERR(dev-
> > >smmu_regmap),
> > + "mmap smmu_base failed(%ld)\n",
> > + PTR_ERR(dev->smmu_regmap));
> > + }
> > +
> > + return 0;
> > +}
> > +
> > static int mtk_jpegdec_hw_probe(struct platform_device *pdev)
> > {
> > struct mtk_jpegdec_clk *jpegdec_clk;
> > @@ -677,6 +696,10 @@ static int mtk_jpegdec_hw_probe(struct
> > platform_device *pdev)
> > dev->master_dev = master_dev;
> > master_dev->max_hw_count++;
> >
> > + ret = mtk_jpegdec_smmu_init(dev);
> > + if (ret)
> > + return ret;
> > +
> > platform_set_drvdata(pdev, dev);
> > pm_runtime_enable(&pdev->dev);
> > ret = devm_clk_bulk_get(dev->dev,
> > 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 b30c728c3712..8a61d5537315 100644
> > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> > @@ -348,6 +348,25 @@ static int mtk_jpegenc_hw_init_irq(struct
> > mtk_jpegenc_comp_dev *dev)
> > return 0;
> > }
> >
> > +static int mtk_jpegenc_smmu_init(struct mtk_jpegenc_comp_dev *dev)
> > +{
> > + struct mtk_jpeg_dev *master_dev = dev->master_dev;
> > +
> > + if (!master_dev->variant->support_smmu)
> > + return 0;
> > +
> > + dev->smmu_regmap =
> > + syscon_regmap_lookup_by_phandle(dev->plat_dev-
> > >dev.of_node,
> > + "mediatek,smmu-
> > config");
> > + if (IS_ERR(dev->smmu_regmap)) {
> > + return dev_err_probe(dev->dev, PTR_ERR(dev-
> > >smmu_regmap),
> > + "mmap smmu_base failed(%ld)\n",
> > + PTR_ERR(dev->smmu_regmap));
> > + }
> > +
> > + return 0;
> > +}
> > +
> > static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
> > {
> > struct mtk_jpegenc_clk *jpegenc_clk;
> > @@ -399,6 +418,10 @@ static int mtk_jpegenc_hw_probe(struct
> > platform_device *pdev)
> > dev->master_dev = master_dev;
> > master_dev->max_hw_count++;
> >
> > + ret = mtk_jpegenc_smmu_init(dev);
> > + if (ret)
> > + return ret;
> > +
> > platform_set_drvdata(pdev, dev);
> > pm_runtime_enable(&pdev->dev);
> > ret = devm_clk_bulk_get(dev->dev,
>
> With that minor fix:
>
> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@...labora.com>
Powered by blists - more mailing lists