From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Tinghan Shen <tinghan.shen@mediatek.com>
Cc: Bjorn Andersson <andersson@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
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 v14 07/12] remoteproc: mediatek: Remove dependency of MT8195 SCP L2TCM power control on dual-core SCP
Date: Tue, 11 Jul 2023 11:50:03 -0600 [thread overview]
Message-ID: <ZK2WS+cldx/8+VGA@p14s> (raw)
In-Reply-To: <20230707052612.27521-8-tinghan.shen@mediatek.com>
On Fri, Jul 07, 2023 at 01:26:07PM +0800, Tinghan Shen wrote:
> Previously, SCP core 0 controlled the power of L2TCM and dictated that
> SCP core 1 could only boot after SCP core 0. To address this constraint,
> extracted the power control flow of L2TCM and made it shared
> between both cores, enabling support of arbitrary boot order.
Definitely an improvement.
>
> The flow for controlling L2TCM power has been incorporated into the
> mt8195_scp_before_load() and mt8195_scp_stop() APIs, which are
> respectively invoked during the rproc->ops->start() and
> rproc->ops->stop() operations. These APIs effectively serve the same
> purpose as the rproc prepare()/unprepare() APIs."
I'm not fond of that custom API but it is so widespread in this driver that I
will go with it.
>
> Signed-off-by: Tinghan Shen <tinghan.shen@mediatek.com>
> ---
> drivers/remoteproc/mtk_common.h | 1 +
> drivers/remoteproc/mtk_scp.c | 80 ++++++++++++++++++++++++++-------
> 2 files changed, 66 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
> index 56395e8664cb..41e1b4732b75 100644
> --- a/drivers/remoteproc/mtk_common.h
> +++ b/drivers/remoteproc/mtk_common.h
> @@ -130,6 +130,7 @@ struct mtk_scp {
> struct rproc_subdev *rpmsg_subdev;
>
> struct list_head elem;
> + struct platform_device *cluster_pdev;
This isn't needed. rproc->dev.parent is pdev->dev. Use container_of() to
get to the platform device.
> };
>
> /**
> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> index 3349488e5f21..94602272c05f 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -29,6 +29,10 @@ struct mtk_scp_of_cluster {
> size_t l1tcm_size;
> phys_addr_t l1tcm_phys;
> struct list_head mtk_scp_list;
> +
> + /* Prevent concurrent operations of L2TCM power control. */
> + struct mutex l2tcm_lock;
> + u32 l2tcm_refcnt;
> };
>
> /**
> @@ -449,7 +453,7 @@ static int mt8192_scp_before_load(struct mtk_scp *scp)
>
> writel(1, scp->reg_base + MT8192_CORE0_SW_RSTN_SET);
>
> - /* enable SRAM clock */
> + /* enable SRAM power */
> scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> @@ -462,19 +466,38 @@ static int mt8192_scp_before_load(struct mtk_scp *scp)
> return 0;
> }
>
> -static int mt8195_scp_before_load(struct mtk_scp *scp)
> +static int mt8195_scp_l2tcm_on(struct mtk_scp *scp)
> {
> - /* clear SPM interrupt, SCP2SPM_IPC_CLR */
> - writel(0xff, scp->reg_base + MT8192_SCP2SPM_IPC_CLR);
> + struct mtk_scp_of_cluster *scp_cluster = platform_get_drvdata(scp->cluster_pdev);
> +
> + mutex_lock(&scp_cluster->l2tcm_lock);
> +
> + if (scp_cluster->l2tcm_refcnt == 0) {
> + /* clear SPM interrupt, SCP2SPM_IPC_CLR */
> + writel(0xff, scp->reg_base + MT8192_SCP2SPM_IPC_CLR);
> +
> + /* Power on L2TCM */
> + scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> + scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> + scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> + scp_sram_power_on(scp->reg_base + MT8192_L1TCM_SRAM_PDN,
> + MT8195_L1TCM_SRAM_PDN_RESERVED_RSI_BITS);
> + }
> +
> + scp_cluster->l2tcm_refcnt += 1;
>
> + mutex_unlock(&scp_cluster->l2tcm_lock);
> +
> + return 0;
> +}
> +
> +static int mt8195_scp_before_load(struct mtk_scp *scp)
> +{
> writel(1, scp->reg_base + MT8192_CORE0_SW_RSTN_SET);
>
> + mt8195_scp_l2tcm_on(scp);
> +
> /* enable SRAM clock */
> - scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> - scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> - scp_sram_power_on(scp->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> - scp_sram_power_on(scp->reg_base + MT8192_L1TCM_SRAM_PDN,
> - MT8195_L1TCM_SRAM_PDN_RESERVED_RSI_BITS);
> scp_sram_power_on(scp->reg_base + MT8192_CPU0_SRAM_PD, 0);
>
> /* enable MPU for all memory regions */
> @@ -487,6 +510,8 @@ static int mt8195_scp_c1_before_load(struct mtk_scp *scp)
> {
> scp->data->scp_reset_assert(scp);
>
> + mt8195_scp_l2tcm_on(scp);
> +
> scp_sram_power_on(scp->reg_base + MT8195_CPU1_SRAM_PD, 0);
>
> /* enable MPU for all memory regions */
> @@ -653,14 +678,30 @@ static void mt8192_scp_stop(struct mtk_scp *scp)
> writel(0, scp->reg_base + MT8192_CORE0_WDT_CFG);
> }
>
> +static void mt8195_scp_l2tcm_off(struct mtk_scp *scp)
> +{
> + struct mtk_scp_of_cluster *scp_cluster = platform_get_drvdata(scp->cluster_pdev);
> +
> + mutex_lock(&scp_cluster->l2tcm_lock);
> +
What happens if ->l2tcm_refcnt is 0 and this function is called?
> + scp_cluster->l2tcm_refcnt -= 1;
> +
> + if (scp_cluster->l2tcm_refcnt == 0) {
> + /* Power off L2TCM */
> + scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> + scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> + scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> + scp_sram_power_off(scp->reg_base + MT8192_L1TCM_SRAM_PDN, 0);
> + scp_sram_power_off(scp->reg_base + MT8192_CPU0_SRAM_PD, 0);
> + }
> +
> + mutex_unlock(&scp_cluster->l2tcm_lock);
> +}
> +
> static void mt8195_scp_stop(struct mtk_scp *scp)
> {
> - /* Disable SRAM clock */
> - scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> - scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> - scp_sram_power_off(scp->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> - scp_sram_power_off(scp->reg_base + MT8192_L1TCM_SRAM_PDN,
> - MT8195_L1TCM_SRAM_PDN_RESERVED_RSI_BITS);
> + mt8195_scp_l2tcm_off(scp);
> +
> scp_sram_power_off(scp->reg_base + MT8192_CPU0_SRAM_PD, 0);
>
> /* Disable SCP watchdog */
> @@ -669,6 +710,8 @@ static void mt8195_scp_stop(struct mtk_scp *scp)
>
> static void mt8195_scp_c1_stop(struct mtk_scp *scp)
> {
> + mt8195_scp_l2tcm_off(scp);
> +
> /* Power off CPU SRAM */
> scp_sram_power_off(scp->reg_base + MT8195_CPU1_SRAM_PD, 0);
>
> @@ -976,6 +1019,8 @@ static int scp_add_single_core(struct platform_device *pdev)
> if (IS_ERR(scp))
> return PTR_ERR(scp);
>
> + scp->cluster_pdev = pdev;
> +
> ret = rproc_add(scp->rproc);
> if (ret) {
> dev_err(dev, "Failed to add rproc\n");
> @@ -1028,6 +1073,8 @@ static int scp_add_multi_core(struct platform_device *pdev)
> goto init_fail;
> }
>
> + scp->cluster_pdev = pdev;
> +
> ret = rproc_add(scp->rproc);
> if (ret) {
> dev_err(dev, "Failed to add rproc of core %d\n", core_id);
> @@ -1114,6 +1161,7 @@ static int scp_probe(struct platform_device *pdev)
> }
>
> INIT_LIST_HEAD(&scp_cluster->mtk_scp_list);
> + mutex_init(&scp_cluster->l2tcm_lock);
> platform_set_drvdata(pdev, scp_cluster);
>
> ret = devm_of_platform_populate(dev);
> @@ -1137,6 +1185,8 @@ static void scp_remove(struct platform_device *pdev)
> rproc_del(scp->rproc);
> scp_free(scp);
> }
> +
> + mutex_destroy(&scp_cluster->l2tcm_lock);
> }
>
> static const struct mtk_scp_of_data mt8183_of_data = {
> --
> 2.18.0
>
next prev parent reply other threads:[~2023-07-11 17:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-07 5:26 [PATCH v14 00/12] Add support for MT8195 SCP 2nd core Tinghan Shen
2023-07-07 5:26 ` [PATCH v14 01/12] dt-bindings: remoteproc: mediatek: Improve the rpmsg subnode definition Tinghan Shen
2023-07-07 5:26 ` [PATCH v14 02/12] arm64: dts: mediatek: Update the node name of SCP rpmsg subnode Tinghan Shen
2023-07-07 5:26 ` [PATCH v14 03/12] dt-bindings: remoteproc: mediatek: Support MT8195 dual-core SCP Tinghan Shen
2023-07-07 5:26 ` [PATCH v14 04/12] remoteproc: mediatek: Add MT8195 SCP core 1 operations Tinghan Shen
2023-07-07 5:26 ` [PATCH v14 05/12] remoteproc: mediatek: Introduce cluster on single-core SCP Tinghan Shen
2023-07-12 20:40 ` Mathieu Poirier
2023-07-07 5:26 ` [PATCH v14 06/12] remoteproc: mediatek: Probe multi-core SCP Tinghan Shen
2023-07-07 5:26 ` [PATCH v14 07/12] remoteproc: mediatek: Remove dependency of MT8195 SCP L2TCM power control on dual-core SCP Tinghan Shen
2023-07-11 17:50 ` Mathieu Poirier [this message]
2023-07-11 18:00 ` Mathieu Poirier
2023-07-13 7:34 ` TingHan Shen (沈廷翰)
2023-07-07 5:26 ` [PATCH v14 08/12] remoteproc: mediatek: Setup MT8195 SCP core 1 SRAM offset Tinghan Shen
2023-07-07 5:26 ` [PATCH v14 09/12] remoteproc: mediatek: Handle MT8195 SCP core 1 watchdog timeout Tinghan Shen
2023-07-07 5:26 ` [PATCH v14 10/12] remoteproc: mediatek: Report watchdog crash to all cores Tinghan Shen
2023-07-12 19:38 ` Mathieu Poirier
2023-07-13 8:01 ` TingHan Shen (沈廷翰)
2023-07-07 5:26 ` [PATCH v14 11/12] remoteproc: mediatek: Refine ipi handler error message Tinghan Shen
2023-07-07 5:26 ` [PATCH v14 12/12] arm64: dts: mediatek: mt8195: Add SCP 2nd core Tinghan Shen
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=ZK2WS+cldx/8+VGA@p14s \
--to=mathieu.poirier@linaro.org \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=andersson@kernel.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=conor+dt@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=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;
as well as URLs for NNTP newsgroup(s).