From patchwork Thu Nov 19 18:08:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 7659831 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EDE7F9F2EC for ; Thu, 19 Nov 2015 18:08:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 05BCB2060B for ; Thu, 19 Nov 2015 18:08:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD7552062F for ; Thu, 19 Nov 2015 18:08:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756263AbbKSSIf (ORCPT ); Thu, 19 Nov 2015 13:08:35 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:33765 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755031AbbKSSIe (ORCPT ); Thu, 19 Nov 2015 13:08:34 -0500 Received: by wmec201 with SMTP id c201so38524026wme.0; Thu, 19 Nov 2015 10:08:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I1B/5ojwc8w4cTYicQ88SOEY/bgyJYtgnAzDBif30oY=; b=R8k+5lJFHSY3qsmo1JJzsaN2n/kHDTUebJ8F2WwO+27yGTCI3Wp5MnVWWfudd9p1nm SYqfd+sH5U2EujYsRusoOWq7NCIBggkSfF4zx/yq4veUsw41wcnFod3U/g0bhhZXYMQB LX8OswyF7RDRfZQwkPFEjwiGVvucu9vyZEmQpU2i9faYmRNgCYmDrFrC3OKMdG1i/ALq 03oIN9ZY6n/7pdZOkpyXXhxBgiLhfv68KRPMjwYQKp+pIcRLUWvQ4mp9brqTRXePKGDP AeoPXZYKf3rqXzABJnjylaj61y8ySy+1ozEfV3he13i3K1YHYIE0HozEYyv9keFOo+gK STcA== X-Received: by 10.194.76.232 with SMTP id n8mr10049235wjw.174.1447956513241; Thu, 19 Nov 2015 10:08:33 -0800 (PST) Received: from omega.localdomain (p20030064A95FF6FDE2CB4EFFFE1BB546.dip0.t-ipconnect.de. [2003:64:a95f:f6fd:e2cb:4eff:fe1b:b546]) by smtp.gmail.com with ESMTPSA id 193sm5105942wmp.16.2015.11.19.10.08.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Nov 2015 10:08:32 -0800 (PST) From: Alexander Aring To: linux-rpi-kernel@lists.infradead.org Cc: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, swarren@wwwdotorg.org, lee@kernel.org, eric@anholt.net, linux@arm.linux.org.uk, f.fainelli@gmail.com, rjui@broadcom.com, sbranden@broadcom.com, rjw@rjwysocki.net, khilman@kernel.org, ulf.hansson@linaro.org, len.brown@intel.com, pavel@ucw.cz, gregkh@linuxfoundation.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-pm@vger.kernel.org, kernel@pengutronix.de, Alexander Aring Subject: [PATCH 1/3] power: domain: add pm_genpd_uninit Date: Thu, 19 Nov 2015 19:08:08 +0100 Message-Id: <1447956490-22930-2-git-send-email-alex.aring@gmail.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1447956490-22930-1-git-send-email-alex.aring@gmail.com> References: <1447956490-22930-1-git-send-email-alex.aring@gmail.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds function pm_genpd_uninit for undo a pm_genpd_init. This is useful for multiple power domains while probing. If the probing fails after one pm_genpd_init was called we need to undo all previous registrations of generic pm domains inside the gpd_list list. There is a check on IS_ERR_OR_NULL(genpd) which is useful to check again registered power domains and not registered domains, the driver can use this mechanism to have an array with registered and non-registered power domains, where non-registered power domains are NULL. Cc: Rafael J. Wysocki Cc: Kevin Hilman Cc: Ulf Hansson Cc: Pavel Machek Cc: Len Brown Cc: Greg Kroah-Hartman Signed-off-by: Alexander Aring Acked-by: Ulf Hansson --- drivers/base/power/domain.c | 22 ++++++++++++++++++++++ include/linux/pm_domain.h | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index e03b1ad..24f54b8 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1509,6 +1509,28 @@ void pm_genpd_init(struct generic_pm_domain *genpd, } EXPORT_SYMBOL_GPL(pm_genpd_init); +/** + * pm_genpd_uninit - Uninitialize a generic I/O PM domain object. + * @genpd: PM domain object to initialize. + */ +void pm_genpd_uninit(struct generic_pm_domain *genpd) +{ + if (IS_ERR_OR_NULL(genpd)) + return; + + /* check if domain is still in registered inside the pm subsystem */ + WARN_ON_ONCE(!list_empty(&genpd->master_links) || + !list_empty(&genpd->slave_links) || + !list_empty(&genpd->dev_list)); + + mutex_lock(&gpd_list_lock); + list_del(&genpd->gpd_list_node); + mutex_unlock(&gpd_list_lock); + + mutex_destroy(&genpd->lock); +} +EXPORT_SYMBOL_GPL(pm_genpd_uninit); + #ifdef CONFIG_PM_GENERIC_DOMAINS_OF /* * Device Tree based PM domain providers. diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index ba4ced3..df84a45 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -123,6 +123,7 @@ extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, struct generic_pm_domain *target); extern void pm_genpd_init(struct generic_pm_domain *genpd, struct dev_power_governor *gov, bool is_off); +extern void pm_genpd_uninit(struct generic_pm_domain *genpd); extern struct dev_power_governor simple_qos_governor; extern struct dev_power_governor pm_domain_always_on_gov; @@ -161,6 +162,9 @@ static inline void pm_genpd_init(struct generic_pm_domain *genpd, struct dev_power_governor *gov, bool is_off) { } +static inline void pm_genpd_uninit(struct generic_pm_domain *genpd) +{ +} #endif static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,