From nobody Sat May 18 22:31:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1603355196; cv=none; d=zohomail.com; s=zohoarc; b=AGEnHcD3zc+CK4gMCqIJvzT9JmotSzCujGI2xFb0cetgh5IhDdzkpWE8TjM/qcp4dhru1HFmUMJCAQnB6Uw2rk/EMBzidDMtj2jtPJcopzVWMDMSGVcxiQyyD7bIoZMmfrBxhRYBYlFYRKr6ivaPNxYwO2r7rBvnDD3zlSoHpmg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603355196; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XD4dw2R3d9CjulMuyr2n4XX5/s6JuRNb97NWKT6eQTE=; b=PTwBrHPJu8bfQ0LhmTtiOHrQFFiJ9DC0W7QNNfGx/raE1qaGij0csovNSGFCt0sVJy8lj166nbjI1cPJM4+TqErA9JnSJDmqxw0x+vK+VtzoTBQSdsv3Sn9LvbL2+mqMH4KFbwL9ju1ceD6A/Y70wXTap0+iXcKHB5JXiHqyHeo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603355196802920.5036394073484; Thu, 22 Oct 2020 01:26:36 -0700 (PDT) Received: from localhost ([::1]:57976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVVvf-0005jA-P3 for importer@patchew.org; Thu, 22 Oct 2020 04:26:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVue-0004JM-27; Thu, 22 Oct 2020 04:25:32 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:34168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVub-00069s-D3; Thu, 22 Oct 2020 04:25:31 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8P3a2114710; Thu, 22 Oct 2020 08:25:26 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2130.oracle.com with ESMTP id 347p4b4nw6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 22 Oct 2020 08:25:26 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8G0Th024182; Thu, 22 Oct 2020 08:25:25 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3020.oracle.com with ESMTP id 34ak19kdvc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Oct 2020 08:25:25 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 09M8PLY7000454; Thu, 22 Oct 2020 08:25:21 GMT Received: from mihai.localdomain (/10.153.73.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Oct 2020 01:25:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=XD4dw2R3d9CjulMuyr2n4XX5/s6JuRNb97NWKT6eQTE=; b=RhXfk7QWGxWIcZlXsNrzrEJtJ3uoSseewoqROLFr31kCuXKADDN0GjWUczT4RP5Cx37i lC+gz/R8Nj+d6F+G+yTasbdj7v2S5OPUFSZartzNNp+rHHxymX6BwHjvWPVwEKlKkEFq MyeHqOSyj+BQhGeVMxo9Swzuy/oYjd81cxTtCFgZFvhhf6fMBtrVfQ4ImVuTUOlUuYoy 1iY2kF6kklrjcyg/VDdT1EUFP6zfJzIc57ekAQ0iXRJkVCpIx1Oc+R14/7pZeuzVhPmY lcZZ0SpJfygedbzo+JPvHJG0t3BPdX4JhTtX2dvdHTDG+vUJ2r1wSPFuq5CQcfNSjNvQ TQ== From: Mihai Carabas To: peter.maydell@linaro.org, shannon.zhaosl@gmail.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 1/8] hw/misc/pvpanic: Build the pvpanic device for any machine Date: Thu, 22 Oct 2020 10:42:49 +0300 Message-Id: <1603352576-21671-2-git-send-email-mihai.carabas@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> References: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 mlxscore=0 phishscore=0 spamscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220055 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 priorityscore=1501 clxscore=1015 malwarescore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 mlxlogscore=999 impostorscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220056 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=141.146.126.79; envelope-from=mihai.carabas@oracle.com; helo=aserp2130.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/22 04:25:28 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mihai Carabas , Peng Hao , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 The 'pvpanic' ISA device can be use by any machine with an ISA bus. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peng Hao Signed-off-by: Mihai Carabas --- hw/misc/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 793d45b..cb250dd 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -11,6 +11,7 @@ softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp= 105.c')) softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c')) softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c')) +softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) =20 # ARM devices softmmu_ss.add(when: 'CONFIG_PL310', if_true: files('arm_l2x0.c')) @@ -90,7 +91,6 @@ softmmu_ss.add(when: 'CONFIG_IOTKIT_SYSINFO', if_true: fi= les('iotkit-sysinfo.c') softmmu_ss.add(when: 'CONFIG_ARMSSE_CPUID', if_true: files('armsse-cpuid.c= ')) softmmu_ss.add(when: 'CONFIG_ARMSSE_MHU', if_true: files('armsse-mhu.c')) =20 -softmmu_ss.add(when: 'CONFIG_PVPANIC', if_true: files('pvpanic.c')) softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c')) softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_scu.c', '= aspeed_sdmc.c', 'aspeed_xdma.c')) softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c')) --=20 1.8.3.1 From nobody Sat May 18 22:31:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1603355206; cv=none; d=zohomail.com; s=zohoarc; b=c/9T13fL1AlVtkD7btkEXM5P9xbLZTMj+QfHNjKAyCfcbv66k72vJyLxMOXpw/CfnDOEyursqwAkKXe0mDTe4K0Gtx/kGrku8yXjuCUOFNz2FJ2wwdDjVxMn/xGdGjiKw+1QxWRjo2nljJb75GYI3EnXwZiqbcAMu3Yq1bv7MHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603355206; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hCQdChAQCcyhN8Dlzatt/sr54/BTy2eCSaPSjnCiuAk=; b=ANqxB/uVESiuOcqhdsfZn5nNgRq0ieFB+9d8B54XHbReiEU/g8Z3vWkNaJmrMxfi+CEQgvfsbTXNHtDvXv7kboklgRRa5vlGfKAAbtd3SQiytR8F5e8NtNRCdO48IOUO6/D2mnNNsg0NqzP6jx7HjnQ/zXKxx/VhKuYR7sryQdg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603355206595756.0818685561175; Thu, 22 Oct 2020 01:26:46 -0700 (PDT) Received: from localhost ([::1]:58210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVVvn-0005ot-S6 for importer@patchew.org; Thu, 22 Oct 2020 04:26:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVuf-0004L7-4R; Thu, 22 Oct 2020 04:25:33 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:53572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVub-00069t-JD; Thu, 22 Oct 2020 04:25:32 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8OvPr168283; Thu, 22 Oct 2020 08:25:25 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2120.oracle.com with ESMTP id 349jrpvpry-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 22 Oct 2020 08:25:25 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8G8NX094828; Thu, 22 Oct 2020 08:25:25 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3030.oracle.com with ESMTP id 348a6qbcp6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Oct 2020 08:25:25 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 09M8PN0x000463; Thu, 22 Oct 2020 08:25:23 GMT Received: from mihai.localdomain (/10.153.73.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Oct 2020 01:25:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=hCQdChAQCcyhN8Dlzatt/sr54/BTy2eCSaPSjnCiuAk=; b=brlWcWcPrOamM6i6Cn/T859qreXgf4XVvMYWowMyNEtzzkN1QDWNirW77EvguQiKYX/4 XPsvMak4a3l+vfnf+8I5F4soshQ/eVVyu1FmmQ7c9XnmE4D1CYXvTXO2NRnO0rncCzQB KX78y3jle0ptePKyKOU3ndXxv5LvJ53uLAqbRT6LTGtVVCNPzocsLnD2Hx/XV/4VIDCR ydSgqEkfeNg9RWvYosBLXRzkoxRVtHsjlypUP/C9LCU/43YRoy0B1vcRiEXqvMxCrdR2 R1kLPqKTi5UHPTkERSxuduAwRkGyg+sxfBRTP6jLlj5CJj9gGw4vZcxdnXKFh4rbYegB nQ== From: Mihai Carabas To: peter.maydell@linaro.org, shannon.zhaosl@gmail.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 2/8] hw/misc/pvpanic: Cosmetic renaming Date: Thu, 22 Oct 2020 10:42:50 +0300 Message-Id: <1603352576-21671-3-git-send-email-mihai.carabas@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> References: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 bulkscore=0 spamscore=0 adultscore=0 suspectscore=1 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220055 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 spamscore=0 suspectscore=1 clxscore=1011 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220056 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=141.146.126.78; envelope-from=mihai.carabas@oracle.com; helo=aserp2120.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/22 04:25:28 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mihai Carabas , Peng Hao , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 To ease the MMIO device addition in the next patch, rename: - ISA_PVPANIC_DEVICE -> PVPANIC_ISA_DEVICE. - PVPanicState -> PVPanicISAState. - TYPE_PVPANIC -> TYPE_PVPANIC_ISA. - MemoryRegion io -> mr. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peng Hao Signed-off-by: Mihai Carabas --- hw/misc/pvpanic.c | 28 ++++++++++++++++------------ include/hw/misc/pvpanic.h | 2 +- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 598d547..2e085f4 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -30,9 +30,9 @@ #define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED) #define PVPANIC_CRASHLOADED (1 << PVPANIC_F_CRASHLOADED) =20 -typedef struct PVPanicState PVPanicState; -DECLARE_INSTANCE_CHECKER(PVPanicState, ISA_PVPANIC_DEVICE, - TYPE_PVPANIC) +typedef struct PVPanicISAState PVPanicISAState; +DECLARE_INSTANCE_CHECKER(PVPanicISAState, PVPANIC_ISA_DEVICE, + TYPE_PVPANIC_ISA) =20 static void handle_event(int event) { @@ -56,10 +56,14 @@ static void handle_event(int event) =20 #include "hw/isa/isa.h" =20 -struct PVPanicState { +/* + * PVPanicISAState for ISA device and + * use ioport. + */ +struct PVPanicISAState { ISADevice parent_obj; =20 - MemoryRegion io; + MemoryRegion mr; uint16_t ioport; }; =20 @@ -86,15 +90,15 @@ static const MemoryRegionOps pvpanic_ops =3D { =20 static void pvpanic_isa_initfn(Object *obj) { - PVPanicState *s =3D ISA_PVPANIC_DEVICE(obj); + PVPanicISAState *s =3D PVPANIC_ISA_DEVICE(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); + PVPanicISAState *s =3D PVPANIC_ISA_DEVICE(dev); FWCfgState *fw_cfg =3D fw_cfg_find(); uint16_t *pvpanic_port; =20 @@ -107,11 +111,11 @@ static void pvpanic_isa_realizefn(DeviceState *dev, E= rror **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 { - DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505), + DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505= ), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -125,9 +129,9 @@ static void pvpanic_isa_class_init(ObjectClass *klass, = void *data) } =20 static TypeInfo pvpanic_isa_info =3D { - .name =3D TYPE_PVPANIC, + .name =3D TYPE_PVPANIC_ISA, .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, }; diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h index ae0c818..30e9f8f 100644 --- a/include/hw/misc/pvpanic.h +++ b/include/hw/misc/pvpanic.h @@ -17,7 +17,7 @@ =20 #include "qom/object.h" =20 -#define TYPE_PVPANIC "pvpanic" +#define TYPE_PVPANIC_ISA "pvpanic" =20 #define PVPANIC_IOPORT_PROP "ioport" =20 --=20 1.8.3.1 From nobody Sat May 18 22:31:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1603355321; cv=none; d=zohomail.com; s=zohoarc; b=Tr7o3GJ5SIbBtHx3EHn3U70FYDY7mlChQxbMwpo4E279lK4ndU5VYT97hbYo2GBf7FlVpSsExkWdXWg3Q7cvRpa3L5sN8fLU4oQkxMxIwVl69AuKq4SoqKORrn0MwRp1l/WLhN1sMxTkvtzC6m4l5eDRkXvHuIFWqFa8Qy0vHFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603355321; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Kk+AYcUh4bUqzojC0BZl0BLT8cSqLqG4veE0K3JL33U=; b=C/7Ad91Vdl6F1RDSywlvCNgWP/RQ3Ys/V3o77BGZvFT7mbPCnfXV23YFS5zVsTDmw+rOQ86Xzic7zXT9zl/Vj5nvIUOPqZeaN3NTtMr583d7y6viCGAP9PkVk+j1QEJQu1E1GJC3RFJL6sUr3t/oErVKGDotWcGi/HJfpiQmNTU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603355321932130.14313116777168; Thu, 22 Oct 2020 01:28:41 -0700 (PDT) Received: from localhost ([::1]:35834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVVxg-0008Cb-U5 for importer@patchew.org; Thu, 22 Oct 2020 04:28:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVuf-0004Ly-KE; Thu, 22 Oct 2020 04:25:33 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:53600) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVud-0006A7-8r; Thu, 22 Oct 2020 04:25:33 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8PAOJ168418; Thu, 22 Oct 2020 08:25:28 GMT Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2120.oracle.com with ESMTP id 349jrpvps7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 22 Oct 2020 08:25:28 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8FjQ3083185; Thu, 22 Oct 2020 08:25:28 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserp3020.oracle.com with ESMTP id 348ah0k2m4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Oct 2020 08:25:28 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 09M8PQT5015193; Thu, 22 Oct 2020 08:25:27 GMT Received: from mihai.localdomain (/10.153.73.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Oct 2020 01:25:26 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=Kk+AYcUh4bUqzojC0BZl0BLT8cSqLqG4veE0K3JL33U=; b=ePtVIF8vIlrFlItT5/M94q/ayrwpOAOUCGX9k0mcYFLx70jtcI9QRSamUb/eb3l0mvYe QKp0nQ8H+AJCJtkXepTmRWtAMXOVDW8hTNhqm3tT8/Fk96xM+p0t6qJzDUiysAe/fmMd pSetF0U9WwuMd6A7eQQsoEoDtVkXbfLNEW68x+FMlTjXDmJRWGRXJWhZj2cc1mlQrviL 8Rhsb7JPrpCQ9eJsAr/dAReR8lpXEz9T73b88va/f/GkxJLLL9GY2V7DoE4+f/dpNQ7B 7knnaNw+bL5ieDXuflL+1bXCK319gOcbprvtRnRxnSrmHDHi9RO+IWLIomqzBcQzKFqG HQ== From: Mihai Carabas To: peter.maydell@linaro.org, shannon.zhaosl@gmail.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 3/8] hw/misc/pvpanic: Add the MMIO interface Date: Thu, 22 Oct 2020 10:42:51 +0300 Message-Id: <1603352576-21671-4-git-send-email-mihai.carabas@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> References: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=1 bulkscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220055 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 spamscore=0 suspectscore=1 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220056 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=141.146.126.78; envelope-from=mihai.carabas@oracle.com; helo=aserp2120.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/22 04:25:28 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mihai Carabas , Peng Hao , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peng Hao Add new pvpanic type: "TYPE_PVPANIC_MMIO". Reviewed-by: Peter Maydell Signed-off-by: Peng Hao Signed-off-by: Mihai Carabas --- hw/misc/pvpanic.c | 51 +++++++++++++++++++++++++++++++++++++++++++= ---- include/hw/misc/pvpanic.h | 3 ++- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 2e085f4..136f1d6 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. @@ -34,6 +36,10 @@ typedef struct PVPanicISAState PVPanicISAState; DECLARE_INSTANCE_CHECKER(PVPanicISAState, PVPANIC_ISA_DEVICE, TYPE_PVPANIC_ISA) =20 +typedef struct PVPanicMMIOState PVPanicMMIOState; +DECLARE_INSTANCE_CHECKER(PVPanicMMIOState, PVPANIC_MMIO_DEVICE, + TYPE_PVPANIC_MMIO) + static void handle_event(int event) { static bool logged; @@ -67,21 +73,32 @@ struct PVPanicISAState { uint16_t ioport; }; =20 +/* PVPanicMMIOState for sysbus device and + * use mmio. + */ +typedef struct PVPanicMMIOState { + SysBusDevice parent_obj; + /**/ + + /* public */ + MemoryRegion mr; +} PVPanicMMIOState; + /* 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, @@ -136,9 +153,35 @@ static TypeInfo pvpanic_isa_info =3D { .class_init =3D pvpanic_isa_class_init, }; =20 +static void pvpanic_mmio_initfn(Object *obj) +{ + PVPanicMMIOState *s =3D PVPANIC_MMIO_DEVICE(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + + memory_region_init_io(&s->mr, OBJECT(s), &pvpanic_ops, s, + TYPE_PVPANIC_MMIO, 2); + sysbus_init_mmio(sbd, &s->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 30e9f8f..ee645dc 100644 --- a/include/hw/misc/pvpanic.h +++ b/include/hw/misc/pvpanic.h @@ -18,12 +18,13 @@ #include "qom/object.h" =20 #define TYPE_PVPANIC_ISA "pvpanic" +#define TYPE_PVPANIC_MMIO "pvpanic-mmio" =20 #define PVPANIC_IOPORT_PROP "ioport" =20 static inline uint16_t pvpanic_port(void) { - Object *o =3D object_resolve_path_type("", TYPE_PVPANIC, NULL); + Object *o =3D object_resolve_path_type("", TYPE_PVPANIC_ISA, NULL); if (!o) { return 0; } --=20 1.8.3.1 From nobody Sat May 18 22:31:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1603355487; cv=none; d=zohomail.com; s=zohoarc; b=POgnFaFpObsz0fDXaeZxRiFpHMXjU9KsYky+slMJ2SnEV0N7zN4Gd4chbonkbtLYCtCy1fy8LRrrkoV2QHfnZkw+uU0gT1tkk5jj5LggrtBc7IekAJ9ibPdYoM2ijo73APLcbD9YbFp43+TE4CKUlxpizorqsKoXevdyZKAi63U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603355487; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=McEgxfLupcUsisyIkVt9vm0XuapJufKvR//mdzCdlyk=; b=NyLqF5KPr+LZiPjyyU/Dg88XAj5ZjuNNtauiRQ6Hi5S2F7BLBM2CKmCSY/i+6gNhqjt6xUIcJWMRx1v76urwOI21HkX8f6x//yiz7Hz+CbOkDUj67dQswCOw7lJi4KAhpJRzOu3pVO6IRNGhDCZNU4mXVeSNxidvI44yD41asJU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603355487976586.1232053081616; Thu, 22 Oct 2020 01:31:27 -0700 (PDT) Received: from localhost ([::1]:41712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVW0L-0002FT-FK for importer@patchew.org; Thu, 22 Oct 2020 04:31:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVuh-0004PY-3k; Thu, 22 Oct 2020 04:25:35 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:42334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVuf-0006BQ-0m; Thu, 22 Oct 2020 04:25:34 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8OWbm008879; Thu, 22 Oct 2020 08:25:29 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2120.oracle.com with ESMTP id 34ak16mvt5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 22 Oct 2020 08:25:29 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8G9a1095051; Thu, 22 Oct 2020 08:25:29 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3030.oracle.com with ESMTP id 348a6qbcqp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Oct 2020 08:25:29 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 09M8PSug020707; Thu, 22 Oct 2020 08:25:28 GMT Received: from mihai.localdomain (/10.153.73.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Oct 2020 01:25:28 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=McEgxfLupcUsisyIkVt9vm0XuapJufKvR//mdzCdlyk=; b=YQCxHhVtBtxDwsWPbDAGVQkQb4+lRpEQWc6SzEW0Z6f15w99c8fWOZA94ZZjMYeYLdEu MPAxe1TnYXsjNWD6eIChf1rTK5yMYW0eRkJJyZqVxMwY0E8MofWI3LMqTHxI8CNfuwlr 0HTPVfWzE5JknwwCK6DACa34q746eKxGqkaDpvRJl6jUPV4YxALl706ynbScw/aFCaXi vCfKVhzxVA0tHdbQHVu1OQIFOMleylanpBlYYH65f7yqMVDW4rbaR3bh4hEaTWC3WUFh p58KaSbopDUpym+Eprb4D7tunqptBZ75QHs+s6LD3/rshXGuHyyOkWZsSLRn3dU1/QIV hg== From: Mihai Carabas To: peter.maydell@linaro.org, shannon.zhaosl@gmail.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 4/8] hw/arm/virt: Use the pvpanic device Date: Thu, 22 Oct 2020 10:42:52 +0300 Message-Id: <1603352576-21671-5-git-send-email-mihai.carabas@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> References: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 bulkscore=0 spamscore=0 adultscore=0 suspectscore=4 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220055 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 mlxlogscore=999 suspectscore=4 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220056 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=156.151.31.85; envelope-from=mihai.carabas@oracle.com; helo=userp2120.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/22 04:09:38 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mihai Carabas , Peng Hao , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peng Hao Add pvpanic device in arm virt machine. Signed-off-by: Peng Hao Reviewed-by: Andrew Jones Signed-off-by: Mihai Carabas --- hw/arm/virt.c | 25 +++++++++++++++++++++++++ include/hw/arm/virt.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index e465a98..63f09a6 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -78,6 +78,7 @@ #include "hw/virtio/virtio-iommu.h" #include "hw/char/pl011.h" #include "qemu/guest-random.h" +#include "hw/misc/pvpanic.h" =20 #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \ static void virt_##major##_##minor##_class_init(ObjectClass *oc, \ @@ -152,6 +153,7 @@ static const MemMapEntry base_memmap[] =3D { [VIRT_ACPI_GED] =3D { 0x09080000, ACPI_GED_EVT_SEL_LEN }, [VIRT_NVDIMM_ACPI] =3D { 0x09090000, NVDIMM_ACPI_IO_LEN}, [VIRT_PVTIME] =3D { 0x090a0000, 0x00010000 }, + [VIRT_PVPANIC] =3D { 0x090b0000, 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 }, @@ -226,6 +228,27 @@ static void create_kaslr_seed(VirtMachineState *vms, c= onst char *node) qemu_fdt_setprop_u64(vms->fdt, node, "kaslr-seed", seed); } =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; + + if (!vms->pvpanic) { + return; + } + 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) { MachineState *ms =3D MACHINE(vms); @@ -1957,6 +1980,8 @@ static void machvirt_init(MachineState *machine) =20 virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem); =20 + create_pvpanic_device(vms); + create_gic(vms); =20 virt_cpu_post_init(vms, possible_cpus->len, sysmem); diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index aad6d69..e6410c3 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -69,6 +69,7 @@ enum { VIRT_GIC_ITS, VIRT_GIC_REDIST, VIRT_SMMU, + VIRT_PVPANIC, VIRT_UART, VIRT_MMIO, VIRT_RTC, @@ -139,6 +140,7 @@ struct VirtMachineState { bool highmem; bool highmem_ecam; bool its; + bool pvpanic; bool virt; bool ras; bool mte; --=20 1.8.3.1 From nobody Sat May 18 22:31:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1603355674; cv=none; d=zohomail.com; s=zohoarc; b=OSUDIlpbIz1K4fjWowZXO4m4sA/bumt3TjsnLZDznQhteDmUnNh7Ja3nCse/KT50Aw/HpRmVRoIIoDhgxHojHJndi15UU44yesW+JHcgGXlN/w2a7TSvE5onQAr33zPz3L00bkGuMomdhki/czA5ox/i3uXbcZ2Iuzzbc7MZb2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603355674; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=KSW4vd9JXP6+2XOuGpp+0xEta4oQs7CUNpzyXUTRHZw=; b=ImkVPP+IHN90zEew9VyU5RPtJvL9RTkM6DYogQqbfxRNmIlNR7oERUM82iMz/xdlg3/Jf5rwNaZA55P2RCTUaj/35KIJU4j6cUO4FLHaQ57EER5dbnVkxsr6ESXOJr7keTxj0FDYJMziQyAPygHLSmJ3l/BmPxJsAqu9+TmwGOU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603355674235943.3192749562191; Thu, 22 Oct 2020 01:34:34 -0700 (PDT) Received: from localhost ([::1]:46194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVW3N-0004H8-3v for importer@patchew.org; Thu, 22 Oct 2020 04:34:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVui-0004SF-2c; Thu, 22 Oct 2020 04:25:36 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:34230) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVug-0006Bw-62; Thu, 22 Oct 2020 04:25:35 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8PVeG114849; Thu, 22 Oct 2020 08:25:31 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2130.oracle.com with ESMTP id 347p4b4nwf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 22 Oct 2020 08:25:31 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8Fxb6024118; Thu, 22 Oct 2020 08:25:30 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3020.oracle.com with ESMTP id 34ak19kdwm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Oct 2020 08:25:30 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 09M8PTb8013989; Thu, 22 Oct 2020 08:25:29 GMT Received: from mihai.localdomain (/10.153.73.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Oct 2020 01:25:29 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=KSW4vd9JXP6+2XOuGpp+0xEta4oQs7CUNpzyXUTRHZw=; b=TjrKZ6MuYhsCmDFjv1NIIOnzKGlghDCOpBDg49CEXILnfZATEqpQuyyBQy3F+H6KupUV Gep+qBBVCuHFvmvq3j6UNNiG6fspsVs35NOWKzvExvGCUbZQbtkwmGms0C3soW1m6ti0 yDv8fWjmlKRuwhgLZi7A6R7Et2T7f1gRK1rjJZaOqKjR8YlruYgnAMka6xiidkFD8t5z JbU7KsxvcuS0gHjsWcFaVePzApZcYwhFN507q6gHDPUncjSeIaZzPWCisNXX3KJ9wZjS jHTBqoW0p406yDCziya90dDewLkZXvaxd6NwUs3wuD5xXxk0SvbG2YcTExt8DwyB5CYU 3g== From: Mihai Carabas To: peter.maydell@linaro.org, shannon.zhaosl@gmail.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 5/8] hw/arm/virt: add pvpanic device in virt acpi table Date: Thu, 22 Oct 2020 10:42:53 +0300 Message-Id: <1603352576-21671-6-git-send-email-mihai.carabas@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> References: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 mlxscore=0 phishscore=0 spamscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220055 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 priorityscore=1501 clxscore=1015 malwarescore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 mlxlogscore=999 impostorscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220056 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=141.146.126.79; envelope-from=mihai.carabas@oracle.com; helo=aserp2130.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/22 04:25:28 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mihai Carabas , Peng Hao , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peng Hao Add pvpanic device in virt acpi table, so when kernel command line uses acpi=3Dforce, kernel can get info from acpi table. Reviewed-by: Andrew Jones Signed-off-by: Peng Hao Signed-off-by: Mihai Carabas --- hw/arm/virt-acpi-build.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 9747a64..f64bf89 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -87,6 +87,20 @@ static void acpi_dsdt_add_uart(Aml *scope, const MemMapE= ntry *uart_memmap, aml_append(scope, dev); } =20 +static void acpi_dsdt_add_pvpanic(Aml *scope, const MemMapEntry *pvpanic_m= emmap) +{ + Aml *dev =3D aml_device("PEVT"); + 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_WRITE)); + + aml_append(dev, aml_name_decl("_CRS", crs)); + aml_append(scope, dev); +} + static void acpi_dsdt_add_fw_cfg(Aml *scope, const MemMapEntry *fw_cfg_mem= map) { Aml *dev =3D aml_device("FWCF"); @@ -605,6 +619,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) if (vmc->acpi_expose_flash) { acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]); } + if (vms->pvpanic) { + acpi_dsdt_add_pvpanic(scope, &memmap[VIRT_PVPANIC]); + } acpi_dsdt_add_fw_cfg(scope, &memmap[VIRT_FW_CFG]); acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO], (irqmap[VIRT_MMIO] + ARM_SPI_BASE), NUM_VIRTIO_TRANSPO= RTS); --=20 1.8.3.1 From nobody Sat May 18 22:31:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1603355493; cv=none; d=zohomail.com; s=zohoarc; b=GsCpFozkbmj+P135sjKZAToOe3DJCpDsWfgOtJo19yj3D02ok4Wj14fUbqoY05BhOKDN/NXkwWTM0DdFK77tgFihgX0niP6HaQtk/ejG0QMgPCVFyADPjQX+TQrtUOeRdwnA1bDBtIbqXZOAUcgMOSKf9rKBC3bnBts14BN5YFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603355493; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=gyRZHdqvOhIxkXvMbN6+hq8Shppks6KTEdlR4q91cNw=; b=IocCGlnqXaq+awlOgAPn0r8s/CwRvWjYnLcW34Z/gPB5mB2K8F6j0IRxfBlIHYA2HjBqxc1fgrZNu5VIkhz+rRnfaNlt2pEJ3DEkw9LMtrUJcTuZqf8IX51OAZswXLPgiHwURDafd8aEPoQVCn2YAydiSTXvok/OdzD1V13bko8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603355493261526.9707945987418; Thu, 22 Oct 2020 01:31:33 -0700 (PDT) Received: from localhost ([::1]:42046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVW0S-0002Pl-2a for importer@patchew.org; Thu, 22 Oct 2020 04:31:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVui-0004Tt-NB; Thu, 22 Oct 2020 04:25:36 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:34234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVug-0006CL-N0; Thu, 22 Oct 2020 04:25:36 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8OvKH114614; Thu, 22 Oct 2020 08:25:32 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2130.oracle.com with ESMTP id 347p4b4nwh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 22 Oct 2020 08:25:32 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8G7uL094709; Thu, 22 Oct 2020 08:25:31 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3030.oracle.com with ESMTP id 348a6qbcr9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Oct 2020 08:25:31 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 09M8PV8j020781; Thu, 22 Oct 2020 08:25:31 GMT Received: from mihai.localdomain (/10.153.73.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Oct 2020 01:25:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=gyRZHdqvOhIxkXvMbN6+hq8Shppks6KTEdlR4q91cNw=; b=j6nmfxOG3a1zGYFruEuW5c94qAuS1V+1uY1PJ8nGK3SE2L3x/fK2ZXX85ZHqnUA8SXza 9W1r7DQgkit3UQR3xLK81RfCF3Gv0lagVRnfRgpQeKyi/oI4Kn1/wM0jYSqy8P7q3K2X HtnVjdfNezOREEV9gysW+CPg4WZb9qClPZHTX0XsuAx0/4XDKGr/qAEfGY7AmAYWR45p SW+2JJJt3Gf5rVTAobERiIj4VGAg0DY3QupDJUeNRjw7rGejSJS4lrQsB2CcGpq9RHzi drs/05fOj9Xt5E/zD9WbRjH7TzWDaxUOyh/T/j4WdJ7L5gfRnQSdXZE3GHLCjlbbg8Qu ZQ== From: Mihai Carabas To: peter.maydell@linaro.org, shannon.zhaosl@gmail.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 6/8] hw/arm/virt: add configure interface for pvpanic-mmio Date: Thu, 22 Oct 2020 10:42:54 +0300 Message-Id: <1603352576-21671-7-git-send-email-mihai.carabas@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> References: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 bulkscore=0 spamscore=0 adultscore=0 suspectscore=1 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220055 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 priorityscore=1501 clxscore=1015 malwarescore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 mlxlogscore=999 impostorscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220056 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=141.146.126.79; envelope-from=mihai.carabas@oracle.com; helo=aserp2130.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/22 04:25:28 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mihai Carabas , Peng Hao , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peng Hao Add the option to turn on/off the pvpanic-mmio device in virt machine. Signed-off-by: Peng Hao Reviewed-by: Andrew Jones Signed-off-by: Mihai Carabas --- hw/arm/virt.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 63f09a6..7548977 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2161,6 +2161,20 @@ static void virt_set_mte(Object *obj, bool value, Er= ror **errp) vms->mte =3D value; } =20 +static bool virt_get_pvpanic(Object *obj, Error **errp) +{ + VirtMachineState *vms =3D VIRT_MACHINE(obj); + + return vms->pvpanic; +} + +static void virt_set_pvpanic(Object *obj, bool value, Error **errp) +{ + VirtMachineState *vms =3D VIRT_MACHINE(obj); + + vms->pvpanic =3D value; +} + static char *virt_get_gic_version(Object *obj, Error **errp) { VirtMachineState *vms =3D VIRT_MACHINE(obj); @@ -2594,6 +2608,14 @@ static void virt_instance_init(Object *obj) "guest CPU which implements the ARM " "Memory Tagging Extension"); =20 + /* Default disallows pvpanic-mmio instantiation */ + vms->pvpanic =3D false; + object_property_add_bool(obj, "pvpanic", virt_get_pvpanic, + virt_set_pvpanic); + object_property_set_description(obj, "pvpanic", + "Set on/off to enable/disable " + "PVPANIC MMIO device"); + vms->irqmap =3D a15irqmap; =20 virt_flash_create(vms); --=20 1.8.3.1 From nobody Sat May 18 22:31:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1603355679; cv=none; d=zohomail.com; s=zohoarc; b=EGVAFbnMNtNTTRHkXeagSmxTZU7iR8q+yatlH6cdlrCBqw203wyLIDquHb2sqVUphqXaPo73VUEa4Tir6LthV0yrw/G+YhmR0K2R27clMrZ1E5PKvWuKqTuoa0ZMoweRVSQC3xIFrvISk93cBnOHOANWMHvfaYe4D9CLeMo0m1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603355679; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=7PgDz6ev4tgSwNrsc81WnNOzRf2qcq5e7/7OU+vopX8=; b=f32P+piVJXBLjrTXEnSqihBUIIuHVycYavb1cF4gLYpGwV+0nTQ40A7sfjnubiFimQHCGc+yFCDbdjJVVqnb0zNbZWeat6koWUbyA74X1AQtnpFZmEuZ5pCrbKKStAL6mJVlwkmX5ugm/PQ1jzvFWnP+8g7BkoGjk69C1Dg7Ats= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16033556794384.500358574741654; Thu, 22 Oct 2020 01:34:39 -0700 (PDT) Received: from localhost ([::1]:46538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVW3S-0004PS-FP for importer@patchew.org; Thu, 22 Oct 2020 04:34:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVus-0004rH-D9; Thu, 22 Oct 2020 04:25:46 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:34360) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVuq-0006LC-JF; Thu, 22 Oct 2020 04:25:46 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8OwsE114665; Thu, 22 Oct 2020 08:25:41 GMT Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2130.oracle.com with ESMTP id 347p4b4nwu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 22 Oct 2020 08:25:40 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8P4XM171199; Thu, 22 Oct 2020 08:25:40 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3030.oracle.com with ESMTP id 348ahygys3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Oct 2020 08:25:40 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 09M8Pdul015316; Thu, 22 Oct 2020 08:25:39 GMT Received: from mihai.localdomain (/10.153.73.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Oct 2020 01:25:39 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=7PgDz6ev4tgSwNrsc81WnNOzRf2qcq5e7/7OU+vopX8=; b=rfDBbPfzZOTJs7ii95wpsnNXcD1YyAfBvBJc4d7OKcDo0ZJn9ccogVsy6d8A9B5KabC5 3co8wjnHRmdP9QJPi75zX1o+iNwREgJ7qfMfzKKj/d5cOeVuSWmDc/mfjdBEtVhc0X2L ZbSkV5V5KjYRybPnvtTm9LLGLkk08t5Oy9Fu4jEXbGGV+8aT3+NlBBPokyuptuCJIrcP LbGmmRfqNGyCr4xbIFdhChnBf9O0F1oQFtr49FqXbofXZ0CsLHqYPQLmAmH54zH5LRo9 dFKn60jh431X+r0G0SlKA2lYMkzkIReq2zjvpYYH73L+DjFE+JVou4qHZAHKCL33kCWU 4A== From: Mihai Carabas To: peter.maydell@linaro.org, shannon.zhaosl@gmail.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 7/8] pvpanic : update pvpanic document Date: Thu, 22 Oct 2020 10:42:55 +0300 Message-Id: <1603352576-21671-8-git-send-email-mihai.carabas@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> References: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 bulkscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 mlxscore=0 suspectscore=1 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220056 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 priorityscore=1501 clxscore=1015 malwarescore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 mlxlogscore=999 impostorscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220056 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=141.146.126.79; envelope-from=mihai.carabas@oracle.com; helo=aserp2130.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/22 04:25:28 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mihai Carabas , Peng Hao , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peng Hao Add mmio support info in docs/specs/pvpanic.txt. Reviewed-by: Andrew Jones Signed-off-by: Peng Hao Signed-off-by: Mihai Carabas --- docs/specs/pvpanic.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/specs/pvpanic.txt b/docs/specs/pvpanic.txt index a90fbca..b50140b 100644 --- a/docs/specs/pvpanic.txt +++ b/docs/specs/pvpanic.txt @@ -1,7 +1,7 @@ PVPANIC DEVICE =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -pvpanic device is a simulated ISA device, through which a guest panic +pvpanic device is a simulated device, through which a guest panic event is sent to qemu, and a QMP event is generated. This allows management apps (e.g. libvirt) to be notified and respond to the event. =20 @@ -9,6 +9,9 @@ The management app has the option of waiting for GUEST_PANI= CKED events, and/or polling for guest-panicked RunState, to learn when the pvpanic device has fired a panic event. =20 +The pvpanic device can be implemented as an ISA device (using IOPORT), +or, since qemu 4.0, as a SYSBUS device (using MMIO). + ISA Interface ------------- =20 @@ -24,6 +27,13 @@ bit 1: a guest panic has happened and will be handled by= the guest; the host should record it or report it, but should not affect the execution of the guest. =20 +SYSBUS Interface +---------------- + +The SYSBUS interface is similar to the ISA interface except that it uses +MMIO. For example, the arm virt machine could put the pvpanic device at +[0x90b0000, 0x90b0001], where currently only the first byte is used. + ACPI Interface -------------- =20 --=20 1.8.3.1 From nobody Sat May 18 22:31:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1603355362; cv=none; d=zohomail.com; s=zohoarc; b=gDZcrAIDDGhTTBzcBxCXoe0KiX6sD8TXNWSeym2SRdsHWDTdWzZNX1+rnhCrZ6fRhrnVzO4oSqYjz3S0GII4+3/qDD40dy1+xB2Q9UBw/rJDCAjobZg8lsRQH9Qs098IKPAbGBhNYKUV0AtAdkvI5DStWpc1A/D7XFO7H+4oSsU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603355362; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=P73tB6V8HboKqkNO+5D1J1iSewP3IjymN3EA3sKR3mI=; b=YMSoZ8noQ9MKyioPD7vnKaXreQ0jGlI2VDNUStSyY4DQbFmAZ5ljYSWeI9phkIXG9jjr1MzxrSDWCy0p+6mZFgu7SIw568NXSnJsOK6ygDd/yy/MRNq3+X/01sY216JvpI8NU7N4PJYHsKefz+QxmJpwHkBH8nOdrh7HdT346uc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603355362433813.4895834676896; Thu, 22 Oct 2020 01:29:22 -0700 (PDT) Received: from localhost ([::1]:37362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVVyK-0000My-3y for importer@patchew.org; Thu, 22 Oct 2020 04:29:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVwq-0007Xb-Vk; Thu, 22 Oct 2020 04:27:48 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:44444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVwo-00076J-9p; Thu, 22 Oct 2020 04:27:48 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8ODRg008760; Thu, 22 Oct 2020 08:27:43 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2120.oracle.com with ESMTP id 34ak16mw97-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 22 Oct 2020 08:27:42 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 09M8G8aV094847; Thu, 22 Oct 2020 08:25:42 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserp3030.oracle.com with ESMTP id 348a6qbcux-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Oct 2020 08:25:42 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 09M8Peb6015325; Thu, 22 Oct 2020 08:25:41 GMT Received: from mihai.localdomain (/10.153.73.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Oct 2020 01:25:40 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=P73tB6V8HboKqkNO+5D1J1iSewP3IjymN3EA3sKR3mI=; b=EtkGSem9MnPRURgxNGpYS5WPtaE0WTY6BswM22CL0NrSDQdiU5MCMiUHOmavqdX1yCBy G95zn2Hm3gNlW9/mYFf5yIw4HKEZrg95oT9tFUemYD42XmXAy2X/fsSqdsfHjpUzVcLJ midjW3QvRjpdjfxJGYJgpBL5Hw5VJWhNTGXkDistuNcNIo/JkH6dEfW4PW9iqh7dUfjc +g7b+u8GUvt5u0IjGY1l9wMHrzc6k8+d3QaTRkry0XvFC07+ltFDQiAL7qRl++LRK3QT TjbkNH2Tih7vwwpvNfCTKNRA2gy3EzwEWCxRWHtXjlvp9HUlzIKu08l0tgBetxQpcsbN zA== From: Mihai Carabas To: peter.maydell@linaro.org, shannon.zhaosl@gmail.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 8/8] pvpanic: break dependency on ISA_BUS Date: Thu, 22 Oct 2020 10:42:56 +0300 Message-Id: <1603352576-21671-9-git-send-email-mihai.carabas@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> References: <1603352576-21671-1-git-send-email-mihai.carabas@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 bulkscore=0 spamscore=0 adultscore=0 suspectscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220055 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9781 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220056 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=156.151.31.85; envelope-from=mihai.carabas@oracle.com; helo=userp2120.oracle.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/22 04:09:38 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mihai Carabas , qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" pvpanic is supported on ARM VIRT MACHINE as an MMIO device, no need for an = ISA bus. Signed-off-by: Mihai Carabas --- hw/arm/Kconfig | 1 + hw/misc/Kconfig | 2 +- hw/misc/pvpanic.c | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index f303c6b..0dd570b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -26,6 +26,7 @@ config ARM_VIRT select ACPI_MEMORY_HOTPLUG select ACPI_HW_REDUCED select ACPI_NVDIMM + select PVPANIC =20 config CHEETAH bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 3185456..5924e70 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -117,7 +117,7 @@ config IOTKIT_SYSINFO =20 config PVPANIC bool - depends on ISA_BUS + depends on ISA_BUS || ARM_VIRT =20 config AUX bool diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 136f1d6..a70adb8 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -105,6 +105,7 @@ static const MemoryRegionOps pvpanic_ops =3D { }, }; =20 +#ifdef CONFIG_ISA_BUS static void pvpanic_isa_initfn(Object *obj) { PVPanicISAState *s =3D PVPANIC_ISA_DEVICE(obj); @@ -152,6 +153,7 @@ static TypeInfo pvpanic_isa_info =3D { .instance_init =3D pvpanic_isa_initfn, .class_init =3D pvpanic_isa_class_init, }; +#endif =20 static void pvpanic_mmio_initfn(Object *obj) { @@ -180,7 +182,9 @@ static TypeInfo pvpanic_mmio_info =3D { =20 static void pvpanic_register_types(void) { +#ifdef CONFIG_ISA_BUS type_register_static(&pvpanic_isa_info); +#endif type_register_static(&pvpanic_mmio_info); } =20 --=20 1.8.3.1