From patchwork Mon Oct 13 14:02:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5076721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D0AD5C11AC for ; Mon, 13 Oct 2014 14:06:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F270D20204 for ; Mon, 13 Oct 2014 14:06:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CDCB20131 for ; Mon, 13 Oct 2014 14:06:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdgDj-0007jf-UW; Mon, 13 Oct 2014 14:03:31 +0000 Received: from mail-wg0-f45.google.com ([74.125.82.45]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdgD9-0007S1-N1 for linux-arm-kernel@lists.infradead.org; Mon, 13 Oct 2014 14:02:56 +0000 Received: by mail-wg0-f45.google.com with SMTP id m15so8854198wgh.16 for ; Mon, 13 Oct 2014 07:02:33 -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=SGmxfuiTs6K49V5ctcfenOYQIFl7xbmsViPs+r35qtc=; b=ZIv5HV4Xk3a23qHp3xd/4HrU3LqjQJd+57iHyZ9k5JMCnDVL1gLCE6pCanFXPfe5PJ 196FkgPc1Vb9T0mp0hBtZ5WsDzTe3ocfKgjqJRr8oDFWWsjjs/ZXThdj+8B6BV+ds2O2 okNV2cgMa9CNOu5O8qktdUZmxLloS8GjYMWkyxi3AgJXQlbs88QB4aei3gDYAJr7+oq/ gncKypO3nFzvjNRiZ/q5ly5hllbs46wUmpm5jnyxEwjyoyJ8HJu76gsFca4pxb3Gdh3F GBU0P4L6BsCSGU+U9fWzvBE7G5DI5TThsYsZqi/627b6ampZrhTmJMnDhyD1pL1gN1KN EnFw== X-Gm-Message-State: ALoCoQno4dCgnGjxos5ezG24ZLHYPh8dg1KUYy/g07t8aWoCGh4v6HMFmyQC+iRUxHxZJDcjSEaC X-Received: by 10.194.3.78 with SMTP id a14mr2932847wja.91.1413208953225; Mon, 13 Oct 2014 07:02:33 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fq1sm1533474wib.12.2014.10.13.07.02.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Oct 2014 07:02:32 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Subject: [PATCH v3 2/9] PM / Domains: Enable genpd to support ->get|put() callbacks Date: Mon, 13 Oct 2014 16:02:03 +0200 Message-Id: <1413208930-26019-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413208930-26019-1-git-send-email-ulf.hansson@linaro.org> References: <1413208930-26019-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141013_070255_965698_5E8BCD6A X-CRM114-Status: GOOD ( 17.68 ) X-Spam-Score: -0.7 (/) Cc: Simon Horman , Ulf Hansson , Kevin Hilman , Russell King , Philipp Zabel , Geert Uytterhoeven , Wolfram Sang , Greg Kroah-Hartman , Mark Brown , Dmitry Torokhov , Magnus Damm , Tomasz Figa , linux-samsung-soc@vger.kernel.org, Alan Stern , Ben Dooks , Jinkun Hong , Kukjin Kim , Sylwester Nawrocki , Aaron Lu , Jack Dai , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, T_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 provide users control over whether the power should be maintained, implement the ->get|put() callbacks for genpd's PM domain. A usage count variable keeps track of the number of users. A positive value tells genpd to keep supplying power and also to power up if it's the first user. Do note, the above applies no matter of CONFIG_PM_RUNTIME. That's because we allows a PM domain to be initialized in power off state and thus we need a way to power it up. Once the usage count reaches zero, genpd tries to power off its PM domain. Although for !CONFIG_PM_RUNTIME we need to maintain the power once it's been enabled, since drivers can't use runtime PM to restore it dynamically. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 26 +++++++++++++++++++++++++- include/linux/pm_domain.h | 1 + 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 40bc2f4..96fe72e 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -451,10 +451,12 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd) * (2) The domain is waiting for its master to power up. * (3) One of the domain's devices is being resumed right now. * (4) System suspend is in progress. + * (5) The usage_count > 0, since it tells us to stay powered. */ if (genpd->status == GPD_STATE_POWER_OFF || genpd->status == GPD_STATE_WAIT_MASTER - || genpd->resume_count > 0 || genpd->prepared_count > 0) + || genpd->resume_count > 0 || genpd->prepared_count > 0 + || atomic_read(&genpd->usage_count) > 0) return 0; if (atomic_read(&genpd->sd_count) > 0) @@ -1358,6 +1360,25 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron); #endif /* CONFIG_PM_SLEEP */ +static int pm_genpd_get(struct dev_pm_domain *domain) +{ + struct generic_pm_domain *genpd = pd_to_genpd(domain); + + atomic_inc(&genpd->usage_count); + + return pm_genpd_poweron(genpd); +} + +static void pm_genpd_put(struct dev_pm_domain *domain) +{ + struct generic_pm_domain *genpd = pd_to_genpd(domain); + + if (!atomic_dec_and_test(&genpd->usage_count)) + return; + + genpd_queue_power_off_work(genpd); +} + static struct generic_pm_domain_data *__pm_genpd_alloc_dev_data(struct device *dev) { struct generic_pm_domain_data *gpd_data; @@ -1875,10 +1896,13 @@ void pm_genpd_init(struct generic_pm_domain *genpd, genpd->status = is_off ? GPD_STATE_POWER_OFF : GPD_STATE_ACTIVE; init_waitqueue_head(&genpd->status_wait_queue); genpd->poweroff_task = NULL; + atomic_set(&genpd->usage_count, 0); genpd->resume_count = 0; genpd->device_count = 0; genpd->max_off_time_ns = -1; genpd->max_off_time_changed = true; + genpd->domain.get = pm_genpd_get; + genpd->domain.put = pm_genpd_put; genpd->domain.ops.runtime_suspend = pm_genpd_runtime_suspend; genpd->domain.ops.runtime_resume = pm_genpd_runtime_resume; genpd->domain.ops.prepare = pm_genpd_prepare; diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 8e2806f..7b3cba2 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -58,6 +58,7 @@ struct generic_pm_domain { enum gpd_status status; /* Current state of the domain */ wait_queue_head_t status_wait_queue; struct task_struct *poweroff_task; /* Powering off task */ + atomic_t usage_count; /* Number of users of the domain */ unsigned int resume_count; /* Number of devices being resumed */ unsigned int device_count; /* Number of devices */ unsigned int suspended_count; /* System suspend device counter */