[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/21] microvm/acpi: add acpi_dsdt_add_virtio() for x86
From: |
Gerd Hoffmann |
Subject: |
[PULL 09/21] microvm/acpi: add acpi_dsdt_add_virtio() for x86 |
Date: |
Thu, 17 Sep 2020 15:53:11 +0200 |
Makes x86 linux kernel find virtio-mmio devices automatically.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-10-kraxel@redhat.com
---
hw/i386/acpi-microvm.c | 52 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c
index 06ef33949f5f..b9ce3768b263 100644
--- a/hw/i386/acpi-microvm.c
+++ b/hw/i386/acpi-microvm.c
@@ -21,6 +21,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cutils.h"
#include "qapi/error.h"
#include "exec/memory.h"
@@ -32,10 +33,60 @@
#include "hw/boards.h"
#include "hw/i386/fw_cfg.h"
#include "hw/i386/microvm.h"
+#include "hw/virtio/virtio-mmio.h"
#include "acpi-common.h"
#include "acpi-microvm.h"
+static void acpi_dsdt_add_virtio(Aml *scope,
+ MicrovmMachineState *mms)
+{
+ gchar *separator;
+ long int index;
+ BusState *bus;
+ BusChild *kid;
+
+ bus = sysbus_get_default();
+ QTAILQ_FOREACH(kid, &bus->children, sibling) {
+ DeviceState *dev = kid->child;
+ Object *obj = object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MMIO);
+
+ if (obj) {
+ VirtIOMMIOProxy *mmio = VIRTIO_MMIO(obj);
+ VirtioBusState *mmio_virtio_bus = &mmio->bus;
+ BusState *mmio_bus = &mmio_virtio_bus->parent_obj;
+
+ if (QTAILQ_EMPTY(&mmio_bus->children)) {
+ continue;
+ }
+ separator = g_strrstr(mmio_bus->name, ".");
+ if (!separator) {
+ continue;
+ }
+ if (qemu_strtol(separator + 1, NULL, 10, &index) != 0) {
+ continue;
+ }
+
+ uint32_t irq = mms->virtio_irq_base + index;
+ hwaddr base = VIRTIO_MMIO_BASE + index * 512;
+ hwaddr size = 512;
+
+ Aml *dev = aml_device("VR%02u", (unsigned)index);
+ aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0005")));
+ aml_append(dev, aml_name_decl("_UID", aml_int(index)));
+ aml_append(dev, aml_name_decl("_CCA", aml_int(1)));
+
+ Aml *crs = aml_resource_template();
+ aml_append(crs, aml_memory32_fixed(base, size, AML_READ_WRITE));
+ aml_append(crs,
+ aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH,
+ AML_EXCLUSIVE, &irq, 1));
+ aml_append(dev, aml_name_decl("_CRS", crs));
+ aml_append(scope, dev);
+ }
+ }
+}
+
static void
build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,
MicrovmMachineState *mms)
@@ -60,6 +111,7 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,
build_ged_aml(sb_scope, GED_DEVICE, HOTPLUG_HANDLER(mms->acpi_dev),
GED_MMIO_IRQ, AML_SYSTEM_MEMORY, GED_MMIO_BASE);
acpi_dsdt_add_power_button(sb_scope);
+ acpi_dsdt_add_virtio(sb_scope, mms);
aml_append(dsdt, sb_scope);
/* ACPI 5.0: Table 7-209 System State Package */
--
2.27.0
- [PULL 12/21] microvm/acpi: disable virtio-mmio cmdline hack, (continued)
- [PULL 12/21] microvm/acpi: disable virtio-mmio cmdline hack, Gerd Hoffmann, 2020/09/17
- [PULL 07/21] microvm: make virtio irq base runtime configurable, Gerd Hoffmann, 2020/09/17
- [PULL 19/21] tests/acpi: add microvm test, Gerd Hoffmann, 2020/09/17
- [PULL 13/21] x86: constify x86_machine_is_*_enabled, Gerd Hoffmann, 2020/09/17
- [PULL 21/21] microvm: enable ramfb, Gerd Hoffmann, 2020/09/17
- [PULL 03/21] seabios: add bios-microvm.bin binary, Gerd Hoffmann, 2020/09/17
- [PULL 11/21] microvm/acpi: use seabios with acpi=on, Gerd Hoffmann, 2020/09/17
- [PULL 16/21] microvm: wire up hotplug, Gerd Hoffmann, 2020/09/17
- [PULL 20/21] tests/acpi: update expected data files for microvm, Gerd Hoffmann, 2020/09/17
- [PULL 06/21] acpi: move acpi_dsdt_add_power_button() to ged, Gerd Hoffmann, 2020/09/17
- [PULL 09/21] microvm/acpi: add acpi_dsdt_add_virtio() for x86,
Gerd Hoffmann <=
- [PULL 14/21] x86: move acpi_dev from pc/microvm, Gerd Hoffmann, 2020/09/17
- [PULL 08/21] microvm/acpi: add minimal acpi support, Gerd Hoffmann, 2020/09/17
- [PULL 15/21] x86: move cpu hotplug from pc to x86, Gerd Hoffmann, 2020/09/17
- [PULL 18/21] tests/acpi: allow override blkdev, Gerd Hoffmann, 2020/09/17
- Re: [PULL 00/21] Microvm 20200917 patches, Peter Maydell, 2020/09/18