@@ -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 = {
@@ -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;
};
/**
@@ -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);
@@ -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);
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(+)