From patchwork Thu Aug 28 08:38:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4799791 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A885A9F375 for ; Thu, 28 Aug 2014 08:39:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA8A2201DD for ; Thu, 28 Aug 2014 08:39:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3279201E4 for ; Thu, 28 Aug 2014 08:39:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936430AbaH1Ijc (ORCPT ); Thu, 28 Aug 2014 04:39:32 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:36761 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936411AbaH1IjT (ORCPT ); Thu, 28 Aug 2014 04:39:19 -0400 Received: by mail-lb0-f181.google.com with SMTP id n15so490161lbi.26 for ; Thu, 28 Aug 2014 01:39:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o8MN3Xb/eMhZvqyB85h8+/+fpO23g3BTygRrGdQ0aU0=; b=GO0tHxmGUKxEEpU6SIn8slIFEhotoLPk/9pwGWP+K8MSN6XLgEjJXZV++9Qj9T+Jti B+jtxqEl2lJTxu+29PpRfHgO8l0S+Q7haFlJdnyAMcJB0O01m6QQ57Df05umoJZU5wGc fulVxJDZmwKvqEHiQb3XH5u+VrdYRRAk2969ZOo7GeSTEkvMso1N/3TaBRrkgky4quyh qGSt+m4wXIXzXWDr+UwJfcmS9vq0HF/Hz9yKjRS5K/H6cbeesGPalRF0fCzL81NGVvdb fEWTSLaiQooL2LKbx0xBDvqQqfKwYAurlF/545STyZsIQJPDlze1iRLj7nqMnKOL/Z8v zalw== X-Gm-Message-State: ALoCoQlat/x4HpXDZF+koLOsLQuTrGAHcasi8RkvLSbA0i8aSLBniRBeDnN+belYXlglSt64VsQ6 X-Received: by 10.152.23.69 with SMTP id k5mr2662827laf.70.1409215157610; Thu, 28 Aug 2014 01:39:17 -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 t12sm4826676lbp.44.2014.08.28.01.39.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Aug 2014 01:39:17 -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 v2 3/9] PM / Domains: Add APIs to attach/detach a PM domain for a device Date: Thu, 28 Aug 2014 10:38:56 +0200 Message-Id: <1409215142-8218-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409215142-8218-1-git-send-email-ulf.hansson@linaro.org> References: <1409215142-8218-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 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 it's 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..c143d20 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 it's 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's hold 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 it's 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 it's PM domain. + * + * This functions will reverse the actions from dev_pm_domain_attach() and thus + * detach the @dev from it's 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