From nobody Thu Nov 6 08:26:17 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1540466137497125.47935854105106; Thu, 25 Oct 2018 04:15:37 -0700 (PDT) Received: from localhost ([::1]:53789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFdbm-0007rz-R5 for importer@patchew.org; Thu, 25 Oct 2018 07:15:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFdZZ-0006Eb-IA for qemu-devel@nongnu.org; Thu, 25 Oct 2018 07:13:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFdZU-0000fG-N7 for qemu-devel@nongnu.org; Thu, 25 Oct 2018 07:13:02 -0400 Received: from out1.zte.com.cn ([202.103.147.172]:43336 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 1gFdZI-0000Qy-52; Thu, 25 Oct 2018 07:12:48 -0400 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id E3C37305AA589F7C8229; Thu, 25 Oct 2018 19:12:28 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id w9PBCIHL015289; Thu, 25 Oct 2018 19:12:18 +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 2018102519124982-6703127 ; Thu, 25 Oct 2018 19:12:49 +0800 From: Peng Hao To: peter.maydell@linaro.org, philmd@redhat.com Date: Fri, 26 Oct 2018 03:23:13 +0800 Message-Id: <1540495397-88089-2-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1540495397-88089-1-git-send-email-peng.hao2@zte.com.cn> References: <1540495397-88089-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-10-25 19:12:49, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-10-25 19:12:06 Content-Transfer-Encoding: quoted-printable X-MAIL: mse01.zte.com.cn w9PBCIHL015289 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 202.103.147.172 Subject: [Qemu-devel] [PATCH V4 1/5] hw/misc/pvpanic: Build the pvpanic device in $(common-obj) 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: 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" From: Philippe Mathieu-Daud=C3=A9 The 'pvpanic' ISA device can be use by any machine with an ISA bus. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 6d50b03..24997d6 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -8,6 +8,7 @@ common-obj-$(CONFIG_ISA_TESTDEV) +=3D pc-testdev.o common-obj-$(CONFIG_PCI_TESTDEV) +=3D pci-testdev.o common-obj-$(CONFIG_EDU) +=3D edu.o common-obj-$(CONFIG_PCA9552) +=3D pca9552.o +common-obj-$(CONFIG_PVPANIC) +=3D pvpanic.o =20 common-obj-y +=3D unimp.o common-obj-$(CONFIG_FW_CFG_DMA) +=3D vmcoreinfo.o @@ -70,7 +71,6 @@ obj-$(CONFIG_IOTKIT_SECCTL) +=3D iotkit-secctl.o obj-$(CONFIG_IOTKIT_SYSCTL) +=3D iotkit-sysctl.o obj-$(CONFIG_IOTKIT_SYSINFO) +=3D iotkit-sysinfo.o =20 -obj-$(CONFIG_PVPANIC) +=3D pvpanic.o obj-$(CONFIG_HYPERV_TESTDEV) +=3D hyperv_testdev.o obj-$(CONFIG_AUX) +=3D auxbus.o obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_scu.o aspeed_sdmc.o --=20 1.8.3.1 From nobody Thu Nov 6 08:26:17 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 1540466404149447.8970622486528; Thu, 25 Oct 2018 04:20:04 -0700 (PDT) Received: from localhost ([::1]:53811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFdgJ-00032Y-0Z for importer@patchew.org; Thu, 25 Oct 2018 07:20:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFda0-0006fU-Qj for qemu-devel@nongnu.org; Thu, 25 Oct 2018 07:13:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFdZj-0000n7-Oy for qemu-devel@nongnu.org; Thu, 25 Oct 2018 07:13:24 -0400 Received: from mxhk.zte.com.cn ([63.217.80.70]:9358) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFdZM-0000R2-0J; Thu, 25 Oct 2018 07:12:54 -0400 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id ABD28929F24AA5F32B51; Thu, 25 Oct 2018 19:12:30 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id w9PBCJLo015337; Thu, 25 Oct 2018 19:12:19 +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 2018102519125091-6703129 ; Thu, 25 Oct 2018 19:12:50 +0800 From: Peng Hao To: peter.maydell@linaro.org, philmd@redhat.com Date: Fri, 26 Oct 2018 03:23:14 +0800 Message-Id: <1540495397-88089-3-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1540495397-88089-1-git-send-email-peng.hao2@zte.com.cn> References: <1540495397-88089-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-10-25 19:12:51, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-10-25 19:12:07 Content-Transfer-Encoding: quoted-printable X-MAIL: mse01.zte.com.cn w9PBCJLo015337 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 63.217.80.70 Subject: [Qemu-devel] [PATCH V4 2/5] hw/misc/pvpanic: Cosmetic renaming 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: 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" From: Philippe Mathieu-Daud=C3=A9 To ease the MMIO device addition in the next patch, rename: - ISA_PVPANIC_DEVICE -> PVPANIC (this just returns a generic Object), - ISADevice parent_obj -> isadev, - MemoryRegion io -> mr. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/pvpanic.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 9d8961b..dd3aef2 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -25,7 +25,7 @@ /* The pv event value */ #define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED) =20 -#define ISA_PVPANIC_DEVICE(obj) \ +#define PVPANIC(obj) \ OBJECT_CHECK(PVPanicState, (obj), TYPE_PVPANIC) =20 static void handle_event(int event) @@ -46,9 +46,11 @@ static void handle_event(int event) #include "hw/isa/isa.h" =20 typedef struct PVPanicState { - ISADevice parent_obj; + /* private */ + ISADevice isadev; =20 - MemoryRegion io; + /* public */ + MemoryRegion mr; uint16_t ioport; } PVPanicState; =20 @@ -75,15 +77,15 @@ static const MemoryRegionOps pvpanic_ops =3D { =20 static void pvpanic_isa_initfn(Object *obj) { - PVPanicState *s =3D ISA_PVPANIC_DEVICE(obj); + PVPanicState *s =3D PVPANIC(obj); =20 - memory_region_init_io(&s->io, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1= ); + memory_region_init_io(&s->mr, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1= ); } =20 static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) { ISADevice *d =3D ISA_DEVICE(dev); - PVPanicState *s =3D ISA_PVPANIC_DEVICE(dev); + PVPanicState *s =3D PVPANIC(dev); FWCfgState *fw_cfg =3D fw_cfg_find(); uint16_t *pvpanic_port; =20 @@ -96,7 +98,7 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error= **errp) fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", pvpanic_port, sizeof(*pvpanic_port)); =20 - isa_register_ioport(d, &s->io, s->ioport); + isa_register_ioport(d, &s->mr, s->ioport); } =20 static Property pvpanic_isa_properties[] =3D { --=20 1.8.3.1 From nobody Thu Nov 6 08:26:17 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 1540466269155547.2601458305325; Thu, 25 Oct 2018 04:17:49 -0700 (PDT) Received: from localhost ([::1]:53803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFde7-0000jp-Uf for importer@patchew.org; Thu, 25 Oct 2018 07:17:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFdZj-0006Jh-Ob for qemu-devel@nongnu.org; Thu, 25 Oct 2018 07:13:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFdZU-0000fH-NB for qemu-devel@nongnu.org; Thu, 25 Oct 2018 07:13:05 -0400 Received: from out1.zte.com.cn ([202.103.147.172]:43350 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 1gFdZI-0000RT-51; Thu, 25 Oct 2018 07:12:48 -0400 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 5156459557B042DDA9BC; Thu, 25 Oct 2018 19:12:31 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id w9PBCKLA015355; Thu, 25 Oct 2018 19:12:20 +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 2018102519125201-6703133 ; Thu, 25 Oct 2018 19:12:52 +0800 From: Peng Hao To: peter.maydell@linaro.org, philmd@redhat.com Date: Fri, 26 Oct 2018 03:23:15 +0800 Message-Id: <1540495397-88089-4-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1540495397-88089-1-git-send-email-peng.hao2@zte.com.cn> References: <1540495397-88089-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-10-25 19:12:52, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-10-25 19:12:08 Content-Transfer-Encoding: quoted-printable X-MAIL: mse01.zte.com.cn w9PBCKLA015355 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 202.103.147.172 Subject: [Qemu-devel] [PATCH V4 3/5] hw/misc/pvpanic: Add the MMIO interface 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" Signed-off-by: Peng Hao Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/pvpanic.c | 74 ++++++++++++++++++++++++++++++++++++++-----= ---- include/hw/misc/pvpanic.h | 2 ++ 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index dd3aef2..b575e01 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -2,10 +2,12 @@ * QEMU simulated pvpanic device. * * Copyright Fujitsu, Corp. 2013 + * Copyright (c) 2018 ZTE Ltd. * * Authors: * Wen Congyang * Hu Tao + * Peng Hao * * This work is licensed under the terms of the GNU GPL, version 2 or late= r. * See the COPYING file in the top-level directory. @@ -45,30 +47,48 @@ static void handle_event(int event) =20 #include "hw/isa/isa.h" =20 -typedef struct PVPanicState { +typedef struct PVPanicCommonState { + MemoryRegion mr; +} PVPanicCommonState; + +typedef struct PVPanicISAState { /* private */ ISADevice isadev; + uint16_t ioport; + /* public */ + PVPanicCommonState common; +} PVPanicISAState; + +typedef struct PVPanicMMIOState { + /* private */ + SysBusDevice busdev; =20 /* public */ - MemoryRegion mr; - uint16_t ioport; -} PVPanicState; + PVPanicCommonState common; +} PVPanicMMIOState; + +#define PVPANIC_ISA(obj) \ + OBJECT_CHECK(PVPanicISAState, (obj), TYPE_PVPANIC) + +#define PVPANIC_MMIO(obj) \ + OBJECT_CHECK(PVPanicMMIOState, (obj), TYPE_PVPANIC_MMIO) + =20 /* return supported events on read */ -static uint64_t pvpanic_ioport_read(void *opaque, hwaddr addr, unsigned si= ze) +static uint64_t pvpanic_read(void *opaque, hwaddr addr, unsigned size) { return PVPANIC_PANICKED; } =20 -static void pvpanic_ioport_write(void *opaque, hwaddr addr, uint64_t val, +static void pvpanic_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { handle_event(val); } =20 static const MemoryRegionOps pvpanic_ops =3D { - .read =3D pvpanic_ioport_read, - .write =3D pvpanic_ioport_write, + .read =3D pvpanic_read, + .write =3D pvpanic_write, .impl =3D { .min_access_size =3D 1, .max_access_size =3D 1, @@ -77,15 +97,15 @@ static const MemoryRegionOps pvpanic_ops =3D { =20 static void pvpanic_isa_initfn(Object *obj) { - PVPanicState *s =3D PVPANIC(obj); + PVPanicISAState *s =3D PVPANIC_ISA(obj); =20 - memory_region_init_io(&s->mr, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1= ); + memory_region_init_io(&s->common.mr, OBJECT(s), &pvpanic_ops, s, TYPE_= PVPANIC, 1); } =20 static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) { ISADevice *d =3D ISA_DEVICE(dev); - PVPanicState *s =3D PVPANIC(dev); + PVPanicISAState *s =3D PVPANIC_ISA(dev); FWCfgState *fw_cfg =3D fw_cfg_find(); uint16_t *pvpanic_port; =20 @@ -98,11 +118,11 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Er= ror **errp) fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", pvpanic_port, sizeof(*pvpanic_port)); =20 - isa_register_ioport(d, &s->mr, s->ioport); + isa_register_ioport(d, &s->common.mr, s->ioport); } =20 static Property pvpanic_isa_properties[] =3D { - DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505), + DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505= ), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -118,14 +138,40 @@ static void pvpanic_isa_class_init(ObjectClass *klass= , void *data) static TypeInfo pvpanic_isa_info =3D { .name =3D TYPE_PVPANIC, .parent =3D TYPE_ISA_DEVICE, - .instance_size =3D sizeof(PVPanicState), + .instance_size =3D sizeof(PVPanicISAState), .instance_init =3D pvpanic_isa_initfn, .class_init =3D pvpanic_isa_class_init, }; =20 +static void pvpanic_mmio_initfn(Object *obj) +{ + PVPanicMMIOState *s =3D PVPANIC_MMIO(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + + memory_region_init_io(&s->common.mr, OBJECT(s), &pvpanic_ops, s, + TYPE_PVPANIC_MMIO, 2); + sysbus_init_mmio(sbd, &s->common.mr); +} + +static void pvpanic_mmio_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + set_bit(DEVICE_CATEGORY_MISC, dc->categories); +} + +static TypeInfo pvpanic_mmio_info =3D { + .name =3D TYPE_PVPANIC_MMIO, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(PVPanicMMIOState), + .instance_init =3D pvpanic_mmio_initfn, + .class_init =3D pvpanic_mmio_class_init, +}; + static void pvpanic_register_types(void) { type_register_static(&pvpanic_isa_info); + type_register_static(&pvpanic_mmio_info); } =20 type_init(pvpanic_register_types) diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h index 1ee071a..c0d2d38 100644 --- a/include/hw/misc/pvpanic.h +++ b/include/hw/misc/pvpanic.h @@ -16,6 +16,8 @@ =20 #define TYPE_PVPANIC "pvpanic" =20 +#define TYPE_PVPANIC_MMIO "pvpanic-mmio" + #define PVPANIC_IOPORT_PROP "ioport" =20 static inline uint16_t pvpanic_port(void) --=20 1.8.3.1 From nobody Thu Nov 6 08:26:17 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 1540466443627368.65352288449117; Thu, 25 Oct 2018 04:20:43 -0700 (PDT) Received: from localhost ([::1]:53816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFdgt-0003VF-3a for importer@patchew.org; Thu, 25 Oct 2018 07:20:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFda0-0006fW-Qp for qemu-devel@nongnu.org; Thu, 25 Oct 2018 07:13:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFdZf-0000j8-3k for qemu-devel@nongnu.org; Thu, 25 Oct 2018 07:13:24 -0400 Received: from mxhk.zte.com.cn ([63.217.80.70]:6838) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFdZM-0000Ri-1d; Thu, 25 Oct 2018 07:12:54 -0400 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id EB3DB6AD2BCCDAC64F8F; Thu, 25 Oct 2018 19:12:31 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id w9PBCLp7015386; Thu, 25 Oct 2018 19:12:21 +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 2018102519125332-6703137 ; Thu, 25 Oct 2018 19:12:53 +0800 From: Peng Hao To: peter.maydell@linaro.org, philmd@redhat.com Date: Fri, 26 Oct 2018 03:23:16 +0800 Message-Id: <1540495397-88089-5-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1540495397-88089-1-git-send-email-peng.hao2@zte.com.cn> References: <1540495397-88089-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-10-25 19:12:53, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-10-25 19:12:09 Content-Transfer-Encoding: quoted-printable X-MAIL: mse01.zte.com.cn w9PBCLp7015386 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 63.217.80.70 Subject: [Qemu-devel] [PATCH V4 4/5] 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 aarch64 virt machine. Signed-off-by: Peng Hao Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/aarch64-softmmu.mak | 1 + hw/arm/virt.c | 21 +++++++++++++++++++++ include/hw/arm/virt.h | 1 + 3 files changed, 23 insertions(+) diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-= softmmu.mak index 6f790f0..57c6ca5 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -9,3 +9,4 @@ CONFIG_DPCD=3Dy CONFIG_XLNX_ZYNQMP=3Dy CONFIG_XLNX_ZYNQMP_ARM=3Dy CONFIG_ARM_SMMUV3=3Dy +CONFIG_PVPANIC=3Dy diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9f67782..ffe8d00 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_MMIO] =3D { 0x09060000, 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_MMIO].base; + hwaddr size =3D vms->memmap[VIRT_PVPANIC_MMIO].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..ba54b84 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_MMIO, VIRT_UART, VIRT_MMIO, VIRT_RTC, --=20 1.8.3.1 From nobody Thu Nov 6 08:26:17 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 1540466523341884.4510581208086; Thu, 25 Oct 2018 04:22:03 -0700 (PDT) Received: from localhost ([::1]:53827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFdi6-0004Bp-96 for importer@patchew.org; Thu, 25 Oct 2018 07:21:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFda0-0006fV-Qn for qemu-devel@nongnu.org; Thu, 25 Oct 2018 07:13:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFdZf-0000j1-3w for qemu-devel@nongnu.org; Thu, 25 Oct 2018 07:13:24 -0400 Received: from mxhk.zte.com.cn ([63.217.80.70]:7846) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFdZM-0000S4-0O; Thu, 25 Oct 2018 07:12:54 -0400 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 891FE5198C9A411C5FEC; Thu, 25 Oct 2018 19:12:32 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id w9PBCNHv015445; Thu, 25 Oct 2018 19:12:23 +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 2018102519125526-6703172 ; Thu, 25 Oct 2018 19:12:55 +0800 From: Peng Hao To: peter.maydell@linaro.org, philmd@redhat.com Date: Fri, 26 Oct 2018 03:23:17 +0800 Message-Id: <1540495397-88089-6-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1540495397-88089-1-git-send-email-peng.hao2@zte.com.cn> References: <1540495397-88089-1-git-send-email-peng.hao2@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2018-10-25 19:12:55, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-10-25 19:12:11, Serialize complete at 2018-10-25 19:12:11 X-MAIL: mse01.zte.com.cn w9PBCNHv015445 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 63.217.80.70 Subject: [Qemu-devel] [PATCH V4 5/5] hw/arm/virt: add pvpanic device in virt acpi table 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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" add pvpanic device in virt acpi table, so when kenrel command line uses acpi=3Dforce, kernel can get info from acpi table in aarch64. Signed-off-by: Peng Hao --- hw/arm/virt-acpi-build.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 5785fb6..d126cee 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -61,6 +61,21 @@ static void acpi_dsdt_add_cpus(Aml *scope, int smp_cpus) } } =20 +static void acpi_dsdt_add_pvpanic(Aml *scope, const MemMapEntry *pvpanic_m= emmap) +{ + Aml *dev =3D aml_device("PANC"); + aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001"))); + aml_append(dev, aml_name_decl("_UID", aml_int(0))); + + Aml *crs =3D aml_resource_template(); + aml_append(crs, aml_memory32_fixed(pvpanic_memmap->base, + pvpanic_memmap->size, AML_READ_WRIT= E)); + + aml_append(dev, aml_name_decl("_CRS", crs)); + + aml_append(scope, dev); +} + static void acpi_dsdt_add_uart(Aml *scope, const MemMapEntry *uart_memmap, uint32_t uart_irq) { @@ -770,6 +785,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) acpi_dsdt_add_cpus(scope, vms->smp_cpus); acpi_dsdt_add_uart(scope, &memmap[VIRT_UART], (irqmap[VIRT_UART] + ARM_SPI_BASE)); + acpi_dsdt_add_pvpanic(scope, &memmap[VIRT_PVPANIC_MMIO]); acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]); acpi_dsdt_add_fw_cfg(scope, &memmap[VIRT_FW_CFG]); acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO], --=20 1.8.3.1