From patchwork Fri Sep 21 22:47:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1493661 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 2E7FB3FE65 for ; Fri, 21 Sep 2012 22:47:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758333Ab2IUWri (ORCPT ); Fri, 21 Sep 2012 18:47:38 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:64693 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758317Ab2IUWrh (ORCPT ); Fri, 21 Sep 2012 18:47:37 -0400 Received: by pbbrr4 with SMTP id rr4so3553224pbb.19 for ; Fri, 21 Sep 2012 15:47:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=XS48Qo5mYIVYXf1NAb9fCeH/RVpivTB66h3YPjRyJr8=; b=blq3oyBp50oUlshQHdp2OlYaqnhMT1hrkFWMPp/Hr8BHN8A3To0py+xnTk+pLOp8cW JzqtWzKM1gcbXVeK/CejZ+hJdAkX3hp0PHMIkBghKDSa0HQyU5aoMTI31P3H3spoW8di BV71A+w5l94Rzyl75ptrsmQyzRSoavx5g++nL9FSTIRMa9f7AZ9NA96u1sZV7Jq7z6XI vlpqJcLaaunH0tuU1NdOGLcHJP7QMypG2FfdGX059ggzB+Ems65q/i4SwnWP33F9fGMF RPplhi2PfjcnhqgwqRqG0CDuuJp5aB2q6OrzAY/b6a2NHtJuZPTegybDjleg1gKRhZsG wd5w== Received: by 10.68.193.196 with SMTP id hq4mr19466131pbc.32.1348267656719; Fri, 21 Sep 2012 15:47:36 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id vf8sm5732138pbc.27.2012.09.21.15.47.35 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Sep 2012 15:47:36 -0700 (PDT) From: Kevin Hilman To: "Rafael J. Wysocki" , linux-pm@vger.kernel.org Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Santosh Shilimkar , Grygorii Strashko , Nishanth Menon , Alan Stern Subject: [PATCH v2] PM / Runtime: let rpm_resume() succeed if RPM_ACTIVE, even when disabled Date: Fri, 21 Sep 2012 15:47:34 -0700 Message-Id: <1348267654-30697-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.7.9.2 X-Gm-Message-State: ALoCoQmk9d//zcH58qx80BXWIDKls9f5aOw30/XW3LGhd/9EVTEBwUv6ArCJqMSJCsXHbeMboiit Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Kevin Hilman There are several drivers where the return value of pm_runtime_get_sync() is used to decide whether or not it is safe to access hardware and that don't provide .suspend() callbacks for system suspend (but may use late/noirq callbacks.) If such a driver happens to call pm_runtime_get_sync() during system suspend, after the core has disabled runtime PM, it will get the error code and will decide that the hardware should not be accessed, although this may be a wrong conclusion, depending on the state of the device when runtime PM was disabled. Drivers might work around this problem by using a test like: ret = pm_runtime_get_sync(dev); if (!ret || (ret == -EACCES && driver_private_data(dev)->suspended)) { /* access hardware */ } where driver_private_data(dev)->suspended is a flag set by the driver's .suspend() method (that would have to be added for this purpose). However, that potentially would need to be done by multiple drivers which means quite a lot of duplicated code and bloat. To avoid that we can use the observation that the core sets dev->power.is_suspended before disabling runtime PM and use that instead of the driver's private flag. Still, potentially many drivers would need to repeat that same check in quite a few places, so it's better to let the core do it. Then we can be a bit smarter and check whether or not runtime PM was disabled by the core only (disable_depth == 1) or by someone else in addition to the core (disable_depth > 1). In the former case rpm_resume() can return 1 if the runtime PM status is RPM_ACTIVE, because it means the device was active when the core disabled runtime PM. In the latter case it should still return -EACCES, because it isn't clear why runtime PM has been disabled. Tested on AM3730/Beagle-xM where a wakeup IRQ firing during the late suspend phase triggers runtime PM activity in the I2C driver since the wakeup IRQ is on an I2C-connected PMIC. Cc: Rafael J. Wysocki Cc: Alan Stern Signed-off-by: Kevin Hilman --- v2: - major changelog rewrite, based largely on input from Rafael - add check for disable_depth == 1 and move to separate if statement, both suggested by Alan Stern drivers/base/power/runtime.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 7d9c1cb..d43856b 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -509,6 +509,9 @@ static int rpm_resume(struct device *dev, int rpmflags) repeat: if (dev->power.runtime_error) retval = -EINVAL; + else if (dev->power.disable_depth == 1 && dev->power.is_suspended + && dev->power.runtime_status == RPM_ACTIVE) + retval = 1; else if (dev->power.disable_depth > 0) retval = -EACCES; if (retval)