From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM list <linux-pm@vger.kernel.org>
Cc: Alan Stern <stern@rowland.harvard.edu>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Aaron Lu <aaron.lu@intel.com>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [RFC][PATCH 3/3] ACPI / PM: Avoid resuming devices in ACPI PM domain during system suspend
Date: Wed, 15 Jan 2014 00:16:03 +0100 [thread overview]
Message-ID: <2417673.F2yu8qohk7@vostro.rjw.lan> (raw)
In-Reply-To: <5420830.W4laSGaAU9@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Rework the ACPI PM domain's PM callbacks to avoid resuming devices
during system suspend in order to modify their wakeup settings if
that isn't necessary.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/device_pm.c | 31 +++++++++++++++++++++++++++----
1 file changed, 27 insertions(+), 4 deletions(-)
Index: linux-pm/drivers/acpi/device_pm.c
===================================================================
--- linux-pm.orig/drivers/acpi/device_pm.c
+++ linux-pm/drivers/acpi/device_pm.c
@@ -812,6 +812,13 @@ int acpi_dev_runtime_resume(struct devic
struct acpi_device *adev = acpi_dev_pm_get_node(dev);
int error;
+ /*
+ * This only matters during system suspend, if acpi_subsys_prepare()
+ * has returned 1. In that case, we may be resumed through a child
+ * runtime resume, in which case our system suspend callbacks will need
+ * to be executed, so power.no_suspend has to be cleared.
+ */
+ dev->power.no_suspend = false;
if (!adev)
return 0;
@@ -912,12 +919,28 @@ EXPORT_SYMBOL_GPL(acpi_dev_resume_early)
*/
int acpi_subsys_prepare(struct device *dev)
{
+ struct acpi_device *adev = acpi_dev_pm_get_node(dev);
+ u32 target_state;
+ int error, state;
+
+ if (!adev || !pm_runtime_enabled_and_suspended(dev))
+ return pm_generic_prepare(dev);
+
+ target_state = acpi_target_system_state();
+ error = acpi_dev_pm_get_state(dev, adev, target_state, NULL, &state);
+ if (error || state != adev->power.state
+ || device_may_wakeup(dev) != !!adev->wakeup.prepare_count) {
+ pm_runtime_resume(dev);
+ return pm_generic_prepare(dev);
+ }
/*
- * Follow PCI and resume devices suspended at run time before running
- * their system suspend callbacks.
+ * If this is a wakeup device, wakeup power has been enabled already for
+ * it during the preceding runtime suspend. Caveat: "sleep state" is
+ * one of the _DSW arguments, but that shouldn't matter for the devices
+ * using acpi_general_pm_domain.
*/
- pm_runtime_resume(dev);
- return pm_generic_prepare(dev);
+ error = pm_generic_prepare(dev);
+ return error ? error : 1;
}
EXPORT_SYMBOL_GPL(acpi_subsys_prepare);
next prev parent reply other threads:[~2014-01-14 23:08 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-14 23:12 [RFC][PATCH 0/3] PM: Mechanism to avoid resuming runtime-suspended devices during system suspend Rafael J. Wysocki
2014-01-14 23:13 ` [RFC][PATCH 1/3] PM / sleep: Flag to avoid executing suspend callbacks for devices Rafael J. Wysocki
2014-01-14 23:14 ` [RFC][PATCH 2/3] PM / runtime: Routine for checking device status during system suspend Rafael J. Wysocki
2014-01-16 13:32 ` Mika Westerberg
2014-01-16 16:07 ` [Update][RFC][PATCH " Rafael J. Wysocki
2014-01-14 23:16 ` Rafael J. Wysocki [this message]
2014-01-15 13:57 ` [Update][RFC][PATCH 3/3] ACPI / PM: Avoid resuming devices in ACPI PM domain " Rafael J. Wysocki
2014-02-16 23:49 ` [RFC][PATCH 0/3] PM: Mechanism to avoid resuming runtime-suspended devices " Rafael J. Wysocki
2014-02-16 23:50 ` [PATCH 1/3] PM / sleep: New flag to speed up suspend-resume of suspended devices Rafael J. Wysocki
2014-02-18 12:59 ` Ulf Hansson
2014-02-18 13:25 ` Rafael J. Wysocki
2014-02-19 17:01 ` Alan Stern
2014-02-20 1:23 ` Rafael J. Wysocki
2014-02-20 1:42 ` Rafael J. Wysocki
2014-02-20 17:03 ` Alan Stern
2014-02-24 0:00 ` Rafael J. Wysocki
2014-02-24 19:36 ` Alan Stern
2014-02-25 0:07 ` Rafael J. Wysocki
2014-02-25 17:08 ` Alan Stern
2014-02-25 23:56 ` Rafael J. Wysocki
2014-02-26 16:49 ` Alan Stern
2014-02-26 21:44 ` Rafael J. Wysocki
2014-02-26 22:17 ` Alan Stern
2014-02-26 23:13 ` Rafael J. Wysocki
2014-02-27 15:02 ` Alan Stern
2014-04-24 22:36 ` [RFC][PATCH 0/3] PM: Mechanism to avoid resuming runtime-suspended devices during system suspend, v2 Rafael J. Wysocki
2014-04-24 22:37 ` [RFC][PATCH 1/3] PM / sleep: Flags to speed up suspend-resume of runtime-suspended devices Rafael J. Wysocki
2014-05-01 21:39 ` Alan Stern
2014-05-01 23:15 ` Rafael J. Wysocki
2014-05-01 23:36 ` Rafael J. Wysocki
2014-05-02 0:04 ` Rafael J. Wysocki
2014-05-02 15:41 ` Rafael J. Wysocki
2014-05-02 18:44 ` Alan Stern
2014-05-05 0:09 ` Rafael J. Wysocki
2014-05-05 15:46 ` Alan Stern
2014-05-06 1:31 ` Rafael J. Wysocki
2014-05-06 19:31 ` Alan Stern
2014-05-07 0:36 ` Rafael J. Wysocki
2014-05-07 15:43 ` Alan Stern
2014-05-07 23:27 ` [RFC][PATCH 0/3] (was: Re: [RFC][PATCH 1/3] PM / sleep: Flags to speed up suspend-resume of runtime-suspended devices) Rafael J. Wysocki
2014-05-07 23:29 ` [RFC][PATCH 1/3] PM / sleep: Flag to speed up suspend-resume of runtime-suspended devices Rafael J. Wysocki
2014-05-08 7:49 ` Ulf Hansson
2014-05-08 10:53 ` Rafael J. Wysocki
2014-05-08 10:59 ` Ulf Hansson
2014-05-08 11:44 ` Rafael J. Wysocki
2014-05-08 12:25 ` Ulf Hansson
2014-05-08 20:02 ` Rafael J. Wysocki
2014-05-08 14:36 ` Alan Stern
2014-05-08 14:57 ` Alan Stern
2014-05-08 20:17 ` Rafael J. Wysocki
2014-05-08 21:03 ` Rafael J. Wysocki
2014-05-08 21:20 ` Alan Stern
2014-05-08 21:42 ` Rafael J. Wysocki
2014-05-08 21:50 ` Rafael J. Wysocki
2014-05-08 22:28 ` [RFC][PATCH 0/3] (was: Re: PM / sleep: Flag to speed up suspend-resume of runtime-suspended devices) Rafael J. Wysocki
2014-05-08 22:41 ` [RFC][PATCH 1/3] PM / sleep: Flag to speed up suspend-resume of runtime-suspended devices Rafael J. Wysocki
2014-05-09 7:23 ` Ulf Hansson
2014-05-09 11:33 ` Rafael J. Wysocki
2014-05-08 22:41 ` [RFC][PATCH 2/3] PM / runtime: Routine for checking device status during system suspend Rafael J. Wysocki
2014-05-08 22:42 ` [RFC][PATCH 3/3] ACPI / PM: Avoid resuming devices in ACPI PM domain " Rafael J. Wysocki
2014-05-09 1:52 ` [RFC][PATCH 1/3] PM / sleep: Flag to speed up suspend-resume of runtime-suspended devices Alan Stern
2014-05-09 22:49 ` Rafael J. Wysocki
2014-05-11 16:46 ` Alan Stern
2014-05-13 0:51 ` Rafael J. Wysocki
2014-05-08 21:08 ` Alan Stern
2014-05-09 22:48 ` Kevin Hilman
2014-05-10 1:38 ` Rafael J. Wysocki
2014-05-12 16:33 ` Kevin Hilman
2014-05-07 23:31 ` [Resend][PATCH 2/3] PM / runtime: Routine for checking device status during system suspend Rafael J. Wysocki
2014-05-07 23:33 ` [RFC][PATCH 3/3] ACPI / PM: Avoid resuming devices in ACPI PM domain " Rafael J. Wysocki
2014-05-08 14:59 ` Alan Stern
2014-05-08 19:40 ` Rafael J. Wysocki
2014-05-02 16:12 ` [RFC][PATCH 1/3] PM / sleep: Flags to speed up suspend-resume of runtime-suspended devices Alan Stern
2014-04-24 22:39 ` [RFC][PATCH 2/3][Resend] PM / runtime: Routine for checking device status during system suspend Rafael J. Wysocki
2014-04-25 11:28 ` Ulf Hansson
2014-04-24 22:40 ` [RFC][PATCH 3/3] ACPI / PM: Avoid resuming devices in ACPI PM domain " Rafael J. Wysocki
2014-02-16 23:51 ` [PATCH 2/3][Resend] PM / runtime: Routine for checking device status " Rafael J. Wysocki
2014-02-16 23:52 ` [PATCH 3/3] ACPI / PM: Avoid resuming devices in ACPI PM domain " Rafael J. Wysocki
2014-05-13 1:02 [RFC][PATCH 0/3] PM / sleep: Avoid resuming runtime-suspended devices " Rafael J. Wysocki
2014-05-13 1:10 ` [RFC][PATCH 3/3] ACPI / PM: Avoid resuming devices in ACPI PM domain " 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=2417673.F2yu8qohk7@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=aaron.lu@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).