On Wed, 28 Nov 2018 at 03:50, Peng Hao <peng.h...@zte.com.cn> wrote: > > Add pvpanic device in arm virt machine. > > Signed-off-by: Peng Hao <peng.h...@zte.com.cn> > --- > default-configs/arm-softmmu.mak | 1 + > hw/arm/virt.c | 21 +++++++++++++++++++++ > include/hw/arm/virt.h | 1 + > 3 files changed, 23 insertions(+) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 2420491..50345df 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -159,3 +159,4 @@ CONFIG_PCI_DESIGNWARE=y > CONFIG_STRONGARM=y > CONFIG_HIGHBANK=y > CONFIG_MUSICPAL=y > +CONFIG_PVPANIC=y > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index a2b8d8f..f2cb5de 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -143,6 +143,7 @@ static const MemMapEntry a15memmap[] = { > [VIRT_GPIO] = { 0x09030000, 0x00001000 }, > [VIRT_SECURE_UART] = { 0x09040000, 0x00001000 }, > [VIRT_SMMU] = { 0x09050000, 0x00020000 }, > + [VIRT_PVPANIC] = { 0x09070000, 0x00000002 }, > [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, > /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size > */ > [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 }, > @@ -190,6 +191,24 @@ static bool cpu_type_valid(const char *cpu) > return false; > } > > +static void create_pvpanic_device(const VirtMachineState *vms) > +{ > + char *nodename; > + hwaddr base = vms->memmap[VIRT_PVPANIC].base; > + hwaddr size = vms->memmap[VIRT_PVPANIC].size; > + > + sysbus_create_simple(TYPE_PVPANIC_MMIO, base, NULL); > + > + nodename = g_strdup_printf("/pvpanic-mmio@%" PRIx64, base); > + qemu_fdt_add_subnode(vms->fdt, nodename); > + qemu_fdt_setprop_string(vms->fdt, nodename, > + "compatible", "qemu,pvpanic-mmio"); > + qemu_fdt_setprop_sized_cells(vms->fdt, nodename, "reg", > + 2, base, 2, size); > + > + g_free(nodename); > +}
Just a note that the binding documentation for this still doesn't seem to be in the mainline kernel git repo yet; I won't take the patchset until it is. thanks -- PMM