[RESEND,V7,3/6] media: mtk-jpegenc: manage jpegenc multi-hardware
kyrie.wu
kyrie.wu at mediatek.com
Sun Mar 6 17:46:50 PST 2022
On Wed, 2022-03-02 at 10:45 +0100, AngeloGioacchino Del Regno wrote:
> Il 24/02/22 10:07, kyrie.wu ha scritto:
> > From: kyrie wu <kyrie.wu at mediatek.com>
> >
> > manage each hardware information, including irq/clk/power.
> > the hardware includes HW0 and HW1.
> >
> > Signed-off-by: kyrie wu <kyrie.wu at mediatek.com>
> > ---
> > drivers/media/platform/mtk-jpeg/Makefile | 11 +-
> > .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 76 +++++---
> > .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 37 ++++
> > .../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 168
> > ++++++++++++++++++
> > 4 files changed, 267 insertions(+), 25 deletions(-)
> >
>
> Hello Kyrie,
>
> despite my v6 review, where I also gave you solutions for an issue
> with
> more than one example, this v7 still didn't get one out of the many
> requested fixes.
>
> I'm sure that this was not intentional, so it's not a problem...
>
> In any case, this gave me the opportunity to see some more issues
> inside
> of this patch: let's get it perfect!
>
>
> ...snip...
>
> > diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
> > b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
> > index 3e4811a41ba2..31e941ef84bd 100644
> > --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
> > +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
> > @@ -9,6 +9,7 @@
> > #ifndef _MTK_JPEG_CORE_H
> > #define _MTK_JPEG_CORE_H
> >
> > +#include <linux/clk.h>
> > #include <linux/interrupt.h>
> > #include <media/v4l2-ctrls.h>
> > #include <media/v4l2-device.h>
> > @@ -60,6 +61,7 @@ enum mtk_jpeg_ctx_state {
> > * @cap_q_default_fourcc: capture queue default fourcc
> > */
> > struct mtk_jpeg_variant {
> > + bool is_multihw;
>
> Thanks for this fix, this name makes it way clearer!
>
> > struct clk_bulk_data *clks;
> > int num_clks;
> > struct mtk_jpeg_fmt *formats;
> > @@ -74,6 +76,38 @@ struct mtk_jpeg_variant {
> > u32 cap_q_default_fourcc;
> > };
> >
> > +enum mtk_jpegenc_hw_id {
> > + MTK_JPEGENC_HW0,
> > + MTK_JPEGENC_HW1,
> > + MTK_JPEGENC_HW_MAX,
> > +};
> > +
> > +/**
> > + * struct mtk_vcodec_clk - Structure used to store vcodec clock
> > information
> > + */
> > +struct mtk_jpegenc_clk {
> > + struct clk_bulk_data *clks;
> > + int clk_num;
>
> Why is clk_num tabbed?
>
> > +};
> > +
> > +/**
> > + * struct mtk_jpegenc_comp_dev - JPEG COREX abstraction
> > + * @dev: JPEG device
> > + * @plat_dev: platform device data
> > + * @reg_base: JPEG registers mapping
> > + * @master_dev: mtk_jpeg_dev device
> > + * @pm: mtk_jpegenc_pm
> > + * @jpegenc_irq: jpeg encode irq num
>
> You're using tabulations *and* spaces.... please use either, not
> both, as it's
> not necessary. Besides, this is also producing bad indentation.
>
> > + */
> > +struct mtk_jpegenc_comp_dev {
> > + struct device *dev;
> > + struct platform_device *plat_dev;
> > + void __iomem *reg_base;
> > + struct mtk_jpeg_dev *master_dev;
> > + struct mtk_jpegenc_clk venc_clk;
> > + int jpegenc_irq;
> > +};
> > +
> > /**
> > * struct mtk_jpeg_dev - JPEG IP abstraction
> > * @lock: the mutex protecting this structure
> > @@ -100,6 +134,9 @@ struct mtk_jpeg_dev {
> > void __iomem *reg_base;
> > struct delayed_work job_timeout_work;
> > const struct mtk_jpeg_variant *variant;
> > +
> > + void __iomem *reg_encbase[MTK_JPEGENC_HW_MAX];
> > + struct mtk_jpegenc_comp_dev *enc_hw_dev[MTK_JPEGENC_HW_MAX];
> > };
> >
> > /**
> > diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
> > b/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
> > index a2b6e1f85c2d..3d967bff1352 100644
> > --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
> > +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
> > @@ -5,11 +5,27 @@
> > *
> > */
> >
> > +#include <linux/clk.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/irq.h>
> > #include <linux/io.h>
> > #include <linux/kernel.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/of_device.h>
> > +#include <linux/pm_runtime.h>
> > +#include <linux/slab.h>
> > +#include <media/media-device.h>
> > #include <media/videobuf2-core.h>
> > #include <media/videobuf2-dma-contig.h>
> > +#include <media/videobuf2-v4l2.h>
> > +#include <media/v4l2-mem2mem.h>
> > +#include <media/v4l2-dev.h>
> > +#include <media/v4l2-device.h>
> > +#include <media/v4l2-fh.h>
> > +#include <media/v4l2-event.h>
> >
> > +#include "mtk_jpeg_core.h"
> > #include "mtk_jpeg_enc_hw.h"
> >
> > static const struct mtk_jpeg_enc_qlt mtk_jpeg_enc_quality[] = {
> > @@ -30,6 +46,21 @@ static const struct mtk_jpeg_enc_qlt
> > mtk_jpeg_enc_quality[] = {
> > {.quality_param = 97, .hardware_value = JPEG_ENC_QUALITY_Q97},
> > };
> >
> > +#if defined(CONFIG_OF)
> > +static const struct of_device_id mtk_jpegenc_drv_ids[] = {
> > + {
> > + .compatible = "mediatek,mt8195-jpgenc0",
> > + .data = (void *)MTK_JPEGENC_HW0,
> > + },
> > + {
> > + .compatible = "mediatek,mt8195-jpgenc1",
> > + .data = (void *)MTK_JPEGENC_HW1,
> > + },
>
> I've already pointed out an issue with this in your v6 series:
>
> https://patchwork.kernel.org/comment/24726607/
>
> Besides, I want to add up that the SoC distinction is already done in
> the
> parent node which, in MT8195's case, is named "mediatek,mt8195-
> jpgenc", so
> you really don't have to redo this distinction "from scratch" here in
> the
> sub-driver, as you can just get your information from the parent
> device/node.
>
> So, just "mediatek,jpgenc-hw" should be totally enough here.
>
> Please fix this for v8.
Dear Angelo,
Thank you for your prompt reply.
I'm terrible sorry for that I got a misunderstanding from your preview
comments. The device node have fixed in [RESEND,V7,1/6], base on this
patch, I thought that your suggestion is adopt properly.
Thanks again for your advice, I will fix driver data in the next
version.
>
>
> > + {},
> > +};
> > +MODULE_DEVICE_TABLE(of, mtk_jpegenc_drv_ids);
> > +#endif
> > +
> > void mtk_jpeg_enc_reset(void __iomem *base)
> > {
> > writel(0, base + JPEG_ENC_RSTB);
>
> ...snip...
>
> > +
> > +static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
> > +{
> > + struct mtk_jpegenc_clk *jpegenc_clk;
> > + struct mtk_jpeg_dev *master_dev;
> > + struct mtk_jpegenc_comp_dev *dev;
> > + int ret, comp_idx;
> > +
> > + struct device *decs = &pdev->dev;
> > +
> > + if (!decs->parent)
> > + return -EPROBE_DEFER;
> > +
> > + master_dev = dev_get_drvdata(decs->parent);
> > + if (!master_dev)
> > + return -EPROBE_DEFER;
> > +
> > + dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
> > + if (!dev)
> > + return -ENOMEM;
> > +
> > + dev->plat_dev = pdev;
> > +
> > + jpegenc_clk = &dev->venc_clk;
> > +
> > + jpegenc_clk->clk_num = devm_clk_bulk_get_all(&pdev->dev,
> > + &jpegenc_clk-
> > >clks);
>
> Using dev_err_probe() looks more appropriate here:
Dear Angelo,
The follow suggestions are same as jpegdec patch in the preview
version. I wiil fix all of them.
Thanks.
Regards,
Kyrie
>
> if (jpegenc_clk->clk_num < 0)
> return dev_err_probe(&pdev->dev, jpegenc_clk->clk_num,
> "Failed to get jpegenc clocks\n");
>
>
> > + if (jpegenc_clk->clk_num < 0) {
> > + dev_err(&pdev->dev, "Failed to get jpegenc clock
> > count\n");
> > + return jpegenc_clk->clk_num;
> > + }
> > +
> > + dev->reg_base =
> > + devm_platform_ioremap_resource(pdev, 0);
> > + if (IS_ERR(dev->reg_base)) {
> > + ret = PTR_ERR(dev->reg_base);
> > + goto err;
>
> There's no need for any goto here, as you're not reverting any
> operation.
>
> Hence, you can just:
>
> if (IS_ERR(dev->reg_base))
> return PTR_ERR(dev->reg_base);
>
> > + }
> > +
> > + ret = mtk_jpegenc_hw_init_irq(dev);
> > + if (ret) {
> > + dev_err(&pdev->dev, "Failed to register JPEGENC irq
> > handler.\n");
>
> You are already printing an error inside of
> mtk_jpegenc_hw_init_irq(), so printing
> another one here is redundant.
> Either remove the prints in the function or, more appropriately,
> remove this print.
>
> Also, same "goto" comment applies here, you can simply return ret.
>
> > + goto err;
> > + }
> > +
> > + comp_idx = (enum
> > mtk_jpegenc_hw_id)of_device_get_match_data(decs);
> > + if (comp_idx < MTK_JPEGENC_HW_MAX) {
>
> `comp_idx` is a bit misleading, this is not using the component
> framework.
>
> ....but this will probably be refactored after following the
> suggestion that
> I gave you in v6 and again now.
>
> > + master_dev->enc_hw_dev[comp_idx] = dev;
> > + master_dev->reg_encbase[comp_idx] = dev->reg_base;
> > + dev->master_dev = master_dev;
> > + } else {
> > + dev_err(&pdev->dev, "Failed to get_match_data.\n");
> > + goto err;
> > + }
> > +
> > + platform_set_drvdata(pdev, dev);
> > + pm_runtime_enable(&pdev->dev);
> > +
> > + return 0;
> > +
> > +err:
>
> This label serves no real purpose: please remove.
>
> > + return ret;
> > +}
> > +
>
>
>
> Regards,
> Angelo
More information about the linux-arm-kernel
mailing list