[PATCH] x86/pmtimer: Fix hvm_acpi_sleep_button behavior

[PATCH] x86/pmtimer: Fix hvm_acpi_sleep_button behavior

[Varad Gautam]

Commit 19fb14622e941 "x86/pmtimer: move ACPI registers from PMTState to
hvm_domain" misconfigures pm1a_sts for hvm_acpi_sleep_button with
PWRBTN_STS instead of SLPBTN_STS, which leads to
XEN_DOMCTL_SENDTRIGGER_SLEEP causing guest powerdowns. Fix this.

Signed-off-by: Varad Gautam <vrd@amazon.de>
CC: Amit Shah <aams@amazon.de>
CC: David Woodhouse <dwmw@amazon.co.uk>
CC: Jan Beulich <jbeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>

---

Please also include into the stable branch.

 xen/arch/x86/hvm/pmtimer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c
index 435647f..b56b743 100644
--- a/xen/arch/x86/hvm/pmtimer.c
+++ b/xen/arch/x86/hvm/pmtimer.c
@@ -87,7 +87,7 @@ void hvm_acpi_sleep_button(struct domain *d)
         return;
 
     spin_lock(&s->lock);
-    d->arch.hvm_domain.acpi.pm1a_sts |= PWRBTN_STS;
+    d->arch.hvm_domain.acpi.pm1a_sts |= SLPBTN_STS;
     pmt_update_sci(s);
     spin_unlock(&s->lock);
 }
-- 
2.7.4
Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B



Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrer: Christian Schlaeger, Ralf Herbrich
Ust-ID: DE 289 237 879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86/pmtimer: Fix hvm_acpi_sleep_button behavior

[Andrew Cooper]

On 19/02/2019 17:40, Varad Gautam wrote:
> Commit 19fb14622e941 "x86/pmtimer: move ACPI registers from PMTState to
> hvm_domain" misconfigures pm1a_sts for hvm_acpi_sleep_button with
> PWRBTN_STS instead of SLPBTN_STS, which leads to
> XEN_DOMCTL_SENDTRIGGER_SLEEP causing guest powerdowns. Fix this.
>
> Signed-off-by: Varad Gautam <vrd@amazon.de>

Oops yes - that looks like a copy/paste error.

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

CC'ing Juergen - this is 4.12 material, and looks like it wants to be
backported to 4.9 in due course.

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel