From nobody Thu Nov 6 18:24:12 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542335625199932.2674912204001; Thu, 15 Nov 2018 18:33:45 -0800 (PST) Received: from localhost ([::1]:41824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNTx2-0006hT-7a for importer@patchew.org; Thu, 15 Nov 2018 21:33:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNTrk-0003G7-Bm for qemu-devel@nongnu.org; Thu, 15 Nov 2018 21:28:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNTrg-0008Sz-0Y for qemu-devel@nongnu.org; Thu, 15 Nov 2018 21:28:16 -0500 Received: from out1.zte.com.cn ([202.103.147.172]:34860 helo=mxct.zte.com.cn) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNTrQ-0007bu-Pp; Thu, 15 Nov 2018 21:27:57 -0500 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id CEBFFF0EE5178EB1E1AD; Fri, 16 Nov 2018 10:27:54 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id wAG2RmjM028673; Fri, 16 Nov 2018 10:27:48 +0800 (GMT-8) (envelope-from peng.hao2@zte.com.cn) Received: from localhost.localdomain.localdomain ([10.74.120.59]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2018111610282389-11036269 ; Fri, 16 Nov 2018 10:28:23 +0800 From: Peng Hao To: peter.maydell@linaro.org, drjones@redhat.com, philmd@redhat.com Date: Fri, 16 Nov 2018 18:50:04 +0800 Message-Id: <1542365406-81310-5-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1542365406-81310-1-git-send-email-peng.hao2@zte.com.cn> References: <1542365406-81310-1-git-send-email-peng.hao2@zte.com.cn> MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2018-11-16 10:28:23, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-11-16 10:27:32 Content-Transfer-Encoding: quoted-printable X-MAIL: mse01.zte.com.cn wAG2RmjM028673 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 202.103.147.172 Subject: [Qemu-devel] [PATCH V7 4/6] hw/arm/virt: Use the pvpanic device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Hao , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add pvpanic device in arm virt machine. Signed-off-by: Peng Hao Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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=3Dy CONFIG_STRONGARM=3Dy CONFIG_HIGHBANK=3Dy CONFIG_MUSICPAL=3Dy +CONFIG_PVPANIC=3Dy 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" =20 #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[] =3D { [VIRT_GPIO] =3D { 0x09030000, 0x00001000 }, [VIRT_SECURE_UART] =3D { 0x09040000, 0x00001000 }, [VIRT_SMMU] =3D { 0x09050000, 0x00020000 }, + [VIRT_PVPANIC] =3D { 0x09070000, 0x00000002 }, [VIRT_MMIO] =3D { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that siz= e */ [VIRT_PLATFORM_BUS] =3D { 0x0c000000, 0x02000000 }, @@ -190,6 +192,23 @@ static bool cpu_type_valid(const char *cpu) return false; } =20 +static void create_pvpanic_device(const VirtMachineState *vms) +{ + char *nodename; + hwaddr base =3D vms->memmap[VIRT_PVPANIC].base; + hwaddr size =3D vms->memmap[VIRT_PVPANIC].size; + + sysbus_create_simple(TYPE_PVPANIC_MMIO, base, NULL); + + nodename =3D 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 =3D create_device_tree(&vms->fdt_size); @@ -1531,6 +1550,8 @@ static void machvirt_init(MachineState *machine) =20 create_flash(vms, sysmem, secure_sysmem ? secure_sysmem : sysmem); =20 + create_pvpanic_device(vms); + create_gic(vms, pic); =20 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, --=20 1.8.3.1