diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-01-20 20:34:19 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-01-20 20:34:19 +0000 |
| commit | 9e2b86f4864fc8b9dc3b70bb60e7dc2cf4305f9a (patch) | |
| tree | c6b62f0a555955f0b8592cfb8a7e84924db5bf5f | |
| parent | 650afa3995c32c50f3272dbe4514781abed8bdc0 (diff) | |
| download | xen-9e2b86f4864fc8b9dc3b70bb60e7dc2cf4305f9a.tar.gz xen-9e2b86f4864fc8b9dc3b70bb60e7dc2cf4305f9a.tar.bz2 xen-9e2b86f4864fc8b9dc3b70bb60e7dc2cf4305f9a.zip | |
hvm: Add ACPI fixed sleep button
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
| -rw-r--r-- | tools/firmware/hvmloader/acpi/static_tables.c | 2 | ||||
| -rw-r--r-- | xen/arch/x86/domctl.c | 13 | ||||
| -rw-r--r-- | xen/arch/x86/hvm/pmtimer.c | 13 | ||||
| -rw-r--r-- | xen/include/public/domctl.h | 1 |
4 files changed, 27 insertions, 2 deletions
diff --git a/tools/firmware/hvmloader/acpi/static_tables.c b/tools/firmware/hvmloader/acpi/static_tables.c index e040c56187..c7faee8635 100644 --- a/tools/firmware/hvmloader/acpi/static_tables.c +++ b/tools/firmware/hvmloader/acpi/static_tables.c @@ -68,7 +68,7 @@ struct acpi_20_fadt Fadt = { .p_lvl2_lat = 0x0fff, /* >100, means we do not support C2 state */ .p_lvl3_lat = 0x0fff, /* >1000, means we do not support C3 state */ .iapc_boot_arch = ACPI_8042, - .flags = (ACPI_PROC_C1 | ACPI_SLP_BUTTON | + .flags = (ACPI_PROC_C1 | ACPI_WBINVD | ACPI_FIX_RTC | ACPI_TMR_VAL_EXT), diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 94673aa081..b59bc9b6c6 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -727,6 +727,19 @@ long arch_do_domctl( } break; + case XEN_DOMCTL_SENDTRIGGER_SLEEP: + { + extern void hvm_acpi_sleep_button(struct domain *d); + + ret = -EINVAL; + if ( is_hvm_domain(d) ) + { + ret = 0; + hvm_acpi_sleep_button(d); + } + } + break; + default: ret = -ENOSYS; } diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 0a0b326efe..48fe26ac87 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -32,14 +32,16 @@ #define TMR_STS (1 << 0) #define GBL_STS (1 << 5) #define PWRBTN_STS (1 << 8) +#define SLPBTN_STS (1 << 9) /* The same in PM1a_EN */ #define TMR_EN (1 << 0) #define GBL_EN (1 << 5) #define PWRBTN_EN (1 << 8) +#define SLPBTN_EN (1 << 9) /* Mask of bits in PM1a_STS that can generate an SCI. */ -#define SCI_MASK (TMR_STS|PWRBTN_STS|GBL_STS) +#define SCI_MASK (TMR_STS|PWRBTN_STS|SLPBTN_STS|GBL_STS) /* SCI IRQ number (must match SCI_INT number in ACPI FADT in hvmloader) */ #define SCI_IRQ 9 @@ -68,6 +70,15 @@ void hvm_acpi_power_button(struct domain *d) spin_unlock(&s->lock); } +void hvm_acpi_sleep_button(struct domain *d) +{ + PMTState *s = &d->arch.hvm_domain.pl_time.vpmt; + spin_lock(&s->lock); + s->pm.pm1a_sts |= SLPBTN_STS; + pmt_update_sci(s); + spin_unlock(&s->lock); +} + /* Set the correct value in the timer, accounting for time elapsed * since the last time we did that. */ static void pmt_update_time(PMTState *s) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 5f29ded1ab..6d00a84df5 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -439,6 +439,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_real_mode_area_t); #define XEN_DOMCTL_SENDTRIGGER_RESET 1 #define XEN_DOMCTL_SENDTRIGGER_INIT 2 #define XEN_DOMCTL_SENDTRIGGER_POWER 3 +#define XEN_DOMCTL_SENDTRIGGER_SLEEP 4 struct xen_domctl_sendtrigger { uint32_t trigger; /* IN */ uint32_t vcpu; /* IN */ |