From patchwork Fri Feb 17 09:55:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 94136 Delivered-To: patches@linaro.org Received: by 10.140.20.99 with SMTP id 90csp89048qgi; Fri, 17 Feb 2017 01:55:33 -0800 (PST) X-Received: by 10.25.74.196 with SMTP id x187mr2101348lfa.30.1487325333666; Fri, 17 Feb 2017 01:55:33 -0800 (PST) Return-Path: Received: from mail-lf0-x231.google.com (mail-lf0-x231.google.com. [2a00:1450:4010:c07::231]) by mx.google.com with ESMTPS id f1si4747269lfa.81.2017.02.17.01.55.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Feb 2017 01:55:33 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::231 as permitted sender) client-ip=2a00:1450:4010:c07::231; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::231 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x231.google.com with SMTP id z127so20155804lfa.2 for ; Fri, 17 Feb 2017 01:55:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=awgrw9/kDlVbjK79/l63CXzYb5IwMxyavFTDAXj78aY=; b=Wg4pmU21tRtE5vmNqCTqEM0lZqN1Mk+0CqTwtllB28dW8hazYPdzU1rD8PqvVhoZXV fWIqr87jwSWKYVAw9HH/cwkh9b0RinpTlHnCbfDEp6MDDWcX16oPoB2jVLrUrB10g6EA 9qkFM7J0muVRaAVdKuPjZy4O0aAYlD6MacRUk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=awgrw9/kDlVbjK79/l63CXzYb5IwMxyavFTDAXj78aY=; b=NeYImrCAnouc/bna7xdA1man79bN4TEOecvM8/TOEhd/tIVWAMmP2+mdyv0Q/jCYxN f83EG4bgUAtKBzUG3AbiWA7XupPE2Ql9MlI2ciIUGiJMWK+ZhNGZdCewCouldCvNC7qp xRt4/DwH+F+tiJH7AOSn8s2ZNODcyIV+lh41D/xrVpOFaqPDNQ2fZeBAAQ2OIwuRehK2 VVR9Q1az+cvmPnLuTIwqPnKqbU7FXOXPyO/q0s0E2450ovmDPgxFmrIPYrJT2mDkI50J BNfdGAR17505XQS76j8XpMZN585MemTt5ReZ5snLoWkS5n/HqZ76PWkgMZrYQpvPzGKQ MTEw== X-Gm-Message-State: AMke39kIjk54xoHgBFpObQByfQXuN+m2CZyjCgWPfG91Kn/iJNAsUb1lq2KwfAwIdNEx74bRARo= X-Received: by 10.25.229.221 with SMTP id i90mr813639lfk.11.1487325333302; Fri, 17 Feb 2017 01:55:33 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-155-4-221-67.na.cust.bahnhof.se. [155.4.221.67]) by smtp.gmail.com with ESMTPSA id f133sm2372773lfg.32.2017.02.17.01.55.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Feb 2017 01:55:32 -0800 (PST) From: Ulf Hansson To: "Rafael J. Wysocki" , Ulf Hansson , linux-pm@vger.kernel.org Cc: Len Brown , Pavel Machek , Kevin Hilman , Geert Uytterhoeven , Lina Iyer , Jon Hunter , Marek Szyprowski Subject: [PATCH 3/3] PM / Domains: Power off masters immediately in the power off sequence Date: Fri, 17 Feb 2017 10:55:25 +0100 Message-Id: <1487325325-18212-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1487325325-18212-1-git-send-email-ulf.hansson@linaro.org> References: <1487325325-18212-1-git-send-email-ulf.hansson@linaro.org> Once a subdomain is powered off, genpd queues a power off work for each of the subdomain's corresponding masters, thus postponing the masters to be powered off to a later point. When genpd used intermediate power off states, which was removed in commit ba2bbfbf6307 ("PM / Domains: Remove intermediate states from the power off sequence"), this behaviour made sense, but now it simply doesn't. Genpd can easily try to power off the masters in the same context as the subdomain, of course by acquiring/releasing the lock. Then, let's convert to this behaviour, as it avoids unnecessary works from being queued. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) -- 1.9.1 Tested-by: Lina Iyer diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 179bb26..e697dec 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -284,7 +284,8 @@ static void genpd_queue_power_off_work(struct generic_pm_domain *genpd) * If all of the @genpd's devices have been suspended and all of its subdomains * have been powered down, remove power from @genpd. */ -static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on) +static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on, + unsigned int depth) { struct pm_domain_data *pdd; struct gpd_link *link; @@ -351,7 +352,9 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on) list_for_each_entry(link, &genpd->slave_links, slave_node) { genpd_sd_counter_dec(link->master); - genpd_queue_power_off_work(link->master); + genpd_lock_nested(link->master, depth + 1); + genpd_power_off(link->master, false, depth + 1); + genpd_unlock(link->master); } return 0; @@ -405,7 +408,9 @@ static int genpd_power_on(struct generic_pm_domain *genpd, unsigned int depth) &genpd->slave_links, slave_node) { genpd_sd_counter_dec(link->master); - genpd_queue_power_off_work(link->master); + genpd_lock_nested(link->master, depth + 1); + genpd_power_off(link->master, false, depth + 1); + genpd_unlock(link->master); } return ret; @@ -462,7 +467,7 @@ static void genpd_power_off_work_fn(struct work_struct *work) genpd = container_of(work, struct generic_pm_domain, power_off_work); genpd_lock(genpd); - genpd_power_off(genpd, false); + genpd_power_off(genpd, false, 0); genpd_unlock(genpd); } @@ -581,7 +586,7 @@ static int genpd_runtime_suspend(struct device *dev) return 0; genpd_lock(genpd); - genpd_power_off(genpd, true); + genpd_power_off(genpd, true, 0); genpd_unlock(genpd); return 0; @@ -661,7 +666,7 @@ static int genpd_runtime_resume(struct device *dev) if (!pm_runtime_is_irq_safe(dev) || (pm_runtime_is_irq_safe(dev) && genpd_is_irq_safe(genpd))) { genpd_lock(genpd); - genpd_power_off(genpd, true); + genpd_power_off(genpd, true, 0); genpd_unlock(genpd); }