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=-8.4 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, USER_AGENT_SANE_2 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 2C903C47255 for ; Mon, 11 May 2020 06:13:12 +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 F27B9207DD for ; Mon, 11 May 2020 06:13:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="maXzLk/H"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="oQESTFDj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F27B9207DD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=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=Qdt2mqOsdEOuVew/jxEnhTzztRan/Kn0O5ntMcvzjJg=; b=maXzLk/HOSJh3G klnbe9tCp+psusUp11d1WZGJpTxz3SLpsh2rmz4jtQ3N8hARJfWSzLPW1Fp8ClXP/U/K894TzZyKS 1sbuiLN5x5ndWqaN8IE+nGkJOr0mY2NOX6L2NPIuI+hSv5Xvmq3g9gWMbHMqS1kRxezBDzPPKVJoy UnIFeGcE4EFaKlFeSV0ep1l+IQOMgfG4Hf9OQcNKaeeE/Fk5IBjBBawqzLBZrJ31bDI2NUC5kJcpm Mg6FSFcdjiugEazTK0Loj4aPn6YDqJp8LUf3RpGli4fjm60+xQhva2SZfehV+98VZxMfKitOKjVkg A8Zeq/H+ozHEuO1JUaKA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jY1gS-0005qs-B6; Mon, 11 May 2020 06:13:00 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jY1g1-0005GA-Q3; Mon, 11 May 2020 06:12:35 +0000 X-UUID: e8d7c648059a4f7681b5f0e8d8eb5209-20200510 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=Lsl8lnD7OWKP4jCPIL+fIGfMyXwcqWyWiC/ejlNhD8w=; b=oQESTFDjCnAE78tcpXC+QY0W1SxBdNbWuhPTIdOz9O3zspoBPQejEVhz+IrErc8LOyu/mr2MvABtsyjG9AD6E/Rs9jF6UF4iQ5qaKgKeWycdh5HThhkiqulD6wPK9tMft2PzW5ydJySxMUpBSGGzKROJuL3Ny4/vmc/hTZpqaPQ=; X-UUID: e8d7c648059a4f7681b5f0e8d8eb5209-20200510 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1774483; Sun, 10 May 2020 22:12:27 -0800 Received: from MTKMBS02N2.mediatek.inc (172.21.101.101) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 10 May 2020 23:02:25 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 11 May 2020 14:02:27 +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.1497.2 via Frontend Transport; Mon, 11 May 2020 14:02:27 +0800 Message-ID: <1589176947.21832.9.camel@mtksdaap41> Subject: Re: [PATCH v14 03/11] soc: mediatek: Add basic_clk_name to scp_power_data From: Weiyi Lu To: Enric Balletbo i Serra Date: Mon, 11 May 2020 14:02:27 +0800 In-Reply-To: <7ad67855-a3f8-f979-8849-3765bd8289d3@collabora.com> References: <1588752963-19934-1-git-send-email-weiyi.lu@mediatek.com> <1588752963-19934-4-git-send-email-weiyi.lu@mediatek.com> <7ad67855-a3f8-f979-8849-3765bd8289d3@collabora.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: DC61A680C42B6E7D8C79A5AE02CAC469C3B32FE8863099B2CB8B03AD60D641312000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200510_231233_850040_E1534C59 X-CRM114-Status: GOOD ( 24.22 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Liao , Nicolas Boichat , srv_heupstream@mediatek.com, Rob Herring , Enric Balletbo Serra , linux-kernel@vger.kernel.org, Fan Chen , linux-mediatek@lists.infradead.org, Sascha Hauer , Matthias Brugger , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Wed, 2020-05-06 at 23:01 +0200, Enric Balletbo i Serra wrote: > Hi Weiyi, > > Thank you for your patch. > > On 6/5/20 10:15, Weiyi Lu wrote: > > Try to stop extending the clk_id or clk_names if there are > > more and more new BASIC clocks. To get its own clocks by the > > basic_clk_name of each power domain. > > And then use basic_clk_name strings for all compatibles, instead of > > mixing clk_id and clk_name. > > > > Signed-off-by: Weiyi Lu > > Reviewed-by: Nicolas Boichat > > --- > > drivers/soc/mediatek/mtk-scpsys.c | 134 ++++++++++++-------------------------- > > 1 file changed, 41 insertions(+), 93 deletions(-) > > > > diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c > > index f669d37..c9c3cf7 100644 > > --- a/drivers/soc/mediatek/mtk-scpsys.c > > +++ b/drivers/soc/mediatek/mtk-scpsys.c > > @@ -78,34 +78,6 @@ > > #define PWR_STATUS_HIF1 BIT(26) /* MT7622 */ > > #define PWR_STATUS_WB BIT(27) /* MT7622 */ > > > > -enum clk_id { > > - CLK_NONE, > > - CLK_MM, > > - CLK_MFG, > > - CLK_VENC, > > - CLK_VENC_LT, > > - CLK_ETHIF, > > - CLK_VDEC, > > - CLK_HIFSEL, > > - CLK_JPGDEC, > > - CLK_AUDIO, > > - CLK_MAX, > > -}; > > - > > -static const char * const clk_names[] = { > > - NULL, > > - "mm", > > - "mfg", > > - "venc", > > - "venc_lt", > > - "ethif", > > - "vdec", > > - "hif_sel", > > - "jpgdec", > > - "audio", > > - NULL, > > -}; > > - > > #define MAX_CLKS 3 > > > > /** > > @@ -116,7 +88,7 @@ enum clk_id { > > * @sram_pdn_bits: The mask for sram power control bits. > > * @sram_pdn_ack_bits: The mask for sram power control acked bits. > > * @bus_prot_mask: The mask for single step bus protection. > > - * @clk_id: The basic clocks required by this power domain. > > + * @basic_clk_name: The basic clocks required by this power domain. > > * @caps: The flag for active wake-up action. > > */ > > struct scp_domain_data { > > @@ -126,7 +98,7 @@ struct scp_domain_data { > > u32 sram_pdn_bits; > > u32 sram_pdn_ack_bits; > > u32 bus_prot_mask; > > - enum clk_id clk_id[MAX_CLKS]; > > + const char *basic_clk_name[MAX_CLKS]; > > I only reviewed v13, so sorry if this was already discussed. I am wondering if > would be better take advantage of the devm_clk_bulk_get() function instead of > kind of reimplementing the same, something like this > > const struct clk_bulk_data *basic_clocks; > I thought it should be const struct clk_bulk_data basic_clocks[MAX_CLKS]; instead of const struct clk_bulk_data *basic_clocks; in struct scp_domain_data data type > > u8 caps; > > }; > > > > @@ -411,12 +383,19 @@ static int scpsys_power_off(struct generic_pm_domain *genpd) > > return ret; > > } > > > > -static void init_clks(struct platform_device *pdev, struct clk **clk) > > +static int init_basic_clks(struct platform_device *pdev, struct clk **clk, > > + const char * const *name) > > { > > int i; > > > > - for (i = CLK_NONE + 1; i < CLK_MAX; i++) > > - clk[i] = devm_clk_get(&pdev->dev, clk_names[i]); > > + for (i = 0; i < MAX_CLKS && name[i]; i++) { > > + clk[i] = devm_clk_get(&pdev->dev, name[i]); > > + > > + if (IS_ERR(clk[i])) > > + return PTR_ERR(clk[i]); > > + } > > You will be able to remove this function, see below ... > > > + > > + return 0; > > } > > > > static struct scp *init_scp(struct platform_device *pdev, > > @@ -426,9 +405,8 @@ static struct scp *init_scp(struct platform_device *pdev, > > { > > struct genpd_onecell_data *pd_data; > > struct resource *res; > > - int i, j; > > + int i, ret; > > struct scp *scp; > > - struct clk *clk[CLK_MAX]; > > > > scp = devm_kzalloc(&pdev->dev, sizeof(*scp), GFP_KERNEL); > > if (!scp) > > @@ -481,8 +459,6 @@ static struct scp *init_scp(struct platform_device *pdev, > > > > pd_data->num_domains = num; > > > > - init_clks(pdev, clk); > > - > > for (i = 0; i < num; i++) { > > struct scp_domain *scpd = &scp->domains[i]; > > struct generic_pm_domain *genpd = &scpd->genpd; > > @@ -493,17 +469,9 @@ static struct scp *init_scp(struct platform_device *pdev, > > > > scpd->data = data; > > > > - for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++) { > > - struct clk *c = clk[data->clk_id[j]]; > > - > > - if (IS_ERR(c)) { > > - dev_err(&pdev->dev, "%s: clk unavailable\n", > > - data->name); > > - return ERR_CAST(c); > > - } > > - > > - scpd->clk[j] = c; > > - } > > + ret = init_basic_clks(pdev, scpd->clk, data->basic_clk_name); > > + if (ret) > > + return ERR_PTR(ret); > > Just call: > > ret = devm_clk_bulk_get(&pdev->dev, ARRAY_SIZE(basic_clocks), > data->basic_clocks); > if (ret) > return ERR_PTR(ret); > > > > > genpd->name = data->name; > > genpd->power_off = scpsys_power_off; > > @@ -560,7 +528,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, > > .ctl_offs = SPM_CONN_PWR_CON, > > .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_CONN_M | > > MT2701_TOP_AXI_PROT_EN_CONN_S, > > - .clk_id = {CLK_NONE}, > > .caps = MTK_SCPD_ACTIVE_WAKEUP, > > }, > > [MT2701_POWER_DOMAIN_DISP] = { > > @@ -568,7 +535,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, > > .sta_mask = PWR_STATUS_DISP, > > .ctl_offs = SPM_DIS_PWR_CON, > > .sram_pdn_bits = GENMASK(11, 8), > > - .clk_id = {CLK_MM}, > > + .basic_clk_name = {"mm"}, > > .basic_clocks[] = { > { .id = "mm" }, > }; > Those basic clocks without given a name (name: null) would get incorrect clock via clk_bulk_get(...) due to /** * of_parse_clkspec() - Parse a DT clock specifier for a given device node * @np: device node to parse clock specifier from * @index: index of phandle to parse clock out of. If index < 0, @name is used * @name: clock name to find and parse. If name is NULL, the index is used And the index is 0 here in this callstack I guess something need to be improved before we use the clk_bulk_ APIs. > > .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, > > .caps = MTK_SCPD_ACTIVE_WAKEUP, > > }, > > @@ -578,7 +545,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, > > .ctl_offs = SPM_MFG_PWR_CON, > > .sram_pdn_bits = GENMASK(11, 8), > > .sram_pdn_ack_bits = GENMASK(12, 12), > > - .clk_id = {CLK_MFG}, > > + .basic_clk_name = {"mfg"}, > > .basic_clocks[] = { > { .id = "mfg" }, > }; > > > .caps = MTK_SCPD_ACTIVE_WAKEUP, > > }, > > [MT2701_POWER_DOMAIN_VDEC] = { > > @@ -587,7 +554,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, > > .ctl_offs = SPM_VDE_PWR_CON, > > .sram_pdn_bits = GENMASK(11, 8), > > .sram_pdn_ack_bits = GENMASK(12, 12), > > - .clk_id = {CLK_MM}, > > + .basic_clk_name = {"mm"}, > > ... > > [snip] _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-8.4 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, USER_AGENT_SANE_2 autolearn=ham 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 D16E0C47255 for ; Mon, 11 May 2020 06:12:50 +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 A21D5207DD for ; Mon, 11 May 2020 06:12:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Hw7D8Lsj"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="oQESTFDj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A21D5207DD Authentication-Results: mail.kernel.org; dmarc=fail (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=EucjQ47/Temn1ThQSPbMPEkKInxbhdEDLVwNfBcNNDE=; b=Hw7D8Lsj/BVeXo VwQ/Adio/BqU9guvHJB4KEywgPwJbOv2jZJb31nqQqgSL2kYt2NX6EaYG6jzPU4TTnNzgE78PrKEx iGb/vx4MW32MRuJMxxpuecxlcvL+KcW0rPqYK1wRWeUwL7xKoA+iCrqti0vL3z9owxs95kI+6dh95 bDyGrU3X1XGHfh+nGEpxX985o/GbRZ7Cu1pVQKH3YWV1ajOizP45jYJ/nP6QmpCiUVI9nPSXPYs7d R/nvGSIq6OssOx1RHqQ5ydemQkm0wqrf6VzVMRQi/LJC7y4MZ8DvVVaqcxOQBTE5jmUGYK2R5i/XY kiI2weLBbRdSteEMngpg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jY1gG-0005Sv-S8; Mon, 11 May 2020 06:12:48 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jY1g1-0005GA-Q3; Mon, 11 May 2020 06:12:35 +0000 X-UUID: e8d7c648059a4f7681b5f0e8d8eb5209-20200510 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=Lsl8lnD7OWKP4jCPIL+fIGfMyXwcqWyWiC/ejlNhD8w=; b=oQESTFDjCnAE78tcpXC+QY0W1SxBdNbWuhPTIdOz9O3zspoBPQejEVhz+IrErc8LOyu/mr2MvABtsyjG9AD6E/Rs9jF6UF4iQ5qaKgKeWycdh5HThhkiqulD6wPK9tMft2PzW5ydJySxMUpBSGGzKROJuL3Ny4/vmc/hTZpqaPQ=; X-UUID: e8d7c648059a4f7681b5f0e8d8eb5209-20200510 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1774483; Sun, 10 May 2020 22:12:27 -0800 Received: from MTKMBS02N2.mediatek.inc (172.21.101.101) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 10 May 2020 23:02:25 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 11 May 2020 14:02:27 +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.1497.2 via Frontend Transport; Mon, 11 May 2020 14:02:27 +0800 Message-ID: <1589176947.21832.9.camel@mtksdaap41> Subject: Re: [PATCH v14 03/11] soc: mediatek: Add basic_clk_name to scp_power_data From: Weiyi Lu To: Enric Balletbo i Serra Date: Mon, 11 May 2020 14:02:27 +0800 In-Reply-To: <7ad67855-a3f8-f979-8849-3765bd8289d3@collabora.com> References: <1588752963-19934-1-git-send-email-weiyi.lu@mediatek.com> <1588752963-19934-4-git-send-email-weiyi.lu@mediatek.com> <7ad67855-a3f8-f979-8849-3765bd8289d3@collabora.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: DC61A680C42B6E7D8C79A5AE02CAC469C3B32FE8863099B2CB8B03AD60D641312000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200510_231233_850040_E1534C59 X-CRM114-Status: GOOD ( 24.22 ) 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: James Liao , Nicolas Boichat , srv_heupstream@mediatek.com, Rob Herring , Enric Balletbo Serra , linux-kernel@vger.kernel.org, Fan Chen , linux-mediatek@lists.infradead.org, Sascha Hauer , Matthias Brugger , linux-arm-kernel@lists.infradead.org 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 Wed, 2020-05-06 at 23:01 +0200, Enric Balletbo i Serra wrote: > Hi Weiyi, > > Thank you for your patch. > > On 6/5/20 10:15, Weiyi Lu wrote: > > Try to stop extending the clk_id or clk_names if there are > > more and more new BASIC clocks. To get its own clocks by the > > basic_clk_name of each power domain. > > And then use basic_clk_name strings for all compatibles, instead of > > mixing clk_id and clk_name. > > > > Signed-off-by: Weiyi Lu > > Reviewed-by: Nicolas Boichat > > --- > > drivers/soc/mediatek/mtk-scpsys.c | 134 ++++++++++++-------------------------- > > 1 file changed, 41 insertions(+), 93 deletions(-) > > > > diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c > > index f669d37..c9c3cf7 100644 > > --- a/drivers/soc/mediatek/mtk-scpsys.c > > +++ b/drivers/soc/mediatek/mtk-scpsys.c > > @@ -78,34 +78,6 @@ > > #define PWR_STATUS_HIF1 BIT(26) /* MT7622 */ > > #define PWR_STATUS_WB BIT(27) /* MT7622 */ > > > > -enum clk_id { > > - CLK_NONE, > > - CLK_MM, > > - CLK_MFG, > > - CLK_VENC, > > - CLK_VENC_LT, > > - CLK_ETHIF, > > - CLK_VDEC, > > - CLK_HIFSEL, > > - CLK_JPGDEC, > > - CLK_AUDIO, > > - CLK_MAX, > > -}; > > - > > -static const char * const clk_names[] = { > > - NULL, > > - "mm", > > - "mfg", > > - "venc", > > - "venc_lt", > > - "ethif", > > - "vdec", > > - "hif_sel", > > - "jpgdec", > > - "audio", > > - NULL, > > -}; > > - > > #define MAX_CLKS 3 > > > > /** > > @@ -116,7 +88,7 @@ enum clk_id { > > * @sram_pdn_bits: The mask for sram power control bits. > > * @sram_pdn_ack_bits: The mask for sram power control acked bits. > > * @bus_prot_mask: The mask for single step bus protection. > > - * @clk_id: The basic clocks required by this power domain. > > + * @basic_clk_name: The basic clocks required by this power domain. > > * @caps: The flag for active wake-up action. > > */ > > struct scp_domain_data { > > @@ -126,7 +98,7 @@ struct scp_domain_data { > > u32 sram_pdn_bits; > > u32 sram_pdn_ack_bits; > > u32 bus_prot_mask; > > - enum clk_id clk_id[MAX_CLKS]; > > + const char *basic_clk_name[MAX_CLKS]; > > I only reviewed v13, so sorry if this was already discussed. I am wondering if > would be better take advantage of the devm_clk_bulk_get() function instead of > kind of reimplementing the same, something like this > > const struct clk_bulk_data *basic_clocks; > I thought it should be const struct clk_bulk_data basic_clocks[MAX_CLKS]; instead of const struct clk_bulk_data *basic_clocks; in struct scp_domain_data data type > > u8 caps; > > }; > > > > @@ -411,12 +383,19 @@ static int scpsys_power_off(struct generic_pm_domain *genpd) > > return ret; > > } > > > > -static void init_clks(struct platform_device *pdev, struct clk **clk) > > +static int init_basic_clks(struct platform_device *pdev, struct clk **clk, > > + const char * const *name) > > { > > int i; > > > > - for (i = CLK_NONE + 1; i < CLK_MAX; i++) > > - clk[i] = devm_clk_get(&pdev->dev, clk_names[i]); > > + for (i = 0; i < MAX_CLKS && name[i]; i++) { > > + clk[i] = devm_clk_get(&pdev->dev, name[i]); > > + > > + if (IS_ERR(clk[i])) > > + return PTR_ERR(clk[i]); > > + } > > You will be able to remove this function, see below ... > > > + > > + return 0; > > } > > > > static struct scp *init_scp(struct platform_device *pdev, > > @@ -426,9 +405,8 @@ static struct scp *init_scp(struct platform_device *pdev, > > { > > struct genpd_onecell_data *pd_data; > > struct resource *res; > > - int i, j; > > + int i, ret; > > struct scp *scp; > > - struct clk *clk[CLK_MAX]; > > > > scp = devm_kzalloc(&pdev->dev, sizeof(*scp), GFP_KERNEL); > > if (!scp) > > @@ -481,8 +459,6 @@ static struct scp *init_scp(struct platform_device *pdev, > > > > pd_data->num_domains = num; > > > > - init_clks(pdev, clk); > > - > > for (i = 0; i < num; i++) { > > struct scp_domain *scpd = &scp->domains[i]; > > struct generic_pm_domain *genpd = &scpd->genpd; > > @@ -493,17 +469,9 @@ static struct scp *init_scp(struct platform_device *pdev, > > > > scpd->data = data; > > > > - for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++) { > > - struct clk *c = clk[data->clk_id[j]]; > > - > > - if (IS_ERR(c)) { > > - dev_err(&pdev->dev, "%s: clk unavailable\n", > > - data->name); > > - return ERR_CAST(c); > > - } > > - > > - scpd->clk[j] = c; > > - } > > + ret = init_basic_clks(pdev, scpd->clk, data->basic_clk_name); > > + if (ret) > > + return ERR_PTR(ret); > > Just call: > > ret = devm_clk_bulk_get(&pdev->dev, ARRAY_SIZE(basic_clocks), > data->basic_clocks); > if (ret) > return ERR_PTR(ret); > > > > > genpd->name = data->name; > > genpd->power_off = scpsys_power_off; > > @@ -560,7 +528,6 @@ static void mtk_register_power_domains(struct platform_device *pdev, > > .ctl_offs = SPM_CONN_PWR_CON, > > .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_CONN_M | > > MT2701_TOP_AXI_PROT_EN_CONN_S, > > - .clk_id = {CLK_NONE}, > > .caps = MTK_SCPD_ACTIVE_WAKEUP, > > }, > > [MT2701_POWER_DOMAIN_DISP] = { > > @@ -568,7 +535,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, > > .sta_mask = PWR_STATUS_DISP, > > .ctl_offs = SPM_DIS_PWR_CON, > > .sram_pdn_bits = GENMASK(11, 8), > > - .clk_id = {CLK_MM}, > > + .basic_clk_name = {"mm"}, > > .basic_clocks[] = { > { .id = "mm" }, > }; > Those basic clocks without given a name (name: null) would get incorrect clock via clk_bulk_get(...) due to /** * of_parse_clkspec() - Parse a DT clock specifier for a given device node * @np: device node to parse clock specifier from * @index: index of phandle to parse clock out of. If index < 0, @name is used * @name: clock name to find and parse. If name is NULL, the index is used And the index is 0 here in this callstack I guess something need to be improved before we use the clk_bulk_ APIs. > > .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, > > .caps = MTK_SCPD_ACTIVE_WAKEUP, > > }, > > @@ -578,7 +545,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, > > .ctl_offs = SPM_MFG_PWR_CON, > > .sram_pdn_bits = GENMASK(11, 8), > > .sram_pdn_ack_bits = GENMASK(12, 12), > > - .clk_id = {CLK_MFG}, > > + .basic_clk_name = {"mfg"}, > > .basic_clocks[] = { > { .id = "mfg" }, > }; > > > .caps = MTK_SCPD_ACTIVE_WAKEUP, > > }, > > [MT2701_POWER_DOMAIN_VDEC] = { > > @@ -587,7 +554,7 @@ static void mtk_register_power_domains(struct platform_device *pdev, > > .ctl_offs = SPM_VDE_PWR_CON, > > .sram_pdn_bits = GENMASK(11, 8), > > .sram_pdn_ack_bits = GENMASK(12, 12), > > - .clk_id = {CLK_MM}, > > + .basic_clk_name = {"mm"}, > > ... > > [snip] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_2 autolearn=ham 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 09D39C47255 for ; Mon, 11 May 2020 06:02:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D635620708 for ; Mon, 11 May 2020 06:02:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="oQESTFDj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728683AbgEKGCe (ORCPT ); Mon, 11 May 2020 02:02:34 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:50978 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725916AbgEKGCe (ORCPT ); Mon, 11 May 2020 02:02:34 -0400 X-UUID: 91e0e5ef17d94fe7978fa7f4c2813fee-20200511 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=Lsl8lnD7OWKP4jCPIL+fIGfMyXwcqWyWiC/ejlNhD8w=; b=oQESTFDjCnAE78tcpXC+QY0W1SxBdNbWuhPTIdOz9O3zspoBPQejEVhz+IrErc8LOyu/mr2MvABtsyjG9AD6E/Rs9jF6UF4iQ5qaKgKeWycdh5HThhkiqulD6wPK9tMft2PzW5ydJySxMUpBSGGzKROJuL3Ny4/vmc/hTZpqaPQ=; X-UUID: 91e0e5ef17d94fe7978fa7f4c2813fee-20200511 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 560715113; Mon, 11 May 2020 14:02:28 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 11 May 2020 14:02:27 +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.1497.2 via Frontend Transport; Mon, 11 May 2020 14:02:27 +0800 Message-ID: <1589176947.21832.9.camel@mtksdaap41> Subject: Re: [PATCH v14 03/11] soc: mediatek: Add basic_clk_name to scp_power_data From: Weiyi Lu To: Enric Balletbo i Serra CC: Enric Balletbo Serra , Matthias Brugger , Nicolas Boichat , "Rob Herring" , Sascha Hauer , James Liao , , , Fan Chen , , Date: Mon, 11 May 2020 14:02:27 +0800 In-Reply-To: <7ad67855-a3f8-f979-8849-3765bd8289d3@collabora.com> References: <1588752963-19934-1-git-send-email-weiyi.lu@mediatek.com> <1588752963-19934-4-git-send-email-weiyi.lu@mediatek.com> <7ad67855-a3f8-f979-8849-3765bd8289d3@collabora.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: DC61A680C42B6E7D8C79A5AE02CAC469C3B32FE8863099B2CB8B03AD60D641312000:8 X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org DQpPbiBXZWQsIDIwMjAtMDUtMDYgYXQgMjM6MDEgKzAyMDAsIEVucmljIEJhbGxldGJvIGkgU2Vy cmEgd3JvdGU6DQo+IEhpIFdlaXlpLA0KPiANCj4gVGhhbmsgeW91IGZvciB5b3VyIHBhdGNoLg0K PiANCj4gT24gNi81LzIwIDEwOjE1LCBXZWl5aSBMdSB3cm90ZToNCj4gPiBUcnkgdG8gc3RvcCBl eHRlbmRpbmcgdGhlIGNsa19pZCBvciBjbGtfbmFtZXMgaWYgdGhlcmUgYXJlDQo+ID4gbW9yZSBh bmQgbW9yZSBuZXcgQkFTSUMgY2xvY2tzLiBUbyBnZXQgaXRzIG93biBjbG9ja3MgYnkgdGhlDQo+ ID4gYmFzaWNfY2xrX25hbWUgb2YgZWFjaCBwb3dlciBkb21haW4uDQo+ID4gQW5kIHRoZW4gdXNl IGJhc2ljX2Nsa19uYW1lIHN0cmluZ3MgZm9yIGFsbCBjb21wYXRpYmxlcywgaW5zdGVhZCBvZg0K PiA+IG1peGluZyBjbGtfaWQgYW5kIGNsa19uYW1lLg0KPiA+IA0KPiA+IFNpZ25lZC1vZmYtYnk6 IFdlaXlpIEx1IDx3ZWl5aS5sdUBtZWRpYXRlay5jb20+DQo+ID4gUmV2aWV3ZWQtYnk6IE5pY29s YXMgQm9pY2hhdCA8ZHJpbmtjYXRAY2hyb21pdW0ub3JnPg0KPiA+IC0tLQ0KPiA+ICBkcml2ZXJz L3NvYy9tZWRpYXRlay9tdGstc2Nwc3lzLmMgfCAxMzQgKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0NCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDkz IGRlbGV0aW9ucygtKQ0KPiA+IA0KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3NvYy9tZWRpYXRl ay9tdGstc2Nwc3lzLmMgYi9kcml2ZXJzL3NvYy9tZWRpYXRlay9tdGstc2Nwc3lzLmMNCj4gPiBp bmRleCBmNjY5ZDM3Li5jOWMzY2Y3IDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvc29jL21lZGlh dGVrL210ay1zY3BzeXMuYw0KPiA+ICsrKyBiL2RyaXZlcnMvc29jL21lZGlhdGVrL210ay1zY3Bz eXMuYw0KPiA+IEBAIC03OCwzNCArNzgsNiBAQA0KPiA+ICAjZGVmaW5lIFBXUl9TVEFUVVNfSElG MQkJCUJJVCgyNikJLyogTVQ3NjIyICovDQo+ID4gICNkZWZpbmUgUFdSX1NUQVRVU19XQgkJCUJJ VCgyNykJLyogTVQ3NjIyICovDQo+ID4gIA0KPiA+IC1lbnVtIGNsa19pZCB7DQo+ID4gLQlDTEtf Tk9ORSwNCj4gPiAtCUNMS19NTSwNCj4gPiAtCUNMS19NRkcsDQo+ID4gLQlDTEtfVkVOQywNCj4g PiAtCUNMS19WRU5DX0xULA0KPiA+IC0JQ0xLX0VUSElGLA0KPiA+IC0JQ0xLX1ZERUMsDQo+ID4g LQlDTEtfSElGU0VMLA0KPiA+IC0JQ0xLX0pQR0RFQywNCj4gPiAtCUNMS19BVURJTywNCj4gPiAt CUNMS19NQVgsDQo+ID4gLX07DQo+ID4gLQ0KPiA+IC1zdGF0aWMgY29uc3QgY2hhciAqIGNvbnN0 IGNsa19uYW1lc1tdID0gew0KPiA+IC0JTlVMTCwNCj4gPiAtCSJtbSIsDQo+ID4gLQkibWZnIiwN Cj4gPiAtCSJ2ZW5jIiwNCj4gPiAtCSJ2ZW5jX2x0IiwNCj4gPiAtCSJldGhpZiIsDQo+ID4gLQki dmRlYyIsDQo+ID4gLQkiaGlmX3NlbCIsDQo+ID4gLQkianBnZGVjIiwNCj4gPiAtCSJhdWRpbyIs DQo+ID4gLQlOVUxMLA0KPiA+IC19Ow0KPiA+IC0NCj4gPiAgI2RlZmluZSBNQVhfQ0xLUwkzDQo+ ID4gIA0KPiA+ICAvKioNCj4gPiBAQCAtMTE2LDcgKzg4LDcgQEAgZW51bSBjbGtfaWQgew0KPiA+ ICAgKiBAc3JhbV9wZG5fYml0czogVGhlIG1hc2sgZm9yIHNyYW0gcG93ZXIgY29udHJvbCBiaXRz Lg0KPiA+ICAgKiBAc3JhbV9wZG5fYWNrX2JpdHM6IFRoZSBtYXNrIGZvciBzcmFtIHBvd2VyIGNv bnRyb2wgYWNrZWQgYml0cy4NCj4gPiAgICogQGJ1c19wcm90X21hc2s6IFRoZSBtYXNrIGZvciBz aW5nbGUgc3RlcCBidXMgcHJvdGVjdGlvbi4NCj4gPiAtICogQGNsa19pZDogVGhlIGJhc2ljIGNs b2NrcyByZXF1aXJlZCBieSB0aGlzIHBvd2VyIGRvbWFpbi4NCj4gPiArICogQGJhc2ljX2Nsa19u YW1lOiBUaGUgYmFzaWMgY2xvY2tzIHJlcXVpcmVkIGJ5IHRoaXMgcG93ZXIgZG9tYWluLg0KPiA+ ICAgKiBAY2FwczogVGhlIGZsYWcgZm9yIGFjdGl2ZSB3YWtlLXVwIGFjdGlvbi4NCj4gPiAgICov DQo+ID4gIHN0cnVjdCBzY3BfZG9tYWluX2RhdGEgew0KPiA+IEBAIC0xMjYsNyArOTgsNyBAQCBz dHJ1Y3Qgc2NwX2RvbWFpbl9kYXRhIHsNCj4gPiAgCXUzMiBzcmFtX3Bkbl9iaXRzOw0KPiA+ICAJ dTMyIHNyYW1fcGRuX2Fja19iaXRzOw0KPiA+ICAJdTMyIGJ1c19wcm90X21hc2s7DQo+ID4gLQll bnVtIGNsa19pZCBjbGtfaWRbTUFYX0NMS1NdOw0KPiA+ICsJY29uc3QgY2hhciAqYmFzaWNfY2xr X25hbWVbTUFYX0NMS1NdOw0KPiANCj4gSSBvbmx5IHJldmlld2VkIHYxMywgc28gc29ycnkgaWYg dGhpcyB3YXMgYWxyZWFkeSBkaXNjdXNzZWQuIEkgYW0gd29uZGVyaW5nIGlmDQo+IHdvdWxkIGJl IGJldHRlciB0YWtlIGFkdmFudGFnZSBvZiB0aGUgZGV2bV9jbGtfYnVsa19nZXQoKSBmdW5jdGlv biBpbnN0ZWFkIG9mDQo+IGtpbmQgb2YgcmVpbXBsZW1lbnRpbmcgdGhlIHNhbWUsIHNvbWV0aGlu ZyBsaWtlIHRoaXMNCj4gDQo+IAljb25zdCBzdHJ1Y3QgY2xrX2J1bGtfZGF0YSAqYmFzaWNfY2xv Y2tzOw0KPiANCg0KSSB0aG91Z2h0IGl0IHNob3VsZCBiZSBjb25zdCBzdHJ1Y3QgY2xrX2J1bGtf ZGF0YQ0KYmFzaWNfY2xvY2tzW01BWF9DTEtTXTsgaW5zdGVhZCBvZiBjb25zdCBzdHJ1Y3QgY2xr X2J1bGtfZGF0YQ0KKmJhc2ljX2Nsb2NrczsgaW4gc3RydWN0IHNjcF9kb21haW5fZGF0YSBkYXRh IHR5cGUNCg0KPiA+ICAJdTggY2FwczsNCj4gPiAgfTsNCj4gPiAgDQo+ID4gQEAgLTQxMSwxMiAr MzgzLDE5IEBAIHN0YXRpYyBpbnQgc2Nwc3lzX3Bvd2VyX29mZihzdHJ1Y3QgZ2VuZXJpY19wbV9k b21haW4gKmdlbnBkKQ0KPiA+ICAJcmV0dXJuIHJldDsNCj4gPiAgfQ0KPiA+ICANCj4gPiAtc3Rh dGljIHZvaWQgaW5pdF9jbGtzKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsIHN0cnVjdCBj bGsgKipjbGspDQo+ID4gK3N0YXRpYyBpbnQgaW5pdF9iYXNpY19jbGtzKHN0cnVjdCBwbGF0Zm9y bV9kZXZpY2UgKnBkZXYsIHN0cnVjdCBjbGsgKipjbGssDQo+ID4gKwkJCWNvbnN0IGNoYXIgKiBj b25zdCAqbmFtZSkNCj4gPiAgew0KPiA+ICAJaW50IGk7DQo+ID4gIA0KPiA+IC0JZm9yIChpID0g Q0xLX05PTkUgKyAxOyBpIDwgQ0xLX01BWDsgaSsrKQ0KPiA+IC0JCWNsa1tpXSA9IGRldm1fY2xr X2dldCgmcGRldi0+ZGV2LCBjbGtfbmFtZXNbaV0pOw0KPiA+ICsJZm9yIChpID0gMDsgaSA8IE1B WF9DTEtTICYmIG5hbWVbaV07IGkrKykgew0KPiA+ICsJCWNsa1tpXSA9IGRldm1fY2xrX2dldCgm cGRldi0+ZGV2LCBuYW1lW2ldKTsNCj4gPiArDQo+ID4gKwkJaWYgKElTX0VSUihjbGtbaV0pKQ0K PiA+ICsJCQlyZXR1cm4gUFRSX0VSUihjbGtbaV0pOw0KPiA+ICsJfQ0KPiANCj4gWW91IHdpbGwg YmUgYWJsZSB0byByZW1vdmUgdGhpcyBmdW5jdGlvbiwgc2VlIGJlbG93IC4uLg0KPiANCj4gPiAr DQo+ID4gKwlyZXR1cm4gMDsNCj4gPiAgfQ0KPiA+ICANCj4gPiAgc3RhdGljIHN0cnVjdCBzY3Ag KmluaXRfc2NwKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQo+ID4gQEAgLTQyNiw5ICs0 MDUsOCBAQCBzdGF0aWMgc3RydWN0IHNjcCAqaW5pdF9zY3Aoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZSAqcGRldiwNCj4gPiAgew0KPiA+ICAJc3RydWN0IGdlbnBkX29uZWNlbGxfZGF0YSAqcGRfZGF0 YTsNCj4gPiAgCXN0cnVjdCByZXNvdXJjZSAqcmVzOw0KPiA+IC0JaW50IGksIGo7DQo+ID4gKwlp bnQgaSwgcmV0Ow0KPiA+ICAJc3RydWN0IHNjcCAqc2NwOw0KPiA+IC0Jc3RydWN0IGNsayAqY2xr W0NMS19NQVhdOw0KPiA+ICANCj4gPiAgCXNjcCA9IGRldm1fa3phbGxvYygmcGRldi0+ZGV2LCBz aXplb2YoKnNjcCksIEdGUF9LRVJORUwpOw0KPiA+ICAJaWYgKCFzY3ApDQo+ID4gQEAgLTQ4MSw4 ICs0NTksNiBAQCBzdGF0aWMgc3RydWN0IHNjcCAqaW5pdF9zY3Aoc3RydWN0IHBsYXRmb3JtX2Rl dmljZSAqcGRldiwNCj4gPiAgDQo+ID4gIAlwZF9kYXRhLT5udW1fZG9tYWlucyA9IG51bTsNCj4g PiAgDQo+ID4gLQlpbml0X2Nsa3MocGRldiwgY2xrKTsNCj4gPiAtDQo+ID4gIAlmb3IgKGkgPSAw OyBpIDwgbnVtOyBpKyspIHsNCj4gPiAgCQlzdHJ1Y3Qgc2NwX2RvbWFpbiAqc2NwZCA9ICZzY3At PmRvbWFpbnNbaV07DQo+ID4gIAkJc3RydWN0IGdlbmVyaWNfcG1fZG9tYWluICpnZW5wZCA9ICZz Y3BkLT5nZW5wZDsNCj4gPiBAQCAtNDkzLDE3ICs0NjksOSBAQCBzdGF0aWMgc3RydWN0IHNjcCAq aW5pdF9zY3Aoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCj4gPiAgDQo+ID4gIAkJc2Nw ZC0+ZGF0YSA9IGRhdGE7DQo+ID4gIA0KPiA+IC0JCWZvciAoaiA9IDA7IGogPCBNQVhfQ0xLUyAm JiBkYXRhLT5jbGtfaWRbal07IGorKykgew0KPiA+IC0JCQlzdHJ1Y3QgY2xrICpjID0gY2xrW2Rh dGEtPmNsa19pZFtqXV07DQo+ID4gLQ0KPiA+IC0JCQlpZiAoSVNfRVJSKGMpKSB7DQo+ID4gLQkJ CQlkZXZfZXJyKCZwZGV2LT5kZXYsICIlczogY2xrIHVuYXZhaWxhYmxlXG4iLA0KPiA+IC0JCQkJ CWRhdGEtPm5hbWUpOw0KPiA+IC0JCQkJcmV0dXJuIEVSUl9DQVNUKGMpOw0KPiA+IC0JCQl9DQo+ ID4gLQ0KPiA+IC0JCQlzY3BkLT5jbGtbal0gPSBjOw0KPiA+IC0JCX0NCj4gPiArCQlyZXQgPSBp bml0X2Jhc2ljX2Nsa3MocGRldiwgc2NwZC0+Y2xrLCBkYXRhLT5iYXNpY19jbGtfbmFtZSk7DQo+ ID4gKwkJaWYgKHJldCkNCj4gPiArCQkJcmV0dXJuIEVSUl9QVFIocmV0KTsNCj4gDQo+IEp1c3Qg Y2FsbDoNCj4gDQo+IAlyZXQgPSBkZXZtX2Nsa19idWxrX2dldCgmcGRldi0+ZGV2LCBBUlJBWV9T SVpFKGJhc2ljX2Nsb2NrcyksDQo+IAkJCQlkYXRhLT5iYXNpY19jbG9ja3MpOw0KPiAJaWYgKHJl dCkNCj4gCQlyZXR1cm4gRVJSX1BUUihyZXQpOw0KPiANCj4gPiAgDQo+ID4gIAkJZ2VucGQtPm5h bWUgPSBkYXRhLT5uYW1lOw0KPiA+ICAJCWdlbnBkLT5wb3dlcl9vZmYgPSBzY3BzeXNfcG93ZXJf b2ZmOw0KPiA+IEBAIC01NjAsNyArNTI4LDYgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bv d2VyX2RvbWFpbnMoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCj4gPiAgCQkuY3RsX29m ZnMgPSBTUE1fQ09OTl9QV1JfQ09OLA0KPiA+ICAJCS5idXNfcHJvdF9tYXNrID0gTVQyNzAxX1RP UF9BWElfUFJPVF9FTl9DT05OX00gfA0KPiA+ICAJCQkJIE1UMjcwMV9UT1BfQVhJX1BST1RfRU5f Q09OTl9TLA0KPiA+IC0JCS5jbGtfaWQgPSB7Q0xLX05PTkV9LA0KPiA+ICAJCS5jYXBzID0gTVRL X1NDUERfQUNUSVZFX1dBS0VVUCwNCj4gPiAgCX0sDQo+ID4gIAlbTVQyNzAxX1BPV0VSX0RPTUFJ Tl9ESVNQXSA9IHsNCj4gPiBAQCAtNTY4LDcgKzUzNSw3IEBAIHN0YXRpYyB2b2lkIG10a19yZWdp c3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQo+ID4gIAkJ LnN0YV9tYXNrID0gUFdSX1NUQVRVU19ESVNQLA0KPiA+ICAJCS5jdGxfb2ZmcyA9IFNQTV9ESVNf UFdSX0NPTiwNCj4gPiAgCQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0KPiA+IC0J CS5jbGtfaWQgPSB7Q0xLX01NfSwNCj4gPiArCQkuYmFzaWNfY2xrX25hbWUgPSB7Im1tIn0sDQo+ IA0KPiAJCS5iYXNpY19jbG9ja3NbXSA9IHsNCj4gCQkJeyAuaWQgPSAibW0iIH0sDQo+IAkJfTsN Cj4gDQoNClRob3NlIGJhc2ljIGNsb2NrcyB3aXRob3V0IGdpdmVuIGEgbmFtZSAobmFtZTogbnVs bCkgd291bGQgZ2V0IGluY29ycmVjdA0KY2xvY2sgdmlhIGNsa19idWxrX2dldCguLi4pIGR1ZSB0 byANCg0KLyoqDQogKiBvZl9wYXJzZV9jbGtzcGVjKCkgLSBQYXJzZSBhIERUIGNsb2NrIHNwZWNp ZmllciBmb3IgYSBnaXZlbiBkZXZpY2UNCm5vZGUNCiAqIEBucDogZGV2aWNlIG5vZGUgdG8gcGFy c2UgY2xvY2sgc3BlY2lmaWVyIGZyb20NCiAqIEBpbmRleDogaW5kZXggb2YgcGhhbmRsZSB0byBw YXJzZSBjbG9jayBvdXQgb2YuIElmIGluZGV4IDwgMCwgQG5hbWUNCmlzIHVzZWQNCiAqIEBuYW1l OiBjbG9jayBuYW1lIHRvIGZpbmQgYW5kIHBhcnNlLiBJZiBuYW1lIGlzIE5VTEwsIHRoZSBpbmRl eCBpcw0KdXNlZA0KDQpBbmQgdGhlIGluZGV4IGlzIDAgaGVyZSBpbiB0aGlzIGNhbGxzdGFjaw0K DQpJIGd1ZXNzIHNvbWV0aGluZyBuZWVkIHRvIGJlIGltcHJvdmVkIGJlZm9yZSB3ZSB1c2UgdGhl IGNsa19idWxrXyBBUElzLg0KDQoNCj4gPiAgCQkuYnVzX3Byb3RfbWFzayA9IE1UMjcwMV9UT1Bf QVhJX1BST1RfRU5fTU1fTTAsDQo+ID4gIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQ LA0KPiA+ICAJfSwNCj4gPiBAQCAtNTc4LDcgKzU0NSw3IEBAIHN0YXRpYyB2b2lkIG10a19yZWdp c3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQo+ID4gIAkJ LmN0bF9vZmZzID0gU1BNX01GR19QV1JfQ09OLA0KPiA+ICAJCS5zcmFtX3Bkbl9iaXRzID0gR0VO TUFTSygxMSwgOCksDQo+ID4gIAkJLnNyYW1fcGRuX2Fja19iaXRzID0gR0VOTUFTSygxMiwgMTIp LA0KPiA+IC0JCS5jbGtfaWQgPSB7Q0xLX01GR30sDQo+ID4gKwkJLmJhc2ljX2Nsa19uYW1lID0g eyJtZmcifSwNCj4gDQo+IAkJLmJhc2ljX2Nsb2Nrc1tdID0gew0KPiAJCQl7IC5pZCA9ICJtZmci IH0sDQo+IAkJfTsNCj4gDQo+ID4gIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVfV0FLRVVQLA0K PiA+ICAJfSwNCj4gPiAgCVtNVDI3MDFfUE9XRVJfRE9NQUlOX1ZERUNdID0gew0KPiA+IEBAIC01 ODcsNyArNTU0LDcgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bvd2VyX2RvbWFpbnMoc3Ry dWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCj4gPiAgCQkuY3RsX29mZnMgPSBTUE1fVkRFX1BX Ul9DT04sDQo+ID4gIAkJLnNyYW1fcGRuX2JpdHMgPSBHRU5NQVNLKDExLCA4KSwNCj4gPiAgCQku c3JhbV9wZG5fYWNrX2JpdHMgPSBHRU5NQVNLKDEyLCAxMiksDQo+ID4gLQkJLmNsa19pZCA9IHtD TEtfTU19LA0KPiA+ICsJCS5iYXNpY19jbGtfbmFtZSA9IHsibW0ifSwNCj4gDQo+IC4uLg0KPiAN Cj4gW3NuaXBdDQoNCg0K