Add pvpanic device in arm virt machine.
Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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 9f67782..c4f29c8 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, \
@@ -143,6 +144,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 +192,23 @@ 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);
+}
+
static void create_fdt(VirtMachineState *vms)
{
void *fdt = create_device_tree(&vms->fdt_size);
@@ -1531,6 +1550,8 @@ static void machvirt_init(MachineState *machine)
create_flash(vms, sysmem, secure_sysmem ? secure_sysmem : sysmem);
+ create_pvpanic_device(vms);
+
create_gic(vms, pic);
fdt_add_pmu_nodes(vms);
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 4cc57a7..937c124 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -66,6 +66,7 @@ enum {
VIRT_GIC_REDIST,
VIRT_GIC_REDIST2,
VIRT_SMMU,
+ VIRT_PVPANIC,
VIRT_UART,
VIRT_MMIO,
VIRT_RTC,
--
1.8.3.1
Hi,
On 2018/11/16 18:50, Peng Hao wrote:
> Add pvpanic device in arm virt machine.
>
> Signed-off-by: Peng Hao<peng.hao2@zte.com.cn>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com>
> ---
> 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 9f67782..c4f29c8 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, \
> @@ -143,6 +144,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 +192,23 @@ 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);
> +}
> +
> static void create_fdt(VirtMachineState *vms)
> {
> void *fdt = create_device_tree(&vms->fdt_size);
> @@ -1531,6 +1550,8 @@ static void machvirt_init(MachineState *machine)
>
> create_flash(vms, sysmem, secure_sysmem ? secure_sysmem : sysmem);
>
> + create_pvpanic_device(vms);
> +
It should not create pvpanic by default. It should be configurable via
-device pvpanic.
Thanks,
Shannon
>Hi, > >On 2018/11/16 18:50, Peng Hao wrote: >> Add pvpanic device in arm virt machine. [...] >> >> + create_pvpanic_device(vms); >> + >It should not create pvpanic by default. It should be configurable via >-device pvpanic. yeah ,it is a problem. I will resolve it. Thanks. >Thanks, >Shannon
On 16 November 2018 at 10:50, Peng Hao <peng.hao2@zte.com.cn> wrote:
> Add pvpanic device in arm virt machine.
>
> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> 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 9f67782..c4f29c8 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, \
> @@ -143,6 +144,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 +192,23 @@ 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);
Note that we can't take these patches into QEMU until the device
tree binding has been agreed upstream and accepted into the kernel.
> + g_free(nodename);
> +}
> +
> static void create_fdt(VirtMachineState *vms)
> {
> void *fdt = create_device_tree(&vms->fdt_size);
> @@ -1531,6 +1550,8 @@ static void machvirt_init(MachineState *machine)
>
> create_flash(vms, sysmem, secure_sysmem ? secure_sysmem : sysmem);
>
> + create_pvpanic_device(vms);
> +
> create_gic(vms, pic);
As Shannon suggests, we should not be creating this device by default.
thanks
-- PMM
> > Add pvpanic device in arm virt machine.
> >
> > Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > ---
> > 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 9f67782..c4f29c8 100644
[...]
> > + "compatible", "qemu,pvpanic-mmio");
> > + qemu_fdt_setprop_sized_cells(vms->fdt, nodename, "reg",
> > + 2, base, 2, size);
>
> Note that we can't take these patches into QEMU until the device
> tree binding has been agreed upstream and accepted into the kernel.
>
kernel part : https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/log/?h=char-misc-next
> > + g_free(nodename);
> > +}
> > +
> > static void create_fdt(VirtMachineState *vms)
> > {
> > void *fdt = create_device_tree(&vms->fdt_size);
> > @@ -1531,6 +1550,8 @@ static void machvirt_init(MachineState *machine)
> >
> > create_flash(vms, sysmem, secure_sysmem ? secure_sysmem : sysmem);
> >
> > + create_pvpanic_device(vms);
> > +
> > create_gic(vms, pic);
>
> As Shannon suggests, we should not be creating this device by default.
I'm just working for that.
Thanks.
>
> thanks
> -- PMM
© 2016 - 2025 Red Hat, Inc.