From patchwork Mon Jan 8 10:28:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 10149245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8C85C60210 for ; Mon, 8 Jan 2018 10:29:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C0051FFDA for ; Mon, 8 Jan 2018 10:29:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F31F2875E; Mon, 8 Jan 2018 10:29:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 002621FFDA for ; Mon, 8 Jan 2018 10:29:26 +0000 (UTC) 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bhPNleKQcfDL9g9Wq/6kXiwGAUe9UHJL1cfuefuM2b8=; b=oNpUqRPrCbmRgN Q7Wjz7COOy+11uoxCir/BZvpt+vJ1DV5tys9Y/+a1tM/R1zsJakN/kAL0GCYTamz/yFp7ZzezWcCJ VY83VDMmFbNz0+4ijFAoNl/e5CoansgzSExxS1knl4akeZn4dYlIDxC3zFgRplzsMbfthk/6mRGVc +CvO5wgs60agliiJITO8D4MOfBWr8H5haGeBRb6yzt3HmX4Uxfa714hmq4IirDtg8vHoU/5qRD0za tvugn5Mjb1XOQVUMqjNIsXW2sgUxhzDQV8K4gWNyb30pFwgPurphU/btndmdaufJfxVTqyAW7Fgiw ECy0cLtmLJ0QrAX1CPsQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eYUgG-0000cq-4u; Mon, 08 Jan 2018 10:29:24 +0000 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eYUgB-0000G1-0q for linux-arm-kernel@lists.infradead.org; Mon, 08 Jan 2018 10:29:21 +0000 Received: by mail-pg0-x243.google.com with SMTP id z20so2977691pgv.6 for ; Mon, 08 Jan 2018 02:29:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=H5f+Dp/oX4gLzLgGf7YpROCvOxvZvAOoxQzAztvR/es=; b=EtXbODn9zvj0oqkqwKDtDRs6WrAETxqIIZzkpSrBVjyKkgUDuuaO/HymHv8R/+XrKi 8psP8WZHRhUFrntq/NjNB54NDvw8ccK9+PO+ry4MqmqKS6P1CuaycTMBVjAh25dlpPAE 2YHhSYWtIHxyuJ4FxOA8hyNsABmTd4OHDRX2vPSyzdJfs4/d/F5hj3hPFd4lhRrE082j hedj3Y+Zi5tz3rT1b4cm1XMgi35AhZF4hf8pD5kMdhpzWpRBH1Kuq1g0dLuoAfi9uL++ +X3J/Pf0RCcT/qAFqYm8kLoaCVM5QO9hZWrN8wumez4430rWWNktkz9bwGirHSdyQEVe QMcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=H5f+Dp/oX4gLzLgGf7YpROCvOxvZvAOoxQzAztvR/es=; b=Q1IMYuJ7IVNWzB0ZksEjL9hKRjO9hatXlXDtCyI+EoUn5c6RN/xFFUVVtxhYMS+h2W Bq9nf/DlyJdX5P8D9it7dn4d6tkLTqoLUHQBrwqspM9If2/cPmLnTpzJGLRTDn0XDbtF LDj/Ge24nyIqElkMaAO/6XJl3SwZ5StNATpy3meJFUmiqmoFl6084eS1Vq1hDihcQXpx iDahdetlRUQxOS00BQ1nE8IkbHcRDvpsBi5cZzZhpsMFNQQnOHyLCIWjiJY836pBSgIk rIOQBot88Zyh6qo9G4YgMv91j+Felu6qm3eiPiFzhF1lPCMaEQv390pxDjTVrWBAUmSz Ogdg== X-Gm-Message-State: AKGB3mJC1ITREaC2Ckzk2Sc1vcFcUfJAy3o3a4hiXYIsfKvAtyU/m7tr wKp1/mOMCI20osda6/iMW1o= X-Google-Smtp-Source: ACJfBoumiIyfwFbRR+8qVzmuwgBptaI43wGfyIa6GRwDguC0xqNKP5pe1yJPmgmlPYqb20YK38FgLA== X-Received: by 10.84.240.12 with SMTP id y12mr11368929plk.382.1515407346977; Mon, 08 Jan 2018 02:29:06 -0800 (PST) Received: from b29396-OptiPlex-7040 (gate-zmy3.freescale.com. [192.88.167.1]) by smtp.gmail.com with ESMTPSA id x15sm23724820pfh.27.2018.01.08.02.29.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 02:29:06 -0800 (PST) Date: Mon, 8 Jan 2018 18:28:55 +0800 From: Dong Aisheng To: Stefan Agner Subject: Re: [PATCH] soc: imx: gpc: de-register power domains only if initialized Message-ID: <20180108102855.GA32635@b29396-OptiPlex-7040> References: <20180107134905.15624-1-stefan@agner.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180107134905.15624-1-stefan@agner.ch> User-Agent: Mutt/1.5.24 (2015-08-30) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180108_022919_073819_62BA014F X-CRM114-Status: GOOD ( 20.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, fabio.estevam@nxp.com, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org, Lucas Stach Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Sun, Jan 07, 2018 at 02:49:05PM +0100, Stefan Agner wrote: > If power domain information are missing in the device tree, no > power domains get initialized. However, imx_gpc_remove tries to > remove power domains always in the old DT binding case. Only > remove power domains when imx_gpc_probe initialized them in > first place. > > Fixes: 721cabf6c660 ("soc: imx: move PGC handling to a new GPC driver") > Cc: Lucas Stach > Signed-off-by: Stefan Agner > --- > drivers/soc/imx/gpc.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c > index 53f7275d6cbd..62bb724726d9 100644 > --- a/drivers/soc/imx/gpc.c > +++ b/drivers/soc/imx/gpc.c > @@ -470,13 +470,21 @@ static int imx_gpc_probe(struct platform_device *pdev) > > static int imx_gpc_remove(struct platform_device *pdev) > { What's the original purpose of imx_gpc_remove? ARM power domain can't be removed. And why current imx_gpc_remove only remove domains for old DT but not for new ones? How about make it un-removable? e.g. Regards Dong Aisheng > + struct device_node *pgc_node; > int ret; > > + pgc_node = of_get_child_by_name(pdev->dev.of_node, "pgc"); > + > + /* bail out if DT too old and doesn't provide the necessary info */ > + if (!of_property_read_bool(pdev->dev.of_node, "#power-domain-cells") && > + !pgc_node) > + return 0; > + > /* > * If the old DT binding is used the toplevel driver needs to > * de-register the power domains > */ > - if (!of_get_child_by_name(pdev->dev.of_node, "pgc")) { > + if (!pgc_node) { > of_genpd_del_provider(pdev->dev.of_node); > > ret = pm_genpd_remove(&imx_gpc_domains[GPC_PGC_DOMAIN_PU].base); > -- > 2.15.1 > diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c index 47e7aa9..7fc6737 100644 --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c @@ -454,36 +454,17 @@ static int imx_gpc_probe(struct platform_device *pdev) return 0; } -static int imx_gpc_remove(struct platform_device *pdev) -{ - int ret; - - /* - * If the old DT binding is used the toplevel driver needs to - * de-register the power domains - */ - if (!of_get_child_by_name(pdev->dev.of_node, "pgc")) { - of_genpd_del_provider(pdev->dev.of_node); - - ret = pm_genpd_remove(&imx_gpc_domains[GPC_PGC_DOMAIN_PU].base); - if (ret) - return ret; - imx_pgc_put_clocks(&imx_gpc_domains[GPC_PGC_DOMAIN_PU]); - - ret = pm_genpd_remove(&imx_gpc_domains[GPC_PGC_DOMAIN_ARM].base); - if (ret) - return ret; - } - - return 0; -} - static struct platform_driver imx_gpc_driver = { .driver = { .name = "imx-gpc", .of_match_table = imx_gpc_dt_ids, + /* + * We can't forcibly eject devices form power domain, + * so we can't really remove power domains once they + * were added. + */ + .suppress_bind_attrs = true, }, .probe = imx_gpc_probe, - .remove = imx_gpc_remove, }; builtin_platform_driver(imx_gpc_driver)