[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH V11 4/8] hw/arm/virt: Use the pvpanic device
From: |
Andrew Jones |
Subject: |
Re: [Qemu-arm] [PATCH V11 4/8] hw/arm/virt: Use the pvpanic device |
Date: |
Mon, 3 Dec 2018 12:21:59 +0100 |
User-agent: |
NeoMutt/20180716 |
On Tue, Dec 04, 2018 at 03:26:45AM +0800, Peng Hao wrote:
> Add pvpanic device in arm virt machine.
>
> Signed-off-by: Peng Hao <address@hidden>
> ---
> default-configs/arm-softmmu.mak | 1 +
> hw/arm/virt.c | 22 ++++++++++++++++++++++
> include/hw/arm/virt.h | 1 +
> 3 files changed, 24 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..a4541fa 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,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("/address@hidden" 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 +1551,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
>
With the change pointed out in 6/8
Reviewed-by: Andrew Jones <address@hidden>
- [Qemu-arm] [PATCH V11 0/8] add pvpanic mmio support, Peng Hao, 2018/12/03
- [Qemu-arm] [PATCH V11 2/8] hw/misc/pvpanic: Cosmetic renaming, Peng Hao, 2018/12/03
- [Qemu-arm] [PATCH V11 5/8] hw/arm/virt: add pvpanic device in virt acpi table, Peng Hao, 2018/12/03
- [Qemu-arm] [PATCH V11 6/8] hw/arm/virt: add configure interface for pvpanic-mmio, Peng Hao, 2018/12/03
- [Qemu-arm] [PATCH V11 1/8] hw/misc/pvpanic: Build the pvpanic device in $(common-obj), Peng Hao, 2018/12/03
- [Qemu-arm] [PATCH V11 3/8] hw/misc/pvpanic: Add the MMIO interface, Peng Hao, 2018/12/03
- [Qemu-arm] [PATCH V11 4/8] hw/arm/virt: Use the pvpanic device, Peng Hao, 2018/12/03
- Re: [Qemu-arm] [PATCH V11 4/8] hw/arm/virt: Use the pvpanic device,
Andrew Jones <=
- [Qemu-arm] [PATCH V11 8/8] pvpanic : update pvpanic document, Peng Hao, 2018/12/03
- [Qemu-arm] [PATCH V11 7/8] hw/arm/virt: use the configure interface, Peng Hao, 2018/12/03
- Re: [Qemu-arm] [PATCH V11 0/8] add pvpanic mmio support, Peter Maydell, 2018/12/03