On Fri, Jun 28, 2013 at 09:46:24AM -0400, Ben Guthro wrote:
> Make use of acpi_os_prepare_sleep extended parameter to notify xen
> to make use of the reduced hardware sleep functionality
>
> The hypervisor change underlying this is commit 62d1a69 ("ACPI: support
> v5 (reduced HW) sleep interface") on the master branch of
> git://xenbits.xen.org/xen.git.
>
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
> Signed-off-by: Ben Guthro <benjamin.guthro@xxxxxxxxxx>
> Cc: Konrad Wilk <konrad.wilk@xxxxxxxxxx>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> ---
> drivers/xen/acpi.c | 25 ++++++++++++-------------
> include/xen/acpi.h | 3 +--
> include/xen/interface/platform.h | 7 ++++---
> 3 files changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/xen/acpi.c b/drivers/xen/acpi.c
> index 36d2be1..371dade 100644
> --- a/drivers/xen/acpi.c
> +++ b/drivers/xen/acpi.c
> @@ -35,28 +35,27 @@
> #include <asm/xen/hypercall.h>
> #include <asm/xen/hypervisor.h>
>
> -int xen_acpi_notify_hypervisor_state(u8 sleep_state,
> - u32 pm1a_cnt, u32 pm1b_cnt,
> +int xen_acpi_notify_hypervisor_state(u8 sleep_state, u32 val_a, u32 val_b,
> bool extended)
> {
> + unsigned int bits = extended ? 8 : 16;
> +
> struct xen_platform_op op = {
> .cmd = XENPF_enter_acpi_sleep,
> .interface_version = XENPF_INTERFACE_VERSION,
> - .u = {
> - .enter_acpi_sleep = {
> - .pm1a_cnt_val = (u16)pm1a_cnt,
> - .pm1b_cnt_val = (u16)pm1b_cnt,
> - .sleep_state = sleep_state,
> - },
> + .u.enter_acpi_sleep = {
> + .val_a = (u16)val_a,
> + .val_b = (u16)val_b,
> + .sleep_state = sleep_state,
> + .flags = extended ? XENPF_ACPI_SLEEP_EXTENDED : 0,
> },
> };
>
> - if ((pm1a_cnt & 0xffff0000) || (pm1b_cnt & 0xffff0000)) {
> - WARN(1, "Using more than 16bits of PM1A/B 0x%x/0x%x!"
> - "Email xen-devel@xxxxxxxxxxxxxxxxxxx Thank you.\n", \
> - pm1a_cnt, pm1b_cnt);
> + if (WARN((val_a & (~0 << bits)) || (val_b & (~0 << bits)),
> + "Using more than %u bits of sleep control values %#x/%#x!"
> + "Email xen-devel@xxxxxxxxxxxxx - Thank you.\n", \
> + bits, val_a, val_b))
> return -1;
> - }
>
> HYPERVISOR_dom0_op(&op);
> return 1;
> diff --git a/include/xen/acpi.h b/include/xen/acpi.h
> index 9f7e2e6..a2d5667 100644
> --- a/include/xen/acpi.h
> +++ b/include/xen/acpi.h
> @@ -75,8 +75,7 @@ static inline int xen_acpi_get_pxm(acpi_handle h)
> return -ENXIO;
> }
>
> -int xen_acpi_notify_hypervisor_state(u8 sleep_state,
> - u32 pm1a_cnt, u32 pm1b_cnd,
> +int xen_acpi_notify_hypervisor_state(u8 sleep_state, u32 val_a, u32 val_b,
> bool extended);
>
> static inline void xen_acpi_sleep_register(void)
> diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h
> index c57d5f6..f1331e3 100644
> --- a/include/xen/interface/platform.h
> +++ b/include/xen/interface/platform.h
> @@ -152,10 +152,11 @@ DEFINE_GUEST_HANDLE_STRUCT(xenpf_firmware_info_t);
> #define XENPF_enter_acpi_sleep 51
> struct xenpf_enter_acpi_sleep {
> /* IN variables */
> - uint16_t pm1a_cnt_val; /* PM1a control value. */
> - uint16_t pm1b_cnt_val; /* PM1b control value. */
> + uint16_t val_a; /* PM1a control / sleep type A. */
> + uint16_t val_b; /* PM1b control / sleep type B. */
> uint32_t sleep_state; /* Which state to enter (Sn). */
> - uint32_t flags; /* Must be zero. */
> +#define XENPF_ACPI_SLEEP_EXTENDED 0x00000001
> + uint32_t flags; /* XENPF_ACPI_SLEEP_*. */
> };
> DEFINE_GUEST_HANDLE_STRUCT(xenpf_enter_acpi_sleep_t);
>
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
