From patchwork Wed Sep 2 08:16:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 7109571 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D2A8B9F1CD for ; Wed, 2 Sep 2015 08:16:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A03420647 for ; Wed, 2 Sep 2015 08:16:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11F34205E1 for ; Wed, 2 Sep 2015 08:16:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752590AbbIBIQX (ORCPT ); Wed, 2 Sep 2015 04:16:23 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:34215 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752589AbbIBIQW (ORCPT ); Wed, 2 Sep 2015 04:16:22 -0400 Received: by lbbmp1 with SMTP id mp1so1549493lbb.1 for ; Wed, 02 Sep 2015 01:16:20 -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; bh=N+RS1ECn08Vggj3IS6uirVWi1JtpW//ttkd0PeshDjk=; b=GUJvfvFSgVFTpGCuRQD4CbAs3MAVN7c37znlpbqwDSFcSknV4VOTJZRfnOe4yjbS+U nChWF14ZMnRlFyi98vkiY+tg5aC4ConnpDj57CYNj6qCxKyhF9DlxT3x97hFS9/nmCj9 ZmZW32lEitZC4HE4sr2fOZq4Pn5wSglrvk3dWHdk1hRPEkJMwrZgVlh1wLqfTufmiZ+g jdqs9jWZvw5oMLXlSRVUCv/LnJxgdgdR13mDywB1OMljmtDR4rA/5+OX8200wejdfoEV 1f8RN37r0w3Jx7sKwzUjb2EJhaME40XPU8U5SfYkmuac4OF5mgAjtIRYjR8UME/CnKyy BEiw== X-Gm-Message-State: ALoCoQmcK37ozu0Z0LxnB+rdsY/01ar4g+lalG+9S2px3Tuq7cTfaRJSfbDAdTikuDJv6hOESY9e X-Received: by 10.152.28.105 with SMTP id a9mr15380305lah.9.1441181780547; Wed, 02 Sep 2015 01:16:20 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by smtp.gmail.com with ESMTPSA id bx5sm5348752lbc.36.2015.09.02.01.16.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Sep 2015 01:16:19 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , linux-pm@vger.kernel.org Cc: Len Brown , Pavel Machek , Geert Uytterhoeven , Lina Iyer , Krzysztof Kozlowski Subject: [PATCH V2] PM / Domains: Try power off masters in error path of __pm_genpd_poweron() Date: Wed, 2 Sep 2015 10:16:13 +0200 Message-Id: <1441181773-21733-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 While powering up a genpd, its domain masters are first being powered up. In the error path of __pm_genpd_poweron(), we didn't care to try power off these domain masters. Let's deal with that to avoid leaving unused PM domains powered. Signed-off-by: Ulf Hansson Reviewed-by: Krzysztof Kozlowski --- Changes in v2: Added Krzysztof's reviewed by tag. --- drivers/base/power/domain.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 4167201..62f7572 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -213,6 +213,18 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool timed) } /** + * genpd_queue_power_off_work - Queue up the execution of pm_genpd_poweroff(). + * @genpd: PM domait to power off. + * + * Queue up the execution of pm_genpd_poweroff() unless it's already been done + * before. + */ +static void genpd_queue_power_off_work(struct generic_pm_domain *genpd) +{ + queue_work(pm_wq, &genpd->power_off_work); +} + +/** * __pm_genpd_poweron - Restore power to a given PM domain and its masters. * @genpd: PM domain to power up. * @@ -259,8 +271,12 @@ static int __pm_genpd_poweron(struct generic_pm_domain *genpd) return 0; err: - list_for_each_entry_continue_reverse(link, &genpd->slave_links, slave_node) + list_for_each_entry_continue_reverse(link, + &genpd->slave_links, + slave_node) { genpd_sd_counter_dec(link->master); + genpd_queue_power_off_work(link->master); + } return ret; } @@ -349,18 +365,6 @@ static int genpd_dev_pm_qos_notifier(struct notifier_block *nb, } /** - * genpd_queue_power_off_work - Queue up the execution of pm_genpd_poweroff(). - * @genpd: PM domait to power off. - * - * Queue up the execution of pm_genpd_poweroff() unless it's already been done - * before. - */ -static void genpd_queue_power_off_work(struct generic_pm_domain *genpd) -{ - queue_work(pm_wq, &genpd->power_off_work); -} - -/** * pm_genpd_poweroff - Remove power from a given PM domain. * @genpd: PM domain to power down. *