From: kyrie.wu <kyrie.wu@mediatek.com>
To: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
kyrie wu <kyrie.wu@mediatek.corp-partner.google.com>,
<linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>
Cc: kyrie.wu <kyrie.wu@mediatek.com>
Subject: [PATCH v2 04/12] media: mediatek: jpeg: add jpeg smmu sid setting
Date: Thu, 10 Apr 2025 14:29:57 +0800 [thread overview]
Message-ID: <20250410063006.5313-5-kyrie.wu@mediatek.com> (raw)
In-Reply-To: <20250410063006.5313-1-kyrie.wu@mediatek.com>
Add a configuration to set jpeg dec & enc smmu sid
Signed-off-by: kyrie.wu <kyrie.wu@mediatek.com>
---
.../platform/mediatek/jpeg/mtk_jpeg_core.c | 34 +++++++++++++++++++
.../platform/mediatek/jpeg/mtk_jpeg_core.h | 19 +++++++++++
.../platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 24 +++++++++++++
.../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 25 ++++++++++++++
4 files changed, 102 insertions(+)
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
index 63a6efc8e21a..97117f7babd9 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
@@ -1584,6 +1584,18 @@ 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)
+{
+ u32 val, mask;
+
+ val = readl(jpeg->smmu_info.smmu_base);
+ mask = ~(jpeg->smmu_info.mask << jpeg->smmu_info.shift);
+ val &= mask;
+ val |= (jpeg->smmu_info.sid << jpeg->smmu_info.shift);
+
+ writel(val, jpeg->smmu_info.smmu_base);
+}
+
static void mtk_jpegenc_worker(struct work_struct *work)
{
struct mtk_jpegenc_comp_dev *comp_jpeg[MTK_JPEGENC_HW_MAX];
@@ -1655,6 +1667,10 @@ 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);
+
+ if (jpeg->variant->support_smmu_flag)
+ 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);
@@ -1679,6 +1695,18 @@ 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)
+{
+ u32 val, mask;
+
+ val = readl(jpeg->smmu_info.smmu_base);
+ mask = ~(jpeg->smmu_info.mask << jpeg->smmu_info.shift);
+ val &= mask;
+ val |= (jpeg->smmu_info.sid << jpeg->smmu_info.shift);
+
+ writel(val, jpeg->smmu_info.smmu_base);
+}
+
static void mtk_jpegdec_worker(struct work_struct *work)
{
struct mtk_jpeg_ctx *ctx = container_of(work, struct mtk_jpeg_ctx,
@@ -1771,6 +1799,10 @@ static void mtk_jpegdec_worker(struct work_struct *work)
spin_lock_irqsave(&comp_jpeg[hw_id]->hw_lock, flags);
ctx->total_frame_num++;
mtk_jpeg_dec_reset(comp_jpeg[hw_id]->reg_base);
+
+ if (jpeg->variant->support_smmu_flag)
+ 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,
@@ -1933,6 +1965,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_flag = true,
};
static const struct mtk_jpeg_variant mtk8195_jpegdec_drvdata = {
@@ -1959,6 +1992,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_flag = true,
};
static const struct mtk_jpeg_variant mtk8188_jpegenc_drvdata = {
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
index 8fddc133c46c..17d2b9274469 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
@@ -82,6 +82,7 @@ struct mtk_jpeg_variant {
bool multi_core;
void (*jpeg_worker)(struct work_struct *work);
bool support_34bit;
+ bool support_smmu_flag;
};
struct mtk_jpeg_src_buf {
@@ -138,6 +139,20 @@ struct mtk_jpegdec_clk {
int clk_num;
};
+/**
+ * struct mtk_smmu_info - Structure used to store smmu information
+ * @smmu_base: JPEG encode smmu register mapping
+ * @sid: JPEG encode smmu hw sid
+ * @shift: JPEG encode smmu hw bit shift
+ * @mask: JPEG encode smmu hw bit mask
+ */
+struct mtk_smmu_info {
+ void __iomem *smmu_base;
+ unsigned int sid;
+ unsigned int shift;
+ unsigned int mask;
+};
+
/**
* struct mtk_jpegenc_comp_dev - JPEG COREX abstraction
* @dev: JPEG device
@@ -150,6 +165,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_info: SMMU information
*/
struct mtk_jpegenc_comp_dev {
struct device *dev;
@@ -163,6 +179,7 @@ struct mtk_jpegenc_comp_dev {
enum mtk_jpeg_hw_state hw_state;
/* spinlock protecting the hw device resource */
spinlock_t hw_lock;
+ struct mtk_smmu_info smmu_info;
};
/**
@@ -177,6 +194,7 @@ struct mtk_jpegenc_comp_dev {
* @hw_param: jpeg decode hw parameters
* @hw_state: record hw state
* @hw_lock: spinlock protecting hw
+ * @smmu_info: SMMU information
*/
struct mtk_jpegdec_comp_dev {
struct device *dev;
@@ -190,6 +208,7 @@ struct mtk_jpegdec_comp_dev {
enum mtk_jpeg_hw_state hw_state;
/* spinlock protecting the hw device resource */
spinlock_t hw_lock;
+ struct mtk_smmu_info smmu_info;
};
/**
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 d868e46aaf37..1bc632f54bc2 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
@@ -618,6 +618,29 @@ static int mtk_jpegdec_hw_init_irq(struct mtk_jpegdec_comp_dev *dev)
return 0;
}
+static void mtk_jpegdec_smmu_init(struct mtk_jpegdec_comp_dev *dev)
+{
+ struct resource *r;
+
+ r = platform_get_resource(dev->plat_dev, IORESOURCE_MEM, 1);
+ if (!r) {
+ dev_err(&dev->plat_dev->dev, "get smmu_base failed\n");
+ return;
+ }
+
+ dev->smmu_info.smmu_base =
+ devm_ioremap(&dev->plat_dev->dev, r->start,
+ resource_size(r));
+ if (IS_ERR(dev->smmu_info.smmu_base)) {
+ dev_err(&dev->plat_dev->dev, "mmap smmu_base failed(%ld)\n",
+ PTR_ERR(dev->smmu_info.smmu_base));
+ return;
+ }
+
+ dev->smmu_info.sid = 0x4;
+ dev->smmu_info.shift = 8;
+ dev->smmu_info.mask = 0x7;
+}
static int mtk_jpegdec_hw_probe(struct platform_device *pdev)
{
struct mtk_jpegdec_clk *jpegdec_clk;
@@ -670,6 +693,7 @@ static int mtk_jpegdec_hw_probe(struct platform_device *pdev)
master_dev->reg_decbase[i] = dev->reg_base;
dev->master_dev = master_dev;
+ mtk_jpegdec_smmu_init(dev);
platform_set_drvdata(pdev, dev);
pm_runtime_enable(&pdev->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 ca06d4f435cd..db9b67830a72 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
@@ -353,6 +353,30 @@ static int mtk_jpegenc_hw_init_irq(struct mtk_jpegenc_comp_dev *dev)
return 0;
}
+static void mtk_jpegenc_smmu_init(struct mtk_jpegenc_comp_dev *dev)
+{
+ struct resource *r;
+
+ r = platform_get_resource(dev->plat_dev, IORESOURCE_MEM, 1);
+ if (!r) {
+ dev_err(&dev->plat_dev->dev, "get smmu_base failed\n");
+ return;
+ }
+
+ dev->smmu_info.smmu_base =
+ devm_ioremap(&dev->plat_dev->dev, r->start,
+ resource_size(r));
+ if (IS_ERR(dev->smmu_info.smmu_base)) {
+ dev_err(&dev->plat_dev->dev, "mmap smmu_base failed(%ld)\n",
+ PTR_ERR(dev->smmu_info.smmu_base));
+ return;
+ }
+
+ dev->smmu_info.sid = 0x5;
+ dev->smmu_info.shift = 4;
+ dev->smmu_info.mask = 0x7;
+}
+
static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
{
struct mtk_jpegenc_clk *jpegenc_clk;
@@ -403,6 +427,7 @@ static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
master_dev->reg_encbase[i] = dev->reg_base;
dev->master_dev = master_dev;
+ mtk_jpegenc_smmu_init(dev);
platform_set_drvdata(pdev, dev);
pm_runtime_enable(&pdev->dev);
--
2.46.0
next prev parent reply other threads:[~2025-04-10 6:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-10 6:29 [PATCH v2 00/12] Enable jpeg enc & dec multi-hardwares for MT8196 kyrie.wu
2025-04-10 6:29 ` [PATCH v2 01/12] dt-bindings: mediatek: Add mediatek, mt8196-jpgdec compatible kyrie.wu
2025-04-10 6:39 ` Krzysztof Kozlowski
2025-04-11 2:54 ` Kyrie Wu (吴晗)
2025-04-12 10:13 ` Krzysztof Kozlowski
2025-04-13 9:41 ` Kyrie Wu (吴晗)
2025-04-10 6:29 ` [PATCH v2 02/12] dt-bindings: mediatek: Add mediatek, mt8196-jpgenc compatible kyrie.wu
2025-04-10 6:40 ` Krzysztof Kozlowski
2025-04-11 2:48 ` Kyrie Wu (吴晗)
2025-04-12 10:13 ` Krzysztof Kozlowski
2025-04-13 9:56 ` Kyrie Wu (吴晗)
2025-04-10 6:29 ` [PATCH v2 03/12] media: mediatek: jpeg: add jpeg compatible kyrie.wu
2025-04-10 6:29 ` kyrie.wu [this message]
2025-04-10 6:29 ` [PATCH v2 05/12] media: mediatek: jpeg: fix jpeg hw count setting kyrie.wu
2025-04-10 6:29 ` [PATCH v2 06/12] media: mediatek: jpeg: refactor jpeg buffer payload setting kyrie.wu
2025-04-10 6:30 ` [PATCH v2 07/12] media: mediatek: jpeg: refactor jpeg dst buffer layout kyrie.wu
2025-04-10 6:30 ` [PATCH v2 08/12] media: mediatek: jpeg: fix stop streaming flow for multi-core kyrie.wu
2025-04-10 6:30 ` [PATCH v2 09/12] media: mediatek: jpeg: refactor multi-core clk suspend and resume setting kyrie.wu
2025-04-10 6:30 ` [PATCH v2 10/12] media: mediatek: jpeg: fix decoding buffer number setting timing issue kyrie.wu
2025-04-10 6:30 ` [PATCH v2 11/12] media: mediatek: jpeg: refactor decoding resolution change operation kyrie.wu
2025-04-10 6:30 ` [PATCH v2 12/12] media: mediatek: jpeg: fix remove buffer operation for multi-core kyrie.wu
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=20250410063006.5313-5-kyrie.wu@mediatek.com \
--to=kyrie.wu@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=krzk+dt@kernel.org \
--cc=kyrie.wu@mediatek.corp-partner.google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=robh@kernel.org \
/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