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 X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50B88C31E49 for ; Wed, 19 Jun 2019 09:20:19 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E229421479 for ; Wed, 19 Jun 2019 09:20:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tfz6041W" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E229421479 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+64jA6dLJ/imNSzFA2QD0qdmphEXK4Dlm1RxxWo55Uw=; b=tfz6041WxH3jks NWI8ujfwaebZjGuZIu8tQ9Xqtq3gKs1CXfeCDuV88E3ETLyaRs5ukX5OgJYqeJlOzOrTJSzRHkqBe jKrZ585JPaJs5kGWti8fq/p/6A2qQNkimwBK9/Ks5qy7dRKVfMBXZfpIzNlUor1lAN8W2buM6ChPQ V9gkLAEliD9gjyJmO5mOXRANHSPCeQIw6NYkd4SdTH6fKHab8ZBq2izFfXuEtE/ogfAx+d4eHEBma GUiQd96IiUTfGPUEwFRrPPhETkVhBBpd1gCL+sBgmGKKy9VflGbCJ9dDrBCaV9XMoq0SW1nK16x4b rZZr10mAerMs8BkwbxIA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hdWlK-0001pN-9K; Wed, 19 Jun 2019 09:20:14 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hdWlG-0001nl-1d; Wed, 19 Jun 2019 09:20:11 +0000 X-UUID: db19d800f7d5414981d56231040ca53b-20190619 X-UUID: db19d800f7d5414981d56231040ca53b-20190619 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1871408692; Wed, 19 Jun 2019 01:19:50 -0800 Received: from MTKMBS01N1.mediatek.inc (172.21.101.68) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 19 Jun 2019 02:19:49 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 19 Jun 2019 17:19:47 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 19 Jun 2019 17:19:47 +0800 Message-ID: <1560935987.2158.8.camel@mtksdaap41> Subject: Re: [PATCH v5 06/14] soc: mediatek: Refactor clock control From: Weiyi Lu To: Nicolas Boichat Date: Wed, 19 Jun 2019 17:19:47 +0800 In-Reply-To: References: <20190319080140.24055-1-weiyi.lu@mediatek.com> <20190319080140.24055-7-weiyi.lu@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190619_022010_099647_DF4B8407 X-CRM114-Status: GOOD ( 19.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Herring , srv_heupstream , James Liao , lkml , Fan Chen , "moderated list:ARM/Mediatek SoC support" , Matthias Brugger , linux-arm Mailing List Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, 2019-03-19 at 20:02 +0800, Nicolas Boichat wrote: > On Tue, Mar 19, 2019 at 4:02 PM Weiyi Lu wrote: > > > > Put clock enable and disable control in separate function. > > > > Signed-off-by: Weiyi Lu > > --- > > drivers/soc/mediatek/mtk-scpsys.c | 49 ++++++++++++++++++++----------- > > 1 file changed, 32 insertions(+), 17 deletions(-) > > > > diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c > > index 765ad4a5e5df..3e9be07a2627 100644 > > --- a/drivers/soc/mediatek/mtk-scpsys.c > > +++ b/drivers/soc/mediatek/mtk-scpsys.c > > @@ -208,6 +208,33 @@ static int scpsys_regulator_disable(struct scp_domain *scpd) > > return regulator_disable(scpd->supply); > > } > > > > +static int scpsys_clk_enable(struct clk *clk[], int max_num) > > +{ > > + int i, ret = 0; > > + > > + for (i = 0; i < max_num && clk[i]; i++) { > > + ret = clk_prepare_enable(clk[i]); > > + if (ret) { > > + for (--i; i >= 0; i--) > > + clk_disable_unprepare(clk[i]); > > Would it be simpler to just call scpsys_clk_disable(clk, i) ? > OK, I'll try. > > + > > + break; > > + } > > + } > > + > > + return ret; > > +} > > Maybe not for this series, but could you use clk_bulk_prepare_enable > instead? The only issue is that it'd still call clk_prepare_enable on > NULL clocks, but that does nothing, so it's just a little less > efficient... > OK, I'll try after this series. > > + > > +static void scpsys_clk_disable(struct clk *clk[], int max_num) > > +{ > > + int i; > > + > > + for (i = max_num - 1; i >= 0; i--) { > > + if (clk[i]) > > if test not needed, clk_disable_unprepare ignores NULL parameters. > You're right. Supposed it's not needed, I'll test. > > + clk_disable_unprepare(clk[i]); > > + } > > +} > > ditto: clk_bulk_disable_unprepare > > > + > > static int scpsys_power_on(struct generic_pm_domain *genpd) > > { > > struct scp_domain *scpd = container_of(genpd, struct scp_domain, genpd); > > @@ -216,21 +243,14 @@ static int scpsys_power_on(struct generic_pm_domain *genpd) > > u32 pdn_ack = scpd->data->sram_pdn_ack_bits; > > u32 val; > > int ret, tmp; > > - int i; > > > > ret = scpsys_regulator_enable(scpd); > > if (ret < 0) > > return ret; > > > > - for (i = 0; i < MAX_CLKS && scpd->clk[i]; i++) { > > - ret = clk_prepare_enable(scpd->clk[i]); > > - if (ret) { > > - for (--i; i >= 0; i--) > > - clk_disable_unprepare(scpd->clk[i]); > > - > > - goto err_clk; > > - } > > - } > > + ret = scpsys_clk_enable(scpd->clk, MAX_CLKS); > > + if (ret) > > + goto err_clk; > > > > val = readl(ctl_addr); > > val |= PWR_ON_BIT; > > @@ -283,10 +303,7 @@ static int scpsys_power_on(struct generic_pm_domain *genpd) > > return 0; > > > > err_pwr_ack: > > - for (i = MAX_CLKS - 1; i >= 0; i--) { > > - if (scpd->clk[i]) > > - clk_disable_unprepare(scpd->clk[i]); > > - } > > + scpsys_clk_disable(scpd->clk, MAX_CLKS); > > err_clk: > > scpsys_regulator_disable(scpd); > > > > @@ -303,7 +320,6 @@ static int scpsys_power_off(struct generic_pm_domain *genpd) > > u32 pdn_ack = scpd->data->sram_pdn_ack_bits; > > u32 val; > > int ret, tmp; > > - int i; > > > > if (scpd->data->bus_prot_mask) { > > ret = mtk_infracfg_set_bus_protection(scp->infracfg, > > @@ -344,8 +360,7 @@ static int scpsys_power_off(struct generic_pm_domain *genpd) > > if (ret < 0) > > goto out; > > > > - for (i = 0; i < MAX_CLKS && scpd->clk[i]; i++) > > - clk_disable_unprepare(scpd->clk[i]); > > + scpsys_clk_disable(scpd->clk, MAX_CLKS); > > > > ret = scpsys_regulator_disable(scpd); > > if (ret < 0) > > -- > > 2.18.0 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel