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 B8831C6FD1D for ; Wed, 15 Mar 2023 17:35:19 +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=Nsg2Lh2ZFhH6zZzPYxca1ywM0ih8gqGU0HIyij/lqBY=; b=F28XGNzkdrJWT9 ZaxtTv9tDqaKtb3oTfUFdbGwKD2YexdbWXABxywnzPcUV9Be9syQQzLcqnGqt/Rsg0Jw9cvf1+9QZ XHb+LbRwClXZh1NGq58hu5d710sy2FAWwcXsCNs0F8gPrm8NmwEmWV4OUeODUkNZKgWxvTNht0kc0 u8b9sV96bQ4/DlNznamyI+rqEWOQCYL7H6nFwopk6ok5C7QqiXpJ+pOJjx3oDXQI8Y6hhIWqQPspg ZSbSTa6eg2a/CX3MljAE1gDomjn90oCVJ4X+8Y13EtpS7IJeBRp+fGc3wkmTC418D1AfeXoQdP65M /9YpogJmgRkPwkKSgF8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pcV11-00E9Sg-2d; Wed, 15 Mar 2023 17:34:19 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pcV0x-00E9Qy-1e for linux-arm-kernel@lists.infradead.org; Wed, 15 Mar 2023 17:34:17 +0000 Received: by mail-pj1-x1030.google.com with SMTP id l9-20020a17090a3f0900b0023d32684e7fso3895989pjc.1 for ; Wed, 15 Mar 2023 10:34:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678901651; 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=f4RksfPONkCdlIzGWCI4gEmQh2PUbMXq0YFoK8rSx6E=; b=ALLgMueiI4TdIzfTHW2Rn0pxzSF5Hg74eyv0v6DvLaJrYmL81uzLko1Xi+IdFFbH4r d2wIOD8VxqSPX1DAJ8LZLVB6NpvqaW+cUaaMTVU5IQTdNDNNsC6+5dlZTil7XL1+Vs6/ GCsbaXj7owb7YxqZrRoeeKfYbf+c0MuT8m/nT1xHwwyK5G0uAIl8GNAs/2yrxqtOQk0t pYB/vgUHRWAgGWq+TvqavP1Z3JArvQJCiHo3si8vPOSA8Q1OUX9W6hl4BJtcfP9L9PKq Wst/e1697jinwVOhhj8K3ap7XwCfaJftZq1WQIPSbgh4ayPz7KryEa6U6Pw1HaYmuZYm ZBow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678901651; 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=f4RksfPONkCdlIzGWCI4gEmQh2PUbMXq0YFoK8rSx6E=; b=yPLQHakk79PPvU0dwKyk2u5wYU/lJWU+wu4bW08TM78k27Z6qydM1VNVXFEv8eUwXk EC8gG5kZtMCfffT3mfrKF7WYKlFR5DbDZnho8Pp054bEfbL6nSa9KhN0I1QjOMPN3sBU JgZfumfBtrrc8h8M3r/qDkbg/t6XNM1NvqCVX/MmTnIICnzAWSHXaAVPb3x9UQ+mJOhd mfeC36qlPZUOWQuipu4XwbTb2YJZFV3igCM6/oru6TWOSB74+Sr4ScjN5g5f0D/D+yDm Ocuw01EtPkrovli1WUX/lFAnxnefl8ThJER569QvxmGW5Wrocu9v0erDAQHxGi+ltnih bSXg== X-Gm-Message-State: AO0yUKXWeRtK2gB6/OlCvqYrwbYaQVGu7Ypq/XUqA/spw9S/IsfObDOA EFgxhwx2N07ozLjZA8CSVFbGVA== X-Google-Smtp-Source: AK7set9x7hqjnN6KvkKgVfidPa131/IDdJPRASJD+jji6O92VQMV1e3hnubtncWiTLiBrYRoBg6eVg== X-Received: by 2002:a17:90a:1913:b0:237:659a:a456 with SMTP id 19-20020a17090a191300b00237659aa456mr410281pjg.49.1678901650925; Wed, 15 Mar 2023 10:34:10 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:c20b:6fb4:a029:ed06]) by smtp.gmail.com with ESMTPSA id y72-20020a638a4b000000b005030a00085asm3669025pgd.46.2023.03.15.10.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 10:34:10 -0700 (PDT) Date: Wed, 15 Mar 2023 11:34:08 -0600 From: Mathieu Poirier To: Tinghan Shen Cc: Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , 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 v8 05/11] remoteproc: mediatek: Extract remoteproc initialization flow Message-ID: <20230315173408.GA2357129@p14s> References: <20230303083355.3378-1-tinghan.shen@mediatek.com> <20230303083355.3378-6-tinghan.shen@mediatek.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230303083355.3378-6-tinghan.shen@mediatek.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230315_103415_645185_C2624C7B X-CRM114-Status: GOOD ( 28.06 ) 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 Hi Shen, On Fri, Mar 03, 2023 at 04:33:49PM +0800, Tinghan Shen wrote: > This is the preparation for probing multi-core SCP. The remoteproc > initialization flow is similar on cores and is reuesd to avoid s/reuesd/reused > redundant code. > > The registers of config and l1tcm are shared for multi-core > SCP. Reuse the mapped addresses for all cores. > > Signed-off-by: Tinghan Shen > Reviewed-by: AngeloGioacchino Del Regno > --- > drivers/remoteproc/mtk_scp.c | 62 ++++++++++++++++++++++++------------ > 1 file changed, 42 insertions(+), 20 deletions(-) > > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > index a3b9bc158cd9..bdb5d87eeaa3 100644 > --- a/drivers/remoteproc/mtk_scp.c > +++ b/drivers/remoteproc/mtk_scp.c > @@ -23,6 +23,13 @@ > #define MAX_CODE_SIZE 0x500000 > #define SECTION_NAME_IPI_BUFFER ".ipi_buffer" > > +struct mtk_scp_of_regs { > + void __iomem *reg_base; > + void __iomem *l1tcm_base; > + size_t l1tcm_size; > + phys_addr_t l1tcm_phys; > +}; > + > /** > * scp_get() - get a reference to SCP. > * > @@ -855,7 +862,8 @@ static void scp_remove_rpmsg_subdev(struct mtk_scp *scp) > } > } > > -static int scp_probe(struct platform_device *pdev) > +static int scp_rproc_init(struct platform_device *pdev, > + struct mtk_scp_of_regs *of_regs) > { > struct device *dev = &pdev->dev; > struct device_node *np = dev->of_node; > @@ -879,6 +887,11 @@ static int scp_probe(struct platform_device *pdev) > scp->data = of_device_get_match_data(dev); > platform_set_drvdata(pdev, scp); > > + scp->reg_base = of_regs->reg_base; > + scp->l1tcm_base = of_regs->l1tcm_base; > + scp->l1tcm_size = of_regs->l1tcm_size; > + scp->l1tcm_phys = of_regs->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)) > @@ -888,24 +901,6 @@ static int scp_probe(struct platform_device *pdev) > 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; > @@ -933,7 +928,6 @@ static int scp_probe(struct platform_device *pdev) > ret = devm_request_threaded_irq(dev, platform_get_irq(pdev, 0), NULL, > scp_irq_handler, IRQF_ONESHOT, > pdev->name, scp); > - Spurious change > if (ret) { > dev_err(dev, "failed to request irq\n"); > goto remove_subdev; > @@ -957,6 +951,34 @@ static int scp_probe(struct platform_device *pdev) > return ret; > } > > +static int scp_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct resource *res; > + struct mtk_scp_of_regs scp_regs; > + int ret; > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg"); > + scp_regs.reg_base = devm_ioremap_resource(dev, res); > + if (IS_ERR(scp_regs.reg_base)) > + return dev_err_probe(dev, PTR_ERR(scp_regs.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_regs.l1tcm_base = devm_ioremap_resource(dev, res); > + if (IS_ERR(scp_regs.l1tcm_base)) { > + ret = PTR_ERR(scp_regs.l1tcm_base); > + if (ret != -EINVAL) > + return dev_err_probe(dev, ret, "Failed to map l1tcm memory\n"); > + } else { > + scp_regs.l1tcm_size = resource_size(res); > + scp_regs.l1tcm_phys = res->start; > + } If l1tcm is not specified scp_regs::[l1tcm_size, l1tcm_phys] contains garbage that is then communicated to scp_rproc_init(). It seems to be the case in the original code as well. More comments to come. > + > + return scp_rproc_init(pdev, &scp_regs); > +} > + > static int scp_remove(struct platform_device *pdev) > { > struct mtk_scp *scp = platform_get_drvdata(pdev); > -- > 2.18.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel