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: 36164 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 473F2202DD for ; Thu, 28 Aug 2014 08:39:25 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kx10sf15232549pab.0 for ; Thu, 28 Aug 2014 01:39:21 -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=o8MN3Xb/eMhZvqyB85h8+/+fpO23g3BTygRrGdQ0aU0=; b=ahJniLE3DmGufofjteSP0Ra6lfKGZrbbb5L/mAaIetnX94ZdDhKQTT2llzmd5MmXRS zeAN63X19imw9KF8z34d299h4gyPqRkGn6pwClAEvSlgqdUNdlAq9jVH+LBkhA1XF8QQ hUlBjDSrRkYkBhSfXwxHKFDqYBLfElOv1f2LdorL6Jh9n6M9faCo2ic99ueIx7PjRGwO AWLuSzSadO/bhE8P4t+ySyPJMTp3plL5G/wjVrqIOpR/n0hAQWSjniEmH1eJDQOaJGSL 7iFUItHPqRTEPJKyau+cAlG3Bp0thpu9S6LP4UEU48tgl/eiHgIzhlmj2XaPaxFq8g1X Fe1A== X-Gm-Message-State: ALoCoQngPunas4kdgdjTKBRC5C+I0PvWVvA4HH7op7E/x+pNg3tjR3mVUj2obiKI4Va1hg3Qd7ia X-Received: by 10.66.141.70 with SMTP id rm6mr1206239pab.37.1409215159724; Thu, 28 Aug 2014 01:39:19 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.237 with SMTP id r100ls546822qgr.49.gmail; Thu, 28 Aug 2014 01:39:19 -0700 (PDT) X-Received: by 10.52.170.211 with SMTP id ao19mr1613686vdc.23.1409215159593; Thu, 28 Aug 2014 01:39:19 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id p18si2920659vdg.54.2014.08.28.01.39.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Aug 2014 01:39:19 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id ij19so446986vcb.31 for ; Thu, 28 Aug 2014 01:39:19 -0700 (PDT) X-Received: by 10.220.182.73 with SMTP id cb9mr1952557vcb.9.1409215159499; Thu, 28 Aug 2014 01:39:19 -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 uj3csp201153vcb; Thu, 28 Aug 2014 01:39:18 -0700 (PDT) X-Received: by 10.152.87.81 with SMTP id v17mr2572096laz.17.1409215158267; Thu, 28 Aug 2014 01:39:18 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com [209.85.215.46]) by mx.google.com with ESMTPS id ap6si4178466lbd.95.2014.08.28.01.39.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Aug 2014 01:39:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id pv20so512485lab.5 for ; Thu, 28 Aug 2014 01:39:17 -0700 (PDT) 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> 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.172 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 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