From patchwork Wed Aug 15 18:22:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 1326571 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 89C17DFFED for ; Wed, 15 Aug 2012 18:16:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752085Ab2HOSQ6 (ORCPT ); Wed, 15 Aug 2012 14:16:58 -0400 Received: from ogre.sisk.pl ([193.178.161.156]:40568 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750984Ab2HOSQ6 (ORCPT ); Wed, 15 Aug 2012 14:16:58 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id CE9161DC1D8; Wed, 15 Aug 2012 20:20:32 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 05433-01; Wed, 15 Aug 2012 20:20:22 +0200 (CEST) Received: from ferrari.rjw.lan (89-67-90-11.dynamic.chello.pl [89.67.90.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id C70341DC0E8; Wed, 15 Aug 2012 20:20:22 +0200 (CEST) From: "Rafael J. Wysocki" To: Alan Stern Subject: [Update][PATCH 3/3] PM / Runtime: Check device PM QoS setting before "no callbacks" check Date: Wed, 15 Aug 2012 20:22:56 +0200 User-Agent: KMail/1.13.6 (Linux/3.5.0+; KDE/4.6.0; x86_64; ; ) Cc: Linux PM list , LKML References: In-Reply-To: MIME-Version: 1.0 Message-Id: <201208152022.56224.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On Wednesday, August 15, 2012, Alan Stern wrote: > On Tue, 14 Aug 2012, Rafael J. Wysocki wrote: > > > > > If __dev_pm_qos_read_value(dev) returns a negative value, > > rpm_suspend() should return -EPERM for dev even if its > > power.no_callbacks flag is set. For this to happen, the device's > > power.no_callbacks flag has to be checked after the PM QoS check, > > so modify the code accordingly. > > > > Signed-off-by: Rafael J. Wysocki > > --- > > drivers/base/power/runtime.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > Index: linux/drivers/base/power/runtime.c > > =================================================================== > > --- linux.orig/drivers/base/power/runtime.c > > +++ linux/drivers/base/power/runtime.c > > @@ -388,6 +388,12 @@ static int rpm_suspend(struct device *de > > goto repeat; > > } > > > > + if (__dev_pm_qos_read_value(dev) < 0) { > > + /* Negative PM QoS constraint means "never suspend". */ > > + retval = -EPERM; > > + goto out; > > + } > > + > > if (dev->power.no_callbacks) > > goto no_callback; /* Assume success. */ > > > > @@ -402,12 +408,6 @@ static int rpm_suspend(struct device *de > > goto out; > > } > > > > - if (__dev_pm_qos_read_value(dev) < 0) { > > - /* Negative PM QoS constraint means "never suspend". */ > > - retval = -EPERM; > > - goto out; > > - } > > - > > __update_runtime_status(dev, RPM_SUSPENDING); > > > > if (dev->pm_domain) > > Wouldn't it be better to move the test into > rpm_check_suspend_allowed()? Then it would apply to idle notifications > and pm_schedule_suspend(). Yes, that makes sense. Updated patch is appended. Thanks, Rafael Acked-by: Alan Stern --- From: Rafael J. Wysocki Subject: PM / Runtime: Check device PM QoS setting before "no callbacks" If __dev_pm_qos_read_value(dev) returns a negative value, rpm_suspend() should return -EPERM for dev even if its power.no_callbacks flag is set. For this to happen, the device's power.no_callbacks flag has to be checked after the PM QoS check, so move the PM QoS check to rpm_check_suspend_allowed() (this will make it cover idle notifications as well as runtime suspend too). Signed-off-by: Rafael J. Wysocki --- drivers/base/power/runtime.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux/drivers/base/power/runtime.c =================================================================== --- linux.orig/drivers/base/power/runtime.c +++ linux/drivers/base/power/runtime.c @@ -147,6 +147,8 @@ static int rpm_check_suspend_allowed(str || (dev->power.request_pending && dev->power.request == RPM_REQ_RESUME)) retval = -EAGAIN; + else if (__dev_pm_qos_read_value(dev) < 0) + retval = -EPERM; else if (dev->power.runtime_status == RPM_SUSPENDED) retval = 1; @@ -402,12 +404,6 @@ static int rpm_suspend(struct device *de goto out; } - if (__dev_pm_qos_read_value(dev) < 0) { - /* Negative PM QoS constraint means "never suspend". */ - retval = -EPERM; - goto out; - } - __update_runtime_status(dev, RPM_SUSPENDING); if (dev->pm_domain)