From: Ben Guthro <benjamin.guthro@citrix.com> To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, Jan Beulich <jbeulich@suse.com>, "Rafaell 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 v3 1/3] acpi: Call acpi_os_prepare_sleep hook in reduced hardware sleep path Date: Wed, 26 Jun 2013 10:06:13 -0400 [thread overview] Message-ID: <1372255575-29567-2-git-send-email-benjamin.guthro@citrix.com> (raw) In-Reply-To: <1372255575-29567-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: Ben Guthro <benjamin.guthro@citrix.com> Signed-off-by: Jan Beulich <jbeulich@suse.com> Cc: Bob Moore <robert.moore@intel.com> Cc: Rafaell J. Wysocki <rjw@sisk.pl> Cc: linux-acpi@vger.kernel.org --- drivers/acpi/acpica/hwesleep.c | 8 ++++++++ drivers/acpi/acpica/hwsleep.c | 2 +- drivers/acpi/osl.c | 16 ++++++++-------- include/linux/acpi.h | 10 +++++----- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/drivers/acpi/acpica/hwesleep.c b/drivers/acpi/acpica/hwesleep.c index 5e5f762..6834dd7 100644 --- a/drivers/acpi/acpica/hwesleep.c +++ b/drivers/acpi/acpica/hwesleep.c @@ -43,6 +43,7 @@ */ #include <acpi/acpi.h> +#include <linux/acpi.h> #include "accommon.h" #define _COMPONENT ACPI_HARDWARE @@ -128,6 +129,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 e3828cc..a93c299 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -153,7 +153,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/drivers/acpi/osl.c b/drivers/acpi/osl.c index e721863..3fc2801 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -77,8 +77,8 @@ EXPORT_SYMBOL(acpi_in_debugger); extern char line_buf[80]; #endif /*ENABLE_DEBUGGER */ -static int (*__acpi_os_prepare_sleep)(u8 sleep_state, u32 pm1a_ctrl, - u32 pm1b_ctrl); +static int (*__acpi_os_prepare_sleep)(u8 sleep_state, u32 val_a, u32 val_b, + u8 extended); static acpi_osd_handler acpi_irq_handler; static void *acpi_irq_context; @@ -1757,13 +1757,13 @@ acpi_status acpi_os_terminate(void) return AE_OK; } -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) { int rc = 0; if (__acpi_os_prepare_sleep) - rc = __acpi_os_prepare_sleep(sleep_state, - pm1a_control, pm1b_control); + rc = __acpi_os_prepare_sleep(sleep_state, val_a, val_b, + extended); if (rc < 0) return AE_ERROR; else if (rc > 0) @@ -1772,8 +1772,8 @@ acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 pm1a_control, return AE_OK; } -void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, - u32 pm1a_ctrl, u32 pm1b_ctrl)) +void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, u32 val_a, + u32 val_b, u8 extended)) { __acpi_os_prepare_sleep = func; } diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 17b5b59..de99022 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -477,11 +477,11 @@ static inline bool acpi_driver_match_device(struct device *dev, #endif /* !CONFIG_ACPI */ #ifdef CONFIG_ACPI -void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, - u32 pm1a_ctrl, u32 pm1b_ctrl)); +void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, u32 val_a, + u32 val_b, u8 extended)); -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); #ifdef CONFIG_X86 void arch_reserve_mem_area(acpi_physical_address addr, size_t size); #else @@ -491,7 +491,7 @@ static inline void arch_reserve_mem_area(acpi_physical_address addr, } #endif /* CONFIG_X86 */ #else -#define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0) +#define acpi_os_set_prepare_sleep(func, val_a, val_b, ext) do { } while (0) #endif #if defined(CONFIG_ACPI) && defined(CONFIG_PM_RUNTIME) -- 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>, "Rafaell 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 v3 1/3] acpi: Call acpi_os_prepare_sleep hook in reduced hardware sleep path Date: Wed, 26 Jun 2013 10:06:13 -0400 [thread overview] Message-ID: <1372255575-29567-2-git-send-email-benjamin.guthro@citrix.com> (raw) In-Reply-To: <1372255575-29567-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: Ben Guthro <benjamin.guthro@citrix.com> Signed-off-by: Jan Beulich <jbeulich@suse.com> Cc: Bob Moore <robert.moore@intel.com> Cc: Rafaell J. Wysocki <rjw@sisk.pl> Cc: linux-acpi@vger.kernel.org --- drivers/acpi/acpica/hwesleep.c | 8 ++++++++ drivers/acpi/acpica/hwsleep.c | 2 +- drivers/acpi/osl.c | 16 ++++++++-------- include/linux/acpi.h | 10 +++++----- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/drivers/acpi/acpica/hwesleep.c b/drivers/acpi/acpica/hwesleep.c index 5e5f762..6834dd7 100644 --- a/drivers/acpi/acpica/hwesleep.c +++ b/drivers/acpi/acpica/hwesleep.c @@ -43,6 +43,7 @@ */ #include <acpi/acpi.h> +#include <linux/acpi.h> #include "accommon.h" #define _COMPONENT ACPI_HARDWARE @@ -128,6 +129,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 e3828cc..a93c299 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -153,7 +153,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/drivers/acpi/osl.c b/drivers/acpi/osl.c index e721863..3fc2801 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -77,8 +77,8 @@ EXPORT_SYMBOL(acpi_in_debugger); extern char line_buf[80]; #endif /*ENABLE_DEBUGGER */ -static int (*__acpi_os_prepare_sleep)(u8 sleep_state, u32 pm1a_ctrl, - u32 pm1b_ctrl); +static int (*__acpi_os_prepare_sleep)(u8 sleep_state, u32 val_a, u32 val_b, + u8 extended); static acpi_osd_handler acpi_irq_handler; static void *acpi_irq_context; @@ -1757,13 +1757,13 @@ acpi_status acpi_os_terminate(void) return AE_OK; } -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) { int rc = 0; if (__acpi_os_prepare_sleep) - rc = __acpi_os_prepare_sleep(sleep_state, - pm1a_control, pm1b_control); + rc = __acpi_os_prepare_sleep(sleep_state, val_a, val_b, + extended); if (rc < 0) return AE_ERROR; else if (rc > 0) @@ -1772,8 +1772,8 @@ acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 pm1a_control, return AE_OK; } -void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, - u32 pm1a_ctrl, u32 pm1b_ctrl)) +void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, u32 val_a, + u32 val_b, u8 extended)) { __acpi_os_prepare_sleep = func; } diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 17b5b59..de99022 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -477,11 +477,11 @@ static inline bool acpi_driver_match_device(struct device *dev, #endif /* !CONFIG_ACPI */ #ifdef CONFIG_ACPI -void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, - u32 pm1a_ctrl, u32 pm1b_ctrl)); +void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, u32 val_a, + u32 val_b, u8 extended)); -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); #ifdef CONFIG_X86 void arch_reserve_mem_area(acpi_physical_address addr, size_t size); #else @@ -491,7 +491,7 @@ static inline void arch_reserve_mem_area(acpi_physical_address addr, } #endif /* CONFIG_X86 */ #else -#define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0) +#define acpi_os_set_prepare_sleep(func, val_a, val_b, ext) do { } while (0) #endif #if defined(CONFIG_ACPI) && defined(CONFIG_PM_RUNTIME) -- 1.7.9.5
next prev parent reply other threads:[~2013-06-26 14:06 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-06-26 14:06 [PATCH v3 0/3] Xen/ACPI: support sleep state entering on hardware reduced systems Ben Guthro 2013-06-26 14:06 ` Ben Guthro 2013-06-26 14:06 ` Ben Guthro [this message] 2013-06-26 14:06 ` [PATCH v3 1/3] acpi: Call acpi_os_prepare_sleep hook in reduced hardware sleep path Ben Guthro 2013-06-26 14:41 ` Jan Beulich 2013-06-26 14:41 ` Jan Beulich 2013-06-26 14:41 ` Jan Beulich 2013-06-26 15:03 ` Ben Guthro 2013-06-26 15:45 ` Jan Beulich 2013-06-26 15:45 ` Jan Beulich 2013-06-26 18:59 ` Rafael J. Wysocki 2013-06-26 18:59 ` Rafael J. Wysocki 2013-06-26 15:45 ` Jan Beulich 2013-06-26 15:03 ` Ben Guthro 2013-07-02 6:19 ` Zheng, Lv 2013-07-02 11:42 ` Ben Guthro 2013-07-24 6:24 ` Zheng, Lv 2013-07-24 6:24 ` Zheng, Lv 2013-07-24 12:01 ` Ben Guthro 2013-07-24 13:18 ` Moore, Robert 2013-07-24 13:18 ` Moore, Robert 2013-07-24 13:23 ` Ben Guthro 2013-07-24 13:23 ` Ben Guthro 2013-07-24 14:38 ` Moore, Robert 2013-07-24 14:38 ` Moore, Robert 2013-07-24 15:14 ` Ben Guthro 2013-07-24 15:14 ` Ben Guthro 2013-07-24 16:32 ` Konrad Rzeszutek Wilk 2013-07-25 1:28 ` Zheng, Lv 2013-07-25 1:28 ` Zheng, Lv 2013-07-25 1:37 ` Ben Guthro 2013-07-25 1:54 ` Zheng, Lv 2013-07-25 1:54 ` Zheng, Lv 2013-07-25 1:54 ` Zheng, Lv 2013-07-25 12:04 ` Konrad Rzeszutek Wilk 2013-07-25 12:04 ` Konrad Rzeszutek Wilk 2013-07-26 2:51 ` Zheng, Lv 2013-07-26 2:51 ` Zheng, Lv 2013-07-26 18:03 ` konrad wilk 2013-07-26 18:03 ` konrad wilk 2013-07-29 2:22 ` Zheng, Lv 2013-07-29 2:22 ` Zheng, Lv 2013-07-26 2:51 ` Zheng, Lv 2013-07-25 12:04 ` Konrad Rzeszutek Wilk 2013-07-24 16:32 ` Konrad Rzeszutek Wilk 2013-07-25 1:01 ` Zheng, Lv 2013-07-25 1:19 ` Ben Guthro 2013-07-25 1:19 ` Ben Guthro 2013-07-25 1:01 ` Zheng, Lv 2013-07-24 12:01 ` Ben Guthro 2013-07-02 11:42 ` Ben Guthro 2013-07-02 6:19 ` Zheng, Lv 2013-06-26 14:06 ` Ben Guthro 2013-06-26 14:06 ` [PATCH v3 2/3] x86/tboot: Fail extended mode reduced hardware sleep Ben Guthro 2013-06-26 14:06 ` Ben Guthro 2013-06-26 14:44 ` Jan Beulich 2013-06-26 14:44 ` Jan Beulich 2013-06-26 14:55 ` Ben Guthro 2013-06-26 14:55 ` Ben Guthro 2013-06-26 15:47 ` Jan Beulich 2013-06-26 15:47 ` Jan Beulich 2013-06-26 15:47 ` Jan Beulich 2013-06-26 14:44 ` Jan Beulich 2013-06-26 14:06 ` Ben Guthro 2013-06-26 14:06 ` [PATCH v3 3/3] xen/acpi: notify xen when reduced hardware sleep is available Ben Guthro 2013-06-26 14:06 ` Ben Guthro 2013-06-26 14:06 ` Ben Guthro
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=1372255575-29567-2-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.