[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 06/11] acpi: Send the GPE event of suspend and wakeup for x86
From: |
Annie Li |
Subject: |
[RFC PATCH 06/11] acpi: Send the GPE event of suspend and wakeup for x86 |
Date: |
Tue, 5 Dec 2023 00:28:15 +0000 |
The GPE event is triggered to notify the guest to suspend or
wakeup itself. This patch removes the previous implementation
of QEMU_WAKEUP_REASON_OTHER pretending the resume was caused
by power button.
Signed-off-by: Annie Li <annie.li@oracle.com>
---
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(-)
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index ec5e127d17..e5c3ff9a54 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -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;
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 9f1e636c90..d51802214b 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -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"
@@ -264,6 +265,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)
diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
index e0e51e85b4..07e31aa138 100644
--- a/include/hw/acpi/acpi.h
+++ b/include/hw/acpi/acpi.h
@@ -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);
diff --git a/include/hw/acpi/acpi_dev_interface.h
b/include/hw/acpi/acpi_dev_interface.h
index 68d9d15f50..1cb050cd3a 100644
--- a/include/hw/acpi/acpi_dev_interface.h
+++ b/include/hw/acpi/acpi_dev_interface.h
@@ -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"
--
2.34.3
- [RFC PATCH 01/11] acpi: hmp/qmp: Add hmp/qmp support for system_sleep, (continued)
[RFC PATCH 02/11] acpi: Implement control method sleep button, Annie Li, 2023/12/04
[RFC PATCH 04/11] acpi: Support Control Method sleep button for x86, Annie Li, 2023/12/04
[RFC PATCH 05/11] tests/acpi/bios-tables-test: update DSDT tables for Control Method Sleep button, Annie Li, 2023/12/04
[RFC PATCH 06/11] acpi: Send the GPE event of suspend and wakeup for x86,
Annie Li <=
[RFC PATCH 08/11] tests/acpi: allow FACP and DSDT table changes for arm/virt, Annie Li, 2023/12/04
[RFC PATCH 10/11] tests/acpi: Update FACP and DSDT tables for sleep button, Annie Li, 2023/12/04
[RFC PATCH 11/11] arm/virt: enable sleep support, Annie Li, 2023/12/04
[RFC PATCH 09/11] hw/arm: enable sleep support for arm/virt, Annie Li, 2023/12/04
[RFC PATCH 03/11] test/acpi: allow DSDT table changes, Annie Li, 2023/12/04
[RFC PATCH 07/11] hw/acpi: Add ACPI GED support for the sleep event, Annie Li, 2023/12/04