[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/4] hw/arm/virt: Use the pvpanic device
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 4/4] hw/arm/virt: Use the pvpanic device |
Date: |
Thu, 18 Oct 2018 15:04:34 +0200 |
Signed-off-by: Peng Hao <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
[PMD: Use TYPE_PVPANIC definition, split in 2 patches]
---
default-configs/arm-softmmu.mak | 2 +-
hw/arm/virt.c | 21 +++++++++++++++++++++
include/hw/arm/virt.h | 1 +
3 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2420491aac..def07fa095 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -43,7 +43,7 @@ CONFIG_USB_MUSB=y
CONFIG_USB_EHCI_SYSBUS=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
-
+CONFIG_PVPANIC=y
CONFIG_ARM11MPCORE=y
CONFIG_A9MPCORE=y
CONFIG_A15MPCORE=y
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 9f677825f9..40469e6785 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -59,6 +59,7 @@
#include "qapi/visitor.h"
#include "standard-headers/linux/input.h"
#include "hw/arm/smmuv3.h"
+#include "hw/misc/pvpanic.h"
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
@@ -140,6 +141,7 @@ static const MemMapEntry a15memmap[] = {
[VIRT_UART] = { 0x09000000, 0x00001000 },
[VIRT_RTC] = { 0x09010000, 0x00001000 },
[VIRT_FW_CFG] = { 0x09020000, 0x00000018 },
+ [VIRT_PVPANIC_MMIO] = { 0x09020018, 0x00000002 },
[VIRT_GPIO] = { 0x09030000, 0x00001000 },
[VIRT_SECURE_UART] = { 0x09040000, 0x00001000 },
[VIRT_SMMU] = { 0x09050000, 0x00020000 },
@@ -802,6 +804,23 @@ static void create_gpio(const VirtMachineState *vms,
qemu_irq *pic)
g_free(nodename);
}
+static void create_pvpanic_device(const VirtMachineState *vms)
+{
+ char *nodename;
+ hwaddr base = vms->memmap[VIRT_PVPANIC_MMIO].base;
+ hwaddr size = vms->memmap[VIRT_PVPANIC_MMIO].size;
+
+ sysbus_create_simple(TYPE_PVPANIC, base, NULL);
+
+ nodename = g_strdup_printf("/address@hidden" PRIx64, base);
+ qemu_fdt_add_subnode(vms->fdt, nodename);
+ qemu_fdt_setprop_string(vms->fdt, nodename,
+ "compatible", "pvpanic,mmio");
+ qemu_fdt_setprop_sized_cells(vms->fdt, nodename, "reg",
+ 2, base, 2, size);
+ g_free(nodename);
+}
+
static void create_virtio_devices(const VirtMachineState *vms, qemu_irq *pic)
{
int i;
@@ -1548,6 +1567,8 @@ static void machvirt_init(MachineState *machine)
create_pcie(vms, pic);
+ create_pvpanic_device(vms);
+
create_gpio(vms, pic);
/* Create mmio transports, so the user can create virtio backends
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 4cc57a7ef6..61cc3109b2 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -70,6 +70,7 @@ enum {
VIRT_MMIO,
VIRT_RTC,
VIRT_FW_CFG,
+ VIRT_PVPANIC_MMIO,
VIRT_PCIE,
VIRT_PCIE_MMIO,
VIRT_PCIE_PIO,
--
2.17.2