From: Ben Guthro <benjamin.guthro@citrix.com> To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, Jan Beulich <jbeulich@suse.com>, "Rafael J . Wysocki" <rjw@sisk.pl>, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, xen-devel@lists.xen.org Cc: Ben Guthro <benjamin.guthro@citrix.com>, Bob Moore <robert.moore@intel.com> Subject: [PATCH v5 2/5] acpi: Call acpi_os_prepare_sleep hook in reduced hardware sleep path Date: Fri, 28 Jun 2013 09:46:21 -0400 [thread overview] Message-ID: <1372427184-6197-3-git-send-email-benjamin.guthro@citrix.com> (raw) In-Reply-To: <1372427184-6197-1-git-send-email-benjamin.guthro@citrix.com> In version 3.4 acpi_os_prepare_sleep() got introduced in parallel with reduced hardware sleep support, and the two changes didn't get synchronized: The new code doesn't call the hook function (if so requested). Fix this, requiring a parameter to be added to the hook function to distinguish "extended" from "legacy" sleep. Signed-off-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Ben Guthro <benjamin.guthro@citrix.com> Cc: Bob Moore <robert.moore@intel.com> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: linux-acpi@vger.kernel.org --- drivers/acpi/acpica/hwesleep.c | 7 +++++++ drivers/acpi/acpica/hwsleep.c | 2 +- include/acpi/acpiosxf.h | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/acpica/hwesleep.c b/drivers/acpi/acpica/hwesleep.c index 5e5f762..69b3e15 100644 --- a/drivers/acpi/acpica/hwesleep.c +++ b/drivers/acpi/acpica/hwesleep.c @@ -128,6 +128,13 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state) ACPI_FLUSH_CPU_CACHE(); + status = acpi_os_prepare_sleep(sleep_state, acpi_gbl_sleep_type_a, + acpi_gbl_sleep_type_b, TRUE); + if (ACPI_SKIP(status)) + return_ACPI_STATUS(AE_OK); + if (ACPI_FAILURE(status)) + return_ACPI_STATUS(status); + /* * Set the SLP_TYP and SLP_EN bits. * diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index 867b947..cf78157 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -152,7 +152,7 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state) ACPI_FLUSH_CPU_CACHE(); status = acpi_os_prepare_sleep(sleep_state, pm1a_control, - pm1b_control); + pm1b_control, FALSE); if (ACPI_SKIP(status)) return_ACPI_STATUS(AE_OK); if (ACPI_FAILURE(status)) diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index c68b779..51d0f78 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -279,7 +279,7 @@ void acpi_os_close_directory(void *dir_handle); /* * ACPI sleep preparation */ -acpi_status acpi_os_prepare_sleep(u8 sleep_state, - u32 pm1a_control, u32 pm1b_control); +acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 val_a, u32 val_b, + u8 extended); #endif /* __ACPIOSXF_H__ */ -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Ben Guthro <benjamin.guthro@citrix.com> To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, Jan Beulich <jbeulich@suse.com>, "Rafael J . Wysocki" <rjw@sisk.pl>, <linux-kernel@vger.kernel.org>, <linux-acpi@vger.kernel.org>, <xen-devel@lists.xen.org> Cc: Ben Guthro <benjamin.guthro@citrix.com>, Bob Moore <robert.moore@intel.com> Subject: [PATCH v5 2/5] acpi: Call acpi_os_prepare_sleep hook in reduced hardware sleep path Date: Fri, 28 Jun 2013 09:46:21 -0400 [thread overview] Message-ID: <1372427184-6197-3-git-send-email-benjamin.guthro@citrix.com> (raw) In-Reply-To: <1372427184-6197-1-git-send-email-benjamin.guthro@citrix.com> In version 3.4 acpi_os_prepare_sleep() got introduced in parallel with reduced hardware sleep support, and the two changes didn't get synchronized: The new code doesn't call the hook function (if so requested). Fix this, requiring a parameter to be added to the hook function to distinguish "extended" from "legacy" sleep. Signed-off-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Ben Guthro <benjamin.guthro@citrix.com> Cc: Bob Moore <robert.moore@intel.com> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: linux-acpi@vger.kernel.org --- drivers/acpi/acpica/hwesleep.c | 7 +++++++ drivers/acpi/acpica/hwsleep.c | 2 +- include/acpi/acpiosxf.h | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/acpica/hwesleep.c b/drivers/acpi/acpica/hwesleep.c index 5e5f762..69b3e15 100644 --- a/drivers/acpi/acpica/hwesleep.c +++ b/drivers/acpi/acpica/hwesleep.c @@ -128,6 +128,13 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state) ACPI_FLUSH_CPU_CACHE(); + status = acpi_os_prepare_sleep(sleep_state, acpi_gbl_sleep_type_a, + acpi_gbl_sleep_type_b, TRUE); + if (ACPI_SKIP(status)) + return_ACPI_STATUS(AE_OK); + if (ACPI_FAILURE(status)) + return_ACPI_STATUS(status); + /* * Set the SLP_TYP and SLP_EN bits. * diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index 867b947..cf78157 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -152,7 +152,7 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state) ACPI_FLUSH_CPU_CACHE(); status = acpi_os_prepare_sleep(sleep_state, pm1a_control, - pm1b_control); + pm1b_control, FALSE); if (ACPI_SKIP(status)) return_ACPI_STATUS(AE_OK); if (ACPI_FAILURE(status)) diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index c68b779..51d0f78 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -279,7 +279,7 @@ void acpi_os_close_directory(void *dir_handle); /* * ACPI sleep preparation */ -acpi_status acpi_os_prepare_sleep(u8 sleep_state, - u32 pm1a_control, u32 pm1b_control); +acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 val_a, u32 val_b, + u8 extended); #endif /* __ACPIOSXF_H__ */ -- 1.7.9.5
next prev parent reply other threads:[~2013-06-28 13:46 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-06-28 13:46 [PATCH v5 0/5] Xen/ACPI: support sleep state entering on hardware reduced systems Ben Guthro 2013-06-28 13:46 ` Ben Guthro 2013-06-28 13:46 ` [PATCH v5 1/5] acpi: Remove need to include linux/acpi.h in common acpica code Ben Guthro 2013-06-28 13:46 ` Ben Guthro 2013-06-28 16:07 ` Konrad Rzeszutek Wilk 2013-06-28 16:07 ` Konrad Rzeszutek Wilk 2013-06-28 13:46 ` Ben Guthro 2013-06-28 13:46 ` Ben Guthro [this message] 2013-06-28 13:46 ` [PATCH v5 2/5] acpi: Call acpi_os_prepare_sleep hook in reduced hardware sleep path Ben Guthro 2013-06-28 16:06 ` Konrad Rzeszutek Wilk 2013-06-28 16:06 ` Konrad Rzeszutek Wilk 2013-06-28 13:46 ` [PATCH v5 3/5] acpi: Adjust linux acpi OS functions to new extended parameter Ben Guthro 2013-06-28 13:46 ` Ben Guthro 2013-06-28 16:03 ` Konrad Rzeszutek Wilk 2013-06-28 16:03 ` Konrad Rzeszutek Wilk 2013-06-28 16:15 ` Ben Guthro 2013-06-28 16:15 ` Ben Guthro 2013-06-28 16:15 ` Ben Guthro 2013-06-28 13:46 ` [PATCH v5 4/5] x86/tboot: Fail extended mode reduced hardware sleep Ben Guthro 2013-06-28 13:46 ` Ben Guthro 2013-06-28 16:05 ` Konrad Rzeszutek Wilk 2013-06-28 16:05 ` Konrad Rzeszutek Wilk 2013-06-28 16:05 ` Konrad Rzeszutek Wilk 2013-06-28 13:46 ` Ben Guthro 2013-06-28 13:46 ` [PATCH v5 5/5] xen/acpi: notify xen when reduced hardware sleep is available Ben Guthro 2013-06-28 13:46 ` Ben Guthro 2013-06-28 16:05 ` Konrad Rzeszutek Wilk 2013-06-28 16:05 ` Konrad Rzeszutek Wilk 2013-06-28 13:46 ` Ben Guthro 2013-07-27 14:05 ` [PATCH v5 0/5] Xen/ACPI: support sleep state entering on hardware reduced systems Rafael J. Wysocki 2013-07-27 14:05 ` 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=1372427184-6197-3-git-send-email-benjamin.guthro@citrix.com \ --to=benjamin.guthro@citrix.com \ --cc=jbeulich@suse.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=rjw@sisk.pl \ --cc=robert.moore@intel.com \ --cc=xen-devel@lists.xen.org \ /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: linkBe 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.