mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen_arm: Create virtio-mmio devices during initialization

Browse Source 
In order to use virtio backends we need to allocate virtio-mmio
parameters (irq and base) and register corresponding buses.

Use the constants defined in public header arch-arm.h to be
aligned with the toolstack. So the number of current supported
virtio-mmio devices is 10.

For the interrupts triggering use already existing on Arm
device-model hypercall.

The toolstack should then insert the same amount of device nodes
into guest device-tree.

Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
This commit is contained in:
Oleksandr Tyshchenko 2023-08-29 21:35:17 -07:00 committed by Stefano Stabellini
parent 156618d9ea
commit 0c8ab1cddd
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hw/arm/xen_arm.c
View File

@ -26,6 +26,7 @@
#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-migration.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/irq.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/tpm_backend.h" #include "sysemu/tpm_backend.h"
@ -59,6 +60,38 @@ struct XenArmState {
} cfg; } cfg;
}; };
/*
* VIRTIO_MMIO_DEV_SIZE is imported from tools/libs/light/libxl_arm.c under Xen
* repository.
*
* Origin: git://xenbits.xen.org/xen.git 2128143c114c
*/
#define VIRTIO_MMIO_DEV_SIZE 0x200
#define NR_VIRTIO_MMIO_DEVICES \
(GUEST_VIRTIO_MMIO_SPI_LAST - GUEST_VIRTIO_MMIO_SPI_FIRST)
static void xen_set_irq(void *opaque, int irq, int level)
{
xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level);
}
static void xen_create_virtio_mmio_devices(XenArmState *xam)
{
int i;
for (i = 0; i < NR_VIRTIO_MMIO_DEVICES; i++) {
hwaddr base = GUEST_VIRTIO_MMIO_BASE + i * VIRTIO_MMIO_DEV_SIZE;
qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL,
GUEST_VIRTIO_MMIO_SPI_FIRST + i);
sysbus_create_simple("virtio-mmio", base, irq);
DPRINTF("Created virtio-mmio device %d: irq %d base 0x%lx\n",
i, GUEST_VIRTIO_MMIO_SPI_FIRST + i, base);
}
}
void arch_handle_ioreq(XenIOState *state, ioreq_t *req) void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
{ {
hw_error("Invalid ioreq type 0x%x\n", req->type); hw_error("Invalid ioreq type 0x%x\n", req->type);
@ -110,6 +143,8 @@ static void xen_arm_init(MachineState *machine)
xen_register_ioreq(xam->state, machine->smp.cpus, &xen_memory_listener); xen_register_ioreq(xam->state, machine->smp.cpus, &xen_memory_listener);
xen_create_virtio_mmio_devices(xam);
#ifdef CONFIG_TPM #ifdef CONFIG_TPM
if (xam->cfg.tpm_base_addr) { if (xam->cfg.tpm_base_addr) {
xen_enable_tpm(xam); xen_enable_tpm(xam);

16
include/hw/xen/xen_native.h
View File

@ -523,4 +523,20 @@ static inline int xen_set_ioreq_server_state(domid_t dom,
enable); enable);
} }
#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41500
static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
domid_t domid, uint32_t irq,
unsigned int level)
{
return 0;
}
#endif
#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41700
#define GUEST_VIRTIO_MMIO_BASE xen_mk_ullong(0x02000000)
#define GUEST_VIRTIO_MMIO_SIZE xen_mk_ullong(0x00100000)
#define GUEST_VIRTIO_MMIO_SPI_FIRST 33
#define GUEST_VIRTIO_MMIO_SPI_LAST 43
#endif
#endif /* QEMU_HW_XEN_NATIVE_H */ #endif /* QEMU_HW_XEN_NATIVE_H */