All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ulf Hansson <ulf.hansson@linaro.org>
To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
	"Rafael J . Wysocki" <rafael@kernel.org>,
	linux-pm@vger.kernel.org
Cc: Ulf Hansson <ulf.hansson@linaro.org>,
	Alan Stern <stern@rowland.harvard.edu>,
	Kevin Hilman <khilman@kernel.org>,
	Maulik Shah <mkshah@codeaurora.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH] PM: runtime: Allow rpm_resume() to succeed when runtime PM is disabled
Date: Wed, 27 Oct 2021 00:26:26 +0200	[thread overview]
Message-ID: <20211026222626.39222-1-ulf.hansson@linaro.org> (raw)

During system suspend, the PM core sets dev->power.is_suspended for the
device that is being suspended. This flag is also being used in
rpm_resume(), to allow it to succeed by returning 1, assuming that runtime
PM has been disabled and the runtime PM status is RPM_ACTIVE, for the
device.

To make this behaviour a bit more useful, let's drop the check for the
dev->power.is_suspended flag in rpm_resume(), as it doesn't really need to
be limited to this anyway.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 drivers/base/power/runtime.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index ec94049442b9..fadc278e3a66 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -742,8 +742,8 @@ 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)
+	else if (dev->power.disable_depth > 0 &&
+		dev->power.runtime_status == RPM_ACTIVE)
 		retval = 1;
 	else if (dev->power.disable_depth > 0)
 		retval = -EACCES;
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: Ulf Hansson <ulf.hansson@linaro.org>
To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
	"Rafael J . Wysocki" <rafael@kernel.org>,
	linux-pm@vger.kernel.org
Cc: Ulf Hansson <ulf.hansson@linaro.org>,
	Alan Stern <stern@rowland.harvard.edu>,
	Kevin Hilman <khilman@kernel.org>,
	Maulik Shah <mkshah@codeaurora.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH] PM: runtime: Allow rpm_resume() to succeed when runtime PM is disabled
Date: Wed, 27 Oct 2021 00:26:26 +0200	[thread overview]
Message-ID: <20211026222626.39222-1-ulf.hansson@linaro.org> (raw)

During system suspend, the PM core sets dev->power.is_suspended for the
device that is being suspended. This flag is also being used in
rpm_resume(), to allow it to succeed by returning 1, assuming that runtime
PM has been disabled and the runtime PM status is RPM_ACTIVE, for the
device.

To make this behaviour a bit more useful, let's drop the check for the
dev->power.is_suspended flag in rpm_resume(), as it doesn't really need to
be limited to this anyway.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 drivers/base/power/runtime.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index ec94049442b9..fadc278e3a66 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -742,8 +742,8 @@ 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)
+	else if (dev->power.disable_depth > 0 &&
+		dev->power.runtime_status == RPM_ACTIVE)
 		retval = 1;
 	else if (dev->power.disable_depth > 0)
 		retval = -EACCES;
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

             reply	other threads:[~2021-10-26 22:27 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-26 22:26 Ulf Hansson [this message]
2021-10-26 22:26 ` [PATCH] PM: runtime: Allow rpm_resume() to succeed when runtime PM is disabled Ulf Hansson
2021-10-27  2:02 ` Alan Stern
2021-10-27  2:02   ` Alan Stern
2021-10-27 10:55   ` Ulf Hansson
2021-10-27 10:55     ` Ulf Hansson
2021-10-27 14:33     ` Alan Stern
2021-10-27 14:33       ` Alan Stern
2021-10-28 22:20       ` Ulf Hansson
2021-10-28 22:20         ` Ulf Hansson
2021-10-29 18:26         ` Rafael J. Wysocki
2021-10-29 18:26           ` Rafael J. Wysocki
2021-11-01  9:27           ` Ulf Hansson
2021-11-01  9:27             ` Ulf Hansson
2021-11-01 14:41             ` Grygorii Strashko
2021-11-01 14:41               ` Grygorii Strashko
2021-11-05 16:03               ` Ulf Hansson
2021-11-05 16:03                 ` Ulf Hansson
2021-11-26 12:19             ` Ulf Hansson
2021-11-26 12:19               ` Ulf Hansson
2021-11-26 13:30               ` Rafael J. Wysocki
2021-11-26 13:30                 ` Rafael J. Wysocki
2021-11-26 13:46                 ` Ulf Hansson
2021-11-26 13:46                   ` Ulf Hansson
2021-11-26 17:58                   ` Rafael J. Wysocki
2021-11-26 17:58                     ` Rafael J. Wysocki
2021-11-26 18:29                     ` Rafael J. Wysocki
2021-11-26 18:29                       ` Rafael J. Wysocki
2021-11-30 11:57                     ` Ulf Hansson
2021-11-30 11:57                       ` Ulf Hansson
2021-11-30 13:01                       ` Rafael J. Wysocki
2021-11-30 13:01                         ` Rafael J. Wysocki
2021-11-30 16:41                         ` Ulf Hansson
2021-11-30 16:41                           ` Ulf Hansson
2021-11-30 17:26                           ` Rafael J. Wysocki
2021-11-30 17:26                             ` Rafael J. Wysocki
2021-12-01  9:02                             ` Ulf Hansson
2021-12-01  9:02                               ` Ulf Hansson
2021-12-01 13:49                               ` Rafael J. Wysocki
2021-12-01 13:49                                 ` Rafael J. Wysocki
2021-12-01 15:22                                 ` Ulf Hansson
2021-12-01 15:22                                   ` Ulf Hansson
2021-12-01 17:44                                   ` Rafael J. Wysocki
2021-12-01 17:44                                     ` Rafael J. Wysocki
2021-12-01 20:11                                     ` Rafael J. Wysocki
2021-12-01 20:11                                       ` Rafael J. Wysocki
2021-12-02 11:28                                       ` Ulf Hansson
2021-12-02 11:28                                         ` Ulf Hansson
2021-12-02 16:18                                         ` Rafael J. Wysocki
2021-12-02 16:18                                           ` Rafael J. Wysocki
2021-12-02 16:50                                           ` Alan Stern
2021-12-02 16:50                                             ` Alan Stern
2021-12-02 18:01                                             ` Rafael J. Wysocki
2021-12-02 18:01                                               ` Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211026222626.39222-1-ulf.hansson@linaro.org \
    --to=ulf.hansson@linaro.org \
    --cc=khilman@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=mkshah@codeaurora.org \
    --cc=rafael@kernel.org \
    --cc=rjw@rjwysocki.net \
    --cc=stern@rowland.harvard.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.