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.2 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,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 DE2E0C433DF for ; Fri, 15 May 2020 03:36:07 +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 A99FE20671 for ; Fri, 15 May 2020 03:36:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WBm2Lz/C"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="cGanwmtl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A99FE20671 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=v0ws3Cwlnh0sBgUAAG3NkYD54kXrBL84OQ1Q3rQvKmE=; b=WBm2Lz/Crl5lRg Grm8v9fgAm8tqyW/3KvJ9U04yymjNJ0/UKKgiwOSGnl8rCTb6getTl0CXoA6V/wjuPb0EZMQ3UzsP oGhpKhC5bnG59r1SnsfsGMykRFgXgDkOAemqp2kvk2bsP8rzpDPRJBzoLw+nmP9zPuy5Awo0qZt29 h6SelBKqqlqt40pv+UJS7R4Il+0ZYCjfm9CJKk6DRA9KdL/XqOY7OEroFjm7LHFkAUSLNIv/Zytuc oGSyESd/URF6Z2AoFPF1/d6z42trbv8etURgTUTtLmaqetJX5p7mBJDMBB0ixEtR51BooW143o+Ao gZoKEOhQ4QXibFXKmsBQ==; 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 1jZR8f-0006ll-Vj; Fri, 15 May 2020 03:35:58 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jZR8T-0006de-P6; Fri, 15 May 2020 03:35:49 +0000 X-UUID: 6f46e8b64367460499e477bf3da51099-20200514 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=VxhYLuYYOUOPauVln+W+RafLc/0dBm6EzZm2DoQqFmU=; b=cGanwmtltlb50v9nBDJldJMBTElcXI9IYhedmxWhkOk8RecTuAYUla7kWlH0wb8KE5XwkKcIUckE8BlrQQIve9vWoQ0crt1o5jwLEckqKa58y01eKjskh5FDELLjP5zF7uLWcDWB1BownmhJz0BpzZlabHEkxbOMimrIH6JucWU=; X-UUID: 6f46e8b64367460499e477bf3da51099-20200514 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 2141509862; Thu, 14 May 2020 19:35:42 -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; Thu, 14 May 2020 20:35:36 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 15 May 2020 11:35:22 +0800 Received: from [172.21.77.4] (172.21.77.4) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 15 May 2020 11:35:24 +0800 Message-ID: <1589513724.16252.3.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: Fri, 15 May 2020 11:35:24 +0800 In-Reply-To: <1589176947.21832.9.camel@mtksdaap41> 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> <1589176947.21832.9.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: AE0EB50745E17FFC46BA5D313A2DD7F2096360A4F9CCEF4C7F6FE617EB23E18B2000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200514_203545_823870_696B0EBA X-CRM114-Status: GOOD ( 28.38 ) 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 Mon, 2020-05-11 at 14:02 +0800, Weiyi Lu wrote: > 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. > Hi Enric, According to the result above, is it necessary to change the APIs or maybe I should send the next version v15 first to fix other problems you mentioned? Many thanks. > > > > .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.2 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,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 EBFFCC433DF for ; Fri, 15 May 2020 03:35:51 +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 BA7DE20671 for ; Fri, 15 May 2020 03:35:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BTWY3j8i"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="cGanwmtl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA7DE20671 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=27+U41GSBN7DEeRYL3k6Dr30toLVSeNmxfsb1q9zDS8=; b=BTWY3j8ildoKXy IJaIn5eP9XI/dZ7ccOO4zZ/Jxjm0mAHIl4J2jU9yTOgz/1/aW+qK6xwMj1MlY4yh7PH5Rw08CdBEo hg3FqF5LZw85YgvSzcLrf/8y3PU1j0fVQlSndugoUTE1a4edB71VhDNZW+qRTvvGs3TAosNGzwyq0 iBgGQ90svZ0FzMnbWo7m6aPZaE7rCYtVzlWJ6hfgI/3T0LgQYV4FrXtX/xJ6STCnHyiHuoXCgnkij G1TLiGJyaX4XwS3ldc+4AIvSHtTrxFDHlqY+4Ns9XgxWk9/O1hEMseqD6+swGJbiI+MxeFkkaQMkk MouIBrHr/VOzjUuNuI4A==; 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 1jZR8Z-0006eI-95; Fri, 15 May 2020 03:35:51 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jZR8T-0006de-P6; Fri, 15 May 2020 03:35:49 +0000 X-UUID: 6f46e8b64367460499e477bf3da51099-20200514 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=VxhYLuYYOUOPauVln+W+RafLc/0dBm6EzZm2DoQqFmU=; b=cGanwmtltlb50v9nBDJldJMBTElcXI9IYhedmxWhkOk8RecTuAYUla7kWlH0wb8KE5XwkKcIUckE8BlrQQIve9vWoQ0crt1o5jwLEckqKa58y01eKjskh5FDELLjP5zF7uLWcDWB1BownmhJz0BpzZlabHEkxbOMimrIH6JucWU=; X-UUID: 6f46e8b64367460499e477bf3da51099-20200514 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 2141509862; Thu, 14 May 2020 19:35:42 -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; Thu, 14 May 2020 20:35:36 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 15 May 2020 11:35:22 +0800 Received: from [172.21.77.4] (172.21.77.4) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 15 May 2020 11:35:24 +0800 Message-ID: <1589513724.16252.3.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: Fri, 15 May 2020 11:35:24 +0800 In-Reply-To: <1589176947.21832.9.camel@mtksdaap41> 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> <1589176947.21832.9.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: AE0EB50745E17FFC46BA5D313A2DD7F2096360A4F9CCEF4C7F6FE617EB23E18B2000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200514_203545_823870_696B0EBA X-CRM114-Status: GOOD ( 28.38 ) 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 Mon, 2020-05-11 at 14:02 +0800, Weiyi Lu wrote: > 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. > Hi Enric, According to the result above, is it necessary to change the APIs or maybe I should send the next version v15 first to fix other problems you mentioned? Many thanks. > > > > .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 5E2FFC433E0 for ; Fri, 15 May 2020 03:35:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 20C1D20671 for ; Fri, 15 May 2020 03:35:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="cGanwmtl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728270AbgEODfg (ORCPT ); Thu, 14 May 2020 23:35:36 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:48795 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726176AbgEODff (ORCPT ); Thu, 14 May 2020 23:35:35 -0400 X-UUID: b42f5585e85a4a3bb48a1461f84878a5-20200515 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=VxhYLuYYOUOPauVln+W+RafLc/0dBm6EzZm2DoQqFmU=; b=cGanwmtltlb50v9nBDJldJMBTElcXI9IYhedmxWhkOk8RecTuAYUla7kWlH0wb8KE5XwkKcIUckE8BlrQQIve9vWoQ0crt1o5jwLEckqKa58y01eKjskh5FDELLjP5zF7uLWcDWB1BownmhJz0BpzZlabHEkxbOMimrIH6JucWU=; X-UUID: b42f5585e85a4a3bb48a1461f84878a5-20200515 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 469382611; Fri, 15 May 2020 11:35:27 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 15 May 2020 11:35:22 +0800 Received: from [172.21.77.4] (172.21.77.4) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 15 May 2020 11:35:24 +0800 Message-ID: <1589513724.16252.3.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: Fri, 15 May 2020 11:35:24 +0800 In-Reply-To: <1589176947.21832.9.camel@mtksdaap41> 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> <1589176947.21832.9.camel@mtksdaap41> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: AE0EB50745E17FFC46BA5D313A2DD7F2096360A4F9CCEF4C7F6FE617EB23E18B2000: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 T24gTW9uLCAyMDIwLTA1LTExIGF0IDE0OjAyICswODAwLCBXZWl5aSBMdSB3cm90ZToNCj4gT24g V2VkLCAyMDIwLTA1LTA2IGF0IDIzOjAxICswMjAwLCBFbnJpYyBCYWxsZXRibyBpIFNlcnJhIHdy b3RlOg0KPiA+IEhpIFdlaXlpLA0KPiA+IA0KPiA+IFRoYW5rIHlvdSBmb3IgeW91ciBwYXRjaC4N Cj4gPiANCj4gPiBPbiA2LzUvMjAgMTA6MTUsIFdlaXlpIEx1IHdyb3RlOg0KPiA+ID4gVHJ5IHRv IHN0b3AgZXh0ZW5kaW5nIHRoZSBjbGtfaWQgb3IgY2xrX25hbWVzIGlmIHRoZXJlIGFyZQ0KPiA+ ID4gbW9yZSBhbmQgbW9yZSBuZXcgQkFTSUMgY2xvY2tzLiBUbyBnZXQgaXRzIG93biBjbG9ja3Mg YnkgdGhlDQo+ID4gPiBiYXNpY19jbGtfbmFtZSBvZiBlYWNoIHBvd2VyIGRvbWFpbi4NCj4gPiA+ IEFuZCB0aGVuIHVzZSBiYXNpY19jbGtfbmFtZSBzdHJpbmdzIGZvciBhbGwgY29tcGF0aWJsZXMs IGluc3RlYWQgb2YNCj4gPiA+IG1peGluZyBjbGtfaWQgYW5kIGNsa19uYW1lLg0KPiA+ID4gDQo+ ID4gPiBTaWduZWQtb2ZmLWJ5OiBXZWl5aSBMdSA8d2VpeWkubHVAbWVkaWF0ZWsuY29tPg0KPiA+ ID4gUmV2aWV3ZWQtYnk6IE5pY29sYXMgQm9pY2hhdCA8ZHJpbmtjYXRAY2hyb21pdW0ub3JnPg0K PiA+ID4gLS0tDQo+ID4gPiAgZHJpdmVycy9zb2MvbWVkaWF0ZWsvbXRrLXNjcHN5cy5jIHwgMTM0 ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQo+ID4gPiAgMSBmaWxlIGNo YW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDkzIGRlbGV0aW9ucygtKQ0KPiA+ID4gDQo+ID4gPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9zb2MvbWVkaWF0ZWsvbXRrLXNjcHN5cy5jIGIvZHJpdmVycy9z b2MvbWVkaWF0ZWsvbXRrLXNjcHN5cy5jDQo+ID4gPiBpbmRleCBmNjY5ZDM3Li5jOWMzY2Y3IDEw MDY0NA0KPiA+ID4gLS0tIGEvZHJpdmVycy9zb2MvbWVkaWF0ZWsvbXRrLXNjcHN5cy5jDQo+ID4g PiArKysgYi9kcml2ZXJzL3NvYy9tZWRpYXRlay9tdGstc2Nwc3lzLmMNCj4gPiA+IEBAIC03OCwz NCArNzgsNiBAQA0KPiA+ID4gICNkZWZpbmUgUFdSX1NUQVRVU19ISUYxCQkJQklUKDI2KQkvKiBN VDc2MjIgKi8NCj4gPiA+ICAjZGVmaW5lIFBXUl9TVEFUVVNfV0IJCQlCSVQoMjcpCS8qIE1UNzYy MiAqLw0KPiA+ID4gIA0KPiA+ID4gLWVudW0gY2xrX2lkIHsNCj4gPiA+IC0JQ0xLX05PTkUsDQo+ ID4gPiAtCUNMS19NTSwNCj4gPiA+IC0JQ0xLX01GRywNCj4gPiA+IC0JQ0xLX1ZFTkMsDQo+ID4g PiAtCUNMS19WRU5DX0xULA0KPiA+ID4gLQlDTEtfRVRISUYsDQo+ID4gPiAtCUNMS19WREVDLA0K PiA+ID4gLQlDTEtfSElGU0VMLA0KPiA+ID4gLQlDTEtfSlBHREVDLA0KPiA+ID4gLQlDTEtfQVVE SU8sDQo+ID4gPiAtCUNMS19NQVgsDQo+ID4gPiAtfTsNCj4gPiA+IC0NCj4gPiA+IC1zdGF0aWMg Y29uc3QgY2hhciAqIGNvbnN0IGNsa19uYW1lc1tdID0gew0KPiA+ID4gLQlOVUxMLA0KPiA+ID4g LQkibW0iLA0KPiA+ID4gLQkibWZnIiwNCj4gPiA+IC0JInZlbmMiLA0KPiA+ID4gLQkidmVuY19s dCIsDQo+ID4gPiAtCSJldGhpZiIsDQo+ID4gPiAtCSJ2ZGVjIiwNCj4gPiA+IC0JImhpZl9zZWwi LA0KPiA+ID4gLQkianBnZGVjIiwNCj4gPiA+IC0JImF1ZGlvIiwNCj4gPiA+IC0JTlVMTCwNCj4g PiA+IC19Ow0KPiA+ID4gLQ0KPiA+ID4gICNkZWZpbmUgTUFYX0NMS1MJMw0KPiA+ID4gIA0KPiA+ ID4gIC8qKg0KPiA+ID4gQEAgLTExNiw3ICs4OCw3IEBAIGVudW0gY2xrX2lkIHsNCj4gPiA+ICAg KiBAc3JhbV9wZG5fYml0czogVGhlIG1hc2sgZm9yIHNyYW0gcG93ZXIgY29udHJvbCBiaXRzLg0K PiA+ID4gICAqIEBzcmFtX3Bkbl9hY2tfYml0czogVGhlIG1hc2sgZm9yIHNyYW0gcG93ZXIgY29u dHJvbCBhY2tlZCBiaXRzLg0KPiA+ID4gICAqIEBidXNfcHJvdF9tYXNrOiBUaGUgbWFzayBmb3Ig c2luZ2xlIHN0ZXAgYnVzIHByb3RlY3Rpb24uDQo+ID4gPiAtICogQGNsa19pZDogVGhlIGJhc2lj IGNsb2NrcyByZXF1aXJlZCBieSB0aGlzIHBvd2VyIGRvbWFpbi4NCj4gPiA+ICsgKiBAYmFzaWNf Y2xrX25hbWU6IFRoZSBiYXNpYyBjbG9ja3MgcmVxdWlyZWQgYnkgdGhpcyBwb3dlciBkb21haW4u DQo+ID4gPiAgICogQGNhcHM6IFRoZSBmbGFnIGZvciBhY3RpdmUgd2FrZS11cCBhY3Rpb24uDQo+ ID4gPiAgICovDQo+ID4gPiAgc3RydWN0IHNjcF9kb21haW5fZGF0YSB7DQo+ID4gPiBAQCAtMTI2 LDcgKzk4LDcgQEAgc3RydWN0IHNjcF9kb21haW5fZGF0YSB7DQo+ID4gPiAgCXUzMiBzcmFtX3Bk bl9iaXRzOw0KPiA+ID4gIAl1MzIgc3JhbV9wZG5fYWNrX2JpdHM7DQo+ID4gPiAgCXUzMiBidXNf cHJvdF9tYXNrOw0KPiA+ID4gLQllbnVtIGNsa19pZCBjbGtfaWRbTUFYX0NMS1NdOw0KPiA+ID4g Kwljb25zdCBjaGFyICpiYXNpY19jbGtfbmFtZVtNQVhfQ0xLU107DQo+ID4gDQo+ID4gSSBvbmx5 IHJldmlld2VkIHYxMywgc28gc29ycnkgaWYgdGhpcyB3YXMgYWxyZWFkeSBkaXNjdXNzZWQuIEkg YW0gd29uZGVyaW5nIGlmDQo+ID4gd291bGQgYmUgYmV0dGVyIHRha2UgYWR2YW50YWdlIG9mIHRo ZSBkZXZtX2Nsa19idWxrX2dldCgpIGZ1bmN0aW9uIGluc3RlYWQgb2YNCj4gPiBraW5kIG9mIHJl aW1wbGVtZW50aW5nIHRoZSBzYW1lLCBzb21ldGhpbmcgbGlrZSB0aGlzDQo+ID4gDQo+ID4gCWNv bnN0IHN0cnVjdCBjbGtfYnVsa19kYXRhICpiYXNpY19jbG9ja3M7DQo+ID4gDQo+IA0KPiBJIHRo b3VnaHQgaXQgc2hvdWxkIGJlIGNvbnN0IHN0cnVjdCBjbGtfYnVsa19kYXRhDQo+IGJhc2ljX2Ns b2Nrc1tNQVhfQ0xLU107IGluc3RlYWQgb2YgY29uc3Qgc3RydWN0IGNsa19idWxrX2RhdGENCj4g KmJhc2ljX2Nsb2NrczsgaW4gc3RydWN0IHNjcF9kb21haW5fZGF0YSBkYXRhIHR5cGUNCj4gDQo+ ID4gPiAgCXU4IGNhcHM7DQo+ID4gPiAgfTsNCj4gPiA+ICANCj4gPiA+IEBAIC00MTEsMTIgKzM4 MywxOSBAQCBzdGF0aWMgaW50IHNjcHN5c19wb3dlcl9vZmYoc3RydWN0IGdlbmVyaWNfcG1fZG9t YWluICpnZW5wZCkNCj4gPiA+ICAJcmV0dXJuIHJldDsNCj4gPiA+ICB9DQo+ID4gPiAgDQo+ID4g PiAtc3RhdGljIHZvaWQgaW5pdF9jbGtzKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsIHN0 cnVjdCBjbGsgKipjbGspDQo+ID4gPiArc3RhdGljIGludCBpbml0X2Jhc2ljX2Nsa3Moc3RydWN0 IHBsYXRmb3JtX2RldmljZSAqcGRldiwgc3RydWN0IGNsayAqKmNsaywNCj4gPiA+ICsJCQljb25z dCBjaGFyICogY29uc3QgKm5hbWUpDQo+ID4gPiAgew0KPiA+ID4gIAlpbnQgaTsNCj4gPiA+ICAN Cj4gPiA+IC0JZm9yIChpID0gQ0xLX05PTkUgKyAxOyBpIDwgQ0xLX01BWDsgaSsrKQ0KPiA+ID4g LQkJY2xrW2ldID0gZGV2bV9jbGtfZ2V0KCZwZGV2LT5kZXYsIGNsa19uYW1lc1tpXSk7DQo+ID4g PiArCWZvciAoaSA9IDA7IGkgPCBNQVhfQ0xLUyAmJiBuYW1lW2ldOyBpKyspIHsNCj4gPiA+ICsJ CWNsa1tpXSA9IGRldm1fY2xrX2dldCgmcGRldi0+ZGV2LCBuYW1lW2ldKTsNCj4gPiA+ICsNCj4g PiA+ICsJCWlmIChJU19FUlIoY2xrW2ldKSkNCj4gPiA+ICsJCQlyZXR1cm4gUFRSX0VSUihjbGtb aV0pOw0KPiA+ID4gKwl9DQo+ID4gDQo+ID4gWW91IHdpbGwgYmUgYWJsZSB0byByZW1vdmUgdGhp cyBmdW5jdGlvbiwgc2VlIGJlbG93IC4uLg0KPiA+IA0KPiA+ID4gKw0KPiA+ID4gKwlyZXR1cm4g MDsNCj4gPiA+ICB9DQo+ID4gPiAgDQo+ID4gPiAgc3RhdGljIHN0cnVjdCBzY3AgKmluaXRfc2Nw KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsDQo+ID4gPiBAQCAtNDI2LDkgKzQwNSw4IEBA IHN0YXRpYyBzdHJ1Y3Qgc2NwICppbml0X3NjcChzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2 LA0KPiA+ID4gIHsNCj4gPiA+ICAJc3RydWN0IGdlbnBkX29uZWNlbGxfZGF0YSAqcGRfZGF0YTsN Cj4gPiA+ICAJc3RydWN0IHJlc291cmNlICpyZXM7DQo+ID4gPiAtCWludCBpLCBqOw0KPiA+ID4g KwlpbnQgaSwgcmV0Ow0KPiA+ID4gIAlzdHJ1Y3Qgc2NwICpzY3A7DQo+ID4gPiAtCXN0cnVjdCBj bGsgKmNsa1tDTEtfTUFYXTsNCj4gPiA+ICANCj4gPiA+ICAJc2NwID0gZGV2bV9remFsbG9jKCZw ZGV2LT5kZXYsIHNpemVvZigqc2NwKSwgR0ZQX0tFUk5FTCk7DQo+ID4gPiAgCWlmICghc2NwKQ0K PiA+ID4gQEAgLTQ4MSw4ICs0NTksNiBAQCBzdGF0aWMgc3RydWN0IHNjcCAqaW5pdF9zY3Aoc3Ry dWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCj4gPiA+ICANCj4gPiA+ICAJcGRfZGF0YS0+bnVt X2RvbWFpbnMgPSBudW07DQo+ID4gPiAgDQo+ID4gPiAtCWluaXRfY2xrcyhwZGV2LCBjbGspOw0K PiA+ID4gLQ0KPiA+ID4gIAlmb3IgKGkgPSAwOyBpIDwgbnVtOyBpKyspIHsNCj4gPiA+ICAJCXN0 cnVjdCBzY3BfZG9tYWluICpzY3BkID0gJnNjcC0+ZG9tYWluc1tpXTsNCj4gPiA+ICAJCXN0cnVj dCBnZW5lcmljX3BtX2RvbWFpbiAqZ2VucGQgPSAmc2NwZC0+Z2VucGQ7DQo+ID4gPiBAQCAtNDkz LDE3ICs0NjksOSBAQCBzdGF0aWMgc3RydWN0IHNjcCAqaW5pdF9zY3Aoc3RydWN0IHBsYXRmb3Jt X2RldmljZSAqcGRldiwNCj4gPiA+ICANCj4gPiA+ICAJCXNjcGQtPmRhdGEgPSBkYXRhOw0KPiA+ ID4gIA0KPiA+ID4gLQkJZm9yIChqID0gMDsgaiA8IE1BWF9DTEtTICYmIGRhdGEtPmNsa19pZFtq XTsgaisrKSB7DQo+ID4gPiAtCQkJc3RydWN0IGNsayAqYyA9IGNsa1tkYXRhLT5jbGtfaWRbal1d Ow0KPiA+ID4gLQ0KPiA+ID4gLQkJCWlmIChJU19FUlIoYykpIHsNCj4gPiA+IC0JCQkJZGV2X2Vy cigmcGRldi0+ZGV2LCAiJXM6IGNsayB1bmF2YWlsYWJsZVxuIiwNCj4gPiA+IC0JCQkJCWRhdGEt Pm5hbWUpOw0KPiA+ID4gLQkJCQlyZXR1cm4gRVJSX0NBU1QoYyk7DQo+ID4gPiAtCQkJfQ0KPiA+ ID4gLQ0KPiA+ID4gLQkJCXNjcGQtPmNsa1tqXSA9IGM7DQo+ID4gPiAtCQl9DQo+ID4gPiArCQly ZXQgPSBpbml0X2Jhc2ljX2Nsa3MocGRldiwgc2NwZC0+Y2xrLCBkYXRhLT5iYXNpY19jbGtfbmFt ZSk7DQo+ID4gPiArCQlpZiAocmV0KQ0KPiA+ID4gKwkJCXJldHVybiBFUlJfUFRSKHJldCk7DQo+ ID4gDQo+ID4gSnVzdCBjYWxsOg0KPiA+IA0KPiA+IAlyZXQgPSBkZXZtX2Nsa19idWxrX2dldCgm cGRldi0+ZGV2LCBBUlJBWV9TSVpFKGJhc2ljX2Nsb2NrcyksDQo+ID4gCQkJCWRhdGEtPmJhc2lj X2Nsb2Nrcyk7DQo+ID4gCWlmIChyZXQpDQo+ID4gCQlyZXR1cm4gRVJSX1BUUihyZXQpOw0KPiA+ IA0KPiA+ID4gIA0KPiA+ID4gIAkJZ2VucGQtPm5hbWUgPSBkYXRhLT5uYW1lOw0KPiA+ID4gIAkJ Z2VucGQtPnBvd2VyX29mZiA9IHNjcHN5c19wb3dlcl9vZmY7DQo+ID4gPiBAQCAtNTYwLDcgKzUy OCw2IEBAIHN0YXRpYyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKnBkZXYsDQo+ID4gPiAgCQkuY3RsX29mZnMgPSBTUE1fQ09OTl9QV1JfQ09O LA0KPiA+ID4gIAkJLmJ1c19wcm90X21hc2sgPSBNVDI3MDFfVE9QX0FYSV9QUk9UX0VOX0NPTk5f TSB8DQo+ID4gPiAgCQkJCSBNVDI3MDFfVE9QX0FYSV9QUk9UX0VOX0NPTk5fUywNCj4gPiA+IC0J CS5jbGtfaWQgPSB7Q0xLX05PTkV9LA0KPiA+ID4gIAkJLmNhcHMgPSBNVEtfU0NQRF9BQ1RJVkVf V0FLRVVQLA0KPiA+ID4gIAl9LA0KPiA+ID4gIAlbTVQyNzAxX1BPV0VSX0RPTUFJTl9ESVNQXSA9 IHsNCj4gPiA+IEBAIC01NjgsNyArNTM1LDcgQEAgc3RhdGljIHZvaWQgbXRrX3JlZ2lzdGVyX3Bv d2VyX2RvbWFpbnMoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiwNCj4gPiA+ICAJCS5zdGFf bWFzayA9IFBXUl9TVEFUVVNfRElTUCwNCj4gPiA+ICAJCS5jdGxfb2ZmcyA9IFNQTV9ESVNfUFdS X0NPTiwNCj4gPiA+ICAJCS5zcmFtX3Bkbl9iaXRzID0gR0VOTUFTSygxMSwgOCksDQo+ID4gPiAt CQkuY2xrX2lkID0ge0NMS19NTX0sDQo+ID4gPiArCQkuYmFzaWNfY2xrX25hbWUgPSB7Im1tIn0s DQo+ID4gDQo+ID4gCQkuYmFzaWNfY2xvY2tzW10gPSB7DQo+ID4gCQkJeyAuaWQgPSAibW0iIH0s DQo+ID4gCQl9Ow0KPiA+IA0KPiANCj4gVGhvc2UgYmFzaWMgY2xvY2tzIHdpdGhvdXQgZ2l2ZW4g YSBuYW1lIChuYW1lOiBudWxsKSB3b3VsZCBnZXQgaW5jb3JyZWN0DQo+IGNsb2NrIHZpYSBjbGtf YnVsa19nZXQoLi4uKSBkdWUgdG8gDQo+IA0KPiAvKioNCj4gICogb2ZfcGFyc2VfY2xrc3BlYygp IC0gUGFyc2UgYSBEVCBjbG9jayBzcGVjaWZpZXIgZm9yIGEgZ2l2ZW4gZGV2aWNlDQo+IG5vZGUN Cj4gICogQG5wOiBkZXZpY2Ugbm9kZSB0byBwYXJzZSBjbG9jayBzcGVjaWZpZXIgZnJvbQ0KPiAg KiBAaW5kZXg6IGluZGV4IG9mIHBoYW5kbGUgdG8gcGFyc2UgY2xvY2sgb3V0IG9mLiBJZiBpbmRl eCA8IDAsIEBuYW1lDQo+IGlzIHVzZWQNCj4gICogQG5hbWU6IGNsb2NrIG5hbWUgdG8gZmluZCBh bmQgcGFyc2UuIElmIG5hbWUgaXMgTlVMTCwgdGhlIGluZGV4IGlzDQo+IHVzZWQNCj4gDQo+IEFu ZCB0aGUgaW5kZXggaXMgMCBoZXJlIGluIHRoaXMgY2FsbHN0YWNrDQo+IA0KPiBJIGd1ZXNzIHNv bWV0aGluZyBuZWVkIHRvIGJlIGltcHJvdmVkIGJlZm9yZSB3ZSB1c2UgdGhlIGNsa19idWxrXyBB UElzLg0KPiANCg0KSGkgRW5yaWMsDQoNCkFjY29yZGluZyB0byB0aGUgcmVzdWx0IGFib3ZlLCBp cyBpdCBuZWNlc3NhcnkgdG8gY2hhbmdlIHRoZSBBUElzIG9yDQptYXliZSBJIHNob3VsZCBzZW5k IHRoZSBuZXh0IHZlcnNpb24gdjE1IGZpcnN0IHRvIGZpeCBvdGhlciBwcm9ibGVtcyB5b3UNCm1l bnRpb25lZD8gTWFueSB0aGFua3MuDQoNCj4gDQo+ID4gPiAgCQkuYnVzX3Byb3RfbWFzayA9IE1U MjcwMV9UT1BfQVhJX1BST1RfRU5fTU1fTTAsDQo+ID4gPiAgCQkuY2FwcyA9IE1US19TQ1BEX0FD VElWRV9XQUtFVVAsDQo+ID4gPiAgCX0sDQo+ID4gPiBAQCAtNTc4LDcgKzU0NSw3IEBAIHN0YXRp YyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KnBkZXYsDQo+ID4gPiAgCQkuY3RsX29mZnMgPSBTUE1fTUZHX1BXUl9DT04sDQo+ID4gPiAgCQku c3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0KPiA+ID4gIAkJLnNyYW1fcGRuX2Fja19i aXRzID0gR0VOTUFTSygxMiwgMTIpLA0KPiA+ID4gLQkJLmNsa19pZCA9IHtDTEtfTUZHfSwNCj4g PiA+ICsJCS5iYXNpY19jbGtfbmFtZSA9IHsibWZnIn0sDQo+ID4gDQo+ID4gCQkuYmFzaWNfY2xv Y2tzW10gPSB7DQo+ID4gCQkJeyAuaWQgPSAibWZnIiB9LA0KPiA+IAkJfTsNCj4gPiANCj4gPiA+ ICAJCS5jYXBzID0gTVRLX1NDUERfQUNUSVZFX1dBS0VVUCwNCj4gPiA+ICAJfSwNCj4gPiA+ICAJ W01UMjcwMV9QT1dFUl9ET01BSU5fVkRFQ10gPSB7DQo+ID4gPiBAQCAtNTg3LDcgKzU1NCw3IEBA IHN0YXRpYyB2b2lkIG10a19yZWdpc3Rlcl9wb3dlcl9kb21haW5zKHN0cnVjdCBwbGF0Zm9ybV9k ZXZpY2UgKnBkZXYsDQo+ID4gPiAgCQkuY3RsX29mZnMgPSBTUE1fVkRFX1BXUl9DT04sDQo+ID4g PiAgCQkuc3JhbV9wZG5fYml0cyA9IEdFTk1BU0soMTEsIDgpLA0KPiA+ID4gIAkJLnNyYW1fcGRu X2Fja19iaXRzID0gR0VOTUFTSygxMiwgMTIpLA0KPiA+ID4gLQkJLmNsa19pZCA9IHtDTEtfTU19 LA0KPiA+ID4gKwkJLmJhc2ljX2Nsa19uYW1lID0geyJtbSJ9LA0KPiA+IA0KPiA+IC4uLg0KPiA+ IA0KPiA+IFtzbmlwXQ0KPiANCj4gDQoNCg==