diff options
author | Igor Mammedov <imammedo@redhat.com> | 2016-05-31 11:57:57 +0200 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2016-06-07 15:36:54 +0300 |
commit | eaf23bf794c749c621a5605c1076a16e3d81e12b (patch) | |
tree | b26aa5b26af67ebb663013d04a50feef28eec911 /hw/acpi | |
parent | 6d42eefad8ead3dd8a1fc887efb9a017a35319fc (diff) |
acpi: extend ACPI interface to provide send_event hook
send_event() hook will allow to send ACPI event in
a target specific way (GPE or GPIO based impl.)
it will also simplify proxy wrappers in piix4pm/ich9
that access ACPI regs and SCI which are part of
piix4pm/lcp_ich9 devices and call acpi_foo() API directly.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Diffstat (limited to 'hw/acpi')
-rw-r--r-- | hw/acpi/acpi_interface.c | 9 | ||||
-rw-r--r-- | hw/acpi/core.c | 2 | ||||
-rw-r--r-- | hw/acpi/piix4.c | 8 |
3 files changed, 18 insertions, 1 deletions
diff --git a/hw/acpi/acpi_interface.c b/hw/acpi/acpi_interface.c index d82131326a..6583917b8e 100644 --- a/hw/acpi/acpi_interface.c +++ b/hw/acpi/acpi_interface.c @@ -2,6 +2,15 @@ #include "hw/acpi/acpi_dev_interface.h" #include "qemu/module.h" +void acpi_send_event(DeviceState *dev, AcpiEventStatusBits event) +{ + AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(dev); + if (adevc->send_event) { + AcpiDeviceIf *adev = ACPI_DEVICE_IF(dev); + adevc->send_event(adev, event); + } +} + static void register_types(void) { static const TypeInfo acpi_dev_if_info = { diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 1ffd155c11..d24b9a98c8 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -698,7 +698,7 @@ uint32_t acpi_gpe_ioport_readb(ACPIREGS *ar, uint32_t addr) } void acpi_send_gpe_event(ACPIREGS *ar, qemu_irq irq, - AcpiGPEStatusBits status) + AcpiEventStatusBits status) { ar->gpe.sts[0] |= status; acpi_update_sci(ar, irq); diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 522c9a89cb..5b4fcb56c5 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -586,6 +586,13 @@ static void piix4_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list) acpi_memory_ospm_status(&s->acpi_memory_hotplug, list); } +static void piix4_send_gpe(AcpiDeviceIf *adev, AcpiEventStatusBits ev) +{ + PIIX4PMState *s = PIIX4_PM(adev); + + acpi_send_gpe_event(&s->ar, s->irq, ev); +} + static Property piix4_pm_properties[] = { DEFINE_PROP_UINT32("smb_io_base", PIIX4PMState, smb_io_base, 0), DEFINE_PROP_UINT8(ACPI_PM_PROP_S3_DISABLED, PIIX4PMState, disable_s3, 0), @@ -624,6 +631,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) hc->unplug_request = piix4_device_unplug_request_cb; hc->unplug = piix4_device_unplug_cb; adevc->ospm_status = piix4_ospm_status; + adevc->send_event = piix4_send_gpe; } static const TypeInfo piix4_pm_info = { |