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 v15 08/13] remoteproc: mediatek: Remove dependency of MT8195 SCP L2TCM power control on dual-core SCP
Date: Tue, 25 Jul 2023 14:05:40 -0600 [thread overview]
Message-ID: <ZMArFGTabcc2j6i9@p14s> (raw)
In-Reply-To: <20230721024132.6548-9-tinghan.shen@mediatek.com>
On Fri, Jul 21, 2023 at 10:41:27AM +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.
>
s/of/for
> 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."
>
> Signed-off-by: Tinghan Shen <tinghan.shen@mediatek.com>
> ---
> drivers/remoteproc/mtk_common.h | 3 ++
> drivers/remoteproc/mtk_scp.c | 71 ++++++++++++++++++++++++++-------
> 2 files changed, 59 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
> index 1438159ae736..fea05bbba9aa 100644
> --- a/drivers/remoteproc/mtk_common.h
> +++ b/drivers/remoteproc/mtk_common.h
> @@ -106,6 +106,9 @@ struct mtk_scp_of_cluster {
> size_t l1tcm_size;
> phys_addr_t l1tcm_phys;
> struct list_head mtk_scp_list;
> + /* Prevent concurrent operations of this structure and L2TCM power control. */
> + struct mutex cluster_lock;
> + u32 l2tcm_refcnt;
> };
>
> struct mtk_scp {
> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> index 34095a461e15..c624f9c3db17 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -454,19 +454,37 @@ 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->cluster->reg_base + MT8192_SCP2SPM_IPC_CLR);
> + struct mtk_scp_of_cluster *scp_cluster = scp->cluster;
> +
> + mutex_lock(&scp_cluster->cluster_lock);
> +
> + if (scp_cluster->l2tcm_refcnt == 0) {
> + /* clear SPM interrupt, SCP2SPM_IPC_CLR */
> + writel(0xff, scp->cluster->reg_base + MT8192_SCP2SPM_IPC_CLR);
> +
> + /* Power on L2TCM */
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> + scp_sram_power_on(scp->cluster->reg_base + MT8192_L1TCM_SRAM_PDN,
> + MT8195_L1TCM_SRAM_PDN_RESERVED_RSI_BITS);
> + }
> +
> + scp_cluster->l2tcm_refcnt += 1;
>
> + mutex_unlock(&scp_cluster->cluster_lock);
> +
> + return 0;
> +}
> +
> +static int mt8195_scp_before_load(struct mtk_scp *scp)
> +{
> writel(1, scp->cluster->reg_base + MT8192_CORE0_SW_RSTN_SET);
>
> - /* enable SRAM clock */
> - scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> - scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> - scp_sram_power_on(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> - scp_sram_power_on(scp->cluster->reg_base + MT8192_L1TCM_SRAM_PDN,
> - MT8195_L1TCM_SRAM_PDN_RESERVED_RSI_BITS);
> + mt8195_scp_l2tcm_on(scp);
> +
> scp_sram_power_on(scp->cluster->reg_base + MT8192_CPU0_SRAM_PD, 0);
>
> /* enable MPU for all memory regions */
> @@ -479,6 +497,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->cluster->reg_base + MT8195_CPU1_SRAM_PD, 0);
>
> /* enable MPU for all memory regions */
> @@ -645,14 +665,31 @@ static void mt8192_scp_stop(struct mtk_scp *scp)
> writel(0, scp->cluster->reg_base + MT8192_CORE0_WDT_CFG);
> }
>
> +static void mt8195_scp_l2tcm_off(struct mtk_scp *scp)
> +{
> + struct mtk_scp_of_cluster *scp_cluster = scp->cluster;
> +
> + mutex_lock(&scp_cluster->cluster_lock);
> +
> + if (scp_cluster->l2tcm_refcnt > 0)
> + scp_cluster->l2tcm_refcnt -= 1;
> +
> + if (scp_cluster->l2tcm_refcnt == 0) {
> + /* Power off L2TCM */
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> + scp_sram_power_off(scp->cluster->reg_base + MT8192_L1TCM_SRAM_PDN,
> + MT8195_L1TCM_SRAM_PDN_RESERVED_RSI_BITS);
> + }
> +
> + mutex_unlock(&scp_cluster->cluster_lock);
> +}
> +
> static void mt8195_scp_stop(struct mtk_scp *scp)
> {
> - /* Disable SRAM clock */
> - scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_0, 0);
> - scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_1, 0);
> - scp_sram_power_off(scp->cluster->reg_base + MT8192_L2TCM_SRAM_PD_2, 0);
> - scp_sram_power_off(scp->cluster->reg_base + MT8192_L1TCM_SRAM_PDN,
> - MT8195_L1TCM_SRAM_PDN_RESERVED_RSI_BITS);
> + mt8195_scp_l2tcm_off(scp);
> +
> scp_sram_power_off(scp->cluster->reg_base + MT8192_CPU0_SRAM_PD, 0);
>
> /* Disable SCP watchdog */
> @@ -661,6 +698,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->cluster->reg_base + MT8195_CPU1_SRAM_PD, 0);
>
> @@ -1103,6 +1142,7 @@ static int scp_probe(struct platform_device *pdev)
> }
>
> INIT_LIST_HEAD(&scp_cluster->mtk_scp_list);
> + mutex_init(&scp_cluster->cluster_lock);
>
> ret = devm_of_platform_populate(dev);
> if (ret)
> @@ -1126,6 +1166,7 @@ static void scp_remove(struct platform_device *pdev)
> rproc_del(scp->rproc);
> scp_free(scp);
> }
> + mutex_destroy(&scp_cluster->cluster_lock);
> }
>
> static const struct mtk_scp_of_data mt8183_of_data = {
> --
> 2.18.0
>
next prev parent reply other threads:[~2023-07-25 20:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-21 2:41 [PATCH v15 00/13] Add support for MT8195 SCP 2nd core Tinghan Shen
2023-07-21 2:41 ` [PATCH v15 01/13] dt-bindings: remoteproc: mediatek: Improve the rpmsg subnode definition Tinghan Shen
2023-07-21 2:41 ` [PATCH v15 02/13] arm64: dts: mediatek: Update the node name of SCP rpmsg subnode Tinghan Shen
2023-07-21 2:41 ` [PATCH v15 03/13] dt-bindings: remoteproc: mediatek: Support MT8195 dual-core SCP Tinghan Shen
2023-07-21 2:41 ` [PATCH v15 04/13] remoteproc: mediatek: Add MT8195 SCP core 1 operations Tinghan Shen
2023-07-21 2:41 ` [PATCH v15 05/13] remoteproc: mediatek: Extract SCP common registers Tinghan Shen
2023-07-25 19:56 ` Mathieu Poirier
2023-07-21 2:41 ` [PATCH v15 06/13] remoteproc: mediatek: Probe SCP cluster on single-core SCP Tinghan Shen
2023-07-21 2:41 ` [PATCH v15 07/13] remoteproc: mediatek: Probe SCP cluster on multi-core SCP Tinghan Shen
2023-07-25 19:59 ` Mathieu Poirier
2023-07-26 2:55 ` TingHan Shen (沈廷翰)
2023-07-21 2:41 ` [PATCH v15 08/13] remoteproc: mediatek: Remove dependency of MT8195 SCP L2TCM power control on dual-core SCP Tinghan Shen
2023-07-25 20:05 ` Mathieu Poirier [this message]
2023-07-21 2:41 ` [PATCH v15 09/13] remoteproc: mediatek: Setup MT8195 SCP core 1 SRAM offset Tinghan Shen
2023-07-21 2:41 ` [PATCH v15 10/13] remoteproc: mediatek: Handle MT8195 SCP core 1 watchdog timeout Tinghan Shen
2023-07-21 2:41 ` [PATCH v15 11/13] remoteproc: mediatek: Report watchdog crash to all cores Tinghan Shen
2023-07-21 2:41 ` [PATCH v15 12/13] remoteproc: mediatek: Refine ipi handler error message Tinghan Shen
2023-07-21 2:41 ` [PATCH v15 13/13] arm64: dts: mediatek: mt8195: Add SCP 2nd core Tinghan Shen
2023-07-25 20:34 ` [PATCH v15 00/13] Add support for MT8195 " Mathieu Poirier
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=ZMArFGTabcc2j6i9@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).