[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 12/22] acpi: move acpi_dsdt_add_power_button() to ged
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 12/22] acpi: move acpi_dsdt_add_power_button() to ged |
Date: |
Wed, 20 May 2020 15:19:53 +0200 |
Allow reuse for microvm.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/hw/acpi/generic_event_device.h | 1 +
hw/acpi/generic_event_device.c | 8 ++++++++
hw/arm/virt-acpi-build.c | 8 --------
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/include/hw/acpi/generic_event_device.h
b/include/hw/acpi/generic_event_device.h
index 9687cb524258..ebed1ffe4231 100644
--- a/include/hw/acpi/generic_event_device.h
+++ b/include/hw/acpi/generic_event_device.h
@@ -113,5 +113,6 @@ typedef struct AcpiGedState {
void build_ged_aml(Aml *table, const char* name, HotplugHandler *hotplug_dev,
uint32_t ged_irq, AmlRegionSpace rs, hwaddr ged_base);
+void acpi_dsdt_add_power_button(Aml *scope);
#endif
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
index 3072fb4ab32b..cde50da5b3ca 100644
--- a/hw/acpi/generic_event_device.c
+++ b/hw/acpi/generic_event_device.c
@@ -142,6 +142,14 @@ void build_ged_aml(Aml *table, const char *name,
HotplugHandler *hotplug_dev,
aml_append(table, dev);
}
+void acpi_dsdt_add_power_button(Aml *scope)
+{
+ Aml *dev = aml_device(ACPI_POWER_BUTTON_DEVICE);
+ aml_append(dev, aml_name_decl("_HID", aml_string("PNP0C0C")));
+ aml_append(dev, aml_name_decl("_UID", aml_int(0)));
+ aml_append(scope, dev);
+}
+
/* Memory read by the GED _EVT AML dynamic method */
static uint64_t ged_evt_read(void *opaque, hwaddr addr, unsigned size)
{
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 1b0a584c7b62..49eacc622219 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -354,14 +354,6 @@ static void acpi_dsdt_add_gpio(Aml *scope, const
MemMapEntry *gpio_memmap,
aml_append(scope, dev);
}
-static void acpi_dsdt_add_power_button(Aml *scope)
-{
- Aml *dev = aml_device(ACPI_POWER_BUTTON_DEVICE);
- aml_append(dev, aml_name_decl("_HID", aml_string("PNP0C0C")));
- aml_append(dev, aml_name_decl("_UID", aml_int(0)));
- aml_append(scope, dev);
-}
-
static void
build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{
--
2.18.4
- [PATCH v3 03/22] [testing] seabios: update config & build rules, (continued)
- [PATCH v3 03/22] [testing] seabios: update config & build rules, Gerd Hoffmann, 2020/05/20
- [PATCH v3 02/22] [testing] seabios: update submodule to master snapshot, Gerd Hoffmann, 2020/05/20
- [PATCH v3 08/22] acpi: fadt: add hw-reduced sleep register support, Gerd Hoffmann, 2020/05/20
- [PATCH v3 07/22] acpi: madt: skip pci override on pci-less systems., Gerd Hoffmann, 2020/05/20
- [PATCH v3 15/22] microvm: make virtio irq base runtime configurable, Gerd Hoffmann, 2020/05/20
- [PATCH v3 06/22] acpi: create acpi-common.c and move madt code, Gerd Hoffmann, 2020/05/20
- [PATCH v3 12/22] acpi: move acpi_dsdt_add_power_button() to ged,
Gerd Hoffmann <=
- [PATCH v3 17/22] microvm/acpi: add acpi_dsdt_add_virtio() for x86, Gerd Hoffmann, 2020/05/20
- [PATCH v3 19/22] microvm/acpi: use seabios with acpi=on, Gerd Hoffmann, 2020/05/20
- [PATCH v3 05/22] acpi: make build_madt() more generic., Gerd Hoffmann, 2020/05/20
- [PATCH v3 18/22] microvm/acpi: use GSI 16-23 for virtio, Gerd Hoffmann, 2020/05/20
- [PATCH v3 10/22] acpi: ged: add control regs, Gerd Hoffmann, 2020/05/20