Support ACPI Control Method Sleep button
v2 cover Support ACPI Control Method Sleep button
The ACPI sleep button can be implemented as a fixed hardware button or Control Method Sleep button.
The patch of implementing a fixed hardware sleep button was posted here 1). More discussions can be found here 2). Essentially, the discussion mainly focuses on whether the sleep button is implemented as a fixed hardware button or Control Method Sleep button. The latter benefits various architectures since the code can be shared among them.
This patch set implements Control Method Sleep button for both x86 and ARM platform.(The patch set was posted previously here 3). We rebase all the patches on QEMU9.1.0 and re-post it).
For x86, a sleep button GPE event handler is implemented, so a GPE event is triggered to indicate the OSPM the sleep button is pressed. Tests have been done for Linux guest, and Windows Server guest, the sleep button works as expected.
For ARM, a GED event is triggered to notify the OSPM. With proper debug knobs it is possible to see the guest OSPM acknowledges the sleep event:
(qemu) system_sleep
(qemu) [6.744138] exregion-0179 ex_system_memory_space: System-Memory (width 32) R/W 0 Address=0000000009080000
[6.746003] evmisc-0132 ev_queue_notify_reques: Dispatching Notify on [SLPB] (Device) Value 0x80 (Status Change) Node 00000000f0e6819e [6.802873] PM: suspend entry (s2idle) [6.806201] Filesystems sync: 0.002 seconds [6.807580] Freezing user space processes [6.809478] Freezing user space processes completed (elapsed 0.001 seconds) [6.810602] OOM killer disabled. [6.811111] Freezing remaining freezable tasks [6.812953] Freezing remaining freezable tasks completed (elapsed 0.001 seconds) [6.814126] printk: Suspending console(s) (use no_console_suspend to debug)
But that seems to be all, depicting that sleep/wakeup for ARM is broken and there are still missing some pieces of the puzzle.
Nonetheless, we would like to take this RFC as an opportunity for updates on this subject as possible roadmaps.
1) https://lists.gnu.org/archive/html/qemu-devel/2017-07/msg06478.html
2) https://lore.kernel.org/all/[email protected]/T/#mfe24f89778020deeacfe45083f3eea3cf9f55961
3) https://lore.kernel.org/all/[email protected]/T/
Annie Li (6):
acpi: hmp/qmp: Add hmp/qmp support for system_sleep
acpi: Implement control method sleep button test/acpi: allow DSDT table changes
acpi: Support Control Method sleep button for x86 tests/acpi: Update DSDT tables for Control method sleep button
acpi: Send the GPE event of suspend and wakeup for x86
Miguel Luis (5):
hw/acpi: Add ACPI GED support for the sleep event tests/acpi: allow FACP and DSDT table changes for arm/virt hw/arm: enable sleep support for arm/virt tests/acpi: Update FACP and DSDT tables for sleep button arm/virt: enable sleep support
hmp-commands.hx | 14 +++++ hw/acpi/control_method_device.c | 54 ++++++++++++++++++ hw/acpi/core.c | 17 ++++-- hw/acpi/generic_event_device.c | 9 +++ hw/acpi/meson.build | 1 + hw/arm/virt-acpi-build.c | 13 +++++ hw/arm/virt.c | 14 ++++- hw/core/machine-hmp-cmds.c | 5 ++ hw/core/machine-qmp-cmds.c | 11 ++++ hw/i386/acpi-build.c | 9 +++ include/hw/acpi/acpi.h | 1 + include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/control_method_device.h | 25 ++++++++ include/hw/acpi/generic_event_device.h | 1 + include/hw/arm/virt.h | 1 + include/monitor/hmp.h | 1 + qapi/machine.json | 18 ++++++ qapi/pragma.json | 1 + tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5278 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5364 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6639 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7761 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5480 bytes tests/data/acpi/aarch64/virt/FACP | Bin 276 -> 276 bytes tests/data/acpi/x86/pc/DSDT | Bin 6830 -> 7012 bytes tests/data/acpi/x86/pc/DSDT.acpierst | Bin 6741 -> 6923 bytes tests/data/acpi/x86/pc/DSDT.acpihmat | Bin 8155 -> 8337 bytes tests/data/acpi/x86/pc/DSDT.bridge | Bin 13701 -> 13883 bytes tests/data/acpi/x86/pc/DSDT.cphp | Bin 7294 -> 7476 bytes tests/data/acpi/x86/pc/DSDT.dimmpxm | Bin 8484 -> 8666 bytes tests/data/acpi/x86/pc/DSDT.hpbridge | Bin 6781 -> 6963 bytes tests/data/acpi/x86/pc/DSDT.hpbrroot | Bin 3337 -> 3519 bytes tests/data/acpi/x86/pc/DSDT.ipmikcs | Bin 6902 -> 7084 bytes tests/data/acpi/x86/pc/DSDT.memhp | Bin 8189 -> 8371 bytes tests/data/acpi/x86/pc/DSDT.nohpet | Bin 6688 -> 6870 bytes tests/data/acpi/x86/pc/DSDT.numamem | Bin 6836 -> 7018 bytes tests/data/acpi/x86/pc/DSDT.roothp | Bin 10623 -> 10805 bytes tests/data/acpi/x86/q35/DSDT | Bin 8355 -> 8537 bytes tests/data/acpi/x86/q35/DSDT.acpierst | Bin 8372 -> 8554 bytes tests/data/acpi/x86/q35/DSDT.acpihmat | Bin 9680 -> 9862 bytes .../acpi/x86/q35/DSDT.acpihmat-noinitiator | Bin 8634 -> 8816 bytes tests/data/acpi/x86/q35/DSDT.applesmc | Bin 8401 -> 8583 bytes tests/data/acpi/x86/q35/DSDT.bridge | Bin 11968 -> 12150 bytes tests/data/acpi/x86/q35/DSDT.core-count | Bin 12913 -> 13095 bytes tests/data/acpi/x86/q35/DSDT.core-count2 | Bin 33770 -> 33952 bytes tests/data/acpi/x86/q35/DSDT.cphp | Bin 8819 -> 9001 bytes tests/data/acpi/x86/q35/DSDT.cxl | Bin 9714 -> 9896 bytes tests/data/acpi/x86/q35/DSDT.dimmpxm | Bin 10009 -> 10191 bytes tests/data/acpi/x86/q35/DSDT.ipmibt | Bin 8430 -> 8612 bytes tests/data/acpi/x86/q35/DSDT.ipmismbus | Bin 8443 -> 8625 bytes tests/data/acpi/x86/q35/DSDT.ivrs | Bin 8372 -> 8554 bytes tests/data/acpi/x86/q35/DSDT.memhp | Bin 9714 -> 9896 bytes tests/data/acpi/x86/q35/DSDT.mmio64 | Bin 9485 -> 9667 bytes tests/data/acpi/x86/q35/DSDT.multi-bridge | Bin 13208 -> 13390 bytes tests/data/acpi/x86/q35/DSDT.noacpihp | Bin 8235 -> 8417 bytes tests/data/acpi/x86/q35/DSDT.nohpet | Bin 8213 -> 8395 bytes tests/data/acpi/x86/q35/DSDT.numamem | Bin 8361 -> 8543 bytes tests/data/acpi/x86/q35/DSDT.pvpanic-isa | Bin 8456 -> 8638 bytes tests/data/acpi/x86/q35/DSDT.thread-count | Bin 12913 -> 13095 bytes tests/data/acpi/x86/q35/DSDT.thread-count2 | Bin 33770 -> 33952 bytes tests/data/acpi/x86/q35/DSDT.tis.tpm12 | Bin 8961 -> 9143 bytes tests/data/acpi/x86/q35/DSDT.tis.tpm2 | Bin 8987 -> 9169 bytes tests/data/acpi/x86/q35/DSDT.type4-count | Bin 18589 -> 18771 bytes tests/data/acpi/x86/q35/DSDT.viot | Bin 9464 -> 9646 bytes tests/data/acpi/x86/q35/DSDT.xapic | Bin 35718 -> 35900 bytes 65 files changed, 191 insertions(+), 5 deletions(-) create mode 100644 hw/acpi/control_method_device.c create mode 100644 include/hw/acpi/control_method_device.h
Signature · 1 line
2.43.5
RFC PATCH v2 1/11 acpi: hmp/qmp: Add hmp/qmp support for system_sleep
Followng hmp/qmp commands are implemented for pressing virtual sleep button,
hmp: system_sleep
qmp: { "execute": "system_sleep" }
These commands put the guest into suspend or other power states depending on the power settings inside the guest.
--- hmp-commands.hx | 14 ++++++++++++++ hw/core/machine-hmp-cmds.c | 5 +++++ hw/core/machine-qmp-cmds.c | 9 +++++++++ include/monitor/hmp.h | 1 + qapi/machine.json | 18 ++++++++++++++++++ qapi/pragma.json | 1 + 6 files changed, 48 insertions(+)
hmp-commands.hx +14 -0
@@ -639,6 +639,20 @@ SRST whether profiling is on or off. ERST + { + .name = "system_sleep", + .args_type = "", + .params = "", + .help = "send ACPI sleep event", + .cmd = hmp_system_sleep, + }, + +SRST +``system_sleep`` + Push the virtual sleep button; if supported the system will enter + an ACPI sleep state. +ERST + { .name = "system_reset", .args_type = "",
hw/core/machine-hmp-cmds.c +5 -0
@@ -189,6 +189,11 @@ void hmp_system_reset(Monitor *mon, const QDict *qdict)qmp_system_reset (NULL ); } +void hmp_system_sleep (Monitor *mon,const QDict *qdict) +{ +qmp_system_sleep (NULL ); +} +void hmp_system_powerdown (Monitor *mon,const QDict *qdict) {qmp_system_powerdown (NULL );
hw/core/machine-qmp-cmds.c +9 -0
@@ -276,6 +276,15 @@ void qmp_system_reset(Error **errp)qemu_system_reset_request (SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET ); } +void qmp_system_sleep (Error **errp) +{ +if (!qemu_wakeup_suspend_enabled ()) { +error_setg (errp, +"suspend from running is not supported by this guest" ); +return ; + } +} +void qmp_system_powerdown (Error **errp) {qemu_system_powerdown_request ();
include/monitor/hmp.h +1 -0
@@ -43,6 +43,7 @@ void hmp_quit(Monitor *mon, const QDict *qdict);void hmp_stop (Monitor *mon,const QDict *qdict);void hmp_sync_profile (Monitor *mon,const QDict *qdict);void hmp_system_reset (Monitor *mon,const QDict *qdict); +void hmp_system_sleep (Monitor *mon,const QDict *qdict);void hmp_system_powerdown (Monitor *mon,const QDict *qdict);void hmp_exit_preconfig (Monitor *mon,const QDict *qdict);void hmp_announce_self (Monitor *mon,const QDict *qdict);
qapi/machine.json +18 -0
@@ -362,6 +362,24 @@ ## { 'command': 'system_reset' } +## +# @system_sleep: +# +# Requests that a guest perform a ACPI sleep transition by pushing a virtual +# sleep button. +# +# .. note:: A guest may or may not respond to this command. This command +# returning does not indicate that a guest has accepted the request +# or that it has gone to sleep. +# +# .. qmp-example:: +# +# -> { "execute": "system_sleep" } +# <- { "return": {} } +# +## +{ 'command': 'system_sleep' } + ## # @system_powerdown: #
qapi/pragma.json +1 -0
@@ -23,6 +23,7 @@ 'set_password', 'system_powerdown', 'system_reset', + 'system_sleep', 'system_wakeup' ], # Commands allowed to return a non-dictionary 'command-returns-exceptions': [
Signature · 1 line
2.43.5
Re: [RFC V2 PATCH 01/11] acpi: hmp/qmp: Add hmp/qmp support for system_sleep
Quoted 29 lines · On Fri, 27 Sep 2024 14:38:56 -0400 Annie Li <[email protected]> wrote:
Followng hmp/qmp commands are implemented for pressing virtual sleep button,
hmp:
system_sleep
qmp: { "execute": "system_sleep" }These commands put the guest into suspend or other power states depending on the power settings inside the guest.
Signed-off-by Annie Li <[email protected]>--- hmp-commands.hx | 14 ++++++++++++++ hw/core/machine-hmp-cmds.c | 5 +++++ hw/core/machine-qmp-cmds.c | 9 +++++++++ include/monitor/hmp.h | 1 + qapi/machine.json | 18 ++++++++++++++++++ qapi/pragma.json | 1 + 6 files changed, 48 insertions(+)hmp-commands.hx +2
-0@@ -639,6 +639,20 @@ SRST whether profiling is on or off. ERST + { + .name = "system_sleep",
hmp-commands.hx SRST · line 653
Quoted 10 lines
hmp-commands.hx +10
-0+ .args_type = "", + .params = "", + .help = "send ACPI sleep event", + .cmd = hmp_system_sleep, + }, + +SRST +``system_sleep`` + Push the virtual sleep button; if supported the system will enter + an ACPI sleep state.
perhaps comma after 'if supported'
Quoted 26 lines
hmp-commands.hx +2
-0+ERST + { .name = "system_reset", .args_type = "",hw/core/machine-hmp-cmds.c +5
-0@@ -189,6 +189,11 @@ void hmp_system_reset(Monitor *mon, const QDict *qdict)qmp_system_reset (NULL ); } +void hmp_system_sleep (Monitor *mon,const QDict *qdict) +{ +qmp_system_sleep (NULL ); +} +void hmp_system_powerdown (Monitor *mon,const QDict *qdict) {qmp_system_powerdown (NULL );hw/core/machine-qmp-cmds.c +0
-0
hw/core/machine-qmp-cmds.c void qmp_system_reset(Error **errp) · line 283
Quoted 8 lines
hw/core/machine-qmp-cmds.c +5
-0@@ -276,6 +276,15 @@ void qmp_system_reset(Error **errp)qemu_system_reset_request (SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET ); } +void qmp_system_sleep (Error **errp) +{ +if (!qemu_wakeup_suspend_enabled ()) { +error_setg (errp, +"suspend from running is not supported by this guest" );
it's machine and not the guest that doesn't support, isn't it?
hw/core/machine-qmp-cmds.c void qmp_system_reset(Error **errp) · line 285
Quoted 2 lines
hw/core/machine-qmp-cmds.c +2
-0+return ; + }
I'd reorder this after 6/11, to avoid adding function that does nothing and then explaining why it is done this way.
Quoted 58 lines
hw/core/machine-qmp-cmds.c +2
-0+} +void qmp_system_powerdown (Error **errp) {qemu_system_powerdown_request ();include/monitor/hmp.h +1
-0@@ -43,6 +43,7 @@ void hmp_quit(Monitor *mon, const QDict *qdict);void hmp_stop (Monitor *mon,const QDict *qdict);void hmp_sync_profile (Monitor *mon,const QDict *qdict);void hmp_system_reset (Monitor *mon,const QDict *qdict); +void hmp_system_sleep (Monitor *mon,const QDict *qdict);void hmp_system_powerdown (Monitor *mon,const QDict *qdict);void hmp_exit_preconfig (Monitor *mon,const QDict *qdict);void hmp_announce_self (Monitor *mon,const QDict *qdict);qapi/machine.json +18
-0@@ -362,6 +362,24 @@ ## { 'command': 'system_reset' } +## +# @system_sleep: +# +# Requests that a guest perform a ACPI sleep transition by pushing a virtual +# sleep button. +# +# .. note:: A guest may or may not respond to this command. This command +# returning does not indicate that a guest has accepted the request +# or that it has gone to sleep. +# +# .. qmp-example:: +# +# -> { "execute": "system_sleep" } +# <- { "return": {} } +# +## +{ 'command': 'system_sleep' } + ## # @system_powerdown: #qapi/pragma.json +1
-0@@ -23,6 +23,7 @@ 'set_password', 'system_powerdown', 'system_reset', + 'system_sleep', 'system_wakeup' ], # Commands allowed to return a non-dictionary 'command-returns-exceptions': [
Re: [RFC V2 PATCH 01/11] acpi: hmp/qmp: Add hmp/qmp support for system_sleep
Quoted 30 lines · Igor Mammedov
Quoted 27 lines · On Fri, 27 Sep 2024 14:38:56 -0400 Annie Li <[email protected]> wrote:
Followng hmp/qmp commands are implemented for pressing virtual sleep button,
hmp:
system_sleep
qmp: { "execute": "system_sleep" }These commands put the guest into suspend or other power states depending on the power settings inside the guest.
Signed-off-by Annie Li <[email protected]>--- hmp-commands.hx | 14 ++++++++++++++ hw/core/machine-hmp-cmds.c | 5 +++++ hw/core/machine-qmp-cmds.c | 9 +++++++++ include/monitor/hmp.h | 1 + qapi/machine.json | 18 ++++++++++++++++++ qapi/pragma.json | 1 + 6 files changed, 48 insertions(+)hmp-commands.hx +0
-0@@ -639,6 +639,20 @@ SRST whether profiling is on or off. ERST
Quoted 13 lines
hmp-commands.hx SRST · line 653
Quoted 12 lines
hmp-commands.hx +12
-0+ { + .name = "system_sleep", + .args_type = "", + .params = "", + .help = "send ACPI sleep event", + .cmd = hmp_system_sleep, + }, + +SRST +``system_sleep`` + Push the virtual sleep button; if supported the system will enter + an ACPI sleep state.perhaps comma after 'if supported'
Sure thing
Quoted 31 lines
Quoted 31 lines
hmp-commands.hx +2
-0+ERST + { .name = "system_reset", .args_type = "",hw/core/machine-hmp-cmds.c +5
-0@@ -189,6 +189,11 @@ void hmp_system_reset(Monitor *mon, const QDict *qdict)qmp_system_reset (NULL ); } +void hmp_system_sleep (Monitor *mon,const QDict *qdict) +{ +qmp_system_sleep (NULL ); +} +void hmp_system_powerdown (Monitor *mon,const QDict *qdict) {qmp_system_powerdown (NULL );hw/core/machine-qmp-cmds.c +0
-0@@ -276,6 +276,15 @@ void qmp_system_reset(Error **errp)qemu_system_reset_request (SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET ); }
Quoted 6 lines
hw/core/machine-qmp-cmds.c void qmp_system_reset(Error **errp) · line 283
Quoted 5 lines
hw/core/machine-qmp-cmds.c +5
-0+void qmp_system_sleep (Error **errp) +{ +if (!qemu_wakeup_suspend_enabled ()) { +error_setg (errp, +"suspend from running is not supported by this guest" );it's machine and not the guest that doesn't support, isn't it?
Not the guest, will change this
Quoted 5 lines
hw/core/machine-qmp-cmds.c void qmp_system_reset(Error **errp) · line 285
Quoted 3 lines
hw/core/machine-qmp-cmds.c +2
-0+return ; + }I'd reorder this after 6/11, to avoid adding function that does nothing and then explaining why it is done this way.
OK, will do.
Thanks
Annie
Quoted 58 lines
Quoted 58 lines
hw/core/machine-qmp-cmds.c +2
-0+} +void qmp_system_powerdown (Error **errp) {qemu_system_powerdown_request ();include/monitor/hmp.h +1
-0@@ -43,6 +43,7 @@ void hmp_quit(Monitor *mon, const QDict *qdict);void hmp_stop (Monitor *mon,const QDict *qdict);void hmp_sync_profile (Monitor *mon,const QDict *qdict);void hmp_system_reset (Monitor *mon,const QDict *qdict); +void hmp_system_sleep (Monitor *mon,const QDict *qdict);void hmp_system_powerdown (Monitor *mon,const QDict *qdict);void hmp_exit_preconfig (Monitor *mon,const QDict *qdict);void hmp_announce_self (Monitor *mon,const QDict *qdict);qapi/machine.json +18
-0@@ -362,6 +362,24 @@ ## { 'command': 'system_reset' } +## +# @system_sleep: +# +# Requests that a guest perform a ACPI sleep transition by pushing a virtual +# sleep button. +# +# .. note:: A guest may or may not respond to this command. This command +# returning does not indicate that a guest has accepted the request +# or that it has gone to sleep. +# +# .. qmp-example:: +# +# -> { "execute": "system_sleep" } +# <- { "return": {} } +# +## +{ 'command': 'system_sleep' } + ## # @system_powerdown: #qapi/pragma.json +1
-0@@ -23,6 +23,7 @@ 'set_password', 'system_powerdown', 'system_reset', + 'system_sleep', 'system_wakeup' ], # Commands allowed to return a non-dictionary 'command-returns-exceptions': [
RFC PATCH v2 2/11 acpi: Implement control method sleep button
In reply to Annie LiThe control method sleep button is added, as well as its GPE event handler.
--- hw/acpi/control_method_device.c | 54 +++++++++++++++++++++++++ hw/acpi/meson.build | 1 + include/hw/acpi/control_method_device.h | 25 ++++++++++++ 3 files changed, 80 insertions(+)
hw/acpi/control_method_device.c new file +54 -0
@@ -0,0 +1,54 @@ +/* +* Control method devices +* +* Copyright (c) 2023 Oracle and/or its affiliates. +* +* +* Authors: +* Annie Li <[email protected]> +* +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +* +*/ + +#include "qemu/osdep.h" +#include "hw/acpi/control_method_device.h" +#include "hw/mem/nvdimm.h" + +void acpi_dsdt_add_sleep_button (Aml *scope) +{ +Aml *dev =aml_device ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE ); +aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0C0E" ))); +Aml *pkg =aml_package (2 ); +aml_append (pkg,aml_int (0x01 )); +aml_append (pkg,aml_int (0x04 )); +aml_append (dev,aml_name_decl ("_PRW" , pkg)); +aml_append (dev,aml_operation_region ("\\Boo" ,AML_SYSTEM_IO , +aml_int (0x201 ),0x1 )); +Aml *field =aml_field ("\\Boo" ,AML_BYTE_ACC ,AML_NOLOCK , +AML_WRITE_AS_ZEROS ); +aml_append (field,aml_named_field ("SBP" ,1 )); +aml_append (field,aml_named_field ("SBW" ,1 )); +aml_append (dev, field); +aml_append (scope, dev); +} + +void acpi_dsdt_add_sleep_gpe_event_handler (Aml *scope) +{ +Aml *method =aml_method ("_L07" ,0 ,AML_NOTSERIALIZED ); +Aml *condition =aml_if (aml_name ("\\_SB.SLPB.SBP" )); +aml_append (condition,aml_store (aml_int (1 ),aml_name ("\\_SB.SLPB.SBP" ))); +aml_append (condition, +aml_notify (aml_name ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE ), +aml_int (0x80 ))); +aml_append (method, condition); + condition =aml_if (aml_name ("\\_SB.SLPB.SBW" )); +aml_append (condition,aml_store (aml_int (1 ),aml_name ("\\_SB.SLPB.SBW" ))); +aml_append (condition, +aml_notify (aml_name ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE ), +aml_int (0x2 ))); +aml_append (method, condition); +aml_append (scope, method); +}
hw/acpi/meson.build +1 -0
@@ -17,6 +17,7 @@ acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pci.c')) acpi_ss.add(when: 'CONFIG_ACPI_CXL', if_true: files('cxl.c'), if_false: files('cxl-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c')) acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c')) +acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('control_method_device.c')) acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false: files('ghes-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_PIIX4', if_true: files('piix4.c'))
include/hw/acpi/control_method_device.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Control method devices +* +* Copyright (c) 2023 Oracle and/or its affiliates. +* +* +* Authors: +* Annie Li <[email protected]> +* +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +* +*/ + + +#ifndef HW_ACPI_CONTROL_METHOD_DEVICE_H +#define HW_ACPI_CONTROL_NETHOD_DEVICE_H + +#define ACPI_SLEEP_BUTTON_DEVICE "SLPB" + +void acpi_dsdt_add_sleep_button (Aml *scope); +void acpi_dsdt_add_sleep_gpe_event_handler (Aml *scope); + +#endif
Signature · 1 line
2.43.5
Re: [RFC V2 PATCH 02/11] acpi: Implement control method sleep button
Quoted 20 lines · On Fri, 27 Sep 2024 14:38:57 -0400 Annie Li <[email protected]> wrote:
The control method sleep button is added, as well as its GPE event handler.
Co-developed-by Miguel Luis <[email protected]>Signed-off-by Annie Li <[email protected]>--- hw/acpi/control_method_device.c | 54 +++++++++++++++++++++++++ hw/acpi/meson.build | 1 + include/hw/acpi/control_method_device.h | 25 ++++++++++++ 3 files changed, 80 insertions(+)hw/acpi/control_method_device.c new file +3
-0@@ -0,0 +1,54 @@ +/* +* Control method devices +*
hw/acpi/control_method_device.c line 12
Quoted 10 lines
hw/acpi/control_method_device.c new file +9
-0+* Copyright (c) 2023 Oracle and/or its affiliates. +* +* +* Authors: +* Annie Li <[email protected]> +* +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory.
replace it with SPDX-License-Identifier like it's done elsewhere
hw/acpi/control_method_device.c line 22
Quoted 10 lines
+ *
+ */hw/acpi/control_method_device.c new file +8
-0+ +#include "qemu/osdep.h" +#include "hw/acpi/control_method_device.h" +#include "hw/mem/nvdimm.h" + +void acpi_dsdt_add_sleep_button (Aml *scope) +{ +Aml *dev =aml_device ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE );
drop "\\_SB." here and below as well,
hw/acpi/control_method_device.c line 28
Quoted 6 lines
hw/acpi/control_method_device.c new file +6
-0+aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0C0E" ))); +Aml *pkg =aml_package (2 ); +aml_append (pkg,aml_int (0x01 )); +aml_append (pkg,aml_int (0x04 )); +aml_append (dev,aml_name_decl ("_PRW" , pkg)); + aml_append(dev, aml_operation_region("\\Boo", AML_SYSTEM_IO,
use some sensible name for opreg
hw/acpi/control_method_device.c line 36
Quoted 8 lines
hw/acpi/control_method_device.c new file +8
-0+ aml_int(0x201), 0x1)); +Aml *field =aml_field ("\\Boo" ,AML_BYTE_ACC ,AML_NOLOCK , +AML_WRITE_AS_ZEROS ); +aml_append (field,aml_named_field ("SBP" ,1 )); +aml_append (field,aml_named_field ("SBW" ,1 )); +aml_append (dev, field); +aml_append (scope, dev); +}
also above and below lacks any documentation,
add comments for relevant spec references, like we do with other ACPI functions. Also perhaps, it's out of order, reviewer has not clue where from above registers come and how it is supposed to work.
if you invented those registers, there should be a preceding doc patch that documents them.
Suggest to reorder after patch that implements above registers in hw, and also comment here where to look for them.
Quoted 61 lines
hw/acpi/control_method_device.c new file +18
-0+ +void acpi_dsdt_add_sleep_gpe_event_handler (Aml *scope) +{ +Aml *method =aml_method ("_L07" ,0 ,AML_NOTSERIALIZED ); +Aml *condition =aml_if (aml_name ("\\_SB.SLPB.SBP" )); +aml_append (condition,aml_store (aml_int (1 ),aml_name ("\\_SB.SLPB.SBP" ))); +aml_append (condition, +aml_notify (aml_name ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE ), +aml_int (0x80 ))); +aml_append (method, condition); + condition =aml_if (aml_name ("\\_SB.SLPB.SBW" )); +aml_append (condition,aml_store (aml_int (1 ),aml_name ("\\_SB.SLPB.SBW" ))); +aml_append (condition, +aml_notify (aml_name ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE ), +aml_int (0x2 ))); +aml_append (method, condition); +aml_append (scope, method); +}hw/acpi/meson.build +1
-0@@ -17,6 +17,7 @@ acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pci.c')) acpi_ss.add(when: 'CONFIG_ACPI_CXL', if_true: files('cxl.c'), if_false: files('cxl-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c')) acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c')) +acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('control_method_device.c')) acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false: files('ghes-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_PIIX4', if_true: files('piix4.c'))include/hw/acpi/control_method_device.h new file +25
-0@@ -0,0 +1,25 @@ +/* +* Control method devices +* +* Copyright (c) 2023 Oracle and/or its affiliates. +* +* +* Authors: +* Annie Li <[email protected]> +* +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +* +*/ + + +#ifndef HW_ACPI_CONTROL_METHOD_DEVICE_H +#define HW_ACPI_CONTROL_NETHOD_DEVICE_H + +#define ACPI_SLEEP_BUTTON_DEVICE "SLPB" + +void acpi_dsdt_add_sleep_button (Aml *scope); +void acpi_dsdt_add_sleep_gpe_event_handler (Aml *scope); + +#endif
Re: [RFC V2 PATCH 02/11] acpi: Implement control method sleep button
Quoted 25 lines · Igor Mammedov
Quoted 22 lines · On Fri, 27 Sep 2024 14:38:57 -0400 Annie Li<[email protected]> wrote:
The control method sleep button is added, as well as its GPE event handler.
Co-developed-by Miguel Luis<[email protected]>Signed-off-by Annie Li<[email protected]>--- hw/acpi/control_method_device.c | 54 +++++++++++++++++++++++++ hw/acpi/meson.build | 1 + include/hw/acpi/control_method_device.h | 25 ++++++++++++ 3 files changed, 80 insertions(+)hw/acpi/control_method_device.c new file +5
-0@@ -0,0 +1,54 @@ +/* +* Control method devices +* +* Copyright (c) 2023 Oracle and/or its affiliates. +*
Quoted 8 lines
hw/acpi/control_method_device.c line 12
Quoted 7 lines
hw/acpi/control_method_device.c new file +7
-0+* +* Authors: +* Annie Li<[email protected]> +* +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. replace it with SPDX-License-Identifier like it's done elsewhere
Nod
Quoted 12 lines
hw/acpi/control_method_device.c line 22
Quoted 11 lines
hw/acpi/control_method_device.c new file +10
-0+* +*/ + +#include "qemu/osdep.h" +#include "hw/acpi/control_method_device.h" +#include "hw/mem/nvdimm.h" + +void acpi_dsdt_add_sleep_button (Aml *scope) +{ +Aml *dev =aml_device ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE );drop "\\_SB." here and below as well,
Make sense here since the scope parameter is "_SB", but for the "_SB"
in acpi_dsdt_add_sleep_gpe_event_handler where the scope parameter is "_GPE", I suppose "\\_SB." is necessary.
Quoted 8 lines
hw/acpi/control_method_device.c line 28
Quoted 7 lines
hw/acpi/control_method_device.c new file +6
-0+aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0C0E" ))); +Aml *pkg =aml_package (2 ); +aml_append (pkg,aml_int (0x01 )); +aml_append (pkg,aml_int (0x04 )); +aml_append (dev,aml_name_decl ("_PRW" , pkg)); + aml_append(dev, aml_operation_region("\\Boo", AML_SYSTEM_IO,use some sensible name for opreg
will do
Quoted 13 lines
hw/acpi/control_method_device.c line 36
Quoted 8 lines
hw/acpi/control_method_device.c new file +8
-0+ aml_int(0x201), 0x1)); +Aml *field =aml_field ("\\Boo" ,AML_BYTE_ACC ,AML_NOLOCK , +AML_WRITE_AS_ZEROS ); +aml_append (field,aml_named_field ("SBP" ,1 )); +aml_append (field,aml_named_field ("SBW" ,1 )); +aml_append (dev, field); +aml_append (scope, dev); +}also above and below lacks any documentation,
add comments for relevant spec references, like we do with other ACPI functions. Also perhaps, it's out of order, reviewer has not clue where from above registers come and how it is supposed to work.
Quoted 5 lines
if you invented those registers, there should be a preceding doc patch that documents them.
Suggest to reorder after patch that implements above registers in hw, and also comment here where to look for them.
Thanks for the feedback.
Thanks
Annie
Quoted 61 lines
Quoted 61 lines
hw/acpi/control_method_device.c new file +18
-0+ +void acpi_dsdt_add_sleep_gpe_event_handler (Aml *scope) +{ +Aml *method =aml_method ("_L07" ,0 ,AML_NOTSERIALIZED ); +Aml *condition =aml_if (aml_name ("\\_SB.SLPB.SBP" )); +aml_append (condition,aml_store (aml_int (1 ),aml_name ("\\_SB.SLPB.SBP" ))); +aml_append (condition, +aml_notify (aml_name ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE ), +aml_int (0x80 ))); +aml_append (method, condition); + condition =aml_if (aml_name ("\\_SB.SLPB.SBW" )); +aml_append (condition,aml_store (aml_int (1 ),aml_name ("\\_SB.SLPB.SBW" ))); +aml_append (condition, +aml_notify (aml_name ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE ), +aml_int (0x2 ))); +aml_append (method, condition); +aml_append (scope, method); +}hw/acpi/meson.build +1
-0@@ -17,6 +17,7 @@ acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pci.c')) acpi_ss.add(when: 'CONFIG_ACPI_CXL', if_true: files('cxl.c'), if_false: files('cxl-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c')) acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c')) +acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('control_method_device.c')) acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false: files('ghes-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_PIIX4', if_true: files('piix4.c'))include/hw/acpi/control_method_device.h new file +25
-0@@ -0,0 +1,25 @@ +/* +* Control method devices +* +* Copyright (c) 2023 Oracle and/or its affiliates. +* +* +* Authors: +* Annie Li<[email protected]> +* +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +* +*/ + + +#ifndef HW_ACPI_CONTROL_METHOD_DEVICE_H +#define HW_ACPI_CONTROL_NETHOD_DEVICE_H + +#define ACPI_SLEEP_BUTTON_DEVICE "SLPB" + +void acpi_dsdt_add_sleep_button (Aml *scope); +void acpi_dsdt_add_sleep_gpe_event_handler (Aml *scope); + +#endif
Re: [RFC V2 PATCH 02/11] acpi: Implement control method sleep button
Quoted 47 lines · On Tue, 8 Oct 2024 11:22:33 -0400 Annie Li <[email protected]> wrote:
Quoted 25 lines · Igor Mammedov
Quoted 22 lines · On Fri, 27 Sep 2024 14:38:57 -0400 Annie Li<[email protected]> wrote:
The control method sleep button is added, as well as its GPE event handler.
Co-developed-by Miguel Luis<[email protected]>Signed-off-by Annie Li<[email protected]>--- hw/acpi/control_method_device.c | 54 +++++++++++++++++++++++++ hw/acpi/meson.build | 1 + include/hw/acpi/control_method_device.h | 25 ++++++++++++ 3 files changed, 80 insertions(+)hw/acpi/control_method_device.c new file +5
-0@@ -0,0 +1,54 @@ +/* +* Control method devices +* +* Copyright (c) 2023 Oracle and/or its affiliates. +* Quoted 8 lines
hw/acpi/control_method_device.c line 12
Quoted 7 lines
hw/acpi/control_method_device.c new file +7
-0+* +* Authors: +* Annie Li<[email protected]> +* +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. replace it with SPDX-License-Identifier like it's done elsewhere
Nod
Quoted 12 lines
hw/acpi/control_method_device.c line 22
Quoted 11 lines
hw/acpi/control_method_device.c new file +10
-0+* +*/ + +#include "qemu/osdep.h" +#include "hw/acpi/control_method_device.h" +#include "hw/mem/nvdimm.h" + +void acpi_dsdt_add_sleep_button (Aml *scope) +{ +Aml *dev =aml_device ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE );drop "\\_SB." here and below as well,
Quoted 3 lines
Make sense here since the scope parameter is "
_SB", but for the "_SB" inacpi_dsdt_add_sleep_gpe_event_handlerwhere the scope parameter is "_GPE", I suppose "\\_SB." is necessary.
Check the spec onhow name resolution in ACPI works.
Anyways you likely won't have dedicated acpi_dsdt_add_sleep_gpe_event_handler(), on respin
Quoted 94 lines
Quoted 8 lines
hw/acpi/control_method_device.c line 28
Quoted 7 lines
hw/acpi/control_method_device.c new file +6
-0+aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0C0E" ))); +Aml *pkg =aml_package (2 ); +aml_append (pkg,aml_int (0x01 )); +aml_append (pkg,aml_int (0x04 )); +aml_append (dev,aml_name_decl ("_PRW" , pkg)); + aml_append(dev, aml_operation_region("\\Boo", AML_SYSTEM_IO,use some sensible name for opreg
will do
Quoted 13 lines
hw/acpi/control_method_device.c line 36
Quoted 8 lines
hw/acpi/control_method_device.c new file +8
-0+ aml_int(0x201), 0x1)); +Aml *field =aml_field ("\\Boo" ,AML_BYTE_ACC ,AML_NOLOCK , +AML_WRITE_AS_ZEROS ); +aml_append (field,aml_named_field ("SBP" ,1 )); +aml_append (field,aml_named_field ("SBW" ,1 )); +aml_append (dev, field); +aml_append (scope, dev); +}also above and below lacks any documentation,
add comments for relevant spec references, like we do with other ACPI functions. Also perhaps, it's out of order, reviewer has not clue where from above registers come and how it is supposed to work.Quoted 5 lines
if you invented those registers, there should be a preceding doc patch that documents them.
Suggest to reorder after patch that implements above registers in hw, and also comment here where to look for them.
Thanks for the feedback.
Thanks
AnnieQuoted 61 lines
Quoted 61 lines
hw/acpi/control_method_device.c new file +18
-0+ +void acpi_dsdt_add_sleep_gpe_event_handler (Aml *scope) +{ +Aml *method =aml_method ("_L07" ,0 ,AML_NOTSERIALIZED ); +Aml *condition =aml_if (aml_name ("\\_SB.SLPB.SBP" )); +aml_append (condition,aml_store (aml_int (1 ),aml_name ("\\_SB.SLPB.SBP" ))); +aml_append (condition, +aml_notify (aml_name ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE ), +aml_int (0x80 ))); +aml_append (method, condition); + condition =aml_if (aml_name ("\\_SB.SLPB.SBW" )); +aml_append (condition,aml_store (aml_int (1 ),aml_name ("\\_SB.SLPB.SBW" ))); +aml_append (condition, +aml_notify (aml_name ("\\_SB." ACPI_SLEEP_BUTTON_DEVICE ), +aml_int (0x2 ))); +aml_append (method, condition); +aml_append (scope, method); +}hw/acpi/meson.build +1
-0@@ -17,6 +17,7 @@ acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pci.c')) acpi_ss.add(when: 'CONFIG_ACPI_CXL', if_true: files('cxl.c'), if_false: files('cxl-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c')) acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c')) +acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('control_method_device.c')) acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false: files('ghes-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_PIIX4', if_true: files('piix4.c'))include/hw/acpi/control_method_device.h new file +25
-0@@ -0,0 +1,25 @@ +/* +* Control method devices +* +* Copyright (c) 2023 Oracle and/or its affiliates. +* +* +* Authors: +* Annie Li<[email protected]> +* +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +* +*/ + + +#ifndef HW_ACPI_CONTROL_METHOD_DEVICE_H +#define HW_ACPI_CONTROL_NETHOD_DEVICE_H + +#define ACPI_SLEEP_BUTTON_DEVICE "SLPB" + +void acpi_dsdt_add_sleep_button (Aml *scope); +void acpi_dsdt_add_sleep_gpe_event_handler (Aml *scope); + +#endif
RFC PATCH v2 3/11 test/acpi: allow DSDT table changes
In reply to Annie Li--- tests/qtest/bios-tables-test-allowed-diff.h | 41 +++++++++++++++++++++ 1 file changed, 41 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +41 -0
@@ -1 +1,42 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/x86/pc/DSDT" , +"tests/data/acpi/x86/pc/DSDT.acpierst" , +"tests/data/acpi/x86/pc/DSDT.acpihmat" , +"tests/data/acpi/x86/pc/DSDT.bridge" , +"tests/data/acpi/x86/pc/DSDT.cphp" , +"tests/data/acpi/x86/pc/DSDT.dimmpxm" , +"tests/data/acpi/x86/pc/DSDT.hpbridge" , +"tests/data/acpi/x86/pc/DSDT.hpbrroot" , +"tests/data/acpi/x86/pc/DSDT.ipmikcs" , +"tests/data/acpi/x86/pc/DSDT.memhp" , +"tests/data/acpi/x86/pc/DSDT.nohpet" , +"tests/data/acpi/x86/pc/DSDT.numamem" , +"tests/data/acpi/x86/pc/DSDT.roothp" , +"tests/data/acpi/x86/q35/DSDT" , +"tests/data/acpi/x86/q35/DSDT.acpierst" , +"tests/data/acpi/x86/q35/DSDT.acpihmat" , +"tests/data/acpi/x86/q35/DSDT.acpihmat-noinitiator" , +"tests/data/acpi/x86/q35/DSDT.applesmc" , +"tests/data/acpi/x86/q35/DSDT.bridge" , +"tests/data/acpi/x86/q35/DSDT.core-count" , +"tests/data/acpi/x86/q35/DSDT.core-count2" , +"tests/data/acpi/x86/q35/DSDT.cphp" , +"tests/data/acpi/x86/q35/DSDT.cxl" , +"tests/data/acpi/x86/q35/DSDT.dimmpxm" , +"tests/data/acpi/x86/q35/DSDT.ipmibt" , +"tests/data/acpi/x86/q35/DSDT.ipmismbus" , +"tests/data/acpi/x86/q35/DSDT.ivrs" , +"tests/data/acpi/x86/q35/DSDT.memhp" , +"tests/data/acpi/x86/q35/DSDT.mmio64" , +"tests/data/acpi/x86/q35/DSDT.multi-bridge" , +"tests/data/acpi/x86/q35/DSDT.noacpihp" , +"tests/data/acpi/x86/q35/DSDT.nohpet" , +"tests/data/acpi/x86/q35/DSDT.numamem" , +"tests/data/acpi/x86/q35/DSDT.pvpanic-isa" , +"tests/data/acpi/x86/q35/DSDT.thread-count" , +"tests/data/acpi/x86/q35/DSDT.thread-count2" , +"tests/data/acpi/x86/q35/DSDT.tis.tpm12" , +"tests/data/acpi/x86/q35/DSDT.tis.tpm2" , +"tests/data/acpi/x86/q35/DSDT.type4-count" , +"tests/data/acpi/x86/q35/DSDT.viot" , +"tests/data/acpi/x86/q35/DSDT.xapic",
Signature · 1 line
2.43.5
RFC PATCH v2 4/11 acpi: Support Control Method sleep button for x86
In reply to Annie LiAdding Control Method Sleep button and its GPE event handler for x86.
--- hw/i386/acpi-build.c | 9 +++++++++ 1 file changed, 9 insertions(+)
hw/i386/acpi-build.c +9 -0
@@ -40,6 +40,7 @@#include "hw/acpi/acpi_aml_interface.h" #include "hw/input/i8042.h" #include "hw/acpi/memory_hotplug.h" +#include "hw/acpi/control_method_device.h" #include "sysemu/tpm.h" #include "hw/acpi/tpm.h" #include "hw/acpi/vmgenid.h"
@@ -1527,6 +1528,14 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, }aml_append (dsdt, scope); + sb_scope =aml_scope ("_SB" ); +acpi_dsdt_add_sleep_button (sb_scope); +aml_append (dsdt, sb_scope); + + scope =aml_scope ("\\_GPE" ); +acpi_dsdt_add_sleep_gpe_event_handler (scope); +aml_append (dsdt, scope); +if (pcmc->legacy_cpu_hotplug) {build_legacy_cpu_hotplug_aml (dsdt, machine, pm->cpu_hp_io_base); }else {
Signature · 1 line
2.43.5
Re: [RFC V2 PATCH 04/11] acpi: Support Control Method sleep button for x86
Quoted 21 lines · On Fri, 27 Sep 2024 14:38:59 -0400 Annie Li <[email protected]> wrote:
Adding Control Method Sleep button and its GPE event handler for x86.
Signed-off-by Annie Li <[email protected]>--- hw/i386/acpi-build.c | 9 +++++++++ 1 file changed, 9 insertions(+)hw/i386/acpi-build.c +1
-0@@ -40,6 +40,7 @@#include "hw/acpi/acpi_aml_interface.h" #include "hw/input/i8042.h" #include "hw/acpi/memory_hotplug.h" +#include "hw/acpi/control_method_device.h" #include "sysemu/tpm.h" #include "hw/acpi/tpm.h" #include "hw/acpi/vmgenid.h"
hw/i386/acpi-build.c build_dsdt(GArray *table_data, BIOSLinker *linker, · line 1537
Quoted 10 lines
hw/i386/acpi-build.c +6
-0@@ -1527,6 +1528,14 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, }aml_append (dsdt, scope); + sb_scope =aml_scope ("_SB" ); +acpi_dsdt_add_sleep_button (sb_scope); +aml_append (dsdt, sb_scope); + + scope =aml_scope ("\\_GPE" ); +acpi_dsdt_add_sleep_gpe_event_handler (scope);
instead of having 1-off function, it would be better to inline impl, here, like we do elsewhere with _Exx methods.
Also given that, series doesn't support wake,
you don't need to copy example from spec related to operation region, as dedicated GPE event by itself tells us that sleep was requested.
so all you need to do is sending Notify to sleep button device.
Quoted 5 lines
hw/i386/acpi-build.c +2
-0+aml_append (dsdt, scope); +if (pcmc->legacy_cpu_hotplug) {build_legacy_cpu_hotplug_aml (dsdt, machine, pm->cpu_hp_io_base);} else {
Re: [RFC V2 PATCH 04/11] acpi: Support Control Method sleep button for x86
Quoted 27 lines · Igor Mammedov
Quoted 24 lines · On Fri, 27 Sep 2024 14:38:59 -0400 Annie Li<[email protected]> wrote:
Adding Control Method Sleep button and its GPE event handler for x86.
Signed-off-by Annie Li<[email protected]>--- hw/i386/acpi-build.c | 9 +++++++++ 1 file changed, 9 insertions(+)hw/i386/acpi-build.c +1
-0@@ -40,6 +40,7 @@#include "hw/acpi/acpi_aml_interface.h" #include "hw/input/i8042.h" #include "hw/acpi/memory_hotplug.h" +#include "hw/acpi/control_method_device.h" #include "sysemu/tpm.h" #include "hw/acpi/tpm.h" #include "hw/acpi/vmgenid.h" @@ -1527,6 +1528,14 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, }aml_append (dsdt, scope);
Quoted 8 lines
hw/i386/acpi-build.c build_dsdt(GArray *table_data, BIOSLinker *linker, · line 1536
Quoted 6 lines
hw/i386/acpi-build.c +6
-0+ sb_scope =aml_scope ("_SB" ); +acpi_dsdt_add_sleep_button (sb_scope); +aml_append (dsdt, sb_scope); + + scope =aml_scope ("\\_GPE" ); +acpi_dsdt_add_sleep_gpe_event_handler (scope);instead of having 1-off function, it would be better to inline impl, here, like we do elsewhere with
_Exxmethods.
Was thinking that "acpi_dsdt_add_sleep_button" is shared by multiple platforms, and "acpi_dsdt_add_sleep_gpe_event_handler" is related this function. However, it totally makes sense to inline this function since it is only being used once for x86.
Quoted 6 lines
Also given that, series doesn't support wake,
you don't need to copy example from spec related to operation region, as dedicated GPE event by itself tells us that sleep was requested.so all you need to do is sending Notify to sleep button device.
Got it, thanks for the feedback.
Thanks
Annie
Quoted 6 lines
Quoted 6 lines
hw/i386/acpi-build.c +2
-0+aml_append (dsdt, scope); +if (pcmc->legacy_cpu_hotplug) {build_legacy_cpu_hotplug_aml (dsdt, machine, pm->cpu_hp_io_base); }else {
RFC PATCH v2 5/11 tests/acpi: Update DSDT tables for Control method sleep button
In reply to Annie LiBelow is the sample iASL difference,
* Signature "DSDT"
- * Length 0x000020A3 (8355)
+ * Length 0x00002159 (8537)
* Revision 0x01 **** 32-bit table (V1), no 64-bit math support
- * Checksum 0x37
+ * Checksum 0x40
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\)
{
OperationRegion (DBG, SystemIO, 0x0402, One)
Field (DBG, ByteAcc, NoLock, Preserve)
{
DBGB, 8
}@@ -2851,32 +2851,69 @@
{
Memory32Fixed (ReadOnly,
0xFED00000, // Address Base
0x00000400, // Address Length
)
})
}
}
Scope (_GPE)
{
Name (_HID, "ACPI0006" /* GPE Block Device */) // _HID: Hardware ID
}
Scope (_SB)
{
+ Device (\_SB.SLPB)
+ {
+ Name (_HID, EisaId ("PNP0C0E") /* Sleep Button Device */) // _HID: Hardware ID
+ Name (_PRW, Package (0x02) // _PRW: Power Resources for Wake
+ {
+ One,
+ 0x04
+ })
+ OperationRegion (\B**, SystemIO, 0x0201, One)
+ Field (\B**, ByteAcc, NoLock, WriteAsZeros)
+ {
+ SBP, 1,
+ SBW, 1+ }
+ }
+ }
+
+ Scope (\_GPE)
+ {
+ Method (_L07, 0, NotSerialized) // _Lxx: Level-Triggered GPE, xx=0x00-0xFF
+ {
+ If (\_SB.SLPB.SBP)
+ {
+ \_SB.SLPB.SBP = One
+ Notify (\_SB.SLPB, 0x80) // Status Change
+ }
+
+ If (\_SB.SLPB.SBW)
+ {
+ \_SB.SLPB.SBW = One
+ Notify (\_SB.SLPB, 0x02) // Device Wake
+ }
+ }
+ }
+
+ Scope (_SB)
+ {
--- tests/data/acpi/x86/pc/DSDT | Bin 6830 -> 7012 bytes tests/data/acpi/x86/pc/DSDT.acpierst | Bin 6741 -> 6923 bytes tests/data/acpi/x86/pc/DSDT.acpihmat | Bin 8155 -> 8337 bytes tests/data/acpi/x86/pc/DSDT.bridge | Bin 13701 -> 13883 bytes tests/data/acpi/x86/pc/DSDT.cphp | Bin 7294 -> 7476 bytes tests/data/acpi/x86/pc/DSDT.dimmpxm | Bin 8484 -> 8666 bytes tests/data/acpi/x86/pc/DSDT.hpbridge | Bin 6781 -> 6963 bytes tests/data/acpi/x86/pc/DSDT.hpbrroot | Bin 3337 -> 3519 bytes tests/data/acpi/x86/pc/DSDT.ipmikcs | Bin 6902 -> 7084 bytes tests/data/acpi/x86/pc/DSDT.memhp | Bin 8189 -> 8371 bytes tests/data/acpi/x86/pc/DSDT.nohpet | Bin 6688 -> 6870 bytes tests/data/acpi/x86/pc/DSDT.numamem | Bin 6836 -> 7018 bytes tests/data/acpi/x86/pc/DSDT.roothp | Bin 10623 -> 10805 bytes tests/data/acpi/x86/q35/DSDT | Bin 8355 -> 8537 bytes tests/data/acpi/x86/q35/DSDT.acpierst | Bin 8372 -> 8554 bytes tests/data/acpi/x86/q35/DSDT.acpihmat | Bin 9680 -> 9862 bytes .../acpi/x86/q35/DSDT.acpihmat-noinitiator | Bin 8634 -> 8816 bytes tests/data/acpi/x86/q35/DSDT.applesmc | Bin 8401 -> 8583 bytes tests/data/acpi/x86/q35/DSDT.bridge | Bin 11968 -> 12150 bytes tests/data/acpi/x86/q35/DSDT.core-count | Bin 12913 -> 13095 bytes tests/data/acpi/x86/q35/DSDT.core-count2 | Bin 33770 -> 33952 bytes tests/data/acpi/x86/q35/DSDT.cphp | Bin 8819 -> 9001 bytes tests/data/acpi/x86/q35/DSDT.cxl | Bin 9714 -> 9896 bytes tests/data/acpi/x86/q35/DSDT.dimmpxm | Bin 10009 -> 10191 bytes tests/data/acpi/x86/q35/DSDT.ipmibt | Bin 8430 -> 8612 bytes tests/data/acpi/x86/q35/DSDT.ipmismbus | Bin 8443 -> 8625 bytes tests/data/acpi/x86/q35/DSDT.ivrs | Bin 8372 -> 8554 bytes tests/data/acpi/x86/q35/DSDT.memhp | Bin 9714 -> 9896 bytes tests/data/acpi/x86/q35/DSDT.mmio64 | Bin 9485 -> 9667 bytes tests/data/acpi/x86/q35/DSDT.multi-bridge | Bin 13208 -> 13390 bytes tests/data/acpi/x86/q35/DSDT.noacpihp | Bin 8235 -> 8417 bytes tests/data/acpi/x86/q35/DSDT.nohpet | Bin 8213 -> 8395 bytes tests/data/acpi/x86/q35/DSDT.numamem | Bin 8361 -> 8543 bytes tests/data/acpi/x86/q35/DSDT.pvpanic-isa | Bin 8456 -> 8638 bytes tests/data/acpi/x86/q35/DSDT.thread-count | Bin 12913 -> 13095 bytes tests/data/acpi/x86/q35/DSDT.thread-count2 | Bin 33770 -> 33952 bytes tests/data/acpi/x86/q35/DSDT.tis.tpm12 | Bin 8961 -> 9143 bytes tests/data/acpi/x86/q35/DSDT.tis.tpm2 | Bin 8987 -> 9169 bytes tests/data/acpi/x86/q35/DSDT.type4-count | Bin 18589 -> 18771 bytes tests/data/acpi/x86/q35/DSDT.viot | Bin 9464 -> 9646 bytes tests/data/acpi/x86/q35/DSDT.xapic | Bin 35718 -> 35900 bytes tests/qtest/bios-tables-test-allowed-diff.h | 41 ------------------ 42 files changed, 41 deletions(-)
tests/data/acpi/x86/pc/DSDT binary +0 -0
tests/data/acpi/x86/pc/DSDT.acpierst binary +0 -0
tests/data/acpi/x86/pc/DSDT.acpihmat binary +0 -0
tests/data/acpi/x86/pc/DSDT.bridge binary +0 -0
tests/data/acpi/x86/pc/DSDT.cphp binary +0 -0
tests/data/acpi/x86/pc/DSDT.dimmpxm binary +0 -0
tests/data/acpi/x86/pc/DSDT.hpbridge binary +0 -0
tests/data/acpi/x86/pc/DSDT.hpbrroot binary +0 -0
tests/data/acpi/x86/pc/DSDT.ipmikcs binary +0 -0
tests/data/acpi/x86/pc/DSDT.memhp binary +0 -0
tests/data/acpi/x86/pc/DSDT.nohpet binary +0 -0
tests/data/acpi/x86/pc/DSDT.numamem binary +0 -0
tests/data/acpi/x86/pc/DSDT.roothp binary +0 -0
tests/data/acpi/x86/q35/DSDT binary +0 -0
tests/data/acpi/x86/q35/DSDT.acpierst binary +0 -0
tests/data/acpi/x86/q35/DSDT.acpihmat binary +0 -0
tests/data/acpi/x86/q35/DSDT.acpihmat-noinitiator binary +0 -0
tests/data/acpi/x86/q35/DSDT.applesmc binary +0 -0
tests/data/acpi/x86/q35/DSDT.bridge binary +0 -0
tests/data/acpi/x86/q35/DSDT.core-count binary +0 -0
tests/data/acpi/x86/q35/DSDT.core-count2 binary +0 -0
tests/data/acpi/x86/q35/DSDT.cphp binary +0 -0
tests/data/acpi/x86/q35/DSDT.cxl binary +0 -0
tests/data/acpi/x86/q35/DSDT.dimmpxm binary +0 -0
tests/data/acpi/x86/q35/DSDT.ipmibt binary +0 -0
tests/data/acpi/x86/q35/DSDT.ipmismbus binary +0 -0
tests/data/acpi/x86/q35/DSDT.ivrs binary +0 -0
tests/data/acpi/x86/q35/DSDT.memhp binary +0 -0
tests/data/acpi/x86/q35/DSDT.mmio64 binary +0 -0
tests/data/acpi/x86/q35/DSDT.multi-bridge binary +0 -0
tests/data/acpi/x86/q35/DSDT.noacpihp binary +0 -0
tests/data/acpi/x86/q35/DSDT.nohpet binary +0 -0
tests/data/acpi/x86/q35/DSDT.numamem binary +0 -0
tests/data/acpi/x86/q35/DSDT.pvpanic-isa binary +0 -0
tests/data/acpi/x86/q35/DSDT.thread-count binary +0 -0
tests/data/acpi/x86/q35/DSDT.thread-count2 binary +0 -0
tests/data/acpi/x86/q35/DSDT.tis.tpm12 binary +0 -0
tests/data/acpi/x86/q35/DSDT.tis.tpm2 binary +0 -0
tests/data/acpi/x86/q35/DSDT.type4-count binary +0 -0
tests/data/acpi/x86/q35/DSDT.viot binary +0 -0
tests/data/acpi/x86/q35/DSDT.xapic binary +0 -0
tests/qtest/bios-tables-test-allowed-diff.h +0 -41
42 lines not on this page · raw message
Signature · 1 line
2.43.5
RFC PATCH v2 6/11 acpi: Send the GPE event of suspend and wakeup for x86
In reply to Annie LiThe GPE event is triggered to notify the guest to suppend or wakeup itself.
--- hw/acpi/core.c | 17 +++++++++++++---- hw/core/machine-qmp-cmds.c | 2 ++ include/hw/acpi/acpi.h | 1 + include/hw/acpi/acpi_dev_interface.h | 1 + 4 files changed, 17 insertions(+), 4 deletions(-)
hw/acpi/core.c +13 -4
@@ -354,6 +354,16 @@ int acpi_get_slic_oem(AcpiSlicOem *oem)return -1 ; } +void acpi_send_sleep_wakeup_event (void ) +{ +Object *obj =object_resolve_path_type ("" ,TYPE_ACPI_DEVICE_IF ,NULL ); + +if (obj) { +/* Send _GPE.L07 event */ +acpi_send_event (DEVICE (obj),ACPI_SLEEP_STATUS ); + } +} +static void acpi_notify_wakeup (Notifier *notifier,void *data) {ACPIREGS *ar =container_of (notifier,ACPIREGS , wakeup);
@@ -369,10 +379,9 @@ static void acpi_notify_wakeup(Notifier *notifier, void *data) (ACPI_BITMASK_WAKE_STATUS |ACPI_BITMASK_TIMER_STATUS );break ;case QEMU_WAKEUP_REASON_OTHER : -/* ACPI_BITMASK_WAKE_STATUS should be set on resume. -Pretend that resume was caused by power button */ - ar->pm1.evt.sts |= - (ACPI_BITMASK_WAKE_STATUS |ACPI_BITMASK_POWER_BUTTON_STATUS ); +/* ACPI_BITMASK_WAKE_STATUS should be set on resume. */ + ar->pm1.evt.sts |=ACPI_BITMASK_WAKE_STATUS ; +acpi_send_sleep_wakeup_event ();break ;default :break ;
hw/core/machine-qmp-cmds.c +2 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.h" #include "hw/acpi/vmgenid.h" +#include "hw/acpi/acpi.h" #include "hw/boards.h" #include "hw/intc/intc.h" #include "hw/mem/memory-device.h"
@@ -283,6 +284,7 @@ void qmp_system_sleep(Error **errp) "suspend from running is not supported by this guest");return ; } +acpi_send_sleep_wakeup_event (); }void qmp_system_powerdown (Error **errp)
include/hw/acpi/acpi.h +1 -0
@@ -181,6 +181,7 @@ uint32_t acpi_gpe_ioport_readb(ACPIREGS *ar, uint32_t addr);void acpi_send_gpe_event (ACPIREGS *ar,qemu_irq irq,AcpiEventStatusBits status); +void acpi_send_sleep_wakeup_event (void );void acpi_update_sci (ACPIREGS *acpi_regs,qemu_irq irq);
include/hw/acpi/acpi_dev_interface.h +1 -0
@@ -13,6 +13,7 @@ typedef enum {ACPI_NVDIMM_HOTPLUG_STATUS =16 ,ACPI_VMGENID_CHANGE_STATUS =32 ,ACPI_POWER_DOWN_STATUS =64 , +ACPI_SLEEP_STATUS =128 , } AcpiEventStatusBits;#define TYPE_ACPI_DEVICE_IF "acpi-device-interface"
Signature · 1 line
2.43.5
RFC PATCH v2 7/11 hw/acpi: Add ACPI GED support for the sleep event
In reply to Annie LiFrom: Miguel Luis <[email protected]>
Add support for ACPI GED sleep event on the ACPI device interface so that HW-reduced systems can enable guests to sleep.
--- hw/acpi/generic_event_device.c | 9 +++++++++ include/hw/acpi/generic_event_device.h | 1 + 2 files changed, 10 insertions(+)
hw/acpi/generic_event_device.c +9 -0
@@ -13,6 +13,7 @@#include "qapi/error.h" #include "hw/acpi/acpi.h" #include "hw/acpi/generic_event_device.h" +#include "hw/acpi/control_method_device.h" #include "hw/irq.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h"
@@ -26,6 +27,7 @@ static const uint32_t ged_supported_events[] = {ACPI_GED_PWR_DOWN_EVT ,ACPI_GED_NVDIMM_HOTPLUG_EVT ,ACPI_GED_CPU_HOTPLUG_EVT , + ACPI_GED_SLEEP_EVT, };/*
@@ -121,6 +123,11 @@ void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev,aml_notify (aml_name ("\\_SB.NVDR" ), aml_int(0x80)));break ; +case ACPI_GED_SLEEP_EVT : +aml_append (if_ctx, +aml_notify (aml_name (ACPI_SLEEP_BUTTON_DEVICE ), +aml_int (0x80 ))); +break ;default :/* * Please make sure all the events in ged_supported_events[]
@@ -295,6 +302,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev) sel =ACPI_GED_MEM_HOTPLUG_EVT ; }else if (ev &ACPI_POWER_DOWN_STATUS ) { sel =ACPI_GED_PWR_DOWN_EVT ; + }else if (ev &ACPI_SLEEP_STATUS ) { + sel =ACPI_GED_SLEEP_EVT ; }else if (ev &ACPI_NVDIMM_HOTPLUG_STATUS ) { sel =ACPI_GED_NVDIMM_HOTPLUG_EVT ; }else if (ev &ACPI_CPU_HOTPLUG_STATUS ) {
include/hw/acpi/generic_event_device.h +1 -0
@@ -98,6 +98,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)#define ACPI_GED_PWR_DOWN_EVT 0x2#define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4#define ACPI_GED_CPU_HOTPLUG_EVT 0x8 +#define ACPI_GED_SLEEP_EVT 0x10 typedef struct GEDState { MemoryRegion evt;
Signature · 1 line
2.43.5
RFC PATCH v2 8/11 tests/acpi: allow FACP and DSDT table changes for arm/virt
In reply to Annie LiFrom: Miguel Luis <[email protected]>
List changed files for FACP and DSDT table changes for the arm/virt.
--- tests/qtest/bios-tables-test-allowed-diff.h | 6 ++++++ 1 file changed, 6 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +6 -0
@@ -1 +1,7 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/DSDT" , +"tests/data/acpi/virt/DSDT.acpihmatvirt" , +"tests/data/acpi/virt/DSDT.memhp" , +"tests/data/acpi/virt/DSDT.pxb" , +"tests/data/acpi/virt/DSDT.topology" , +"tests/data/acpi/virt/FACP",
Signature · 1 line
2.43.5
RFC PATCH v2 9/11 hw/arm: enable sleep support for arm/virt
In reply to Annie LiFrom: Miguel Luis <[email protected]>
Include the ACPI control method device into arm/virt ACPI tables and the corresponding handling which enables triggering the event.
--- hw/arm/virt-acpi-build.c | 13 +++++++++++++ hw/arm/virt.c | 13 ++++++++++++- include/hw/arm/virt.h | 1 + 3 files changed, 26 insertions(+), 1 deletion(-)
hw/arm/virt-acpi-build.c +13 -0
@@ -41,6 +41,7 @@#include "hw/acpi/pci.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/generic_event_device.h" +#include "hw/acpi/control_method_device.h" #include "hw/acpi/tpm.h" #include "hw/acpi/hmat.h" #include "hw/pci/pcie_host.h"
@@ -779,6 +780,17 @@ static void build_fadt_rev6(GArray *table_data, BIOSLinker *linker, .rev = 6, .minor_ver = 3, .flags = 1 << ACPI_FADT_F_HW_REDUCED_ACPI, +/* ACPI 5.0: 4.8.3.7 Sleep Control and Status Registers */ + .sleep_ctl = { + .space_id = AML_AS_SYSTEM_MEMORY, + .bit_width = 8, + .address = vms->memmap[VIRT_ACPI_GED].base + ACPI_GED_REG_SLEEP_CTL, + }, + .sleep_sts = { + .space_id = AML_AS_SYSTEM_MEMORY, + .bit_width = 8, + .address = vms->memmap[VIRT_ACPI_GED].base + ACPI_GED_REG_SLEEP_STS, + }, .xdsdt_tbl_offset = &dsdt_tbl_offset, };
@@ -858,6 +870,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }acpi_dsdt_add_power_button (scope); +acpi_dsdt_add_sleep_button (scope);#ifdef CONFIG_TPM acpi_dsdt_add_tpm (scope, vms);#endif
hw/arm/virt.c +12 -1
@@ -677,7 +677,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)DeviceState *dev;MachineState *ms =MACHINE (vms);int irq = vms->irqmap[VIRT_ACPI_GED ]; -uint32_t event =ACPI_GED_PWR_DOWN_EVT ; +uint32_t event =ACPI_GED_PWR_DOWN_EVT |ACPI_GED_SLEEP_EVT ;if (ms->ram_slots) { event |=ACPI_GED_MEM_HOTPLUG_EVT ;
@@ -996,6 +996,14 @@ static void create_rtc(const VirtMachineState *vms)g_free (nodename); } +static void virt_sleep_req (Notifier *n,void *opaque) +{ +VirtMachineState *s =container_of (n, VirtMachineState, sleep_notifier); + +if (s->acpi_dev) { +acpi_send_event (s->acpi_dev,ACPI_SLEEP_STATUS ); + } +}static DeviceState *gpio_key_dev;static void virt_powerdown_req (Notifier *n,void *opaque) {
@@ -2393,6 +2401,9 @@ static void machvirt_init(MachineState *machine)create_gpio_devices (vms,VIRT_SECURE_GPIO , secure_sysmem); } +/* connect sleep request */ + vms->sleep_notifier.notify = virt_sleep_req; +/* connect powerdown request */ vms->powerdown_notifier.notify = virt_powerdown_req;qemu_register_powerdown_notifier (&vms->powerdown_notifier);
include/hw/arm/virt.h +1 -0
@@ -175,6 +175,7 @@ struct VirtMachineState {DeviceState *gic;DeviceState *acpi_dev;Notifier powerdown_notifier; +Notifier sleep_notifier;PCIBus *bus;char *oem_id;char *oem_table_id;
Signature · 1 line
2.43.5
RFC PATCH v2 10/11 tests/acpi: Update FACP and DSDT tables for sleep button
In reply to Annie LiFrom: Miguel Luis <[email protected]>
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] [004h 0004 4] Table Length : 00000114 [008h 0008 1] Revision : 06 -[009h 0009 1] Checksum : 12 +[009h 0009 1] Checksum : DF [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
[024h 0036 4] FACS Address : 00000000 [028h 0040 4] DSDT Address : 00000000 [02Ch 0044 1] Model : 00 [02Dh 0045 1] PM Profile : 00 [Unspecified] [02Eh 0046 2] SCI Interrupt : 0000 [030h 0048 4] SMI Command Port : 00000000 [034h 0052 1] ACPI Enable Value : 00 [035h 0053 1] ACPI Disable Value : 00 [036h 0054 1] S4BIOS Command : 00 [037h 0055 1] P-State Control : 00 @@ -148,50 +148,50 @@ [0DCh 0220 1] Space ID : 00 [SystemMemory] [0DDh 0221 1] Bit Width : 00 [0DEh 0222 1] Bit Offset : 00 [0DFh 0223 1] Encoded Access Width : 00 [Undefined/Legacy] [0E0h 0224 8] Address : 0000000000000000
[0E8h 0232 12] GPE1 Block : [Generic Address Structure]
[0E8h 0232 1] Space ID : 00 [SystemMemory] [0E9h 0233 1] Bit Width : 00 [0EAh 0234 1] Bit Offset : 00 [0EBh 0235 1] Encoded Access Width : 00 [Undefined/Legacy] [0ECh 0236 8] Address : 0000000000000000
[0F4h 0244 12] Sleep Control Register : [Generic Address Structure]
[0F4h 0244 1] Space ID : 00 [SystemMemory] -[0F5h 0245 1] Bit Width : 00 +[0F5h 0245 1] Bit Width : 08 [0F6h 0246 1] Bit Offset : 00 [0F7h 0247 1] Encoded Access Width : 00 [Undefined/Legacy] -[0F8h 0248 8] Address : 0000000000000000 +[0F8h 0248 8] Address : 0000000009080000
[100h 0256 12] Sleep Status Register : [Generic Address Structure]
[100h 0256 1] Space ID : 00 [SystemMemory] -[101h 0257 1] Bit Width : 00 +[101h 0257 1] Bit Width : 08 [102h 0258 1] Bit Offset : 00 [103h 0259 1] Encoded Access Width : 00 [Undefined/Legacy] -[104h 0260 8] Address : 0000000000000000 +[104h 0260 8] Address : 0000000009080001
[10Ch 0268 8] Hypervisor ID : 00000000554D4551
Raw Table Data: Length 276 (0x114)
- 0000: 46 41 43 50 14 01 00 00 06 12 42 4F 43 48 53 20 // FACP......BOCHS
+ 0000: 46 41 43 50 14 01 00 00 06 DF 42 4F 43 48 53 20 // FACP......BOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC
0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0070: 00 00 10 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0080: 00 03 00 03 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00A0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00B0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00C0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00D0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00E0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
- 00F0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
- 0100: 00 00 00 00 00 00 00 00 00 00 00 00 51 45 4D 55 // ............QEMU
+ 00F0: 00 00 00 00 00 08 00 00 00 00 08 09 00 00 00 00 // ................
+ 0100: 00 08 00 00 01 00 08 09 00 00 00 00 51 45 4D 55 // ............QEMU
0110: 00 00 00 00 // ....* Original Table Header:
* Signature "DSDT"
- * Length 0x0000144C (5196)
+ * Length 0x0000149E (5278)
* Revision 0x02
- * Checksum 0x1B
+ * Checksum 0x97
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\_SB)
{
Device (C000)
{
Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
}@@ -1876,27 +1876,48 @@
0x00000029,
}
})
OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
Field (EREG, DWordAcc, NoLock, WriteAsZeros)
{
ESEL, 32
}
Method (_EVT, 1, Serialized) // _EVT: Event
{
Local0 = ESEL /* \_SB_.GED_.ESEL */
If (((Local0 & 0x02) == 0x02))
{
Notify (PWRB, 0x80) // Status Change
}+
+ If (((Local0 & 0x10) == 0x10))
+ {
+ Notify (SLPB, 0x80) // Status Change
+ }
}
}
Device (PWRB)
{
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
}
+
+ Device (\_SB.SLPB)
+ {
+ Name (_HID, EisaId ("PNP0C0E") /* Sleep Button Device */) // _HID: Hardware ID
+ Name (_PRW, Package (0x02) // _PRW: Power Resources for Wake
+ {
+ One,
+ 0x04
+ })
+ OperationRegion (\B**, SystemIO, 0x0201, One)
+ Field (\B**, ByteAcc, NoLock, WriteAsZeros)
+ {
+ SBP, 1,
+ SBW, 1
+ }
+ }
}}
--- tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5278 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5364 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6639 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7761 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5480 bytes tests/data/acpi/aarch64/virt/FACP | Bin 276 -> 276 bytes tests/qtest/bios-tables-test-allowed-diff.h | 6 ------ 7 files changed, 6 deletions(-)
tests/data/acpi/aarch64/virt/DSDT binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.memhp binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.pxb binary +0 -0
tests/data/acpi/aarch64/virt/DSDT.topology binary +0 -0
tests/data/acpi/aarch64/virt/FACP binary +0 -0
tests/qtest/bios-tables-test-allowed-diff.h +0 -6
@@ -1,7 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/DSDT" , -"tests/data/acpi/virt/DSDT.acpihmatvirt" , -"tests/data/acpi/virt/DSDT.memhp" , -"tests/data/acpi/virt/DSDT.pxb" , -"tests/data/acpi/virt/DSDT.topology" , -"tests/data/acpi/virt/FACP",
Signature · 1 line
2.43.5
RFC PATCH v2 11/11 arm/virt: enable sleep support
In reply to Annie LiFrom: Miguel Luis <[email protected]>
For reference: qmp_system_sleep relies on wakeup support delegated by qemu_wakeup_suspend_enabled() hence the need for calling qemu_register_wakeup_support(). With this, we should be able to issue QMP system_sleep command now.
--- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+)
hw/arm/virt.c +1 -0
@@ -2403,6 +2403,7 @@ static void machvirt_init(MachineState *machine)/* connect sleep request */ vms->sleep_notifier.notify = virt_sleep_req; +qemu_register_wakeup_support ();/* connect powerdown request */ vms->powerdown_notifier.notify = virt_powerdown_req;
Signature · 1 line
2.43.5
Re: [RFC V2 PATCH 11/11] arm/virt: enable sleep support
Quoted 18 lines · Annie Li
From: Miguel Luis <[email protected]>
For reference:
qmp_system_sleeprelies on wakeup support delegated byqemu_wakeup_suspend_enabled()hence the need for callingqemu_register_wakeup_support(). With this, we should be able to issue QMPsystem_sleepcommand now.Signed-off-by Miguel Luis <[email protected]>--- hw/arm/virt.c | 1 + 1 file changed, 1 insertion(+)hw/arm/virt.c +0
-0
hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 2406
Quoted 4 lines
hw/arm/virt.c +1
-0@@ -2403,6 +2403,7 @@ static void machvirt_init(MachineState *machine)/* connect sleep request */ vms->sleep_notifier.notify = virt_sleep_req; +qemu_register_wakeup_support ();
On i386 the machine has a MachineClass::wakeup method (pc_machine_wakeup) that does things on wakeup.
On ppc/spapr there is this comment before the call
to qemu_register_wakeup_support():
/*
* Nothing needs to be done to resume a suspended guest because
* suspending does not change the machine state, so no need for
* a ->wakeup method.
*/
I think that for Arm we need to determine whether the virt board is like i386/pc (need to do something on wakeup) or like ppc/spapr (don't need to do anything on wakeup). If the former, we obviously would need to implement the MachineClass::wakeup method; if the latter, then we should have a comment explaining why there doesn't need to be any action taken on resume and therefore the machine has no wakeup method.
thanks
-- PMM
Re: [RFC V2 PATCH 11/11] arm/virt: enable sleep support
Hi Peter,
Quoted 37 lines · Peter Maydell
Quoted 18 lines · Annie Li
From: Miguel Luis <[email protected]>
For reference:
qmp_system_sleeprelies on wakeup support delegated byqemu_wakeup_suspend_enabled()hence the need for callingqemu_register_wakeup_support(). With this, we should be able to issue QMPsystem_sleepcommand now.Signed-off-by Miguel Luis <[email protected]>---
hw/arm/virt.c| 1 +1 file changed, 1 insertion(+)hw/arm/virt.c +0
-0hw/arm/virt.c static void machvirt_init(MachineState *machine) · line 2406
Quoted 4 lines
hw/arm/virt.c +1
-0@@ -2403,6 +2403,7 @@ static void machvirt_init(MachineState *machine)/* connect sleep request */ vms->sleep_notifier.notify = virt_sleep_req; +qemu_register_wakeup_support ();On i386 the machine has a
MachineClass::wakeupmethod (pc_machine_wakeup) that does things on wakeup.On ppc/spapr there is this comment before the call
toqemu_register_wakeup_support():
/*
* Nothing needs to be done to resume a suspended guest because
* suspending does not change the machine state, so no need for
* a ->wakeup method.
*/
Quoted 9 lines
I think that for Arm we need to determine whether the virt board is like i386/pc (need to do something on wakeup) or like ppc/spapr (don't need to do anything on wakeup). If the former, we obviously would need to implement the
MachineClass::wakeupmethod; if the latter, then we should have a comment explaining why there doesn't need to be any action taken on resume and therefore the machine has no wakeup method.
I believe it will be needed to reset the cpus and restore context afterwards but before that I’m yet still to find a reliable wakeup source for the experiments.
So far I’ve tried the rtc-efi wakeup source but it seems not supporting time in the future in wakealarm so there’s still pending research on this.
Direction hints for acceptable ways forward are always welcome, of course. Many thanks for that.
Miguel
Quoted 2 lines
thanks
-- PMM
Quoted 14 lines · On Fri, 27 Sep 2024 14:38:55 -0400 Annie Li <[email protected]> wrote:
The ACPI sleep button can be implemented as a fixed hardware button or Control Method Sleep button.
The patch of implementing a fixed hardware sleep button was posted here 1). More discussions can be found here 2). Essentially, the discussion mainly focuses on whether the sleep button is implemented as a fixed hardware button or Control Method Sleep button. The latter benefits various architectures since the code can be shared among them.
This patch set implements Control Method Sleep button for both x86 and ARM platform.(The patch set was posted previously here 3). We rebase all the patches on QEMU9.1.0 and re-post it).
Quoted 8 lines
For x86, a sleep button GPE event handler is implemented, so a GPE event is triggered to indicate the OSPM the sleep button is pressed. Tests have been done for Linux guest, and Windows Server guest, the sleep button works as expected.
For ARM, a GED event is triggered to notify the OSPM. With proper debug knobs it is possible to see the guest OSPM acknowledges the sleep event:
Series also missed 'microvm', that uses GED
(it's likely the same amount of work as for arm/virt board)
also test all boards you are touching, to make sure you didn't break them.
Note: commit messages should be more verbose explaining why and what patches are doing.
PS:
Also keep changelog in cover letter, for a short list of changes between series revisions,
see '[PATCH v3 0/1] hw/nvme: add atomic write support' for an example
Quoted 108 lines
(qemu)
system_sleep
(qemu) [6.744138] exregion-0179ex_system_memory_space: System-Memory (width 32) R/W 0 Address=0000000009080000[6.746003] evmisc-0132 ev_queue_notify_reques: Dispatching Notify on [SLPB] (Device) Value 0x80 (Status Change) Node 00000000f0e6819e [6.802873] PM: suspend entry (s2idle) [6.806201] Filesystems sync: 0.002 seconds [6.807580] Freezing user space processes [6.809478] Freezing user space processes completed (elapsed 0.001 seconds) [6.810602] OOM killer disabled. [6.811111] Freezing remaining freezable tasks [6.812953] Freezing remaining freezable tasks completed (elapsed 0.001 seconds) [6.814126] printk: Suspending console(s) (use no_console_suspend to debug)But that seems to be all, depicting that sleep/wakeup for ARM is broken and there are still missing some pieces of the puzzle.
Nonetheless, we would like to take this RFC as an opportunity for updates on this subject as possible roadmaps.
1) https://lists.gnu.org/archive/html/qemu-devel/2017-07/msg06478.html
2) https://lore.kernel.org/all/[email protected]/T/#mfe24f89778020deeacfe45083f3eea3cf9f55961
3) https://lore.kernel.org/all/[email protected]/T/Annie Li (6):
acpi: hmp/qmp: Add hmp/qmp support forsystem_sleep
acpi: Implement control method sleep button test/acpi: allow DSDT table changes
acpi: Support Control Method sleep button for x86 tests/acpi: Update DSDT tables for Control method sleep button
acpi: Send the GPE event of suspend and wakeup for x86Miguel Luis (5):
hw/acpi: Add ACPI GED support for the sleep event tests/acpi: allow FACP and DSDT table changes for arm/virt hw/arm: enable sleep support for arm/virt tests/acpi: Update FACP and DSDT tables for sleep button arm/virt: enable sleep supporthmp-commands.hx | 14 +++++ hw/acpi/control_method_device.c | 54 ++++++++++++++++++ hw/acpi/core.c | 17 ++++-- hw/acpi/generic_event_device.c | 9 +++ hw/acpi/meson.build | 1 + hw/arm/virt-acpi-build.c | 13 +++++ hw/arm/virt.c | 14 ++++- hw/core/machine-hmp-cmds.c | 5 ++ hw/core/machine-qmp-cmds.c | 11 ++++ hw/i386/acpi-build.c | 9 +++ include/hw/acpi/acpi.h | 1 + include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/control_method_device.h | 25 ++++++++ include/hw/acpi/generic_event_device.h | 1 + include/hw/arm/virt.h | 1 + include/monitor/hmp.h | 1 + qapi/machine.json | 18 ++++++ qapi/pragma.json | 1 + tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5278 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5364 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6639 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7761 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5480 bytes tests/data/acpi/aarch64/virt/FACP | Bin 276 -> 276 bytes tests/data/acpi/x86/pc/DSDT | Bin 6830 -> 7012 bytes tests/data/acpi/x86/pc/DSDT.acpierst | Bin 6741 -> 6923 bytes tests/data/acpi/x86/pc/DSDT.acpihmat | Bin 8155 -> 8337 bytes tests/data/acpi/x86/pc/DSDT.bridge | Bin 13701 -> 13883 bytes tests/data/acpi/x86/pc/DSDT.cphp | Bin 7294 -> 7476 bytes tests/data/acpi/x86/pc/DSDT.dimmpxm | Bin 8484 -> 8666 bytes tests/data/acpi/x86/pc/DSDT.hpbridge | Bin 6781 -> 6963 bytes tests/data/acpi/x86/pc/DSDT.hpbrroot | Bin 3337 -> 3519 bytes tests/data/acpi/x86/pc/DSDT.ipmikcs | Bin 6902 -> 7084 bytes tests/data/acpi/x86/pc/DSDT.memhp | Bin 8189 -> 8371 bytes tests/data/acpi/x86/pc/DSDT.nohpet | Bin 6688 -> 6870 bytes tests/data/acpi/x86/pc/DSDT.numamem | Bin 6836 -> 7018 bytes tests/data/acpi/x86/pc/DSDT.roothp | Bin 10623 -> 10805 bytes tests/data/acpi/x86/q35/DSDT | Bin 8355 -> 8537 bytes tests/data/acpi/x86/q35/DSDT.acpierst | Bin 8372 -> 8554 bytes tests/data/acpi/x86/q35/DSDT.acpihmat | Bin 9680 -> 9862 bytes .../acpi/x86/q35/DSDT.acpihmat-noinitiator | Bin 8634 -> 8816 bytes tests/data/acpi/x86/q35/DSDT.applesmc | Bin 8401 -> 8583 bytes tests/data/acpi/x86/q35/DSDT.bridge | Bin 11968 -> 12150 bytes tests/data/acpi/x86/q35/DSDT.core-count | Bin 12913 -> 13095 bytes tests/data/acpi/x86/q35/DSDT.core-count2 | Bin 33770 -> 33952 bytes tests/data/acpi/x86/q35/DSDT.cphp | Bin 8819 -> 9001 bytes tests/data/acpi/x86/q35/DSDT.cxl | Bin 9714 -> 9896 bytes tests/data/acpi/x86/q35/DSDT.dimmpxm | Bin 10009 -> 10191 bytes tests/data/acpi/x86/q35/DSDT.ipmibt | Bin 8430 -> 8612 bytes tests/data/acpi/x86/q35/DSDT.ipmismbus | Bin 8443 -> 8625 bytes tests/data/acpi/x86/q35/DSDT.ivrs | Bin 8372 -> 8554 bytes tests/data/acpi/x86/q35/DSDT.memhp | Bin 9714 -> 9896 bytes tests/data/acpi/x86/q35/DSDT.mmio64 | Bin 9485 -> 9667 bytes tests/data/acpi/x86/q35/DSDT.multi-bridge | Bin 13208 -> 13390 bytes tests/data/acpi/x86/q35/DSDT.noacpihp | Bin 8235 -> 8417 bytes tests/data/acpi/x86/q35/DSDT.nohpet | Bin 8213 -> 8395 bytes tests/data/acpi/x86/q35/DSDT.numamem | Bin 8361 -> 8543 bytes tests/data/acpi/x86/q35/DSDT.pvpanic-isa | Bin 8456 -> 8638 bytes tests/data/acpi/x86/q35/DSDT.thread-count | Bin 12913 -> 13095 bytes tests/data/acpi/x86/q35/DSDT.thread-count2 | Bin 33770 -> 33952 bytes tests/data/acpi/x86/q35/DSDT.tis.tpm12 | Bin 8961 -> 9143 bytes tests/data/acpi/x86/q35/DSDT.tis.tpm2 | Bin 8987 -> 9169 bytes tests/data/acpi/x86/q35/DSDT.type4-count | Bin 18589 -> 18771 bytes tests/data/acpi/x86/q35/DSDT.viot | Bin 9464 -> 9646 bytes tests/data/acpi/x86/q35/DSDT.xapic | Bin 35718 -> 35900 bytes 65 files changed, 191 insertions(+), 5 deletions(-) create mode 100644 hw/acpi/control_method_device.c create mode 100644 include/hw/acpi/control_method_device.h
Quoted 22 lines · Igor Mammedov
Quoted 19 lines · On Fri, 27 Sep 2024 14:38:55 -0400 Annie Li <[email protected]> wrote:
The ACPI sleep button can be implemented as a fixed hardware button or Control Method Sleep button.
The patch of implementing a fixed hardware sleep button was posted here 1). More discussions can be found here 2). Essentially, the discussion mainly focuses on whether the sleep button is implemented as a fixed hardware button or Control Method Sleep button. The latter benefits various architectures since the code can be shared among them.
This patch set implements Control Method Sleep button for both x86 and ARM platform.(The patch set was posted previously here 3). We rebase all the patches on QEMU9.1.0 and re-post it).
For x86, a sleep button GPE event handler is implemented, so a GPE event is triggered to indicate the OSPM the sleep button is pressed. Tests have been done for Linux guest, and Windows Server guest, the sleep button works as expected.
Quoted 5 lines
Quoted 3 lines
For ARM, a GED event is triggered to notify the OSPM. With proper debug knobs it is possible to see the guest OSPM acknowledges the sleep event:
Series also missed 'microvm', that uses GED
(it's likely the same amount of work as for arm/virt board)
I haven't implement this for 'microvm' yet, will work on this part, as well as things you mentioned below.
Thanks
Annie
Quoted 119 lines
also test all boards you are touching, to make sure you didn't break them.
Note: commit messages should be more verbose explaining why and what patches are doing.
PS:
Also keep changelog in cover letter, for a short list of changes between series revisions,
see '[PATCH v3 0/1] hw/nvme: add atomic write support' for an exampleQuoted 107 lines
(qemu)
system_sleep
(qemu) [6.744138] exregion-0179ex_system_memory_space: System-Memory (width 32) R/W 0 Address=0000000009080000[6.746003] evmisc-0132 ev_queue_notify_reques: Dispatching Notify on [SLPB] (Device) Value 0x80 (Status Change) Node 00000000f0e6819e [6.802873] PM: suspend entry (s2idle) [6.806201] Filesystems sync: 0.002 seconds [6.807580] Freezing user space processes [6.809478] Freezing user space processes completed (elapsed 0.001 seconds) [6.810602] OOM killer disabled. [6.811111] Freezing remaining freezable tasks [6.812953] Freezing remaining freezable tasks completed (elapsed 0.001 seconds) [6.814126] printk: Suspending console(s) (use no_console_suspend to debug)But that seems to be all, depicting that sleep/wakeup for ARM is broken and there are still missing some pieces of the puzzle.
Nonetheless, we would like to take this RFC as an opportunity for updates on this subject as possible roadmaps.
1) https://urldefense.com/v3/__https://lists.gnu.org/archive/html/qemu-devel/2017-07/msg06478.html__;!!ACWV5N9M2RV99hQ!PLz2MGkywgnU4MB6tbITFe4-fMs6CqdUQY9Jhgbi2vIdAVf94Uz2OI-yBQOYElEQb-dsvtN323zzSb8$
2) https://urldefense.com/v3/__https://lore.kernel.org/all/[email protected]/T/*mfe24f89778020deeacfe45083f3eea3cf9f55961__;Iw!!ACWV5N9M2RV99hQ!PLz2MGkywgnU4MB6tbITFe4-fMs6CqdUQY9Jhgbi2vIdAVf94Uz2OI-yBQOYElEQb-dsvtN34RUikoM$
3) https://urldefense.com/v3/__https://lore.kernel.org/all/[email protected]/T/__;!!ACWV5N9M2RV99hQ!PLz2MGkywgnU4MB6tbITFe4-fMs6CqdUQY9Jhgbi2vIdAVf94Uz2OI-yBQOYElEQb-dsvtN3zrJlck4$Annie Li (6):
acpi: hmp/qmp: Add hmp/qmp support forsystem_sleep
acpi: Implement control method sleep button test/acpi: allow DSDT table changes
acpi: Support Control Method sleep button for x86 tests/acpi: Update DSDT tables for Control method sleep button
acpi: Send the GPE event of suspend and wakeup for x86Miguel Luis (5):
hw/acpi: Add ACPI GED support for the sleep event tests/acpi: allow FACP and DSDT table changes for arm/virt hw/arm: enable sleep support for arm/virt tests/acpi: Update FACP and DSDT tables for sleep button arm/virt: enable sleep supporthmp-commands.hx | 14 +++++ hw/acpi/control_method_device.c | 54 ++++++++++++++++++ hw/acpi/core.c | 17 ++++-- hw/acpi/generic_event_device.c | 9 +++ hw/acpi/meson.build | 1 + hw/arm/virt-acpi-build.c | 13 +++++ hw/arm/virt.c | 14 ++++- hw/core/machine-hmp-cmds.c | 5 ++ hw/core/machine-qmp-cmds.c | 11 ++++ hw/i386/acpi-build.c | 9 +++ include/hw/acpi/acpi.h | 1 + include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/control_method_device.h | 25 ++++++++ include/hw/acpi/generic_event_device.h | 1 + include/hw/arm/virt.h | 1 + include/monitor/hmp.h | 1 + qapi/machine.json | 18 ++++++ qapi/pragma.json | 1 + tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5278 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5364 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6639 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7761 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5480 bytes tests/data/acpi/aarch64/virt/FACP | Bin 276 -> 276 bytes tests/data/acpi/x86/pc/DSDT | Bin 6830 -> 7012 bytes tests/data/acpi/x86/pc/DSDT.acpierst | Bin 6741 -> 6923 bytes tests/data/acpi/x86/pc/DSDT.acpihmat | Bin 8155 -> 8337 bytes tests/data/acpi/x86/pc/DSDT.bridge | Bin 13701 -> 13883 bytes tests/data/acpi/x86/pc/DSDT.cphp | Bin 7294 -> 7476 bytes tests/data/acpi/x86/pc/DSDT.dimmpxm | Bin 8484 -> 8666 bytes tests/data/acpi/x86/pc/DSDT.hpbridge | Bin 6781 -> 6963 bytes tests/data/acpi/x86/pc/DSDT.hpbrroot | Bin 3337 -> 3519 bytes tests/data/acpi/x86/pc/DSDT.ipmikcs | Bin 6902 -> 7084 bytes tests/data/acpi/x86/pc/DSDT.memhp | Bin 8189 -> 8371 bytes tests/data/acpi/x86/pc/DSDT.nohpet | Bin 6688 -> 6870 bytes tests/data/acpi/x86/pc/DSDT.numamem | Bin 6836 -> 7018 bytes tests/data/acpi/x86/pc/DSDT.roothp | Bin 10623 -> 10805 bytes tests/data/acpi/x86/q35/DSDT | Bin 8355 -> 8537 bytes tests/data/acpi/x86/q35/DSDT.acpierst | Bin 8372 -> 8554 bytes tests/data/acpi/x86/q35/DSDT.acpihmat | Bin 9680 -> 9862 bytes .../acpi/x86/q35/DSDT.acpihmat-noinitiator | Bin 8634 -> 8816 bytes tests/data/acpi/x86/q35/DSDT.applesmc | Bin 8401 -> 8583 bytes tests/data/acpi/x86/q35/DSDT.bridge | Bin 11968 -> 12150 bytes tests/data/acpi/x86/q35/DSDT.core-count | Bin 12913 -> 13095 bytes tests/data/acpi/x86/q35/DSDT.core-count2 | Bin 33770 -> 33952 bytes tests/data/acpi/x86/q35/DSDT.cphp | Bin 8819 -> 9001 bytes tests/data/acpi/x86/q35/DSDT.cxl | Bin 9714 -> 9896 bytes tests/data/acpi/x86/q35/DSDT.dimmpxm | Bin 10009 -> 10191 bytes tests/data/acpi/x86/q35/DSDT.ipmibt | Bin 8430 -> 8612 bytes tests/data/acpi/x86/q35/DSDT.ipmismbus | Bin 8443 -> 8625 bytes tests/data/acpi/x86/q35/DSDT.ivrs | Bin 8372 -> 8554 bytes tests/data/acpi/x86/q35/DSDT.memhp | Bin 9714 -> 9896 bytes tests/data/acpi/x86/q35/DSDT.mmio64 | Bin 9485 -> 9667 bytes tests/data/acpi/x86/q35/DSDT.multi-bridge | Bin 13208 -> 13390 bytes tests/data/acpi/x86/q35/DSDT.noacpihp | Bin 8235 -> 8417 bytes tests/data/acpi/x86/q35/DSDT.nohpet | Bin 8213 -> 8395 bytes tests/data/acpi/x86/q35/DSDT.numamem | Bin 8361 -> 8543 bytes tests/data/acpi/x86/q35/DSDT.pvpanic-isa | Bin 8456 -> 8638 bytes tests/data/acpi/x86/q35/DSDT.thread-count | Bin 12913 -> 13095 bytes tests/data/acpi/x86/q35/DSDT.thread-count2 | Bin 33770 -> 33952 bytes tests/data/acpi/x86/q35/DSDT.tis.tpm12 | Bin 8961 -> 9143 bytes tests/data/acpi/x86/q35/DSDT.tis.tpm2 | Bin 8987 -> 9169 bytes tests/data/acpi/x86/q35/DSDT.type4-count | Bin 18589 -> 18771 bytes tests/data/acpi/x86/q35/DSDT.viot | Bin 9464 -> 9646 bytes tests/data/acpi/x86/q35/DSDT.xapic | Bin 35718 -> 35900 bytes 65 files changed, 191 insertions(+), 5 deletions(-)create mode 100644
hw/acpi/control_method_device.ccreate mode 100644include/hw/acpi/control_method_device.h