Re: [PATCH 03/13] microvm: add isa-acpi device

[Igor Mammedov]

On Thu, 19 Mar 2020 09:01:07 +0100
Gerd Hoffmann <address@hidden> wrote:

> Minimal ACPI device for PCI-less machines like microvm.
it seems that x86 kernel is able to boot on hw-reduced acpi systems
(but I haven't really tested any distro kernel, not sure how usable NEMU is)

Maybe reusing hw/acpi/generic_event_device.c (which was borrowed
for NEMU effort) would be better since guest won't have to initialize
not necessary interfaces and QEMU could implement simpler hw impl
compared to full ACPI with GPEs, SCIs & co.


> 
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  hw/acpi/isa-acpi.c    | 114 ++++++++++++++++++++++++++++++++++++++++++
>  hw/acpi/Makefile.objs |   1 +
>  2 files changed, 115 insertions(+)
>  create mode 100644 hw/acpi/isa-acpi.c
> 
> diff --git a/hw/acpi/isa-acpi.c b/hw/acpi/isa-acpi.c
> new file mode 100644
> index 000000000000..5d7d770a5c0b
> --- /dev/null
> +++ b/hw/acpi/isa-acpi.c
> @@ -0,0 +1,114 @@
> +#include "qemu/osdep.h"
> +#include "hw/i386/pc.h"
> +#include "hw/acpi/acpi.h"
> +#include "sysemu/runstate.h"
> +
> +typedef struct ISAACPI {
> +    ISADevice base;
> +
> +    uint32_t io_base;
> +    uint16_t sci_irq;
> +    uint32_t gpe_base;
> +    uint32_t gpe_len;
> +
> +    qemu_irq irq;
> +    MemoryRegion io;
> +    ACPIREGS acpi;
> +    Notifier powerdown_req;
> +} ISAACPI;
> +
> +#define TYPE_ISA_ACPI "isa-acpi"
> +#define ISA_ACPI(obj) \
> +    OBJECT_CHECK(ISAACPI, (obj), TYPE_ISA_ACPI)
> +
> +static void isa_acpi_timer(ACPIREGS *acpi)
> +{
> +    ISAACPI *s = container_of(acpi, ISAACPI, acpi);
> +    acpi_update_sci(&s->acpi, s->irq);
> +}
> +
> +static void isa_acpi_init(Object *obj)
> +{
> +    ISAACPI *s = ISA_ACPI(obj);
> +
> +    s->io_base = 0x600;
> +    s->sci_irq = 9;
> +    s->gpe_base = 0x680;
> +    s->gpe_len = 4;
> +}
> +
> +static void isa_acpi_powerdown_req(Notifier *n, void *opaque)
> +{
> +    ISAACPI *s = container_of(n, ISAACPI, powerdown_req);
> +
> +    acpi_pm1_evt_power_down(&s->acpi);
> +}
> +
> +static void isa_acpi_add_propeties(ISAACPI *s)
> +{
> +    static const uint8_t zero;
> +
> +    object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_ENABLE_CMD,
> +                                  &zero, NULL);
> +    object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_DISABLE_CMD,
> +                                  &zero, NULL);
> +    object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK,
> +                                   &s->gpe_base, NULL);
> +    object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK_LEN,
> +                                   &s->gpe_len, NULL);
> +    object_property_add_uint16_ptr(OBJECT(s), ACPI_PM_PROP_SCI_INT,
> +                                   &s->sci_irq, NULL);
> +    object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_PM_IO_BASE,
> +                                   &s->io_base, NULL);
> +}
> +
> +static void isa_acpi_realize(DeviceState *dev, Error **errp)
> +{
> +    ISADevice *isa = ISA_DEVICE(dev);
> +    ISAACPI *s = ISA_ACPI(dev);
> +
> +    memory_region_init(&s->io, OBJECT(s), "isa-acpi", 64);
> +    memory_region_set_enabled(&s->io, true);
> +    isa_register_ioport(isa, &s->io, s->io_base);
> +    isa_init_irq(isa, &s->irq, s->sci_irq);
> +
> +    acpi_pm_tmr_init(&s->acpi, isa_acpi_timer, &s->io);
> +    acpi_pm1_evt_init(&s->acpi, isa_acpi_timer, &s->io);
> +    acpi_pm1_cnt_init(&s->acpi, &s->io, true, true, 0);
> +    acpi_gpe_init(&s->acpi, 4);
> +
> +    s->powerdown_req.notify = isa_acpi_powerdown_req;
> +    qemu_register_powerdown_notifier(&s->powerdown_req);
> +
> +    isa_acpi_add_propeties(s);
> +}
> +
> +static void isa_acpi_class_init(ObjectClass *klass, void *data)
> +{
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> +    AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(klass);
> +
> +    dc->realize = isa_acpi_realize;
> +    dc->user_creatable = false;
> +    dc->hotpluggable = false;
> +    adevc->madt_cpu = pc_madt_cpu_entry;
> +}
> +
> +static const TypeInfo isa_acpi_info = {
> +    .name          = TYPE_ISA_ACPI,
> +    .parent        = TYPE_ISA_DEVICE,
> +    .instance_size = sizeof(ISAACPI),
> +    .instance_init = isa_acpi_init,
> +    .class_init    = isa_acpi_class_init,
> +    .interfaces = (InterfaceInfo[]) {
> +        { TYPE_ACPI_DEVICE_IF },
> +        { }
> +    }
> +};
> +
> +static void register_types(void)
> +{
> +    type_register_static(&isa_acpi_info);
> +}
> +
> +type_init(register_types)
> diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
> index 777da07f4d70..aae53c73ebbd 100644
> --- a/hw/acpi/Makefile.objs
> +++ b/hw/acpi/Makefile.objs
> @@ -14,6 +14,7 @@ common-obj-$(call lnot,$(CONFIG_PC)) += acpi-x86-stub.o
>  common-obj-y += acpi_interface.o
>  common-obj-y += bios-linker-loader.o
>  common-obj-y += aml-build.o utils.o
> +common-obj-$(CONFIG_PC) += isa-acpi.o
>  common-obj-$(CONFIG_ACPI_PCI) += pci.o
>  common-obj-$(CONFIG_TPM) += tpm.o
>