From patchwork Wed Sep 19 23:39:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1481601 Return-Path: X-Original-To: patchwork-linux-omap@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 8B18BDF280 for ; Wed, 19 Sep 2012 23:39:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752984Ab2ISXjx (ORCPT ); Wed, 19 Sep 2012 19:39:53 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:60519 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752979Ab2ISXjw (ORCPT ); Wed, 19 Sep 2012 19:39:52 -0400 Received: by pbbrr13 with SMTP id rr13so3663822pbb.19 for ; Wed, 19 Sep 2012 16:39:52 -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=IYbXLu9hbaNz/wTc1+160Fxay2JX4f1XgHlOEYqHvd4=; b=YuAsLKFdJBl4um83QL181ZmXK9C+Lrbw/qgc/Q6W7ttlmYJYeUlzT6bN59r1y6G/sH DiBWgos8h7fqiA378Kgo9jcUMQvKMzOAQEoAb8xvq/L1EDt+Msjqf3QMSUknXcJuSZy0 2vjKU164QZQbVoabpIAnNoTiF3ovDRwWvj026HdLMz0beeaKJXfaP+HC6uF63IrWyD8H sHtyywtb4yVYE8qWqoz1tH+qvPLz+aWlpgDPyDvFGbHt7lnlNQyUwEvsTjeZXifgnbiO ojN9P6PCdQ8lohU09Xp3Cs2s2b1j+dyzYnBuRsY2doyGh79gpHNSKAPuzfI5VQUOoYn/ 8ZOw== Received: by 10.68.135.199 with SMTP id pu7mr2163426pbb.0.1348097992315; Wed, 19 Sep 2012 16:39:52 -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 u2sm1434092pay.28.2012.09.19.16.39.51 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 16:39:51 -0700 (PDT) From: Kevin Hilman To: "Rafael J. Wysocki" , linux-pm@lists.linux-foundation.org Cc: linux-omap@vger.kernel.org, Santosh Shilimkar , Grygorii Strashko , Nishanth Menon Subject: [PATCH] PM / Runtime: let rpm_resume() succeed if RPM_ACTIVE, even when disabled Date: Wed, 19 Sep 2012 16:39:50 -0700 Message-Id: <1348097990-5956-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.7.9.2 X-Gm-Message-State: ALoCoQkyjXK/0E+0/qtMUA0KKgVqMgvpDUvQ/bFDNE2FOOf0I1XSo7Jyx42G8yqZJVnU7JfWJll1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Kevin Hilman When runtime PM is disabled, what we want is for callbacks not to be called from then on. However, currently, when runtime PM is disabled, operations such as 'get' will also fail even if the device is currently active. Since calling 'get' on a device that is already RPM_ACTIVE does not involve calling the callbacks, it should be allowed to succeed, even if runtime PM is disabled. This is particularily useful in runtime PM enabled drivers that are used during system suspend. Because runtime PM is disabled during system suspend, currently any driver's use of pm_runtime_get* will fail with -EACCES. This is expected if the device was already runtime suspended, but if the device is actually active (due to recent usage, autosuspend timeout not expired, or pm_runtime_resume() called in ->suspend() method), the pm_runtime_get*() call should actually succeed. To permit the usage described above, add a check to rpm_resume() so that success is returned in the case where a driver is suspended (it's ->suspend callback has been called) but is still RPM_ACTIVE. This patch was developed in close collaboration with Rafael J. Wysocki Tested on AM3730/Beagle-xM where 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 Signed-off-by: Kevin Hilman --- drivers/base/power/runtime.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 7d9c1cb..dafa5ec 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -510,7 +510,8 @@ static int rpm_resume(struct device *dev, int rpmflags) if (dev->power.runtime_error) retval = -EINVAL; else if (dev->power.disable_depth > 0) - retval = -EACCES; + retval = dev->power.is_suspended && + dev->power.runtime_status == RPM_ACTIVE ? 1 : -EACCES; if (retval) goto out;