From patchwork Thu Sep 4 13:52:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 36707 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f71.google.com (mail-oi0-f71.google.com [209.85.218.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8584520CBB for ; Thu, 4 Sep 2014 13:52:56 +0000 (UTC) Received: by mail-oi0-f71.google.com with SMTP id v63sf48488792oia.2 for ; Thu, 04 Sep 2014 06:52:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=hv5eKedyTfY/A/sr+rjRCxxYnwjGOk5pByGuRbSvLXQ=; b=jKoiufPI+1mEykftxM2jZwRjWGlyOMi/6XJa/gXKaIs4EAblN27UvPDOCMeplWYRmE E1I3vjx1Lq1YvDQFF/6vgBLvB+GhIrx+ziCvgF3+A4WkCwIuEri01n+CX2rZMVPObwNR K50tQuLUhFantgjlVfq4gNVz7VbaVd1DAgYKa2EX62z+2BuI8BY9PdxZ/MhJkYFJHjsQ IB6zIOU1tfU+bMWwSaT1wtgUJJVMxF9ooNteX3Ah6h4i+5qjQT69MCAmbTNhdTkDcj8g 8KaYSEdL2mZcfaFyTMVfLnizOlrQ5KGJtAzjY3LDfMhQvWyUi+UaZ3XJxenJayJBOzj3 GusQ== X-Gm-Message-State: ALoCoQkINugshjMX2ik1zwuqzAUALyjzxbRHNUOMO7flKBvVbNz9fGLWPNnANT/5XleUE3nUDz8r X-Received: by 10.42.94.69 with SMTP id a5mr2500235icn.29.1409838776104; Thu, 04 Sep 2014 06:52:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.246 with SMTP id l109ls262703qgf.1.gmail; Thu, 04 Sep 2014 06:52:56 -0700 (PDT) X-Received: by 10.52.83.227 with SMTP id t3mr1965572vdy.20.1409838776024; Thu, 04 Sep 2014 06:52:56 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id uv6si5679896vcb.3.2014.09.04.06.52.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Sep 2014 06:52:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id la4so10612618vcb.15 for ; Thu, 04 Sep 2014 06:52:55 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr3270952vdb.27.1409838775933; Thu, 04 Sep 2014 06:52:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp841199vcb; Thu, 4 Sep 2014 06:52:55 -0700 (PDT) X-Received: by 10.112.56.148 with SMTP id a20mr4610881lbq.72.1409838774502; Thu, 04 Sep 2014 06:52:54 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com [209.85.217.178]) by mx.google.com with ESMTPS id je6si2581512lbc.139.2014.09.04.06.52.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Sep 2014 06:52:54 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id v6so11517405lbi.37 for ; Thu, 04 Sep 2014 06:52:53 -0700 (PDT) X-Received: by 10.112.4.70 with SMTP id i6mr4669739lbi.54.1409838773926; Thu, 04 Sep 2014 06:52:53 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id p3sm2085260lap.14.2014.09.04.06.52.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Sep 2014 06:52:53 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, Geert Uytterhoeven , Kevin Hilman , Alan Stern , Daniel Lezcano , Tomasz Figa , devicetree@vger.kernel.org, Linus Walleij , Simon Horman , Magnus Damm , Ben Dooks , Kukjin Kim , Stephen Boyd , Philipp Zabel , Mark Brown , Wolfram Sang , Chris Ball , Russell King , Ulf Hansson Subject: [PATCH v3 3/9] PM / Domains: Add APIs to attach/detach a PM domain for a device Date: Thu, 4 Sep 2014 15:52:30 +0200 Message-Id: <1409838756-31963-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409838756-31963-1-git-send-email-ulf.hansson@linaro.org> References: <1409838756-31963-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , To maintain scalability let's add common methods to attach and detach a PM domain for a device, dev_pm_domain_attach|detach(). Typically dev_pm_domain_attach() shall be invoked from subsystem level code at the probe phase to try to attach a device to its PM domain. The reversed actions may be done a the remove phase and then by invoking dev_pm_domain_detach(). The supported PM domains at this point are the ACPI and the generic PM domains. Signed-off-by: Ulf Hansson Tested-by: Philipp Zabel --- drivers/base/power/common.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/pm.h | 14 ++++++++++++ 2 files changed, 70 insertions(+) diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c index df2e5ee..9a86b16 100644 --- a/drivers/base/power/common.c +++ b/drivers/base/power/common.c @@ -11,6 +11,8 @@ #include #include #include +#include +#include /** * dev_pm_get_subsys_data - Create or refcount power.subsys_data for device. @@ -82,3 +84,57 @@ int dev_pm_put_subsys_data(struct device *dev) return ret; } EXPORT_SYMBOL_GPL(dev_pm_put_subsys_data); + +/** + * dev_pm_domain_attach - Attach a device to its PM domain. + * @dev: Device to attach. + * @power_on: Used to indicate whether we should power on the device. + * + * The @dev may only be attached to a single PM domain. By iterating through + * the available alternatives we try to find a valid PM domain for the device. + * + * This function should typically be invoked from subsystem level code during + * the probe phase. Especially for those that holds devices which requires + * power management through PM domains. + * + * Callers must ensure proper synchronization of this function with power + * management callbacks. + * + * Returns 0 on successfully attached PM domain or negative error code. + */ +int dev_pm_domain_attach(struct device *dev, bool power_on) +{ + int ret; + + ret = acpi_dev_pm_attach(dev, power_on); + if (!ret || ret == -EPROBE_DEFER) + return ret; + + return genpd_dev_pm_attach(dev); +} +EXPORT_SYMBOL_GPL(dev_pm_domain_attach); + +/** + * dev_pm_domain_detach - Detach a device from its PM domain. + * @dev: Device to attach. + * @power_off: Used to indicate whether we should power off the device. + * + * The @dev may be attached to a PM domain. By iterating through the available + * alternatives we detach it from its PM domain. + * + * This functions will reverse the actions from dev_pm_domain_attach() and thus + * detach the @dev from its PM domain. Typically it should be invoked from + * subsystem level code during the remove phase. + * + * Callers must ensure proper synchronization of this function with power + * management callbacks. + * + * Returns 0 on successfully detached PM domain or negative error code. + */ +int dev_pm_domain_detach(struct device *dev, bool power_off) +{ + if (acpi_dev_pm_detach(dev, power_off)) + return genpd_dev_pm_detach(dev); + return 0; +} +EXPORT_SYMBOL_GPL(dev_pm_domain_detach); diff --git a/include/linux/pm.h b/include/linux/pm.h index 72c0fe0..8176b07 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -621,6 +621,20 @@ struct dev_pm_domain { struct dev_pm_ops ops; }; +#ifdef CONFIG_PM +extern int dev_pm_domain_attach(struct device *dev, bool power_on); +extern int dev_pm_domain_detach(struct device *dev, bool power_off); +#else +static inline int dev_pm_domain_attach(struct device *dev, bool power_on) +{ + return -ENODEV; +} +static inline int dev_pm_domain_detach(struct device *dev, bool power_off) +{ + return -ENODEV; +} +#endif + /* * The PM_EVENT_ messages are also used by drivers implementing the legacy * suspend framework, based on the ->suspend() and ->resume() callbacks common