From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Thomas Huth <thuth@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Sergio Lopez <slp@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Shannon Zhao <shannon.zhaosl@gmail.com>,
qemu-arm@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH v5 09/20] microvm/acpi: add acpi_dsdt_add_virtio() for x86
Date: Tue, 7 Jul 2020 14:53:45 +0200 [thread overview]
Message-ID: <20200707125356.32450-10-kraxel@redhat.com> (raw)
In-Reply-To: <20200707125356.32450-1-kraxel@redhat.com>
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>
---
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 6c4178caefee..d44d7b0cb234 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);
scope = aml_scope("\\");
--
2.18.4
next prev parent reply other threads:[~2020-07-07 13:05 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 12:53 [PATCH v5 00/20] microvm: add acpi support Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 01/20] microvm: name qboot binary qboot.rom Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 02/20] seabios: add microvm config, update build rules Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 03/20] seabios: add bios-microvm.bin binary Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 04/20] acpi: ged: add control regs Gerd Hoffmann
2020-07-10 19:07 ` Igor Mammedov
2020-07-07 12:53 ` [PATCH v5 05/20] acpi: ged: add x86 device variant Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 06/20] acpi: move acpi_dsdt_add_power_button() to ged Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 07/20] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-07-10 19:09 ` Igor Mammedov
2020-07-07 12:53 ` [PATCH v5 08/20] microvm/acpi: add minimal acpi support Gerd Hoffmann
2020-07-08 16:52 ` Michael S. Tsirkin
2020-07-09 12:33 ` Gerd Hoffmann
2020-07-10 19:30 ` Igor Mammedov
2020-07-16 8:52 ` Gerd Hoffmann
2020-07-07 12:53 ` Gerd Hoffmann [this message]
2020-07-07 12:53 ` [PATCH v5 10/20] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 11/20] microvm/acpi: use seabios with acpi=on Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 12/20] microvm/acpi: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 13/20] x86: constify x86_machine_is_*_enabled Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 14/20] x86: move acpi_dev from pc/microvm Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 15/20] x86: move cpu plug from pc to x86 Gerd Hoffmann
2020-07-10 19:37 ` Igor Mammedov
2020-07-07 12:53 ` [PATCH v5 16/20] microvm: wire up hotplug Gerd Hoffmann
2020-07-10 19:44 ` Igor Mammedov
2020-07-07 12:53 ` [PATCH v5 17/20] tests/acpi: allow microvm test data updates Gerd Hoffmann
2020-07-07 12:53 ` [PATCH v5 18/20] tests/acpi: allow override blkdev Gerd Hoffmann
2020-07-10 19:48 ` Igor Mammedov
2020-07-07 12:53 ` [PATCH v5 19/20] tests/acpi: add microvm test Gerd Hoffmann
2020-07-10 19:49 ` Igor Mammedov
2020-07-16 9:10 ` Gerd Hoffmann
2020-07-16 13:05 ` Igor Mammedov
2020-07-07 12:53 ` [PATCH v5 20/20] tests/acpi: update expected data files for microvm Gerd Hoffmann
2020-07-07 13:34 ` [PATCH v5 00/20] microvm: add acpi support no-reply
2020-07-07 13:35 ` no-reply
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=20200707125356.32450-10-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=shannon.zhaosl@gmail.com \
--cc=slp@redhat.com \
--cc=thuth@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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).