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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C193CC0015E for ; Tue, 11 Jul 2023 17:50:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230148AbjGKRuL (ORCPT ); Tue, 11 Jul 2023 13:50:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231308AbjGKRuK (ORCPT ); Tue, 11 Jul 2023 13:50:10 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B86D310EF for ; Tue, 11 Jul 2023 10:50:06 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-666e5f0d60bso3466991b3a.3 for ; Tue, 11 Jul 2023 10:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689097806; x=1691689806; 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=xCOkP5CDdhGizUYOgGdZHkLCur4OBITVBmD5gPvHVWc=; b=NCgHZUD2RZASGsxd1ZfpCcPz7oJJsSZaGM98LHpY9wSUi8y/xzFhJGEhNmJHKdwuMZ F4RTyJsX7mJM0NsbL3kCm9cEfcLJUMRwEZyBLRcMyr9C1411K9EnmYqG1upok8/dtHHf KVOG0Ca2JGUF0CH2iLyPUQA2LcjZhyZT8esWRZPc4v1awv1Wj6Z2y+d2v+V0rkNPhD6h NOmYD/PJ5HcyIZTr3nwITUwEbNAU84h+nVyz7JhXKgn1n8fpfuYiU8+vz/za3DuAYVDh fLOKDAsTpKbkrHEWU2g2HxuLEOl8k1GeL1MzmIIfcZQ3U0XYBYspBKYqtc0AF66xjLhV warg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689097806; x=1691689806; 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=xCOkP5CDdhGizUYOgGdZHkLCur4OBITVBmD5gPvHVWc=; b=kbRDPNKS1gLSQBB++XqgCz+qeY+0bOilJUvS2UK9KCfCfhUIYpF4Vamkyhb0iLy/h/ B13djqOGU+u8WyvusLhZaZEs2EcSI3/CqxtgDq/A7xi7TrT6pXXoaedukN2SRn+iUzRn O+dsaL7gnX1GJbdTKBhf+RUqmEduYtgKRRAW9llDDBoFikaRPVsPXrAi+besryLbHIAm PhyAiKAG1mf0QDAoS4X7hoGL3WWnZ2yrIQ69/ppRY7XvxFQXIbkNlZDycnokOqgCQly2 magifm43DkcExD1/obT/H+WPjYjE5F1u9y6AtYunKeCeOVZF9DwBFk4Ewpsu5asY7Tai vQEA== X-Gm-Message-State: ABy/qLbZ2O0/bvXGb1+0wCC00lvEtw+hN/TxIM6WJykPtw9V758tFoY7 vQ9/0EPIXRJyWOeCQSOvzbH02c9UKeZbNHLzRZ4EMg== X-Google-Smtp-Source: APBJJlGHgdMWYyEXVwg+gW4btUFN31cDzzu6vMOtLlJ7QM1fNSgVYfXs9vQeN4RUv43NlnBDdkhgEg== X-Received: by 2002:a05:6a20:2444:b0:132:7ca6:54ca with SMTP id t4-20020a056a20244400b001327ca654camr1679651pzc.24.1689097806079; Tue, 11 Jul 2023 10:50:06 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:9b4d:d526:6948:59a2]) by smtp.gmail.com with ESMTPSA id jd10-20020a170903260a00b001acae9734c0sm2191168plb.266.2023.07.11.10.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 10:50:05 -0700 (PDT) Date: Tue, 11 Jul 2023 11:50:03 -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 v14 07/12] remoteproc: mediatek: Remove dependency of MT8195 SCP L2TCM power control on dual-core SCP Message-ID: References: <20230707052612.27521-1-tinghan.shen@mediatek.com> <20230707052612.27521-8-tinghan.shen@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230707052612.27521-8-tinghan.shen@mediatek.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 > --- > 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 >