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 X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD5B4C433DB for ; Fri, 8 Jan 2021 10:49:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 93F1F238E2 for ; Fri, 8 Jan 2021 10:49:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727471AbhAHKtU (ORCPT ); Fri, 8 Jan 2021 05:49:20 -0500 Received: from gloria.sntech.de ([185.11.138.130]:56286 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726752AbhAHKtU (ORCPT ); Fri, 8 Jan 2021 05:49:20 -0500 Received: from ip5f5aa64a.dynamic.kabel-deutschland.de ([95.90.166.74] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kxpJl-0002Jc-KQ; Fri, 08 Jan 2021 11:48:29 +0100 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: Ezequiel Garcia , Paul Kocialkowski Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jacob Chen , Mauro Carvalho Chehab , Rob Herring , Philipp Zabel , Greg Kroah-Hartman , Thomas Petazzoni Subject: Re: [PATCH 5/5] media: hantro: Add support for the Rockchip PX30 Date: Fri, 08 Jan 2021 11:48:26 +0100 Message-ID: <11669141.O9o76ZdvQC@diego> In-Reply-To: References: <20210107134101.195426-1-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Am Freitag, 8. Januar 2021, 10:05:16 CET schrieb Paul Kocialkowski: > Hi Ezequiel, > > On Thu 07 Jan 21, 16:08, Ezequiel Garcia wrote: > > Happy to see this patch. It was on my TODO list, > > but I hadn't had time to bringup my rk3326 device. > > Same here, I just had an occasion to use it again these days so I jumped > on it! > > > A few comments. > > > > On Thu, 2021-01-07 at 14:41 +0100, Paul Kocialkowski wrote: > > > The PX30 SoC includes both the VDPU2 and VEPU2 blocks which are similar > > > to the RK3399 (Hantro G1/H1 with shuffled registers). > > > > > > Besides taking an extra clock, it also shares an interrupt with the IOMMU > > > so it's necessary to request the interrupt shared. > > > > > > > Could you clarify on the commit description which iommu device interrupt > > line is being shared? > > Sure! It's IRQ 79 of the GIC that's shared with vopl_mmu. > It's not very obvious in the dt commit. Having looked through the docs again, I think that the vopl_mmu using irq 79 is just a mistake: (1) in general vop and vop-mmu use the same irq (78 in that case) (2) Rockchip does seem to have fixed that in their 4.19 tree as well: https://github.com/rockchip-linux/kernel/blob/develop-4.19/arch/arm64/boot/dts/rockchip/px30.dtsi#L1598 So to me it looks like this doesn't need to be shared and instead "simply" the px30 dtsi fixed ;-) Heiko > > > Signed-off-by: Paul Kocialkowski > > > --- > > > drivers/staging/media/hantro/hantro_drv.c | 5 +++-- > > > drivers/staging/media/hantro/hantro_hw.h | 1 + > > > drivers/staging/media/hantro/rk3399_vpu_hw.c | 21 ++++++++++++++++++++ > > > 3 files changed, 25 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c > > > index e5f200e64993..076a7782b476 100644 > > > --- a/drivers/staging/media/hantro/hantro_drv.c > > > +++ b/drivers/staging/media/hantro/hantro_drv.c > > > @@ -472,6 +472,7 @@ static const struct v4l2_file_operations hantro_fops = { > > > > > > static const struct of_device_id of_hantro_match[] = { > > > #ifdef CONFIG_VIDEO_HANTRO_ROCKCHIP > > > + { .compatible = "rockchip,px30-vpu", .data = &px30_vpu_variant, }, > > > { .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, }, > > > { .compatible = "rockchip,rk3328-vpu", .data = &rk3328_vpu_variant, }, > > > { .compatible = "rockchip,rk3288-vpu", .data = &rk3288_vpu_variant, }, > > > @@ -796,8 +797,8 @@ static int hantro_probe(struct platform_device *pdev) > > > return -ENXIO; > > > > > > ret = devm_request_irq(vpu->dev, irq, > > > - vpu->variant->irqs[i].handler, 0, > > > - dev_name(vpu->dev), vpu); > > > + vpu->variant->irqs[i].handler, > > > + IRQF_SHARED, dev_name(vpu->dev), vpu); > > > > Maybe this irq flag should be part of vpu->variant? It sounds like an IP block > > integration specific thing. > > Ah right, I agree that it would be justified. But it would also be simple to > just fix the irq handlers and assume this can generally be the case, because it > feels like a bit of a detail to justify a flag. > > Do you think this could be a safe/workable assumption? > > > Also, you will need a px30-specific interrupt handler now, > > since the rk3399 one is not shared-friendly. > > Yeah I realize I haven't been very careful there and didn't really check that > the IOMMU driver is really safe to handle shared interrupts either. I'll take > a look a that when crafting v2. > > > > if (ret) { > > > dev_err(vpu->dev, "Could not request %s IRQ.\n", > > > irq_name); > > > diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h > > > index 34c9e4649a25..07f516fd7a2e 100644 > > > --- a/drivers/staging/media/hantro/hantro_hw.h > > > +++ b/drivers/staging/media/hantro/hantro_hw.h > > > @@ -148,6 +148,7 @@ enum hantro_enc_fmt { > > > RK3288_VPU_ENC_FMT_UYVY422 = 3, > > > }; > > > > > > +extern const struct hantro_variant px30_vpu_variant; > > > extern const struct hantro_variant rk3399_vpu_variant; > > > extern const struct hantro_variant rk3328_vpu_variant; > > > extern const struct hantro_variant rk3288_vpu_variant; > > > diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw.c b/drivers/staging/media/hantro/rk3399_vpu_hw.c > > > index 7a7962cf771e..4112f98baa60 100644 > > > --- a/drivers/staging/media/hantro/rk3399_vpu_hw.c > > > +++ b/drivers/staging/media/hantro/rk3399_vpu_hw.c > > > > Perhaps it's time to rename this to rockchip_vpu_hw.c, > > and merge rk3288 and rk3399? It's a nitpick, though. > > Haha, I was thinking the exact same thing but wasn't sure it would be welcome! > > I was thinking of rockchip_vpu2_hw.c or rockchip_vdpu2_hw.c since that's > apparently how it's called in Rockchip terminology: VDPU2 and VEPU2 for the > Hantro G1 and H1 with the shuffled register layout. The rk3288 stuff is > probably VDPU1/VEPU1 and we might want to rename it accordingly as well. > > Cheers and thanks for the review! > > Paul > > > > @@ -220,3 +220,24 @@ const struct hantro_variant rk3328_vpu_variant = { > > > .clk_names = rk3399_clk_names, > > > .num_clocks = ARRAY_SIZE(rk3399_clk_names), > > > }; > > > + > > > +static const char * const px30_clk_names[] = { > > > + "aclk", "hclk", "sclk" > > > +}; > > > + > > > +const struct hantro_variant px30_vpu_variant = { > > > + .enc_offset = 0x0, > > > + .enc_fmts = rk3399_vpu_enc_fmts, > > > + .num_enc_fmts = ARRAY_SIZE(rk3399_vpu_enc_fmts), > > > + .dec_offset = 0x400, > > > + .dec_fmts = rk3399_vpu_dec_fmts, > > > + .num_dec_fmts = ARRAY_SIZE(rk3399_vpu_dec_fmts), > > > + .codec = HANTRO_JPEG_ENCODER | HANTRO_MPEG2_DECODER | > > > + HANTRO_VP8_DECODER, > > > + .codec_ops = rk3399_vpu_codec_ops, > > > + .irqs = rk3399_irqs, > > > + .num_irqs = ARRAY_SIZE(rk3399_irqs), > > > + .init = rk3399_vpu_hw_init, > > > + .clk_names = px30_clk_names, > > > + .num_clocks = ARRAY_SIZE(px30_clk_names) > > > +}; > > > > Thanks, > > Ezequiel > > > >