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=-10.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 B105AC433DF for ; Wed, 22 Jul 2020 21:40:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B6742071A for ; Wed, 22 Jul 2020 21:40:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=vanguardiasur-com-ar.20150623.gappssmtp.com header.i=@vanguardiasur-com-ar.20150623.gappssmtp.com header.b="c6gciru4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732511AbgGVVkF (ORCPT ); Wed, 22 Jul 2020 17:40:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728198AbgGVVkE (ORCPT ); Wed, 22 Jul 2020 17:40:04 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E833CC0619E2 for ; Wed, 22 Jul 2020 14:40:03 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id br7so3967423ejb.5 for ; Wed, 22 Jul 2020 14:40:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=R2Z64vw+qagebjdsDOZbyCjOc3To2u+GAsC3OZaH0G0=; b=c6gciru4GNSVk6ACnSwN7WSWkOkNYhNfvBET9SAOmn9Ro9gbliYSWw5UdV+cBA4Yj8 ijw7MqughICPQnqPFWXiMZ+dEzfbYjruQTOVG5ab17egls2CEdRZoH+Rm+qri6GxpOtJ yNMIIl70FXiRM3bvH4JDvfTx49NZd/arMvbHn6ksBcaNdJMTZ2giM70wkugXd2kxF6qu OdnPaAZTfqjfyGjP98TZ2fgPnEiHiIV6Ut86/rl9MfLAnwaEULKtHrc225f31ma8a3F4 E5ndfVJeY0aDdCQ2Kgu3s2AOVmVj7I+5uOTie1Ka71f7tGNgJofPOd4c6AQivGkDrZXS 1YVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=R2Z64vw+qagebjdsDOZbyCjOc3To2u+GAsC3OZaH0G0=; b=CFluTi+Hv6zkjWDtjvg1dB3vCXlDcc/oh+irWrV7aeY5zDT0z8L62ncUMQSAPepbrg mRIqnRq9z30fXvh+9kSan0PaWT1MJ+4+0zNVlHcpWzEbHlFxzSqS9cMWk8BH4RGmHCgw CQIsvaJISvhhQ0tlqadzJ0TFMUf4luNp6YDKiipp+WR1AKnPQDB1wngOrz/VvqUkcuLl 0ceGj6m2VCgYIJs7BSEQ6kcvuyWFKJITFVsO0WDVUkePxTAe2XBV3kUX6SzcJjBn8hNX 7V1Upp218AqQjPtmqoWYBA5Vlsh5e506OkSFOley+vzMJCsqqLssFWPWyABXsLb/fpuQ AIJQ== X-Gm-Message-State: AOAM531CjMtvHqQqjC+nOjq1hJvukfUpUsQoSCRvJ0W+8p6PZBi7WplM 0rW195rMlbgRAjjjzac0semQqnZeF7qErlOwDkShLQ== X-Google-Smtp-Source: ABdhPJzHaNsqfK3Cgkhaz7H4JevQ9ugXdy7SdXJtgxpfwTXUY+TcYHfJIaCSrlRJz0qjL8JV1YigBM7LqQiReqlipEY= X-Received: by 2002:a17:906:1e43:: with SMTP id i3mr1470530ejj.92.1595454002394; Wed, 22 Jul 2020 14:40:02 -0700 (PDT) MIME-Version: 1.0 References: <20200713060842.471356-1-acourbot@chromium.org> <20200713060842.471356-4-acourbot@chromium.org> In-Reply-To: <20200713060842.471356-4-acourbot@chromium.org> From: Ezequiel Garcia Date: Wed, 22 Jul 2020 18:39:50 -0300 Message-ID: Subject: Re: [PATCH v3 03/16] media: mtk-vcodec: add SCP firmware ops To: Alexandre Courbot Cc: Tiffany Lin , Andrew-CT Chen , Hans Verkuil , Yunfei Dong , Maoguang Meng , linux-media , "moderated list:ARM/Mediatek SoC support" , devicetree , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Mon, 13 Jul 2020 at 03:09, Alexandre Courbot wrote: > > From: Yunfei Dong > > Add support for communicating with the SCP firmware, which will be used > by MT8183. > > Signed-off-by: Yunfei Dong > [acourbot: refactor, cleanup and split] > Co-developed-by: Alexandre Courbot > Signed-off-by: Alexandre Courbot > Acked-by: Tiffany Lin > --- > drivers/media/platform/Kconfig | 1 + > .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 3 + > .../platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 3 + > .../media/platform/mtk-vcodec/mtk_vcodec_fw.c | 56 +++++++++++++++++++ > .../media/platform/mtk-vcodec/mtk_vcodec_fw.h | 2 + > 5 files changed, 65 insertions(+) > > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > index c57ee78fa99d..f0dbe048efea 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -256,6 +256,7 @@ config VIDEO_MEDIATEK_VCODEC > select VIDEOBUF2_DMA_CONTIG > select V4L2_MEM2MEM_DEV > select VIDEO_MEDIATEK_VPU > + select MTK_SCP > help > Mediatek video codec driver provides HW capability to > encode and decode in a range of video formats > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > index 4f07a5fcce7f..5b5765b98e57 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > @@ -225,6 +225,9 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > if (!of_property_read_u32(pdev->dev.of_node, "mediatek,vpu", > &rproc_phandle)) { > fw_type = VPU; > + } else if (!of_property_read_u32(pdev->dev.of_node, "mediatek,scp", > + &rproc_phandle)) { > + fw_type = SCP; > } else { > mtk_v4l2_err("Could not get vdec IPI device"); > return -ENODEV; > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > index 4340ea10afd0..42530cd01a30 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c > @@ -233,6 +233,9 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > if (!of_property_read_u32(pdev->dev.of_node, "mediatek,vpu", > &rproc_phandle)) { > fw_type = VPU; > + } else if (!of_property_read_u32(pdev->dev.of_node, "mediatek,scp", > + &rproc_phandle)) { > + fw_type = SCP; > } else { > mtk_v4l2_err("Could not get venc IPI device"); > return -ENODEV; > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c > index 967bb100a990..f2a62ea62fc6 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c > @@ -19,6 +19,7 @@ struct mtk_vcodec_fw { > enum mtk_vcodec_fw_type type; > const struct mtk_vcodec_fw_ops *ops; > struct platform_device *pdev; > + struct mtk_scp *scp; > }; > > static int mtk_vcodec_vpu_load_firmware(struct mtk_vcodec_fw *fw) > @@ -71,6 +72,48 @@ static const struct mtk_vcodec_fw_ops mtk_vcodec_vpu_msg = { > .ipi_send = mtk_vcodec_vpu_ipi_send, > }; > > +static int mtk_vcodec_scp_load_firmware(struct mtk_vcodec_fw *fw) > +{ > + return rproc_boot(scp_get_rproc(fw->scp)); > +} > + > +static unsigned int mtk_vcodec_scp_get_vdec_capa(struct mtk_vcodec_fw *fw) > +{ > + return scp_get_vdec_hw_capa(fw->scp); > +} > + > +static unsigned int mtk_vcodec_scp_get_venc_capa(struct mtk_vcodec_fw *fw) > +{ > + return scp_get_venc_hw_capa(fw->scp); > +} > + > +static void *mtk_vcodec_vpu_scp_dm_addr(struct mtk_vcodec_fw *fw, > + u32 dtcm_dmem_addr) > +{ > + return scp_mapping_dm_addr(fw->scp, dtcm_dmem_addr); > +} > + > +static int mtk_vcodec_scp_set_ipi_register(struct mtk_vcodec_fw *fw, int id, > + mtk_vcodec_ipi_handler handler, const char *name, void *priv) > +{ > + return scp_ipi_register(fw->scp, id, handler, priv); > +} > + > +static int mtk_vcodec_scp_ipi_send(struct mtk_vcodec_fw *fw, int id, void *buf, > + unsigned int len, unsigned int wait) > +{ > + return scp_ipi_send(fw->scp, id, buf, len, wait); > +} > + > +static const struct mtk_vcodec_fw_ops mtk_vcodec_rproc_msg = { > + .load_firmware = mtk_vcodec_scp_load_firmware, > + .get_vdec_capa = mtk_vcodec_scp_get_vdec_capa, > + .get_venc_capa = mtk_vcodec_scp_get_venc_capa, > + .map_dm_addr = mtk_vcodec_vpu_scp_dm_addr, > + .ipi_register = mtk_vcodec_scp_set_ipi_register, > + .ipi_send = mtk_vcodec_scp_ipi_send, > +}; > + > static void mtk_vcodec_reset_handler(void *priv) > { > struct mtk_vcodec_dev *dev = priv; > @@ -94,6 +137,7 @@ struct mtk_vcodec_fw *mtk_vcodec_fw_select(struct mtk_vcodec_dev *dev, > const struct mtk_vcodec_fw_ops *ops; > struct mtk_vcodec_fw *fw; > struct platform_device *fw_pdev = NULL; > + struct mtk_scp *scp = NULL; > > switch (type) { > case VPU: > @@ -106,6 +150,14 @@ struct mtk_vcodec_fw *mtk_vcodec_fw_select(struct mtk_vcodec_dev *dev, > vpu_wdt_reg_handler(fw_pdev, mtk_vcodec_reset_handler, > dev, rst_id); > break; > + case SCP: > + ops = &mtk_vcodec_rproc_msg; > + scp = scp_get(dev->plat_dev); > + if (!scp) { > + mtk_v4l2_err("could not get vdec scp handle"); > + return ERR_PTR(-EPROBE_DEFER); I suspect the EPROBE_DEFER should be returned by scp_get itself instead. > + } > + break; > default: > mtk_v4l2_err("invalid vcodec fw type"); > return ERR_PTR(-EINVAL); > @@ -118,6 +170,7 @@ struct mtk_vcodec_fw *mtk_vcodec_fw_select(struct mtk_vcodec_dev *dev, > fw->type = type; > fw->ops = ops; > fw->pdev = fw_pdev; > + fw->scp = scp; > > return fw; > } > @@ -129,6 +182,9 @@ void mtk_vcodec_fw_release(struct mtk_vcodec_fw *fw) > case VPU: > put_device(&fw->pdev->dev); > break; > + case SCP: > + scp_put(fw->scp); Interestingly scp_put is a wrapper around put_device :-) Perhaps not a reason to violate the layering. Regards, Ezequiel