Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp135229rwb; Tue, 25 Jul 2023 13:11:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlE/fZIEmZiCpWcV2Gp663FVzMA1/daaE1muc0IvBzD2AErRPdurJ/pri2zD/jc6HR9j6cQU X-Received: by 2002:a05:6a21:3d86:b0:12f:883a:6fce with SMTP id bj6-20020a056a213d8600b0012f883a6fcemr45787pzc.48.1690315859960; Tue, 25 Jul 2023 13:10:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690315859; cv=none; d=google.com; s=arc-20160816; b=y5xgwF4C89++jnekbBTPr2BI1zIVMc6lAgq+nhHilh+5pEO5BgWJKAnOjlCwwOqOpd jJ+QpClr5VowOjRs//Ofzoi1E3gvapUBIBb0R3L0igT3rL7s/GeSJCRYxn78pgX1NGfX 7PT5q4tk6k/307eXe9gmiPCsRtk03ChzG1EK2jFmB5LjHyoT7WMSIzLnrl8LV4aZ/Qwl T827hSgA7kNhmFrBOaShO/AAZVY1FCtflMd0N2prG4iSADJpWqmXeuzqn/cXF4qpZgO8 yR814OvdJ1rKOMn12wIyWaYrkVCVshG6L0Sxms7SuYGw39Az/TahLEVmB1TQhQKRRZd4 k76g== 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=YCIAEkv+xo6a49Qxw52m347tO8F3UsV4ScqWgSVtBQo=; fh=yi/MxYXfacE0X+NxIrMTYJjyuHQvy4J/o6VG8eEuF48=; b=hLGnv3aoNzSwFKTYQvLCqV/3P5snY1tO6erL0dBoZCsX36wp/whN6KO52HpKUiWhi4 e8Px/unhO37HLKa5u5OQy/bzmeAf5AE9bHYXulvo9BpCffBCKUv0UHBl2tEYYHq2uORz bfxwaFnEScxmFDG0lpruB1FblBma2FlkDx7AaPMiB0vytEZ64oo0D2AfCwZDbMGQUoeI LbG0mCFSkQFZvTVRVgpyw54vSj8O8VPyiLPp2UzfZudk5ZUl++aryFQOwLkAtdAqZu3I h4lKomTdUjMCeggF5Cv9Xgxf5tTn2mgdFhvg468GRlv5zldvFQs3VEvyhJY1fhky3q3O d94g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qF9waU9+; 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 s3-20020a63d043000000b0055c7702855esi11747972pgi.41.2023.07.25.13.10.47; Tue, 25 Jul 2023 13:10:59 -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=qF9waU9+; 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 S230044AbjGYT77 (ORCPT + 99 others); Tue, 25 Jul 2023 15:59:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229904AbjGYT75 (ORCPT ); Tue, 25 Jul 2023 15:59:57 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78F192685 for ; Tue, 25 Jul 2023 12:59:48 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1bba2318546so19590665ad.1 for ; Tue, 25 Jul 2023 12:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690315188; x=1690919988; 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=YCIAEkv+xo6a49Qxw52m347tO8F3UsV4ScqWgSVtBQo=; b=qF9waU9+2RMo/5zIqF66WCIqhSsv8BKJs/OYENeuVcblNZi/YbyvAY+j7734s2X7ku uTLI476KfO3Czm7k0elNhrBsmPKb/ToDS9X3WFxWoSRJUg2vIM7pQJT/rGgPjkJX5rN0 K7gyMiXy6D/BVBkmUbWhuzaIJScKRgA1kLtpDWA7tpdIvv1cVzF9KkR6bmc5nYNCfrwB bploaPpfjsKEo+9F7nz9vD37aTfP5m28YvI8nv5V4V2AVYMn5ezFOM9Zx0Q3OSTzCYx4 VAMhuLcBkgK4EhdG+szZZ8wKTzhtORVAEQRkNbLRrNoh4US57B+0xo9rtwv0PTYfyPf0 vhUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690315188; x=1690919988; 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=YCIAEkv+xo6a49Qxw52m347tO8F3UsV4ScqWgSVtBQo=; b=E9OaKQJY5gBi9cpxO+5x3GQsXdC8XAHbFK9P/JpsKfyL0/hZQMhmotHmCqrowcUsjF rJylM96QZ+FxGgTS4jJBaZBhd8mU/IZoVsOXi8RPWu+dSnOBZdQjTQiaTWfDNMV0orPx ADHioTCyuinzfjv8jqOG2bXc6Ccth3EnJ/trkSFIdp9kEY38px8SU1Jn0lWw8aV4ou1P 1YH8NsVrSUQnTnDc9vH2gRKtWmv3IX+KGzvDf8BaZTP5jUW4kd4hKyMbluQW2s8UEpXQ IJ3KH0tR49fnczCsUx8c9WYZAuYDVEnbUN67Qv2WtTK8NvVxtTaMlv1UAtLD+2NFqFR3 06jw== X-Gm-Message-State: ABy/qLZzNhdv8P+/Ikq4yfc215vWX7GflHWu5ZtoKBh14siCDsMFVaB3 5Htf+vZve0nwAKvGbct07LG0mQ== X-Received: by 2002:a17:902:d2c4:b0:1bb:14e7:4fdf with SMTP id n4-20020a170902d2c400b001bb14e74fdfmr244864plc.22.1690315187915; Tue, 25 Jul 2023 12:59:47 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:2116:2b1f:2fd8:ec8d]) by smtp.gmail.com with ESMTPSA id 20-20020a170902e9d400b001bba27d1b65sm4939667plk.85.2023.07.25.12.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 12:59:47 -0700 (PDT) Date: Tue, 25 Jul 2023 13:59:44 -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 v15 07/13] remoteproc: mediatek: Probe SCP cluster on multi-core SCP Message-ID: References: <20230721024132.6548-1-tinghan.shen@mediatek.com> <20230721024132.6548-8-tinghan.shen@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230721024132.6548-8-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_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 Fri, Jul 21, 2023 at 10:41:26AM +0800, Tinghan Shen wrote: > The difference of single-core SCP and multi-core SCP device tree is > the presence of child device nodes described SCP cores. The SCP > driver populates the platform device and checks the child nodes > to identify whether it's a single-core SCP or a multi-core SCP. > > Add the remoteproc instances of multi-core SCP to the SCP cluster list. > When the SCP driver is removed, it cleanup resources by walking > through the cluster list. > > Signed-off-by: Tinghan Shen > Reviewed-by: AngeloGioacchino Del Regno > --- > drivers/remoteproc/mtk_scp.c | 118 +++++++++++++++++++++++++++++++++-- > 1 file changed, 113 insertions(+), 5 deletions(-) > > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > index d67dcabdab9e..34095a461e15 100644 > --- a/drivers/remoteproc/mtk_scp.c > +++ b/drivers/remoteproc/mtk_scp.c > @@ -855,7 +855,8 @@ static void scp_remove_rpmsg_subdev(struct mtk_scp *scp) > } > > static struct mtk_scp *scp_rproc_init(struct platform_device *pdev, > - struct mtk_scp_of_cluster *scp_cluster) > + struct mtk_scp_of_cluster *scp_cluster, > + const struct mtk_scp_of_data *of_data) > { > struct device *dev = &pdev->dev; > struct device_node *np = dev->of_node; > @@ -878,7 +879,7 @@ static struct mtk_scp *scp_rproc_init(struct platform_device *pdev, > scp = rproc->priv; > scp->rproc = rproc; > scp->dev = dev; > - scp->data = of_device_get_match_data(dev); > + scp->data = of_data; > scp->cluster = scp_cluster; > platform_set_drvdata(pdev, scp); > > @@ -951,15 +952,15 @@ static void scp_free(struct mtk_scp *scp) > mutex_destroy(&scp->send_lock); > } > > -static int scp_cluster_init(struct platform_device *pdev, > - struct mtk_scp_of_cluster *scp_cluster) > +static int scp_add_single_core(struct platform_device *pdev, > + struct mtk_scp_of_cluster *scp_cluster) > { > struct device *dev = &pdev->dev; > struct list_head *scp_list = &scp_cluster->mtk_scp_list; > struct mtk_scp *scp; > int ret; > > - scp = scp_rproc_init(pdev, scp_cluster); > + scp = scp_rproc_init(pdev, scp_cluster, of_device_get_match_data(dev)); > if (IS_ERR(scp)) > return PTR_ERR(scp); > > @@ -975,6 +976,102 @@ static int scp_cluster_init(struct platform_device *pdev, > return 0; > } > > +static int scp_add_multi_core(struct platform_device *pdev, > + struct mtk_scp_of_cluster *scp_cluster) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev_of_node(dev); > + struct platform_device *cpdev; > + struct device_node *child; > + struct list_head *scp_list = &scp_cluster->mtk_scp_list; > + const struct mtk_scp_of_data **cluster_of_data; > + struct mtk_scp *scp, *temp; > + int core_id = 0; > + int ret; > + > + cluster_of_data = (const struct mtk_scp_of_data **)of_device_get_match_data(dev); > + > + for_each_available_child_of_node(np, child) { > + if (!cluster_of_data[core_id]) { > + ret = -EINVAL; > + dev_err(dev, "Not support core %d\n", core_id); > + of_node_put(child); > + goto init_fail; > + } > + > + cpdev = of_find_device_by_node(child); > + if (!cpdev) { > + ret = -ENODEV; > + dev_err(dev, "Not found platform device for core %d\n", core_id); > + of_node_put(child); > + goto init_fail; > + } > + > + scp = scp_rproc_init(cpdev, scp_cluster, cluster_of_data[core_id]); > + put_device(&cpdev->dev); > + if (IS_ERR(scp)) { > + ret = PTR_ERR(scp); > + dev_err(dev, "Failed to initialize core %d rproc\n", core_id); > + of_node_put(child); > + goto init_fail; > + } > + > + ret = rproc_add(scp->rproc); > + if (ret) { > + dev_err(dev, "Failed to add rproc of core %d\n", core_id); > + of_node_put(child); > + scp_free(scp); > + goto init_fail; > + } > + > + list_add_tail(&scp->elem, scp_list); > + core_id++; > + } > + > + platform_set_drvdata(pdev, list_first_entry(scp_list, struct mtk_scp, elem)); (sigh) Why is list_first_entry() used here rather than just @scp? What is the purpose of using the list API? > + > + return 0; > + > +init_fail: > + list_for_each_entry_safe_reverse(scp, temp, scp_list, elem) { > + list_del(&scp->elem); > + rproc_del(scp->rproc); > + scp_free(scp); > + } > + > + return ret; > +} > + > +static int scp_is_single_core(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev_of_node(dev); > + struct device_node *child; > + > + child = of_get_next_available_child(np, NULL); > + if (!child) > + return dev_err_probe(dev, -ENODEV, "No child node\n"); > + > + of_node_put(child); > + return of_node_name_eq(child, "cros-ec-rpmsg"); > +} > + > +static int scp_cluster_init(struct platform_device *pdev, struct mtk_scp_of_cluster *scp_cluster) > +{ > + int ret; > + > + ret = scp_is_single_core(pdev); > + if (ret < 0) > + return ret; > + > + if (ret) > + ret = scp_add_single_core(pdev, scp_cluster); > + else > + ret = scp_add_multi_core(pdev, scp_cluster); > + > + return ret; > +} > + > static int scp_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -1007,6 +1104,10 @@ static int scp_probe(struct platform_device *pdev) > > INIT_LIST_HEAD(&scp_cluster->mtk_scp_list); > > + ret = devm_of_platform_populate(dev); > + if (ret) > + return dev_err_probe(dev, ret, "Failed to populate platform devices\n"); > + > ret = scp_cluster_init(pdev, scp_cluster); > if (ret) > return ret; > @@ -1101,12 +1202,19 @@ static const struct mtk_scp_of_data mt8195_of_data_c1 = { > .host_to_scp_int_bit = MT8195_CORE1_HOST_IPC_INT_BIT, > }; > > +static const struct mtk_scp_of_data *mt8195_of_data_cores[] = { > + &mt8195_of_data, > + &mt8195_of_data_c1, > + NULL > +}; > + > static const struct of_device_id mtk_scp_of_match[] = { > { .compatible = "mediatek,mt8183-scp", .data = &mt8183_of_data }, > { .compatible = "mediatek,mt8186-scp", .data = &mt8186_of_data }, > { .compatible = "mediatek,mt8188-scp", .data = &mt8188_of_data }, > { .compatible = "mediatek,mt8192-scp", .data = &mt8192_of_data }, > { .compatible = "mediatek,mt8195-scp", .data = &mt8195_of_data }, > + { .compatible = "mediatek,mt8195-scp-dual", .data = &mt8195_of_data_cores }, > {}, > }; > MODULE_DEVICE_TABLE(of, mtk_scp_of_match); > -- > 2.18.0 >