From patchwork Wed Jan 10 20:31:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10156077 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B9915601A1 for ; Wed, 10 Jan 2018 20:38:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA3C524BFE for ; Wed, 10 Jan 2018 20:38:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C93826E51; Wed, 10 Jan 2018 20:38:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F31FE24BFE for ; Wed, 10 Jan 2018 20:38:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751655AbeAJUiq (ORCPT ); Wed, 10 Jan 2018 15:38:46 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:42895 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751405AbeAJUio (ORCPT ); Wed, 10 Jan 2018 15:38:44 -0500 Received: by mail-lf0-f67.google.com with SMTP id e27so300305lfb.9 for ; Wed, 10 Jan 2018 12:38:44 -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; bh=lgn+OvDMi8kaGdHEcFsU1kO3VFOemp18eA78uEQKwes=; b=h+JHngqr3lWsDirsgJ2iKAvOcXVy2bnPm7mPuomHwogcu0TT8EZfXw/h1jtyIrtM47 iZHpouJs9Nq1AMo5tpwIfAmzEpXym9ot9Ex8f06f/K7DAkI8IpilJcaMZFObMcPPaRCI CDeGFZmjyNeoK0tLFoKGahbbtkX4Q/CMsdFMQ= 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; bh=lgn+OvDMi8kaGdHEcFsU1kO3VFOemp18eA78uEQKwes=; b=nUb/e7h+mGfe3637+NXcE4u3tG3YzikdooWmu3R0M21EJxV5lsl6qMsHgnmVifrm0F uZI5JZaH4doCE0QqMndvlcoeqt+Rccp/df6eoDXZrzxtv3ALSKbSd77BAOcbQoVy4H5H Msa2e1LoS2fyLm/OZltvhW1YRQJ7JICNNXdCHf0UqSZ8A7A6Gygms+34Ekc9ZZNUm535 RWPC0bNGAQEeyRy0XVtTuJZ+8eKanJngSSziZi4fz6LUQ1CzIz5qxILD3liTln0lSCn2 Pu11TG/mBaGuMDiSF+XU7ll+Qbx9EJ+zGHXgBMrag9rr6b7D+tRV7Z8mNrLKuzoktaXr RkEw== X-Gm-Message-State: AKGB3mLH5TtB2XvVv8dkSzsVQnMJxpsmIte50sLxQYSUMLm9iNFZ4QLN 41dMX5VE7VgKNe0hAUVJBeWslw== X-Google-Smtp-Source: ACJfBou5kk+xWxmgzkoViMI0QZ+0P2IUpkekHXSwowM4fv2ZE5s5kDBM4CQrtwIA1U0I2Jy4ofsi8w== X-Received: by 10.46.18.8 with SMTP id t8mr11810799lje.76.1515616320241; Wed, 10 Jan 2018 12:32:00 -0800 (PST) Received: from localhost.localdomain (h-158-174-22-67.NA.cust.bahnhof.se. [158.174.22.67]) by smtp.gmail.com with ESMTPSA id 85sm3510910ljc.82.2018.01.10.12.31.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 12:31:59 -0800 (PST) From: Ulf Hansson To: "Rafael J . Wysocki" , Ulf Hansson , linux-pm@vger.kernel.org Cc: khilman@kernel.org, Geert Uytterhoeven , Mikko Perttunen Subject: [PATCH] PM / Domains: Don't skip driver's ->suspend|resume_noirq() callbacks Date: Wed, 10 Jan 2018 21:31:56 +0100 Message-Id: <1515616316-5118-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The commit 10da65423fdb ("PM / Domains: Call driver's noirq callbacks") started to respect driver's noirq callbacks, but while doing that it also introduced a few potential problems. More precisely, in genpd_finish_suspend() and genpd_resume_noirq() the noirq callbacks at the driver level should be invoked, no matter of whether dev->power.wakeup_path is set or not. Additionally, the commit in question also made genpd_resume_noirq() to ignore the return value from pm_runtime_force_resume(). Let's fix both these issues! Fixes: 10da65423fdb ("PM / Domains: Call driver's noirq callbacks") Signed-off-by: Ulf Hansson --- 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 f9dcc98..48255ce 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1032,15 +1032,12 @@ static int genpd_prepare(struct device *dev) static int genpd_finish_suspend(struct device *dev, bool poweroff) { struct generic_pm_domain *genpd; - int ret; + int ret = 0; genpd = dev_to_genpd(dev); if (IS_ERR(genpd)) return -EINVAL; - if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd)) - return 0; - if (poweroff) ret = pm_generic_poweroff_noirq(dev); else @@ -1048,10 +1045,18 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff) if (ret) return ret; + if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd)) + return 0; + if (genpd->dev_ops.stop && genpd->dev_ops.start) { ret = pm_runtime_force_suspend(dev); - if (ret) + if (ret) { + if (poweroff) + pm_generic_restore_noirq(dev); + else + pm_generic_resume_noirq(dev); return ret; + } } genpd_lock(genpd); @@ -1085,7 +1090,7 @@ static int genpd_suspend_noirq(struct device *dev) static int genpd_resume_noirq(struct device *dev) { struct generic_pm_domain *genpd; - int ret = 0; + int ret; dev_dbg(dev, "%s()\n", __func__); @@ -1094,21 +1099,20 @@ static int genpd_resume_noirq(struct device *dev) return -EINVAL; if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd)) - return 0; + return pm_generic_resume_noirq(dev); genpd_lock(genpd); genpd_sync_power_on(genpd, true, 0); genpd->suspended_count--; genpd_unlock(genpd); - if (genpd->dev_ops.stop && genpd->dev_ops.start) + if (genpd->dev_ops.stop && genpd->dev_ops.start) { ret = pm_runtime_force_resume(dev); + if (ret) + return ret; + } - ret = pm_generic_resume_noirq(dev); - if (ret) - return ret; - - return ret; + return pm_generic_resume_noirq(dev); } /**