From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20BAFC19F28 for ; Wed, 3 Aug 2022 11:35:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236049AbiHCLft (ORCPT ); Wed, 3 Aug 2022 07:35:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237661AbiHCLfm (ORCPT ); Wed, 3 Aug 2022 07:35:42 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B132FDF8B; Wed, 3 Aug 2022 04:35:39 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id bv3so7305489wrb.5; Wed, 03 Aug 2022 04:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc; bh=kyIB5we5dkoZV/HXA++yWxVj1lZNnKb9luN75IO40Ic=; b=FUAJ+oKaYZ7aGrt0QuCDBVx9MP47cD3JOzaWlY+Il6X0XBlX88oVzQkdyPzGLWH0Ul VpUPRDtiafdBjuh8NXGGlESX+E5OuVjAxF49h2hkoAZH/3DRWq6j1Vla2ggqmvsQrEDJ 7yop5eX5D5ODhUBfQA9ipdJ2lvqJHBUyRaHqaBfqc6/LgpSgrVWuH1HnI2is48Mc4VTN x4ahC7UFhmNvim+19Ksh+rNOtVOn8eDXPQVhA1vEyg8Xli3iOf6kVLQY8x+knYVF6eeQ DW0WLfAMCjOwgkJSf068QQQ/p++kE7GRpz4ZKbw1cLfkKMbJGye6vuBB4Q4bxQ5QigwG Pj8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=kyIB5we5dkoZV/HXA++yWxVj1lZNnKb9luN75IO40Ic=; b=cn3O8O2itGm7lqc2HnHtFpmBD3ILvlf/p434ByOS97TEUQrDyrbl08WRbFXKGUPDsh +2ngR88WHvClSD3xxkvYxZf+oLJawOitKT0x0xhsGlHP0gVjt2S4+t6P7rkx6AkJoF1l l9BNZoqka8gL1PF58z25rxoYqvYyzCYosg5t5bp2nzopKmxDbMYGrLUdKVMbtsIuXhj0 RVvnM1bNVLPRWtP2iqy9GB6+GwdQOYlOEknjr6dUxWRyTRoEDunl/EOCq5bnvUXGuuSj ENAdLo7NS3EdoXNVFpN2BwCr44tGWdgscjPc81XLebUXxfakNb7fGMsS/TTkyl6VTY6h zS4A== X-Gm-Message-State: ACgBeo3A5WkMpw4yn/KUJI9W1xIXJXeB5C1JcoUbEZKfaJ4+TSgGaAv4 KdcAiPavXvxKAahSqkim2RQ= X-Google-Smtp-Source: AA6agR6T4lvEpmqiF4+T3ltyl0Hs0JBC8AiI4o7H5j98i7u1cl7atObs2OFq3PUBUJXP4sxnuIIn/g== X-Received: by 2002:a05:6000:15ce:b0:21e:4aab:1c2a with SMTP id y14-20020a05600015ce00b0021e4aab1c2amr12896057wry.109.1659526538085; Wed, 03 Aug 2022 04:35:38 -0700 (PDT) Received: from [192.168.1.145] ([207.188.167.132]) by smtp.gmail.com with ESMTPSA id u11-20020a05600c19cb00b003a302fb9df7sm2404251wmq.21.2022.08.03.04.35.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Aug 2022 04:35:36 -0700 (PDT) Message-ID: <69aefc6f-c17b-2904-0de3-655cab294b19@gmail.com> Date: Wed, 3 Aug 2022 13:35:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: Irui Wang , Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , Tzung-Bi Shih , angelogioacchino.delregno@collabora.com, nicolas.dufresne@collabora.com, wenst@chromium.org, kyrie wu Cc: Project_Global_Chrome_Upstream_Group@mediatek.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, Tomasz Figa , xia.jiang@mediatek.com, maoguang.meng@mediatek.com References: <20220729062630.5592-1-irui.wang@mediatek.com> <20220729062630.5592-4-irui.wang@mediatek.com> From: Matthias Brugger Subject: Re: [V12,3/7] mtk-jpegenc: manage jpegenc multi-hardware In-Reply-To: <20220729062630.5592-4-irui.wang@mediatek.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 29/07/2022 08:26, Irui Wang wrote: > From: kyrie wu > > manage each hardware information, including irq/clk/power. > the hardware includes HW0 and HW1. > Please improove commit message. Apart from that you are doing far more then just this. It seems that would need to be split up in different commit messages. > Signed-off-by: kyrie wu > Signed-off-by: irui wang > --- > drivers/media/platform/mediatek/jpeg/Makefile | 11 +- > .../platform/mediatek/jpeg/mtk_jpeg_core.c | 71 ++++---- > .../platform/mediatek/jpeg/mtk_jpeg_core.h | 37 ++++ > .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 163 ++++++++++++++++++ > 4 files changed, 249 insertions(+), 33 deletions(-) > > diff --git a/drivers/media/platform/mediatek/jpeg/Makefile b/drivers/media/platform/mediatek/jpeg/Makefile > index 76c33aad0f3f..69703db4b0a5 100644 > --- a/drivers/media/platform/mediatek/jpeg/Makefile > +++ b/drivers/media/platform/mediatek/jpeg/Makefile > @@ -1,6 +1,9 @@ > # SPDX-License-Identifier: GPL-2.0-only > -mtk_jpeg-objs := mtk_jpeg_core.o \ > +obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk_jpeg.o \ > + mtk-jpeg-enc-hw.o > + > +mtk_jpeg-y := mtk_jpeg_core.o \ > mtk_jpeg_dec_hw.o \ > - mtk_jpeg_dec_parse.o \ > - mtk_jpeg_enc_hw.o > -obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk_jpeg.o > + mtk_jpeg_dec_parse.o > + > +mtk-jpeg-enc-hw-y := mtk_jpeg_enc_hw.o > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > index 724fb7aeb0ee..690d0e676481 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > @@ -680,7 +680,7 @@ static int mtk_jpeg_buf_prepare(struct vb2_buffer *vb) > { > struct mtk_jpeg_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); > struct mtk_jpeg_q_data *q_data = NULL; > - struct v4l2_plane_pix_format plane_fmt; > + struct v4l2_plane_pix_format plane_fmt = {}; > int i; > > q_data = mtk_jpeg_get_q_data(ctx, vb->vb2_queue->type); > @@ -1301,6 +1301,7 @@ static void mtk_jpeg_job_timeout_work(struct work_struct *work) > static int mtk_jpeg_probe(struct platform_device *pdev) > { > struct mtk_jpeg_dev *jpeg; > + bool is_nultihw = false; For me this is not a sound variable name. > int jpeg_irq; > int ret; > > @@ -1312,38 +1313,54 @@ static int mtk_jpeg_probe(struct platform_device *pdev) > spin_lock_init(&jpeg->hw_lock); > jpeg->dev = &pdev->dev; > jpeg->variant = of_device_get_match_data(jpeg->dev); > - INIT_DELAYED_WORK(&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work); > > - jpeg->reg_base = devm_platform_ioremap_resource(pdev, 0); > - if (IS_ERR(jpeg->reg_base)) { > - ret = PTR_ERR(jpeg->reg_base); > - return ret; > + ret = devm_of_platform_populate(&pdev->dev); > + if (ret) { > + v4l2_err(&jpeg->v4l2_dev, "Master of platform populate failed."); > + return -EINVAL; > } > > - jpeg_irq = platform_get_irq(pdev, 0); > - if (jpeg_irq < 0) > - return jpeg_irq; > + if (!list_empty(&pdev->dev.devres_head)) > + is_nultihw = true; > > - ret = devm_request_irq(&pdev->dev, jpeg_irq, > - jpeg->variant->irq_handler, 0, pdev->name, jpeg); > - if (ret) { > - dev_err(&pdev->dev, "Failed to request jpeg_irq %d (%d)\n", > - jpeg_irq, ret); > - goto err_req_irq; > - } > + if (!is_nultihw) { So you only use the variable directly after assigning, so no need for the variable at all. > + INIT_DELAYED_WORK(&jpeg->job_timeout_work, > + mtk_jpeg_job_timeout_work); > > - ret = devm_clk_bulk_get(jpeg->dev, jpeg->variant->num_clks, > - jpeg->variant->clks); > - if (ret) { > - dev_err(&pdev->dev, "Failed to init clk, err %d\n", ret); > - goto err_clk_init; > + jpeg->reg_base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(jpeg->reg_base)) { > + ret = PTR_ERR(jpeg->reg_base); > + return ret; > + } > + > + jpeg_irq = platform_get_irq(pdev, 0); > + if (jpeg_irq < 0) > + return jpeg_irq; > + > + ret = devm_request_irq(&pdev->dev, > + jpeg_irq, > + jpeg->variant->irq_handler, > + 0, > + pdev->name, jpeg); > + if (ret) { > + dev_err(&pdev->dev, "Failed to request jpeg_irq %d (%d)\n", > + jpeg_irq, ret); > + return ret; > + } > + > + ret = devm_clk_bulk_get(jpeg->dev, > + jpeg->variant->num_clks, > + jpeg->variant->clks); > + if (ret) { > + dev_err(&pdev->dev, "Failed to init clk\n"); > + return ret; > + } > } > > ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev); > if (ret) { > dev_err(&pdev->dev, "Failed to register v4l2 device\n"); > - ret = -EINVAL; > - goto err_dev_register; > + return -EINVAL; > } > > jpeg->m2m_dev = v4l2_m2m_init(jpeg->variant->m2m_ops); > @@ -1401,12 +1418,6 @@ static int mtk_jpeg_probe(struct platform_device *pdev) > err_m2m_init: > v4l2_device_unregister(&jpeg->v4l2_dev); > > -err_dev_register: > - > -err_clk_init: > - > -err_req_irq: > - > return ret; > } > > @@ -1497,6 +1508,7 @@ static const struct mtk_jpeg_variant mtk_jpeg_drvdata = { > .cap_q_default_fourcc = V4L2_PIX_FMT_JPEG, > }; > > +#if defined(CONFIG_OF) Do we want to instanciate the driver through a platform device? That's not part of the driver. I suppose this will break compilation actually. Maybe I'm missing something important here, but it seems to me this patch is like one part of something that on a quick look is not implemented in this series. Regards, Matthias > static const struct of_device_id mtk_jpeg_match[] = { > { > .compatible = "mediatek,mt8173-jpgdec", > @@ -1514,6 +1526,7 @@ static const struct of_device_id mtk_jpeg_match[] = { > }; > > MODULE_DEVICE_TABLE(of, mtk_jpeg_match); > +#endif > > static struct platform_driver mtk_jpeg_driver = { > .probe = mtk_jpeg_probe, > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > index 3e4811a41ba2..4aaddf0301d1 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > @@ -9,6 +9,7 @@ > #ifndef _MTK_JPEG_CORE_H > #define _MTK_JPEG_CORE_H > > +#include > #include > #include > #include > @@ -74,6 +75,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_jpegenc_clk - Structure used to store vcodec clock information > + */ > +struct mtk_jpegenc_clk { > + struct clk_bulk_data *clks; > + int clk_num; > +}; > + > +/** > + * 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 > + */ > +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 +133,10 @@ 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]; > + bool is_jpgenc_multihw; > }; > > /** > 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 a2b6e1f85c2d..749851590a75 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > @@ -5,11 +5,27 @@ > * > */ > > +#include > +#include > +#include > #include > #include > +#include > +#include > +#include > +#include > +#include > +#include > #include > #include > +#include > +#include > +#include > +#include > +#include > +#include > > +#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,16 @@ 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-jpgenc-hw", > + }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, mtk_jpegenc_drv_ids); > +#endif > + > void mtk_jpeg_enc_reset(void __iomem *base) > { > writel(0, base + JPEG_ENC_RSTB); > @@ -159,3 +185,140 @@ void mtk_jpeg_set_enc_params(struct mtk_jpeg_ctx *ctx, void __iomem *base) > } > EXPORT_SYMBOL_GPL(mtk_jpeg_set_enc_params); > > +static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv) > +{ > + struct vb2_v4l2_buffer *src_buf, *dst_buf; > + enum vb2_buffer_state buf_state; > + struct mtk_jpeg_ctx *ctx; > + u32 result_size; > + u32 irq_status; > + > + struct mtk_jpegenc_comp_dev *jpeg = priv; > + struct mtk_jpeg_dev *master_jpeg = jpeg->master_dev; > + > + irq_status = readl(jpeg->reg_base + JPEG_ENC_INT_STS) & > + JPEG_ENC_INT_STATUS_MASK_ALLIRQ; > + if (irq_status) > + writel(0, jpeg->reg_base + JPEG_ENC_INT_STS); > + if (!(irq_status & JPEG_ENC_INT_STATUS_DONE)) > + return IRQ_NONE; > + > + ctx = v4l2_m2m_get_curr_priv(master_jpeg->m2m_dev); > + if (!ctx) { > + v4l2_err(&master_jpeg->v4l2_dev, "Context is NULL\n"); > + return IRQ_HANDLED; > + } > + > + src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); > + dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > + v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true); > + > + result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base); > + vb2_set_plane_payload(&dst_buf->vb2_buf, 0, result_size); > + buf_state = VB2_BUF_STATE_DONE; > + v4l2_m2m_buf_done(src_buf, buf_state); > + v4l2_m2m_buf_done(dst_buf, buf_state); > + v4l2_m2m_job_finish(master_jpeg->m2m_dev, ctx->fh.m2m_ctx); > + pm_runtime_put(ctx->jpeg->dev); > + > + return IRQ_HANDLED; > +} > + > +static int mtk_jpegenc_hw_init_irq(struct mtk_jpegenc_comp_dev *dev) > +{ > + struct platform_device *pdev = dev->plat_dev; > + int ret; > + > + dev->jpegenc_irq = platform_get_irq(pdev, 0); > + if (dev->jpegenc_irq < 0) { > + dev_err(&pdev->dev, "Failed to get irq resource"); > + return dev->jpegenc_irq; > + } > + > + ret = devm_request_irq(&pdev->dev, > + dev->jpegenc_irq, > + mtk_jpegenc_hw_irq_handler, > + 0, > + pdev->name, dev); > + if (ret) { > + dev_err(&pdev->dev, "Failed to devm_request_irq %d (%d)", > + dev->jpegenc_irq, ret); > + return -ENOENT; > + } > + > + return 0; > +} > + > +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, i; > + > + 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; > + dev->dev = &pdev->dev; > + > + if (!master_dev->is_jpgenc_multihw) { > + master_dev->is_jpgenc_multihw = true; > + for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) > + master_dev->enc_hw_dev[i] = NULL; > + } > + > + jpegenc_clk = &dev->venc_clk; > + > + jpegenc_clk->clk_num = devm_clk_bulk_get_all(&pdev->dev, > + &jpegenc_clk->clks); > + if (jpegenc_clk->clk_num < 0) > + return dev_err_probe(&pdev->dev, jpegenc_clk->clk_num, > + "Failed to get jpegenc clock count\n"); > + > + dev->reg_base = > + devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(dev->reg_base)) > + return PTR_ERR(dev->reg_base); > + > + ret = mtk_jpegenc_hw_init_irq(dev); > + if (ret) > + return ret; > + > + for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) { > + if (master_dev->enc_hw_dev[i]) > + continue; > + > + master_dev->enc_hw_dev[i] = dev; > + master_dev->reg_encbase[i] = dev->reg_base; > + dev->master_dev = master_dev; > + } > + > + platform_set_drvdata(pdev, dev); > + pm_runtime_enable(&pdev->dev); > + > + return 0; > +} > + > +struct platform_driver mtk_jpegenc_hw_driver = { > + .probe = mtk_jpegenc_hw_probe, > + .driver = { > + .name = "mtk-jpegenc-hw", > + .of_match_table = of_match_ptr(mtk_jpegenc_drv_ids), > + }, > +}; > + > +module_platform_driver(mtk_jpegenc_hw_driver); > + > +MODULE_DESCRIPTION("MediaTek JPEG encode HW driver"); > +MODULE_LICENSE("GPL"); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C496C19F28 for ; Wed, 3 Aug 2022 11:38:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:Subject:From:References:Cc:To: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AewFz60zK8pjlwtYiUy5gMolofYthsEAI0tSqMnaQg8=; b=qe8HQpof82P419 BkHfzBOBlquLRiw5wnEOD6DsEa4S1UlP8Z1CkAMLZ1Xf8okq5RQPrJoKvOHJ2DDyDTJcESm/HAngI /n5UOwrxAal598ju18VT4ZZQULF8vgcZw+kEkyKZc9y422nGykju59Wo4y0e49oV/RyM4BEj1ADsQ DvKUFpoIsj+YH2o8yF40wn2XYfW/06cHjwDrs5j3IPsHwjCua/VIxlOs7zFSF3RVuFYewNA9CJm49 NOioUGxU/v11zuNlm3Eru3hGLsvHCkSoPabWnG6E0TbAz1zS7/D3W9bJGPSn36wyoH+7AyIEs2KmF r7E8r103vdwkCLHMVMgw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJCgM-005QVf-O0; Wed, 03 Aug 2022 11:36:59 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJCfD-005PX1-4j; Wed, 03 Aug 2022 11:35:50 +0000 Received: by mail-wr1-x42b.google.com with SMTP id z17so16528553wrq.4; Wed, 03 Aug 2022 04:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc; bh=kyIB5we5dkoZV/HXA++yWxVj1lZNnKb9luN75IO40Ic=; b=FUAJ+oKaYZ7aGrt0QuCDBVx9MP47cD3JOzaWlY+Il6X0XBlX88oVzQkdyPzGLWH0Ul VpUPRDtiafdBjuh8NXGGlESX+E5OuVjAxF49h2hkoAZH/3DRWq6j1Vla2ggqmvsQrEDJ 7yop5eX5D5ODhUBfQA9ipdJ2lvqJHBUyRaHqaBfqc6/LgpSgrVWuH1HnI2is48Mc4VTN x4ahC7UFhmNvim+19Ksh+rNOtVOn8eDXPQVhA1vEyg8Xli3iOf6kVLQY8x+knYVF6eeQ DW0WLfAMCjOwgkJSf068QQQ/p++kE7GRpz4ZKbw1cLfkKMbJGye6vuBB4Q4bxQ5QigwG Pj8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=kyIB5we5dkoZV/HXA++yWxVj1lZNnKb9luN75IO40Ic=; b=BLVSNaA77Hk78/jP2cKCgJlb+epHPpSgKTuE7v5KH5m1gxeBGFTXYOrnqPnF7gmmx7 xFGd2Sxqx/htsY6Fa58HzkNHtfYyWzXEy+ntOC9RlBQ9puhQRHqSwPXzUx2yBgi2tC5f 96QIoCvtQ/Otz8gTf9bUxMrxnhTTMGiZGbP9ZCscqwq/vbMNH0X0L4XD/E49dK3O0/oy Rx44ecL6WtUI4lW+CKrct2oM3H8uUvvSYoPTeL/QOHN2Pg3v/4YUFGAr0TtU9EYEnXed bImV1DQ3AJwwLJR31YzKLrt6K5cELI90OmcTWXSqU+7OT2qqvGd7ZP8MVHyd29G6t1h6 /E8Q== X-Gm-Message-State: ACgBeo2vPb6i4K8m52ERJfIbbBqHD8mM+wHab6652hVHREEDbohcyz2T XlyxsUolxoggGap/C+Ih0YQ= X-Google-Smtp-Source: AA6agR6T4lvEpmqiF4+T3ltyl0Hs0JBC8AiI4o7H5j98i7u1cl7atObs2OFq3PUBUJXP4sxnuIIn/g== X-Received: by 2002:a05:6000:15ce:b0:21e:4aab:1c2a with SMTP id y14-20020a05600015ce00b0021e4aab1c2amr12896057wry.109.1659526538085; Wed, 03 Aug 2022 04:35:38 -0700 (PDT) Received: from [192.168.1.145] ([207.188.167.132]) by smtp.gmail.com with ESMTPSA id u11-20020a05600c19cb00b003a302fb9df7sm2404251wmq.21.2022.08.03.04.35.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Aug 2022 04:35:36 -0700 (PDT) Message-ID: <69aefc6f-c17b-2904-0de3-655cab294b19@gmail.com> Date: Wed, 3 Aug 2022 13:35:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: Irui Wang , Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , Tzung-Bi Shih , angelogioacchino.delregno@collabora.com, nicolas.dufresne@collabora.com, wenst@chromium.org, kyrie wu Cc: Project_Global_Chrome_Upstream_Group@mediatek.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, Tomasz Figa , xia.jiang@mediatek.com, maoguang.meng@mediatek.com References: <20220729062630.5592-1-irui.wang@mediatek.com> <20220729062630.5592-4-irui.wang@mediatek.com> From: Matthias Brugger Subject: Re: [V12,3/7] mtk-jpegenc: manage jpegenc multi-hardware In-Reply-To: <20220729062630.5592-4-irui.wang@mediatek.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220803_043547_203056_D56AC635 X-CRM114-Status: GOOD ( 37.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 29/07/2022 08:26, Irui Wang wrote: > From: kyrie wu > > manage each hardware information, including irq/clk/power. > the hardware includes HW0 and HW1. > Please improove commit message. Apart from that you are doing far more then just this. It seems that would need to be split up in different commit messages. > Signed-off-by: kyrie wu > Signed-off-by: irui wang > --- > drivers/media/platform/mediatek/jpeg/Makefile | 11 +- > .../platform/mediatek/jpeg/mtk_jpeg_core.c | 71 ++++---- > .../platform/mediatek/jpeg/mtk_jpeg_core.h | 37 ++++ > .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 163 ++++++++++++++++++ > 4 files changed, 249 insertions(+), 33 deletions(-) > > diff --git a/drivers/media/platform/mediatek/jpeg/Makefile b/drivers/media/platform/mediatek/jpeg/Makefile > index 76c33aad0f3f..69703db4b0a5 100644 > --- a/drivers/media/platform/mediatek/jpeg/Makefile > +++ b/drivers/media/platform/mediatek/jpeg/Makefile > @@ -1,6 +1,9 @@ > # SPDX-License-Identifier: GPL-2.0-only > -mtk_jpeg-objs := mtk_jpeg_core.o \ > +obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk_jpeg.o \ > + mtk-jpeg-enc-hw.o > + > +mtk_jpeg-y := mtk_jpeg_core.o \ > mtk_jpeg_dec_hw.o \ > - mtk_jpeg_dec_parse.o \ > - mtk_jpeg_enc_hw.o > -obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk_jpeg.o > + mtk_jpeg_dec_parse.o > + > +mtk-jpeg-enc-hw-y := mtk_jpeg_enc_hw.o > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > index 724fb7aeb0ee..690d0e676481 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > @@ -680,7 +680,7 @@ static int mtk_jpeg_buf_prepare(struct vb2_buffer *vb) > { > struct mtk_jpeg_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); > struct mtk_jpeg_q_data *q_data = NULL; > - struct v4l2_plane_pix_format plane_fmt; > + struct v4l2_plane_pix_format plane_fmt = {}; > int i; > > q_data = mtk_jpeg_get_q_data(ctx, vb->vb2_queue->type); > @@ -1301,6 +1301,7 @@ static void mtk_jpeg_job_timeout_work(struct work_struct *work) > static int mtk_jpeg_probe(struct platform_device *pdev) > { > struct mtk_jpeg_dev *jpeg; > + bool is_nultihw = false; For me this is not a sound variable name. > int jpeg_irq; > int ret; > > @@ -1312,38 +1313,54 @@ static int mtk_jpeg_probe(struct platform_device *pdev) > spin_lock_init(&jpeg->hw_lock); > jpeg->dev = &pdev->dev; > jpeg->variant = of_device_get_match_data(jpeg->dev); > - INIT_DELAYED_WORK(&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work); > > - jpeg->reg_base = devm_platform_ioremap_resource(pdev, 0); > - if (IS_ERR(jpeg->reg_base)) { > - ret = PTR_ERR(jpeg->reg_base); > - return ret; > + ret = devm_of_platform_populate(&pdev->dev); > + if (ret) { > + v4l2_err(&jpeg->v4l2_dev, "Master of platform populate failed."); > + return -EINVAL; > } > > - jpeg_irq = platform_get_irq(pdev, 0); > - if (jpeg_irq < 0) > - return jpeg_irq; > + if (!list_empty(&pdev->dev.devres_head)) > + is_nultihw = true; > > - ret = devm_request_irq(&pdev->dev, jpeg_irq, > - jpeg->variant->irq_handler, 0, pdev->name, jpeg); > - if (ret) { > - dev_err(&pdev->dev, "Failed to request jpeg_irq %d (%d)\n", > - jpeg_irq, ret); > - goto err_req_irq; > - } > + if (!is_nultihw) { So you only use the variable directly after assigning, so no need for the variable at all. > + INIT_DELAYED_WORK(&jpeg->job_timeout_work, > + mtk_jpeg_job_timeout_work); > > - ret = devm_clk_bulk_get(jpeg->dev, jpeg->variant->num_clks, > - jpeg->variant->clks); > - if (ret) { > - dev_err(&pdev->dev, "Failed to init clk, err %d\n", ret); > - goto err_clk_init; > + jpeg->reg_base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(jpeg->reg_base)) { > + ret = PTR_ERR(jpeg->reg_base); > + return ret; > + } > + > + jpeg_irq = platform_get_irq(pdev, 0); > + if (jpeg_irq < 0) > + return jpeg_irq; > + > + ret = devm_request_irq(&pdev->dev, > + jpeg_irq, > + jpeg->variant->irq_handler, > + 0, > + pdev->name, jpeg); > + if (ret) { > + dev_err(&pdev->dev, "Failed to request jpeg_irq %d (%d)\n", > + jpeg_irq, ret); > + return ret; > + } > + > + ret = devm_clk_bulk_get(jpeg->dev, > + jpeg->variant->num_clks, > + jpeg->variant->clks); > + if (ret) { > + dev_err(&pdev->dev, "Failed to init clk\n"); > + return ret; > + } > } > > ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev); > if (ret) { > dev_err(&pdev->dev, "Failed to register v4l2 device\n"); > - ret = -EINVAL; > - goto err_dev_register; > + return -EINVAL; > } > > jpeg->m2m_dev = v4l2_m2m_init(jpeg->variant->m2m_ops); > @@ -1401,12 +1418,6 @@ static int mtk_jpeg_probe(struct platform_device *pdev) > err_m2m_init: > v4l2_device_unregister(&jpeg->v4l2_dev); > > -err_dev_register: > - > -err_clk_init: > - > -err_req_irq: > - > return ret; > } > > @@ -1497,6 +1508,7 @@ static const struct mtk_jpeg_variant mtk_jpeg_drvdata = { > .cap_q_default_fourcc = V4L2_PIX_FMT_JPEG, > }; > > +#if defined(CONFIG_OF) Do we want to instanciate the driver through a platform device? That's not part of the driver. I suppose this will break compilation actually. Maybe I'm missing something important here, but it seems to me this patch is like one part of something that on a quick look is not implemented in this series. Regards, Matthias > static const struct of_device_id mtk_jpeg_match[] = { > { > .compatible = "mediatek,mt8173-jpgdec", > @@ -1514,6 +1526,7 @@ static const struct of_device_id mtk_jpeg_match[] = { > }; > > MODULE_DEVICE_TABLE(of, mtk_jpeg_match); > +#endif > > static struct platform_driver mtk_jpeg_driver = { > .probe = mtk_jpeg_probe, > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > index 3e4811a41ba2..4aaddf0301d1 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > @@ -9,6 +9,7 @@ > #ifndef _MTK_JPEG_CORE_H > #define _MTK_JPEG_CORE_H > > +#include > #include > #include > #include > @@ -74,6 +75,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_jpegenc_clk - Structure used to store vcodec clock information > + */ > +struct mtk_jpegenc_clk { > + struct clk_bulk_data *clks; > + int clk_num; > +}; > + > +/** > + * 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 > + */ > +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 +133,10 @@ 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]; > + bool is_jpgenc_multihw; > }; > > /** > 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 a2b6e1f85c2d..749851590a75 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > @@ -5,11 +5,27 @@ > * > */ > > +#include > +#include > +#include > #include > #include > +#include > +#include > +#include > +#include > +#include > +#include > #include > #include > +#include > +#include > +#include > +#include > +#include > +#include > > +#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,16 @@ 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-jpgenc-hw", > + }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, mtk_jpegenc_drv_ids); > +#endif > + > void mtk_jpeg_enc_reset(void __iomem *base) > { > writel(0, base + JPEG_ENC_RSTB); > @@ -159,3 +185,140 @@ void mtk_jpeg_set_enc_params(struct mtk_jpeg_ctx *ctx, void __iomem *base) > } > EXPORT_SYMBOL_GPL(mtk_jpeg_set_enc_params); > > +static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv) > +{ > + struct vb2_v4l2_buffer *src_buf, *dst_buf; > + enum vb2_buffer_state buf_state; > + struct mtk_jpeg_ctx *ctx; > + u32 result_size; > + u32 irq_status; > + > + struct mtk_jpegenc_comp_dev *jpeg = priv; > + struct mtk_jpeg_dev *master_jpeg = jpeg->master_dev; > + > + irq_status = readl(jpeg->reg_base + JPEG_ENC_INT_STS) & > + JPEG_ENC_INT_STATUS_MASK_ALLIRQ; > + if (irq_status) > + writel(0, jpeg->reg_base + JPEG_ENC_INT_STS); > + if (!(irq_status & JPEG_ENC_INT_STATUS_DONE)) > + return IRQ_NONE; > + > + ctx = v4l2_m2m_get_curr_priv(master_jpeg->m2m_dev); > + if (!ctx) { > + v4l2_err(&master_jpeg->v4l2_dev, "Context is NULL\n"); > + return IRQ_HANDLED; > + } > + > + src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); > + dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > + v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true); > + > + result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base); > + vb2_set_plane_payload(&dst_buf->vb2_buf, 0, result_size); > + buf_state = VB2_BUF_STATE_DONE; > + v4l2_m2m_buf_done(src_buf, buf_state); > + v4l2_m2m_buf_done(dst_buf, buf_state); > + v4l2_m2m_job_finish(master_jpeg->m2m_dev, ctx->fh.m2m_ctx); > + pm_runtime_put(ctx->jpeg->dev); > + > + return IRQ_HANDLED; > +} > + > +static int mtk_jpegenc_hw_init_irq(struct mtk_jpegenc_comp_dev *dev) > +{ > + struct platform_device *pdev = dev->plat_dev; > + int ret; > + > + dev->jpegenc_irq = platform_get_irq(pdev, 0); > + if (dev->jpegenc_irq < 0) { > + dev_err(&pdev->dev, "Failed to get irq resource"); > + return dev->jpegenc_irq; > + } > + > + ret = devm_request_irq(&pdev->dev, > + dev->jpegenc_irq, > + mtk_jpegenc_hw_irq_handler, > + 0, > + pdev->name, dev); > + if (ret) { > + dev_err(&pdev->dev, "Failed to devm_request_irq %d (%d)", > + dev->jpegenc_irq, ret); > + return -ENOENT; > + } > + > + return 0; > +} > + > +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, i; > + > + 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; > + dev->dev = &pdev->dev; > + > + if (!master_dev->is_jpgenc_multihw) { > + master_dev->is_jpgenc_multihw = true; > + for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) > + master_dev->enc_hw_dev[i] = NULL; > + } > + > + jpegenc_clk = &dev->venc_clk; > + > + jpegenc_clk->clk_num = devm_clk_bulk_get_all(&pdev->dev, > + &jpegenc_clk->clks); > + if (jpegenc_clk->clk_num < 0) > + return dev_err_probe(&pdev->dev, jpegenc_clk->clk_num, > + "Failed to get jpegenc clock count\n"); > + > + dev->reg_base = > + devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(dev->reg_base)) > + return PTR_ERR(dev->reg_base); > + > + ret = mtk_jpegenc_hw_init_irq(dev); > + if (ret) > + return ret; > + > + for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) { > + if (master_dev->enc_hw_dev[i]) > + continue; > + > + master_dev->enc_hw_dev[i] = dev; > + master_dev->reg_encbase[i] = dev->reg_base; > + dev->master_dev = master_dev; > + } > + > + platform_set_drvdata(pdev, dev); > + pm_runtime_enable(&pdev->dev); > + > + return 0; > +} > + > +struct platform_driver mtk_jpegenc_hw_driver = { > + .probe = mtk_jpegenc_hw_probe, > + .driver = { > + .name = "mtk-jpegenc-hw", > + .of_match_table = of_match_ptr(mtk_jpegenc_drv_ids), > + }, > +}; > + > +module_platform_driver(mtk_jpegenc_hw_driver); > + > +MODULE_DESCRIPTION("MediaTek JPEG encode HW driver"); > +MODULE_LICENSE("GPL"); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel