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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 9362CC433DF for ; Tue, 16 Jun 2020 13:17:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A97A2100A for ; Tue, 16 Jun 2020 13:17:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="FiMajHQm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728787AbgFPNRX (ORCPT ); Tue, 16 Jun 2020 09:17:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725843AbgFPNRW (ORCPT ); Tue, 16 Jun 2020 09:17:22 -0400 Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75D8CC061573 for ; Tue, 16 Jun 2020 06:17:20 -0700 (PDT) Received: by mail-ot1-x342.google.com with SMTP id t6so15854595otk.9 for ; Tue, 16 Jun 2020 06:17:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=rzMbHCBVqOXYNcr+qlbWYXnu4pNfFFS2FAbZ34pmgSc=; b=FiMajHQm7L6DE7XhIjtgClVw9dM6cFiUMth6qMwoC0Emy3gOzr89rNweEqq8RXT2rm pOgmOB4uLk0vlKKD5iVRMmwYIBZGPwAHQZI+Dviz/nlvIE+3qu6k6FVURyqCv9s7P6aS Zzk9wgbThOGRYsnJ0OSaaZL0J6mVMCZGcrofs= 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=rzMbHCBVqOXYNcr+qlbWYXnu4pNfFFS2FAbZ34pmgSc=; b=nO5B1C52mKTqM/k3YVC6vwmhKRXAtBVYfA7W0BkUiA8nrkk4/VosnwlmPgBpnm3hJd 0CLoNVfU3iN1CgK2rDgdLeNSDsJJ+y+6Vs9lpyPZ+12YX+iYFr+t+UreanfZ34TZoxQe 1X14jLc4SkZtP4MsCkLR4qTDCDdihmOWYjIjydzEhLO6wSA09pUj3iqAu6nZYPiLoojU FBmYifRC72Om3y8jWGGZTe5lPf+K4dNz9NgBvvDlKgMO2qwc8eHhXfR8eC5GtU/V19Jz td1m352Tm6hTrJ7/3OWE/JY1nUW64XnKcQdbqBN3ivaSqE4UQWaOqNUHaT+TBjLbKKBa /cNA== X-Gm-Message-State: AOAM531nGBPvEFGW0rkv5kqXAAAtN+ePOIRmf1xRGW1WSiP+bqvRwhOW 7VrR8p1/ErNnlJpwSmg1EvU5NqPnQlM= X-Google-Smtp-Source: ABdhPJwJdXVehjO2tA6uF11OLFiTkkjsu5YifeTxcf7IRC52jUTM98ZVQOQLzNpQdso3ZsvWoy879Q== X-Received: by 2002:a9d:204f:: with SMTP id n73mr2263435ota.342.1592313438321; Tue, 16 Jun 2020 06:17:18 -0700 (PDT) Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com. [209.85.161.49]) by smtp.gmail.com with ESMTPSA id c23sm4040861otd.7.2020.06.16.06.17.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 Jun 2020 06:17:17 -0700 (PDT) Received: by mail-oo1-f49.google.com with SMTP id v1so4073675ooh.0 for ; Tue, 16 Jun 2020 06:17:16 -0700 (PDT) X-Received: by 2002:a4a:6156:: with SMTP id u22mr2286731ooe.50.1592313436257; Tue, 16 Jun 2020 06:17:16 -0700 (PDT) MIME-Version: 1.0 References: <20200520082723.96136-1-acourbot@chromium.org> <20200520082723.96136-3-acourbot@chromium.org> <1591613234.18435.8.camel@mtksdaap41> In-Reply-To: <1591613234.18435.8.camel@mtksdaap41> From: Alexandre Courbot Date: Tue, 16 Jun 2020 22:17:03 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 02/10] media: mtk-vcodec: add SCP firmware ops To: Tiffany Lin Cc: Andrew-CT Chen , Rui Wang , Yunfei Dong , Pi-Hsun Shih , Maoguang Meng , Linux Media Mailing List , "moderated list:ARM/Mediatek SoC support" , LKML Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 8, 2020 at 7:47 PM Tiffany Lin wrote: > > On Wed, 2020-05-20 at 17:27 +0900, 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 > > --- > > drivers/media/platform/Kconfig | 2 + > > .../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, 66 insertions(+) > > > > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > > index c57ee78fa99d..9b11dd6b1ef3 100644 > > --- a/drivers/media/platform/Kconfig > > +++ b/drivers/media/platform/Kconfig > > @@ -256,6 +256,8 @@ config VIDEO_MEDIATEK_VCODEC > > select VIDEOBUF2_DMA_CONTIG > > select V4L2_MEM2MEM_DEV > > select VIDEO_MEDIATEK_VPU > > + select MTK_SCP > > + default n > > 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)); > > > Does rproc_boot and scp_get_rproc depend on the other kernel module? > where are they defineded? rproc_boot() is part of the remoteproc subsystem. scp_get_rproc() is part of the mtk_scp driver, which is present upstream. This patch also adds a dependency on MTK_SCP in Kconfig, which ensures both functions are available. > > > +} > > + > > +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); > > + } > > + 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); > > + break; > > } > > } > > EXPORT_SYMBOL_GPL(mtk_vcodec_fw_release); > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h > > index ff25b0c19f74..ced1b6a10e07 100644 > > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h > > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h > > @@ -4,6 +4,7 @@ > > #define _MTK_VCODEC_FW_H_ > > > > #include > > +#include > > > > #include "../mtk-vpu/mtk_vpu.h" > > > > @@ -11,6 +12,7 @@ struct mtk_vcodec_dev; > > > > enum mtk_vcodec_fw_type { > > VPU, > > + SCP, > > }; > > > > struct mtk_vcodec_fw; >