@samitouri / QOSamiQemu / commits / 76f40eb3f1

hw/hexagon/virt: instantiate virtio-mmio transports

Add a VIRT_MMIO region and virtio-mmio transports, wired into l2vic. Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Link: https://lore.kernel.org/qemu-devel/20260806042723.3785369-11-brian.cain@oss.qualcomm.com Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>

Brian Cain committed Aug 5, 2026 at 21:27 UTC 76f40eb3f19311d2f83ba3bd2e1a778681359902
2 files changed +32 -1
hw/hexagon/virt.c
+29 -1
@@ -30,11 +30,19 @@
30
31 enum {
32 VIRT_UART0,
33 + VIRT_MMIO,
34 VIRT_FDT,
35 };
36
37 +/*
38 + * Virtio IRQs run from VIRTIO_IRQ_BASE to
39 + * VIRTIO_IRQ_BASE + VIRTIO_DEV_COUNT - 1
40 + */
41 +static const int VIRTIO_IRQ_BASE = 16;
42 +
43 static const MemMapEntry base_memmap[] = {
44 [VIRT_UART0] = { 0x10000000, 0x00000200 },
45 + [VIRT_MMIO] = { 0x11000000, 0x00001000 },
46 [VIRT_FDT] = { 0x99800000, 0x00400000 },
47 };
48
@@ -167,7 +175,25 @@ static void fdt_add_cpu_nodes(const HexagonVirtMachineState *vms)
175 }
176 }
177
170 -
178 +static void create_virtio_devices(HexagonVirtMachineState *vms)
179 +{
180 + hwaddr size = base_memmap[VIRT_MMIO].size;
181 +
182 + for (int i = 0; i < VIRTIO_DEV_COUNT; i++) {
183 + int irq = VIRTIO_IRQ_BASE + i;
184 + hwaddr base = base_memmap[VIRT_MMIO].base + i * size;
185 + DeviceState *dev = qdev_new("virtio-mmio");
186 + SysBusDevice *s = SYS_BUS_DEVICE(dev);
187 +
188 + object_property_add_child(OBJECT(MACHINE(vms)), "virtio-mmio[*]",
189 + OBJECT(dev));
190 + sysbus_realize_and_unref(s, &error_fatal);
191 + sysbus_mmio_map(s, 0, base);
192 + sysbus_connect_irq(s, 0,
193 + qdev_get_gpio_in(vms->parent_obj.l2vic, irq));
194 + vms->virtio_mmio[i] = dev;
195 + }
196 +}
197
198 void hexagon_load_fdt(const HexagonVirtMachineState *vms)
199 {
@@ -246,6 +272,8 @@ static void virt_init(MachineState *ms)
272
273 fdt_add_hvx(vms, m_cfg);
274
275 + create_virtio_devices(vms);
276 +
277 g_autofree HexagonCPU **cpus = g_new(HexagonCPU *, ms->smp.cpus);
278
279 for (int i = 0; i < ms->smp.cpus; i++) {
include/hw/hexagon/virt.h
+3
@@ -11,6 +11,8 @@
11 #include "hw/hexagon/hexagon.h"
12 #include "target/hexagon/cpu.h"
13
14 +#define VIRTIO_DEV_COUNT 8
15 +
16 struct HexagonVirtMachineState {
17 HexagonCommonMachineState parent_obj;
18
@@ -19,6 +21,7 @@ struct HexagonVirtMachineState {
21 MemoryRegion tcm;
22 MemoryRegion bios;
23 Clock *apb_clk;
24 + DeviceState *virtio_mmio[VIRTIO_DEV_COUNT];
25 };
26
27 void hexagon_load_fdt(const struct HexagonVirtMachineState *vms);