QEMU-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>,
	Sergio Lopez <slp@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Igor Mammedov <imammedo@redhat.com>,
	Richard Henderson <rth@twiddle.net>
Subject: [PATCH 03/13] microvm: add isa-acpi device
Date: Thu, 19 Mar 2020 09:01:07 +0100
Message-ID: <20200319080117.7725-4-kraxel@redhat.com> (raw)
In-Reply-To: <20200319080117.7725-1-kraxel@redhat.com>

Minimal ACPI device for PCI-less machines like microvm.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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
 
-- 
2.18.2



  parent reply index

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-19  8:01 [PATCH 00/13] microvm: add acpi support Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 01/13] acpi: make build_madt() more generic Gerd Hoffmann
2020-03-19  9:34   ` Philippe Mathieu-Daudé
2020-03-19  8:01 ` [PATCH 02/13] acpi: factor out acpi_dsdt_add_fw_cfg() Gerd Hoffmann
2020-03-19  9:36   ` Philippe Mathieu-Daudé
2020-03-19 12:16   ` Igor Mammedov
2020-03-19  8:01 ` Gerd Hoffmann [this message]
2020-03-19 13:42   ` [PATCH 03/13] microvm: add isa-acpi device Igor Mammedov
2020-03-20  8:22     ` Gerd Hoffmann
2020-03-20 14:54       ` Igor Mammedov
2020-03-19  8:01 ` [PATCH 04/13] microvm: add minimal acpi support Gerd Hoffmann
2020-03-19 14:00   ` Igor Mammedov
2020-03-25  9:04     ` Gerd Hoffmann
2020-03-25 18:59       ` Igor Mammedov
2020-03-19  8:01 ` [PATCH 05/13] microvm: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-03-19 14:30   ` Igor Mammedov
2020-03-20  8:19     ` Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 06/13] microvm: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 07/13] [testing] seabios: update submodule to experimental microvm branch Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 08/13] [testing] seabios: update config & build rules Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 09/13] [testing] seabios: update binaries to experimental microvm branch Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 10/13] microvm/acpi: add rtc Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 11/13] microvm/acpi: add serial Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 12/13] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 13/13] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-03-20 15:30   ` Konrad Rzeszutek Wilk
2020-03-23 10:23     ` Gerd Hoffmann
2020-03-19  8:19 ` [PATCH 00/13] microvm: add acpi support no-reply
2020-03-19  8:23 ` no-reply
2020-03-19  8:24 ` no-reply
2020-03-19  8:49 ` Paolo Bonzini
2020-03-19  9:33   ` Gerd Hoffmann
2020-03-19  9:59     ` Paolo Bonzini
2020-03-19 11:28       ` Gerd Hoffmann
2020-03-19 13:40   ` Gerd Hoffmann
2020-03-19 17:34     ` Paolo Bonzini
2020-03-20  8:32       ` Gerd Hoffmann
2020-03-20 10:41         ` Paolo Bonzini
2020-03-23 10:51 ` Michael S. Tsirkin
2020-03-23 12:09   ` Gerd Hoffmann
2020-03-23 12:16     ` Igor Mammedov
2020-03-25  9:16       ` Gerd Hoffmann
2020-03-25  9:53         ` Igor Mammedov
2020-03-25 18:56         ` Igor Mammedov
2020-03-25 12:32 ` Igor Mammedov
2020-03-25 15:03   ` Gerd Hoffmann
2020-03-25 18:44     ` Igor Mammedov
2020-03-26  7:33       ` Michael S. Tsirkin
2020-03-26 10:59         ` Igor Mammedov
2020-03-27 12:06       ` Gerd Hoffmann
2020-03-27 14:05         ` Igor Mammedov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200319080117.7725-4-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=slp@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

QEMU-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git
	git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \
		qemu-devel@nongnu.org
	public-inbox-index qemu-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git