Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp106153rwd; Mon, 12 Jun 2023 10:41:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ZK69IvuTcQTDhBH+K3KFsUuUPJ5TQXOEEXmG0+MCh0n+AyZGMF9sjSYFxdCLa1BEN/fNl X-Received: by 2002:a05:6a00:24ca:b0:65e:fca6:f2cf with SMTP id d10-20020a056a0024ca00b0065efca6f2cfmr12121982pfv.26.1686591709164; Mon, 12 Jun 2023 10:41:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686591709; cv=none; d=google.com; s=arc-20160816; b=oRmuij4QL8INhH5sqqoyCgi1SI4QhQMv5i3RGfOtKuG9wwAYEKMySioGe8YabjkqYV HKriLZ4dOqOVZLz8ALT15bCb2uZtpQIBcc5jp5r8qrLZsq7ma3Z46ztfMXyX8WMDu0WL T1cfRN6pKsj3EQr3RfBitXgzBF3wrB+4ewivoFG4Slca0sCTDiV1TCfsoANx7sN32LI1 jY4jd1z2UjmRcvRvZzCJZLjH7pFrUeU31yfG3n0OJA3hpySIEDQNb08f2K2S/oS9/nJ0 K492wuO2B91kIEyeWX0CWbcq3zD6OQZLNUWsHeIHJI2VdQnGi9SLLqzIP57rUORJZ3OC ePJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=asb2YbzZmJ8Y+rb0Bv7BEXuQQgx2TEfK/rGH9i109JE=; b=WLLD/aXo9aDpaEOer1rbPsmf2S/QDm4QiLr1QUKJ6vAIHBpvU3/Mv53C9Riin+4DH2 juJGa9rERhKzd6j9NTtfPV4xzU2VEZRstu7dCpEN2B2qr9fKOx8BFmjfNVprMU3/hict rJ0hwhAMZyRDMlgq/Szqduq4E3qVdvXDbJX8Lg91Fy1zopzsOnb1BpfGKSdHqAJxa3s0 exMNdZI6pAirhd8f96seovHb3R9CSjPH0gINdfb0knT6JmIMS9PEku4lQ4Smo6bZnAEp qulxTKDsQWPlBiX4FxYfkEJfzhxsT1Nz+fraUcZ91a7VtnuLwQW27eW7+qK0KDt4MgmK 6+RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rsa24uUz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w127-20020a627b85000000b0065f8094971csi7101850pfc.349.2023.06.12.10.41.36; Mon, 12 Jun 2023 10:41:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rsa24uUz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236681AbjFLR0C (ORCPT + 99 others); Mon, 12 Jun 2023 13:26:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234579AbjFLRZv (ORCPT ); Mon, 12 Jun 2023 13:25:51 -0400 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7C8A107 for ; Mon, 12 Jun 2023 10:25:49 -0700 (PDT) Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-33d22754450so28553185ab.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=ZhMq54lgwYoyrT0/0WRxmkG6AMOuA037X7DyzDVF5rRpUnRtTPnbkz0YhrAW6hCZTL 1ghh2f39r5GU2KdtO6MYJDDO9XPPBsx9wT89BDVnqHj0plXvdDx+G3r+EZA1BK1jkbSh 4ldHXPs/iqV1zY/EIOq2rVr+Qci2ekV2d8NScmzJBIs90BlLDUune+ATjOGGT23Cd8al cWr9GTxbgZBe3oT4zyCVQlnes1YITUiKNb8qN9IYVz6IaUvrWB32e0767Yb2lywLvdJw Yid6IWHJr6th88oLfrxjtAQo5fkN2XFvRcjY/XjJFUf2Lb5Lq85IkngO5kb82opRDN0o ocYw== X-Gm-Message-State: AC+VfDwcVQiqEtnBrCWe2+Rit1BXOdiE/xXL3XwXqhE0A903S3+y8CnT vZom18lGJ+QNAkO/yvMyfKT4lA== 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230607072222.8628-6-tinghan.shen@mediatek.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 >