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 D9B5BC88CB2 for ; Mon, 12 Jun 2023 17:26:23 +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-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A8qyGTwmtaVTM8lGFHfLY/7PAbqfhk1Nv/7PSimQbXs=; b=ck1sDErFdOK4m/ F4UutYfKFK+9E/bespiVZGR42b9tancwwJozvT3bCzDnCpPikg5aCQj7zw/PhSQrvRjU/qJueuqOW eGnVf9jXZGzz6YEWKKEq1eUFE3F6DfVMy2XgKbu0syk3hBuX2HY35PE0exmEI0MulD/jehTRlMxGT DBZJsupLnj0nvT4Y4PH7+KBkJXcY9WwL0BCAlan0LdpW+b9ztn2U5pQQXUThFAegtCljfp1DNnARS 6UbO0p+EwHRLz1mpcXL1J4ZlTZSaUsuwtaL/48c5mB6nlHrHGXz2Lh+o6k76sejyjGdIFpP282vie wjvq6SVW9IlFv+Udf9zA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q8lIj-004klM-1B; Mon, 12 Jun 2023 17:25:57 +0000 Received: from mail-io1-xd34.google.com ([2607:f8b0:4864:20::d34]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q8lIe-004kiN-2T for linux-arm-kernel@lists.infradead.org; Mon, 12 Jun 2023 17:25:55 +0000 Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-77acb944bdfso296898339f.0 for ; Mon, 12 Jun 2023 10:25:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686590749; x=1689182749; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=asb2YbzZmJ8Y+rb0Bv7BEXuQQgx2TEfK/rGH9i109JE=; b=Rsa24uUzMqdAsJHSF+h42OlPLWjVBw3NTj71LvmnWO8UCuKFOQucADXXL4ZWvmi9SM CRo2N5Kpd87oAbGXRc20izEoXbhDj6Q8uY5is/C7y97JkKz2zo6iYfJouigsTDd/PuUD Eo3qia7gwf2Fkp5inLywL6vGHK94Ai2Lf5r6/mlVe2Q56GWJsYfwwRY27Gd9SX+x8Xp6 6sGZxLX+kEY8i9kNBJxR390lFr4NglwSyjJ2HXSyOGkzHXO+nLTQPYLZBXmVMU+Dhg84 ZA5lzRbjur1/nzI1Jz+m133OCImpZ+FyJpjhaSDR/7y1WCKJieGPd1biDTVrxeehY+ta ouJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686590749; x=1689182749; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=asb2YbzZmJ8Y+rb0Bv7BEXuQQgx2TEfK/rGH9i109JE=; b=IWATp0hFesYKa9te1ZonE6g4IHTHEQ3afMFeHNbps7WbDPZZr6+K/Fdva3NHy0VOsH jw4Z2N36C/CExWCLsekW/TEw2pSLzSUINnRqh4ZKYBVLM+lGIoMpAaT4mICAFzMXNmbF NViEgA4N64sKPLpUNaqNraF4rClP7ffzDRYNOSbRl2Meg7bZ7tPJ2y7Q09Q9sT9mUjXq k/zTSBrT6zW8ZjcrIBlF8i6/Jfh+0aKiXhZ3QZtKLxspjqwojRBv3fP5f7i3Y0ZHMylD uSqMu2EJ/ZcyvGyeRNd60H1aZxzrxdkUX44ZwUQy1E6oaKfxbgvFOuxNSPARFXIb0kd2 XrLQ== X-Gm-Message-State: AC+VfDxHnCODt5ZNf9lZakEFLOzria8zlI3QaWdkyvhDVR3XTVN9Ao+M 1wkhpGRXCKzk7CmpupBb1G0WRA== X-Google-Smtp-Source: ACHHUZ6KK5XCmTiJYojtBXCpmz3GhE+omMzev7vabWUK04m/npgSBykQTp4otvpM4xPPs67s/uA40g== X-Received: by 2002:a92:d986:0:b0:335:542b:aa48 with SMTP id r6-20020a92d986000000b00335542baa48mr8898230iln.19.1686590749311; Mon, 12 Jun 2023 10:25:49 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:8960:fd1b:9d08:8ca1]) by smtp.gmail.com with ESMTPSA id n18-20020a63e052000000b005346b9a7fe5sm7781057pgj.22.2023.06.12.10.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 10:25:48 -0700 (PDT) Date: Mon, 12 Jun 2023 11:25:46 -0600 From: Mathieu Poirier To: Tinghan Shen Cc: Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Project_Global_Chrome_Upstream_Group@mediatek.com Subject: Re: [PATCH v13 05/11] remoteproc: mediatek: Introduce cluster on single-core SCP Message-ID: References: <20230607072222.8628-1-tinghan.shen@mediatek.com> <20230607072222.8628-6-tinghan.shen@mediatek.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230607072222.8628-6-tinghan.shen@mediatek.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230612_102552_813888_BFAC3882 X-CRM114-Status: GOOD ( 35.95 ) 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Jun 07, 2023 at 03:22:16PM +0800, Tinghan Shen wrote: > This is the preliminary step for probing multi-core SCP. > The initialization procedure for remoteproc is similar for both > single-core and multi-core architectures and is reusing to avoid > redundant code. > > Rewrite the probing flow of single-core SCP to adapt with the 'cluster' > concept needed by probing the multi-core SCP. The main differences > are, > - the SCP core object(s) is maintained at the cluster list instead of at > the platofmr device driver data property. > - save the cluster information at the platofmr device driver data property. > - In order to keep the compatibility of exported SCP APIs which getting > the SCP core object by SCP node phandle, move the SCP core object > pointers to the platform device platform data property. > > The registers of config and l1tcm are shared for multi-core > SCP. Reuse the mapped addresses for all cores. > > Signed-off-by: Tinghan Shen > --- > drivers/remoteproc/mtk_common.h | 2 + > drivers/remoteproc/mtk_scp.c | 151 +++++++++++++++++++++++--------- > 2 files changed, 112 insertions(+), 41 deletions(-) > > diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h > index c0905aec3b4b..56395e8664cb 100644 > --- a/drivers/remoteproc/mtk_common.h > +++ b/drivers/remoteproc/mtk_common.h > @@ -128,6 +128,8 @@ struct mtk_scp { > size_t dram_size; > > struct rproc_subdev *rpmsg_subdev; > + > + struct list_head elem; > }; > > /** > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > index d66822dad943..c8fc6b46f82b 100644 > --- a/drivers/remoteproc/mtk_scp.c > +++ b/drivers/remoteproc/mtk_scp.c > @@ -23,6 +23,14 @@ > #define MAX_CODE_SIZE 0x500000 > #define SECTION_NAME_IPI_BUFFER ".ipi_buffer" > > +struct mtk_scp_of_cluster { > + void __iomem *reg_base; > + void __iomem *l1tcm_base; > + size_t l1tcm_size; > + phys_addr_t l1tcm_phys; > + struct list_head mtk_scp_list; > +}; > + > /** > * scp_get() - get a reference to SCP. > * > @@ -51,7 +59,7 @@ struct mtk_scp *scp_get(struct platform_device *pdev) > return NULL; > } > > - return platform_get_drvdata(scp_pdev); > + return *(struct mtk_scp **)dev_get_platdata(&scp_pdev->dev); > } > EXPORT_SYMBOL_GPL(scp_get); > > @@ -810,14 +818,14 @@ static void scp_unmap_memory_region(struct mtk_scp *scp) > static int scp_register_ipi(struct platform_device *pdev, u32 id, > ipi_handler_t handler, void *priv) > { > - struct mtk_scp *scp = platform_get_drvdata(pdev); > + struct mtk_scp *scp = *(struct mtk_scp **)dev_get_platdata(&pdev->dev); > > return scp_ipi_register(scp, id, handler, priv); > } > > static void scp_unregister_ipi(struct platform_device *pdev, u32 id) > { > - struct mtk_scp *scp = platform_get_drvdata(pdev); > + struct mtk_scp *scp = *(struct mtk_scp **)dev_get_platdata(&pdev->dev); > > scp_ipi_unregister(scp, id); > } > @@ -825,7 +833,7 @@ static void scp_unregister_ipi(struct platform_device *pdev, u32 id) > static int scp_send_ipi(struct platform_device *pdev, u32 id, void *buf, > unsigned int len, unsigned int wait) > { > - struct mtk_scp *scp = platform_get_drvdata(pdev); > + struct mtk_scp *scp = *(struct mtk_scp **)dev_get_platdata(&pdev->dev); > > return scp_ipi_send(scp, id, buf, len, wait); > } > @@ -855,7 +863,8 @@ static void scp_remove_rpmsg_subdev(struct mtk_scp *scp) > } > } > > -static int scp_probe(struct platform_device *pdev) > +static struct mtk_scp *scp_rproc_init(struct platform_device *pdev, > + struct mtk_scp_of_cluster *scp_cluster) > { > struct device *dev = &pdev->dev; > struct device_node *np = dev->of_node; > @@ -867,52 +876,42 @@ static int scp_probe(struct platform_device *pdev) > > ret = rproc_of_parse_firmware(dev, 0, &fw_name); > if (ret < 0 && ret != -EINVAL) > - return ret; > + return ERR_PTR(ret); > > rproc = devm_rproc_alloc(dev, np->name, &scp_ops, fw_name, sizeof(*scp)); > - if (!rproc) > - return dev_err_probe(dev, -ENOMEM, "unable to allocate remoteproc\n"); > + if (!rproc) { > + dev_err(dev, "unable to allocate remoteproc\n"); > + return ERR_PTR(-ENOMEM); > + } > > scp = rproc->priv; > scp->rproc = rproc; > scp->dev = dev; > scp->data = of_device_get_match_data(dev); > - platform_set_drvdata(pdev, scp); > + platform_device_add_data(pdev, &scp, sizeof(scp)); > + > + scp->reg_base = scp_cluster->reg_base; > + scp->l1tcm_base = scp_cluster->l1tcm_base; > + scp->l1tcm_size = scp_cluster->l1tcm_size; > + scp->l1tcm_phys = scp_cluster->l1tcm_phys; > > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sram"); > scp->sram_base = devm_ioremap_resource(dev, res); > - if (IS_ERR(scp->sram_base)) > - return dev_err_probe(dev, PTR_ERR(scp->sram_base), > - "Failed to parse and map sram memory\n"); > + if (IS_ERR(scp->sram_base)) { > + dev_err(dev, "Failed to parse and map sram memory\n"); > + return ERR_PTR(PTR_ERR(scp->sram_base)); Can you spot what is wrong here? > + } > > scp->sram_size = resource_size(res); > scp->sram_phys = res->start; > > - /* l1tcm is an optional memory region */ > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "l1tcm"); > - scp->l1tcm_base = devm_ioremap_resource(dev, res); > - if (IS_ERR(scp->l1tcm_base)) { > - ret = PTR_ERR(scp->l1tcm_base); > - if (ret != -EINVAL) { > - return dev_err_probe(dev, ret, "Failed to map l1tcm memory\n"); > - } > - } else { > - scp->l1tcm_size = resource_size(res); > - scp->l1tcm_phys = res->start; > - } > - > - scp->reg_base = devm_platform_ioremap_resource_byname(pdev, "cfg"); > - if (IS_ERR(scp->reg_base)) > - return dev_err_probe(dev, PTR_ERR(scp->reg_base), > - "Failed to parse and map cfg memory\n"); > - > ret = scp->data->scp_clk_get(scp); > if (ret) > - return ret; > + return ERR_PTR(ret); > > ret = scp_map_memory_region(scp); > if (ret) > - return ret; > + return ERR_PTR(ret); > > mutex_init(&scp->send_lock); > for (i = 0; i < SCP_IPI_MAX; i++) > @@ -939,11 +938,7 @@ static int scp_probe(struct platform_device *pdev) > goto remove_subdev; > } > > - ret = rproc_add(rproc); > - if (ret) > - goto remove_subdev; > - > - return 0; > + return scp; > > remove_subdev: > scp_remove_rpmsg_subdev(scp); > @@ -954,15 +949,13 @@ static int scp_probe(struct platform_device *pdev) > mutex_destroy(&scp->ipi_desc[i].lock); > mutex_destroy(&scp->send_lock); > > - return ret; > + return ERR_PTR(ret); > } > > -static void scp_remove(struct platform_device *pdev) > +static void scp_free(struct mtk_scp *scp) > { > - struct mtk_scp *scp = platform_get_drvdata(pdev); > int i; > > - rproc_del(scp->rproc); > scp_remove_rpmsg_subdev(scp); > scp_ipi_unregister(scp, SCP_IPI_INIT); > scp_unmap_memory_region(scp); > @@ -971,6 +964,82 @@ static void scp_remove(struct platform_device *pdev) > mutex_destroy(&scp->send_lock); > } > > +static int scp_cluster_init(struct platform_device *pdev) > +{ > + struct mtk_scp_of_cluster *scp_cluster = platform_get_drvdata(pdev); > + struct list_head *cluster = &scp_cluster->mtk_scp_list; > + struct mtk_scp *scp; > + int ret; > + > + scp = scp_rproc_init(pdev, scp_cluster); > + if (IS_ERR(scp)) > + return PTR_ERR(scp); > + > + ret = rproc_add(scp->rproc); > + if (ret) { > + dev_err(dev, "Failed to add rproc\n"); > + scp_free(scp); > + return ret; > + } > + > + list_add_tail(&scp->elem, cluster); > + > + return 0; > +} > + > +static int scp_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mtk_scp_of_cluster *scp_cluster; > + struct resource *res; > + int ret; > + > + scp_cluster = devm_kzalloc(dev, sizeof(*scp_cluster), GFP_KERNEL); > + if (!scp_cluster) > + return -ENOMEM; > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg"); > + scp_cluster->reg_base = devm_ioremap_resource(dev, res); > + if (IS_ERR(scp_cluster->reg_base)) > + return dev_err_probe(dev, PTR_ERR(scp_cluster->reg_base), > + "Failed to parse and map cfg memory\n"); > + > + /* l1tcm is an optional memory region */ > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "l1tcm"); > + scp_cluster->l1tcm_base = devm_ioremap_resource(dev, res); > + if (IS_ERR(scp_cluster->l1tcm_base)) { > + ret = PTR_ERR(scp_cluster->l1tcm_base); > + if (ret != -EINVAL) > + return dev_err_probe(dev, ret, "Failed to map l1tcm memory\n"); > + > + scp_cluster->l1tcm_base = NULL; > + } else { > + scp_cluster->l1tcm_size = resource_size(res); > + scp_cluster->l1tcm_phys = res->start; > + } > + > + INIT_LIST_HEAD(&scp_cluster->mtk_scp_list); > + platform_set_drvdata(pdev, scp_cluster); > + > + ret = scp_cluster_init(pdev); > + if (ret) > + return ret; > + > + return 0; > +} > + > +static void scp_remove(struct platform_device *pdev) > +{ > + struct mtk_scp_of_cluster *scp_cluster = platform_get_drvdata(pdev); > + struct mtk_scp *scp, *temp; > + > + list_for_each_entry_safe_reverse(scp, temp, &scp_cluster->mtk_scp_list, elem) { > + list_del(&scp->elem); > + rproc_del(scp->rproc); > + scp_free(scp); > + } > +} > + > static const struct mtk_scp_of_data mt8183_of_data = { > .scp_clk_get = mt8183_scp_clk_get, > .scp_before_load = mt8183_scp_before_load, > -- > 2.18.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel