From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
To: Tinghan Shen <tinghan.shen@mediatek.com>,
Bjorn Andersson <andersson@kernel.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: 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 v5 06/12] remoteproc: mediatek: Extract remoteproc initialization flow
Date: Fri, 10 Feb 2023 15:02:38 +0100 [thread overview]
Message-ID: <ace701a0-45cb-3b48-cdc5-e4d39384b8aa@collabora.com> (raw)
In-Reply-To: <20230210085931.8941-7-tinghan.shen@mediatek.com>
Il 10/02/23 09:59, Tinghan Shen ha scritto:
> This is the preparation for probing multi-core SCP. The remoteproc
> initialization flow is similar on cores and is reuesd to avoid
> 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 <tinghan.shen@mediatek.com>
> ---
> drivers/remoteproc/mtk_common.h | 7 +++++
> drivers/remoteproc/mtk_scp.c | 55 +++++++++++++++++++++------------
> 2 files changed, 42 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
> index 3778894c96f3..20c1a90be77d 100644
> --- a/drivers/remoteproc/mtk_common.h
> +++ b/drivers/remoteproc/mtk_common.h
> @@ -112,6 +112,13 @@ struct mtk_scp_of_data {
> size_t ipi_buf_offset;
> };
>
> +struct mtk_scp_of_regs {
In v4, I already commented on this one, saying that this structure is used
only in mtk_scp.c as a commodity and *only* as a commodity for passing data
between two functions, and I already asked to move this structure definition
to mtk_scp.c.
Thanks,
Angelo
> + void __iomem *reg_base;
> + void __iomem *l1tcm_base;
> + size_t l1tcm_size;
> + phys_addr_t l1tcm_phys;
> +};
> +
> struct mtk_scp {
> struct device *dev;
> struct rproc *rproc;
> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> index b92274067522..898039879142 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -854,7 +854,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;
> @@ -878,6 +879,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))
> @@ -887,24 +893,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;
> @@ -932,7 +920,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);
> -
> if (ret) {
> dev_err(dev, "failed to request irq\n");
> goto remove_subdev;
> @@ -956,6 +943,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;
> + }
> +
> + return scp_rproc_init(pdev, &scp_regs);
> +}
> +
> static int scp_remove(struct platform_device *pdev)
> {
> struct mtk_scp *scp = platform_get_drvdata(pdev);
next prev parent reply other threads:[~2023-02-10 14:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 8:59 [PATCH v5 00/12] Add support for MT8195 SCP 2nd core Tinghan Shen
2023-02-10 8:59 ` [PATCH v5 01/12] dt-bindings: remoteproc: mediatek: Improve the rpmsg subnode definition Tinghan Shen
2023-02-10 8:59 ` [PATCH v5 02/12] arm64: dts: mediatek: mt8183-kukui: Update the node name of SCP rpmsg subnode Tinghan Shen
2023-02-10 14:05 ` AngeloGioacchino Del Regno
2023-02-10 8:59 ` [PATCH v5 03/12] dt-bindings: remoteproc: mediatek: Support MT8195 dual-core SCP Tinghan Shen
2023-02-10 14:05 ` AngeloGioacchino Del Regno
2023-02-10 8:59 ` [PATCH v5 04/12] remoteproc: mediatek: Add SCP core 1 register definitions Tinghan Shen
2023-02-10 8:59 ` [PATCH v5 05/12] remoteproc: mediatek: Add MT8195 SCP core 1 operations Tinghan Shen
2023-02-10 8:59 ` [PATCH v5 06/12] remoteproc: mediatek: Extract remoteproc initialization flow Tinghan Shen
2023-02-10 14:02 ` AngeloGioacchino Del Regno [this message]
2023-02-13 3:34 ` TingHan Shen (沈廷翰)
2023-02-10 8:59 ` [PATCH v5 07/12] remoteproc: mediatek: Probe multi-core SCP Tinghan Shen
2023-02-10 8:59 ` [PATCH v5 08/12] remoteproc: mediatek: Control SCP core 1 by rproc subdevice Tinghan Shen
2023-02-10 8:59 ` [PATCH v5 09/12] remoteproc: mediatek: Setup MT8195 SCP core 1 SRAM offset Tinghan Shen
2023-02-10 8:59 ` [PATCH v5 10/12] remoteproc: mediatek: Handle MT8195 SCP core 1 watchdog timeout Tinghan Shen
2023-02-10 14:01 ` AngeloGioacchino Del Regno
2023-02-10 8:59 ` [PATCH v5 11/12] remoteproc: mediatek: Refine ipi handler error message Tinghan Shen
2023-02-10 8:59 ` [PATCH v5 12/12] arm64: dts: mediatek: mt8195: Add SCP 2nd core Tinghan Shen
2023-02-10 14:09 ` AngeloGioacchino Del Regno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ace701a0-45cb-3b48-cdc5-e4d39384b8aa@collabora.com \
--to=angelogioacchino.delregno@collabora.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=andersson@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
--cc=tinghan.shen@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox