From nobody Fri Apr 26 03:35:53 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=flygoat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675344153824438.3953662063093; Thu, 2 Feb 2023 05:22:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNZXH-0006Q7-5u; Thu, 02 Feb 2023 08:21:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNZXF-0006Pa-UH for qemu-devel@nongnu.org; Thu, 02 Feb 2023 08:21:53 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNZXD-0001Ke-E2 for qemu-devel@nongnu.org; Thu, 02 Feb 2023 08:21:53 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 12FAD5C0070; Thu, 2 Feb 2023 08:21:49 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 02 Feb 2023 08:21:49 -0500 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 2 Feb 2023 08:21:47 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1675344109; x=1675430509; bh=e0 OQT4uz4ABVJKxxqXI7A6P/UBymcjnm1X3NoOPiCDI=; b=K+fY6d1T/WgI07c59L zIFm/FcQXm9isY80Tr6VUFW673PPZMocvlvtTf4S/W/rEdsGABHy6OihzSJL8O5o fC18fUWvdFzt4xoEGWeci310/UblC190/3HmCo+nqvk4R65uhGvd8P5xZPt2r7IH T2XS+NnBr+XIv27+CIYxwmU33zAlYxlTOZ2BMHRXj9iYEtBBhW35DsvZfc+DJ98l tgM2L+gnDO2igpKUomSxsiC9mEcXBK4TSJPfnbFqihFWimN2WwOq3fQhnLfCaz9O KpejMYqXolBERGfQDHyYKb5NW3MqoQtvIT9t2by2cBJQLacG3nh0jijbtS70bZRg 9d+w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1675344109; x=1675430509; bh=e0OQT4uz4ABVJ KxxqXI7A6P/UBymcjnm1X3NoOPiCDI=; b=ZRvVLm3kRZXOOlVPqbZQsLGkvN6+P 0Wso5h9rwgYp7V9vZCHY54KFfyB8GmV/aWBpI66xLgCwjTR3S50iN7WQtQ2W9m94 WCeIK8bL3lj89/A44j+dwqMKc0UVUaES8DkA5ZDO90gkA1PIK+7acj2H0ZAMHzj6 5kFtCXnaQI9Um/DbD5/nGkTBIPLKMiW4QSHx91bkhojixm+AX6zeGq7XqPgk74Sw vHxZj7RSKj9ciuhVI0q4lXhroyuCjFOPqx3nJidTYeM7ylRAK43PByZ300qIVhJP 0XnFfOb78kTukoqcWw26FPa+GFwbVOTNpcN1rCwLvJieTbycW4oIljqQw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudefkedggeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeflihgrgihunhcujggrnhhguceojhhirgiguhhnrdihrghn ghesfhhlhihgohgrthdrtghomheqnecuggftrfgrthhtvghrnhepfeeludefheegvdeuvd dvgeekgfdvtdettdelieeihfegtedugeekhfdvhfejfedtnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhirgiguhhnrdihrghnghesfhhlhi hgohgrthdrtghomh X-ME-Proxy: Feedback-ID: ifd894703:Fastmail From: Jiaxun Yang To: qemu-devel@nongnu.org Cc: philmd@linaro.org, balaton@eik.bme.hu, Jiaxun Yang Subject: [PATCH 1/3] docs/system: Remove "mips" board from target-mips.rst Date: Thu, 2 Feb 2023 13:21:36 +0000 Message-Id: <20230202132138.30945-2-jiaxun.yang@flygoat.com> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) In-Reply-To: <20230202132138.30945-1-jiaxun.yang@flygoat.com> References: <20230202132138.30945-1-jiaxun.yang@flygoat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=66.111.4.26; envelope-from=jiaxun.yang@flygoat.com; helo=out2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZM-MESSAGEID: 1675344154901100001 Content-Type: text/plain; charset="utf-8" This board had been deprecated long ago. Signed-off-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- docs/system/target-mips.rst | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/docs/system/target-mips.rst b/docs/system/target-mips.rst index 138441bdec..83239fb9df 100644 --- a/docs/system/target-mips.rst +++ b/docs/system/target-mips.rst @@ -8,8 +8,6 @@ endian options, ``qemu-system-mips``, ``qemu-system-mipsel`` ``qemu-system-mips64`` and ``qemu-system-mips64el``. Five different machine types are emulated: =20 -- A generic ISA PC-like machine \"mips\" - - The MIPS Malta prototype board \"malta\" =20 - An ACER Pica \"pica61\". This machine needs the 64-bit emulator. @@ -19,18 +17,6 @@ machine types are emulated: - A MIPS Magnum R4000 machine \"magnum\". This machine needs the 64-bit emulator. =20 -The generic emulation is supported by Debian 'Etch' and is able to -install Debian into a virtual disk image. The following devices are -emulated: - -- A range of MIPS CPUs, default is the 24Kf - -- PC style serial port - -- PC style IDE disk - -- NE2000 network card - The Malta emulation supports the following devices: =20 - Core board with MIPS 24Kf CPU and Galileo system controller --=20 2.37.1 (Apple Git-137.1) From nobody Fri Apr 26 03:35:53 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=flygoat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675344186331425.42436723768117; Thu, 2 Feb 2023 05:23:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNZXL-0006Qd-Cj; Thu, 02 Feb 2023 08:21:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNZXG-0006Pe-3n for qemu-devel@nongnu.org; Thu, 02 Feb 2023 08:21:54 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNZXD-0001Kx-1n for qemu-devel@nongnu.org; Thu, 02 Feb 2023 08:21:53 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 3680A5C0099; Thu, 2 Feb 2023 08:21:50 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 02 Feb 2023 08:21:50 -0500 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 2 Feb 2023 08:21:49 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1675344110; x=1675430510; bh=tp fAoyD9ytmG8Iha5DzGRS8+2ULIeHVLoZ3MPfyy05s=; b=FSgwgD62F2l7gWGx+U /MCH99ZclpbO32saN5d8uJ+LeJLdKgPN27EycVphhzwZ3IHoRqrP5gdr0zFbfs7y /lkK4HBEf3/DTlIY96h+twSwlWeG/TX5vw8XPT8NQDdA1a4N1pNSykze0lADQGen 1d2qckLRLV/KhL05kYvKlrWgPeT5wVBiI7whu4Xzp42mwFuhRzGhBFbclZmMsAaE 53KGjgGl3spr6vOUQ8JyMVA4D8Kgu8GCmag8kvysDNIXmzR8bJdKW/5J9IoeKsxB HmS+bUC8ViFimvKBu1WxgTQBYBlPWsKb5D1fxOT56RFOhBGnrMccU3rym41h64v5 fiJQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1675344110; x=1675430510; bh=tpfAoyD9ytmG8 Iha5DzGRS8+2ULIeHVLoZ3MPfyy05s=; b=DBPynNPf60FNH3D5nx1NGk1WmBOhc /HHrryjQUSXjleULfoXhoioYGgyRhF3zIDXQ35A4LHlbMM7ZP0cxiJCTRoHMoCq1 yFiUL2ACjSF8zWughKRJb8ZtA4r8IJAaIBPnb531ozs3S7pcn5FN39Hvf2uumZuE D6IfH/4wR5LOMbmD2ep85LpEFJYzkk2DEhhd1x4HE0T5KtkTYmVeFpWWCGH5avMm p0znE8NzSJvJP6bOrOf3OXH0DNVFn92l0LMjqWxP1RU8nFJ9/zfrDpZ5904xkG3c 3mXeqZ1+8p95RRUFmJs+mfSfGRJ+Q+Cg1PaeumRt5i4Z3Qirh4ZGNuXcQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudefkedggeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeflihgrgihunhcujggrnhhguceojhhirgiguhhnrdihrghn ghesfhhlhihgohgrthdrtghomheqnecuggftrfgrthhtvghrnhepfeeludefheegvdeuvd dvgeekgfdvtdettdelieeihfegtedugeekhfdvhfejfedtnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhirgiguhhnrdihrghnghesfhhlhi hgohgrthdrtghomh X-ME-Proxy: Feedback-ID: ifd894703:Fastmail From: Jiaxun Yang To: qemu-devel@nongnu.org Cc: philmd@linaro.org, balaton@eik.bme.hu, Jiaxun Yang Subject: [PATCH 2/3] hw/misc: Add MIPS Trickbox device Date: Thu, 2 Feb 2023 13:21:37 +0000 Message-Id: <20230202132138.30945-3-jiaxun.yang@flygoat.com> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) In-Reply-To: <20230202132138.30945-1-jiaxun.yang@flygoat.com> References: <20230202132138.30945-1-jiaxun.yang@flygoat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=66.111.4.26; envelope-from=jiaxun.yang@flygoat.com; helo=out2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZM-MESSAGEID: 1675344186763100001 Content-Type: text/plain; charset="utf-8" MIPS Trickbox is a emulated device present in MIPS's IASIM simulator for decades. It's capable of managing simulator status, signaling interrupts, doing DMA and EJTAG signal stimulations. For now we just use definition of this device and implement power management related functions. Signed-off-by: Jiaxun Yang --- v1: Rewording commit message --- hw/misc/Kconfig | 3 + hw/misc/meson.build | 1 + hw/misc/mips_trickbox.c | 97 +++++++++++++++++++++++++++++++++ hw/misc/trace-events | 4 ++ include/hw/misc/mips_trickbox.h | 41 ++++++++++++++ 5 files changed, 146 insertions(+) create mode 100644 hw/misc/mips_trickbox.c create mode 100644 include/hw/misc/mips_trickbox.h diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index eaeddca277..a9637e6494 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -89,6 +89,9 @@ config STM32F4XX_EXTI config MIPS_ITU bool =20 +config MIPS_TRICKBOX + bool + config MPS2_FPGAIO bool select LED diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 448e14b531..1ea92b266d 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -135,6 +135,7 @@ specific_ss.add(when: 'CONFIG_MAC_VIA', if_true: files(= 'mac_via.c')) =20 specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'm= ips_cpc.c')) specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c')) +specific_ss.add(when: 'CONFIG_MIPS_TRICKBOX', if_true: files('mips_trickbo= x.c')) =20 softmmu_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa_ec.c')) =20 diff --git a/hw/misc/mips_trickbox.c b/hw/misc/mips_trickbox.c new file mode 100644 index 0000000000..20349b774b --- /dev/null +++ b/hw/misc/mips_trickbox.c @@ -0,0 +1,97 @@ +/* + * SPDX-License-Identifier: LGPL-2.0-or-later + * + * MIPS Trickbox + */ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "qapi/error.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "trace.h" +#include "sysemu/runstate.h" +#include "hw/misc/mips_trickbox.h" + +static uint64_t mips_trickbox_read(void *opaque, hwaddr addr, unsigned int= size) +{ + uint64_t value =3D 0; + + qemu_log_mask(LOG_UNIMP, + "%s: unimplemented register read 0x%02"HWADDR_PRIx"\n", + __func__, addr); + trace_mips_trickbox_read(size, value); + + return 0; +} + +static void mips_trickbox_write(void *opaque, hwaddr addr, + uint64_t val64, unsigned int size) +{ + trace_mips_trickbox_write(size, val64); + + switch (addr) { + case REG_SIM_CMD: + switch (val64 & 0xffffffff) { + case TRICK_PANIC: + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_PANIC); + break; + case TRICK_HALT: + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); + break; + case TRICK_SUSPEND: + qemu_system_suspend_request(); + break; + case TRICK_RESET: + qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); + break; + case TRICK_PASS_MIPS: + case TRICK_PASS_NANOMIPS: + exit(EXIT_SUCCESS); + break; + case TRICK_FAIL_MIPS: + case TRICK_FAIL_NANOMIPS: + exit(EXIT_FAILURE); + break; + } + break; + default: + qemu_log_mask(LOG_UNIMP, + "%s: unimplemented register write 0x%02"HWADDR_PRIx"= \n", + __func__, addr); + break; + } +} + +static const MemoryRegionOps mips_trickbox_ops =3D { + .read =3D mips_trickbox_read, + .write =3D mips_trickbox_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 2, + .max_access_size =3D 4 + } +}; + +static void mips_trickbox_init(Object *obj) +{ + MIPSTrickboxState *s =3D MIPS_TRICKBOX(obj); + + memory_region_init_io(&s->mmio, obj, &mips_trickbox_ops, s, + TYPE_MIPS_TRICKBOX, 0x100); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); +} + +static const TypeInfo mips_trickbox_info =3D { + .name =3D TYPE_MIPS_TRICKBOX, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(MIPSTrickboxState), + .instance_init =3D mips_trickbox_init, +}; + +static void mips_trickbox_register_types(void) +{ + type_register_static(&mips_trickbox_info); +} + +type_init(mips_trickbox_register_types) diff --git a/hw/misc/trace-events b/hw/misc/trace-events index c47876a902..8603cf0d5a 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -279,3 +279,7 @@ virt_ctrl_instance_init(void *dev) "ctrl: %p" lasi_chip_mem_valid(uint64_t addr, uint32_t val) "access to addr 0x%"PRIx6= 4" is %d" lasi_chip_read(uint64_t addr, uint32_t val) "addr 0x%"PRIx64" val 0x%08x" lasi_chip_write(uint64_t addr, uint32_t val) "addr 0x%"PRIx64" val 0x%08x" + +# mips_trickbox.c +mips_trickbox_read(uint64_t addr, uint32_t val) "addr 0x%"PRIx64" val 0x%0= 8x" +mips_trickbox_write(uint64_t addr, uint32_t val) "addr 0x%"PRIx64" val 0x%= 08x" diff --git a/include/hw/misc/mips_trickbox.h b/include/hw/misc/mips_trickbo= x.h new file mode 100644 index 0000000000..386a767937 --- /dev/null +++ b/include/hw/misc/mips_trickbox.h @@ -0,0 +1,41 @@ +/* + * SPDX-License-Identifier: LGPL-2.0-or-later + * + * MIPS Trickbox + */ + + +#ifndef HW_MIPS_TRICKBOX_H +#define HW_MIPS_TRICKBOX_H + +#include "hw/sysbus.h" +#include "qom/object.h" + +#define TYPE_MIPS_TRICKBOX "mips.trickbox" + +typedef struct MIPSTrickboxState MIPSTrickboxState; +DECLARE_INSTANCE_CHECKER(MIPSTrickboxState, MIPS_TRICKBOX, + TYPE_MIPS_TRICKBOX) + +struct MIPSTrickboxState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + MemoryRegion mmio; +}; + +#define REG_SIM_CMD 0x0 + +enum { + TRICK_PANIC =3D 1, + TRICK_HALT =3D 2, + TRICK_SUSPEND =3D 3, + TRICK_RESET =3D 4, + TRICK_FAIL_MIPS =3D 0x2c00abc1, + TRICK_PASS_MIPS =3D 0x2c00abc2, + TRICK_FAIL_NANOMIPS =3D 0x80005bc1, + TRICK_PASS_NANOMIPS =3D 0x80005bc2 +}; + +#endif --=20 2.37.1 (Apple Git-137.1) From nobody Fri Apr 26 03:35:53 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=flygoat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675344165208544.1374771525876; Thu, 2 Feb 2023 05:22:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNZXM-0006Qv-Ip; Thu, 02 Feb 2023 08:22:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNZXI-0006QE-4r for qemu-devel@nongnu.org; Thu, 02 Feb 2023 08:21:59 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNZXD-0001Li-OB for qemu-devel@nongnu.org; Thu, 02 Feb 2023 08:21:55 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 43C545C00F4; Thu, 2 Feb 2023 08:21:51 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 02 Feb 2023 08:21:51 -0500 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 2 Feb 2023 08:21:50 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1675344111; x=1675430511; bh=rm H3wzOWL7ip3MGj4VXtT4mSuTaNRy7zUmwzWPv+uu8=; b=Mlri7y+xbU9bqn9QO1 sOb7IpZYoXN9q88oMyVJ7hHPQyFBTy/PawYDr7+4dkyF0cRP2FnktpU1t+LsvdDQ gIymYLwuUlInqaVNTd2/eoXn1k6BySlSDg5aqg8KYCTOPkInJrjyZ+oBYH2ebmuk aLykO2t4BBSmY9bgfKPz7Xx3qpa4dH2CibKsEDgx0Wiq+H/QIxf6sE3HS222INqW 0sHUjQIElt95+Wavxm9ZV8nVr9x8hYrNysxfdoh14ZAHpLzO1UQ5Mx9AvWDYhbH6 DQERm0pxfctMhZXg3CfHiByR2hbCVgf3KRl01uCwrD9R3etV8lYc/GkzBCCaGYDJ QvwA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1675344111; x=1675430511; bh=rmH3wzOWL7ip3 MGj4VXtT4mSuTaNRy7zUmwzWPv+uu8=; b=QTdv2fSjJcI/ZLL1RL13zMsSxqaYz EJqh9DYXPShJxIASeYV+a9dP3NvQfuWKkX3vCTzj8s4rHuTTgrWuGnTG+kATKD83 fxCxwVVBVQ8/aHP7r/Mffh8h7s+PJwnYQtzisIh7Kd6OiEczo6blqlmphheS3Jl2 3SmNHcfObl+Mo03/R0qnokc2uxp84lk8LMBqXGfpceaVjkbysJZEcdbqOC+kIfaA bU5NBz64C81iLxwFM6bELpVjS5oUYgFCYDtA7WIPgtju0Vshsg9jKx4zGbPtq5fh HBpHpDCDI4W8dEH75r/0OqqCKVgH1AKUQ1G1hjnrFnKJQiW+yYY1pMvhQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudefkedggeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeflihgrgihunhcujggrnhhguceojhhirgiguhhnrdihrghn ghesfhhlhihgohgrthdrtghomheqnecuggftrfgrthhtvghrnhepfeeludefheegvdeuvd dvgeekgfdvtdettdelieeihfegtedugeekhfdvhfejfedtnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhirgiguhhnrdihrghnghesfhhlhi hgohgrthdrtghomh X-ME-Proxy: Feedback-ID: ifd894703:Fastmail From: Jiaxun Yang To: qemu-devel@nongnu.org Cc: philmd@linaro.org, balaton@eik.bme.hu, Jiaxun Yang Subject: [PATCH 3/3] hw/mips: Add MIPS virt board Date: Thu, 2 Feb 2023 13:21:38 +0000 Message-Id: <20230202132138.30945-4-jiaxun.yang@flygoat.com> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) In-Reply-To: <20230202132138.30945-1-jiaxun.yang@flygoat.com> References: <20230202132138.30945-1-jiaxun.yang@flygoat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=66.111.4.26; envelope-from=jiaxun.yang@flygoat.com; helo=out2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZM-MESSAGEID: 1675344166484100001 Content-Type: text/plain; charset="utf-8" MIPS virt board is design to utilize existing VirtIO infrastures but also comptitable with MIPS's existing internal simulation tools. It includes virtio-mmio, pcie gpex, flash rom, fw_cfg, goldfish-rtc, and optional goldfish_pic in case MIPS GIC is not present. It should be able to cooperate with any MIPS CPU cores. Signed-off-by: Jiaxun Yang --- v1: - Rename to virt board - Convert BIOS flash to ROM - Cleanups --- MAINTAINERS | 7 + configs/devices/mips-softmmu/common.mak | 1 + docs/system/target-mips.rst | 24 + hw/mips/Kconfig | 18 + hw/mips/meson.build | 1 + hw/mips/virt.c | 1015 +++++++++++++++++++++++ 6 files changed, 1066 insertions(+) create mode 100644 hw/mips/virt.c diff --git a/MAINTAINERS b/MAINTAINERS index c581c11a64..eb6b748786 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1291,6 +1291,13 @@ F: hw/mips/boston.c F: hw/pci-host/xilinx-pcie.c F: include/hw/pci-host/xilinx-pcie.h =20 +Virt +M: Jiaxun Yang +S: Maintained +F: hw/mips/virt.c +F: hw/misc/mips_trickbox.c +F: include/hw/misc/mips_trickbox.h + OpenRISC Machines ----------------- or1k-sim diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips= -softmmu/common.mak index 7da99327a7..eb2c32b7c1 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -24,6 +24,7 @@ CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy +CONFIG_MIPS_VIRT=3Dy CONFIG_MALTA=3Dy CONFIG_PCNET_PCI=3Dy CONFIG_MIPSSIM=3Dy diff --git a/docs/system/target-mips.rst b/docs/system/target-mips.rst index 83239fb9df..8755a21bf4 100644 --- a/docs/system/target-mips.rst +++ b/docs/system/target-mips.rst @@ -8,6 +8,8 @@ endian options, ``qemu-system-mips``, ``qemu-system-mipsel`` ``qemu-system-mips64`` and ``qemu-system-mips64el``. Five different machine types are emulated: =20 +- Generic Virtual Platform \"virt\" + - The MIPS Malta prototype board \"malta\" =20 - An ACER Pica \"pica61\". This machine needs the 64-bit emulator. @@ -17,6 +19,28 @@ machine types are emulated: - A MIPS Magnum R4000 machine \"magnum\". This machine needs the 64-bit emulator. =20 +The virt machine supports the following devices: + +- A range of MIPS CPUs, default is the P5600 (32-bit) or I6400 (64-bit) + +- MIPS CM (Coherence Manager) for SMP system with supported CPU + +- Google Goldfish PIC Interrupt Controller for system without CM + +- CFI parallel NOR flash memory + +- 1 NS16550 compatible UART + +- 1 Google Goldfish RTC + +- 1 MIPS Trickbox device + +- 8 virtio-mmio transport devices + +- 1 generic PCIe host bridge + +- The fw_cfg device that allows a guest to obtain data from QEMU + The Malta emulation supports the following devices: =20 - Core board with MIPS 24Kf CPU and Galileo system controller diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index da3a37e215..0790ec55c3 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -59,5 +59,23 @@ config MIPS_BOSTON select AHCI_ICH9 select SERIAL =20 +config MIPS_VIRT + bool + imply PCI_DEVICES + imply VIRTIO_VGA + imply TEST_DEVICES + select MIPS_CPS + select MIPS_TRICKBOX + select SERIAL + select FW_CFG_MIPS + select GOLDFISH_RTC + select GOLDFISH_PIC + select PCI + select PCI_EXPRESS_GENERIC_BRIDGE + select PFLASH_CFI01 + select VIRTIO_MMIO + select FW_CFG_DMA + select PLATFORM_BUS + config FW_CFG_MIPS bool diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 900613fc08..5670c939fa 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -1,6 +1,7 @@ mips_ss =3D ss.source_set() mips_ss.add(files('bootloader.c', 'mips_int.c')) mips_ss.add(when: 'CONFIG_FW_CFG_MIPS', if_true: files('fw_cfg.c')) +mips_ss.add(when: 'CONFIG_MIPS_VIRT', if_true: files('virt.c')) mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: files('loongson3_bootp.c',= 'loongson3_virt.c')) mips_ss.add(when: 'CONFIG_MALTA', if_true: files('malta.c')) mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c')) diff --git a/hw/mips/virt.c b/hw/mips/virt.c new file mode 100644 index 0000000000..e13b2c731b --- /dev/null +++ b/hw/mips/virt.c @@ -0,0 +1,1015 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/* + * QEMU MIPS Virt Board + * Copyright (C) 2022 Jiaxun Yang + */ + +#include "qemu/osdep.h" +#include "qemu/units.h" +#include "qemu/datadir.h" + +#include "chardev/char.h" +#include "hw/block/flash.h" +#include "hw/boards.h" +#include "hw/char/serial.h" +#include "hw/core/sysbus-fdt.h" +#include "hw/display/ramfb.h" +#include "hw/intc/goldfish_pic.h" +#include "hw/loader-fit.h" +#include "hw/loader.h" +#include "hw/mips/bootloader.h" +#include "hw/mips/cps.h" +#include "hw/mips/cpudevs.h" +#include "hw/mips/mips.h" +#include "hw/misc/mips_trickbox.h" +#include "hw/pci-host/gpex.h" +#include "hw/pci/pci.h" +#include "hw/platform-bus.h" +#include "hw/qdev-clock.h" +#include "hw/qdev-properties.h" +#include "hw/rtc/goldfish_rtc.h" +#include "hw/sysbus.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "qemu/guest-random.h" +#include "qemu/log.h" +#include "sysemu/device_tree.h" +#include "sysemu/kvm.h" +#include "sysemu/qtest.h" +#include "sysemu/reset.h" +#include "sysemu/runstate.h" +#include "sysemu/sysemu.h" +#include "sysemu/tcg.h" +#include "sysemu/tpm.h" +#include "elf.h" + +#include "qom/object.h" +#include + +#define TYPE_MIPS_VIRT_MACHINE MACHINE_TYPE_NAME("virt") +typedef struct MIPSVirtState MIPSVirtState; +DECLARE_INSTANCE_CHECKER(MIPSVirtState, MIPS_VIRT_MACHINE, + TYPE_MIPS_VIRT_MACHINE) + +#define FDT_IRQ_TYPE_NONE 0 +#define FDT_IRQ_TYPE_LEVEL_HIGH 4 +#define FDT_GIC_SHARED 0 +#define FDT_GIC_LOCAL 1 +#define FDT_VIRT_CLK_SYS 1 +#define FDT_VIRT_CLK_CPU 2 +#define FDT_PCI_IRQ_MAP_PINS 4 +#define FDT_PCI_IRQ_MAP_DESCS 6 + +#define FDT_PCI_ADDR_CELLS 3 +#define FDT_PCI_INT_CELLS 1 +#define FDT_MAX_INT_CELLS 3 +#define FDT_MAX_INT_MAP_WIDTH \ + (FDT_PCI_ADDR_CELLS + FDT_PCI_INT_CELLS + 1 + FDT_MAX_INT_CELLS) + +#define VIRT_CPU_REF_CLK_FREQ 100000000 + +typedef enum MIPSVirtPlatType { + VIRT_PLAT_UP =3D 0, + VIRT_PLAT_CPS =3D 1 +} MIPSVirtPlatType; + +struct MIPSVirtState { + MachineState parent; + + Notifier machine_done; + Clock *cpuclk; + DeviceState *platform_bus_dev; + MIPSCPSState *cps; + DeviceState *pic; + PFlashCFI01 *flash; + MemoryRegion *rom; + FWCfgState *fw_cfg; + + MIPSVirtPlatType plat_type; + int fdt_size; +}; + +enum { + VIRT_LOMEM, + VIRT_ROM, + VIRT_FLASH, + VIRT_PLATFORM_BUS, + VIRT_CM, + VIRT_GIC, + VIRT_CDMM, + VIRT_CPC, + VIRT_PCIE_PIO, + VIRT_PCIE_ECAM, + VIRT_ROM_BOOT, + VIRT_FW_CFG, + VIRT_RTC, + VIRT_PIC, + VIRT_VIRTIO, + VIRT_UART0, + VIRT_TRICKBOX, + VIRT_PCIE_MMIO, + VIRT_HIGHMEM +}; + +static const MemMapEntry virt_memmap[] =3D { + [VIRT_LOMEM] =3D { 0x0, 0x10000000 }, + [VIRT_ROM] =3D { 0x10000000, 0x2000000 }, + [VIRT_FLASH] =3D { 0x12000000, 0x2000000 }, + [VIRT_PLATFORM_BUS] =3D { 0x14000000, 0x2000000 }, + /* CPC CM GCRs */ + [VIRT_CM] =3D { 0x16100000, 0x20000 }, + [VIRT_GIC] =3D { 0x16120000, 0x20000 }, + [VIRT_CDMM] =3D { 0x16140000, 0x8000 }, + [VIRT_CPC] =3D { 0x16148000, 0x8000 }, + /* Leave some space for CM GCR growth */ + [VIRT_PCIE_PIO] =3D { 0x1a000000, 0x10000 }, + [VIRT_PCIE_ECAM] =3D { 0x1b000000, 0x1000000 }, + [VIRT_ROM_BOOT] =3D { 0x1fc00000, 0x300000 }, + [VIRT_FW_CFG] =3D { 0x1ff00000, 0x100 }, + [VIRT_RTC] =3D { 0x1ff01000, 0x100 }, + [VIRT_PIC] =3D { 0x1ff02000, 0x100 }, /* Only for VIRT_PLAT_UP */ + [VIRT_VIRTIO] =3D { 0x1ff03000, 0x1000 }, /* 8 * virtio */ + /* AVP SIM Page */ + [VIRT_UART0] =3D { 0x1ffff000, 0x100 }, + [VIRT_TRICKBOX] =3D { 0x1fffff00, 0x100 }, + [VIRT_PCIE_MMIO] =3D { 0x20000000, 0x20000000 }, + [VIRT_HIGHMEM] =3D { 0x40000000, 0x0 }, /* Variable */ +}; + +enum { + UART0_IRQ =3D 0, + RTC_IRQ =3D 1, + PCIE_IRQ =3D 2, + VIRTIO_IRQ =3D 7, + VIRTIO_COUNT =3D 8, + VIRT_PLATFORM_BUS_IRQ =3D 16 +}; + +#define VIRT_PLATFORM_BUS_NUM_IRQS 16 + +static void create_fdt_hypervisor(MIPSVirtState *s) +{ + MachineState *mc =3D MACHINE(s); + + qemu_fdt_add_subnode(mc->fdt, "/hypervisor"); + if (kvm_enabled()) { + qemu_fdt_setprop_string(mc->fdt, "/hypervisor", "compatible", + "linux,kvm"); + } else if (tcg_enabled()) { + qemu_fdt_setprop_string(mc->fdt, "/hypervisor", "compatible", + "qemu,tcg"); + } +} + +static void create_fdt_memory(MIPSVirtState *s, const MemMapEntry *memmap) +{ + MachineState *mc =3D MACHINE(s); + char *name; + + name =3D g_strdup_printf("/memory@0"); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "device_type", "memory"); + qemu_fdt_setprop_sized_cells(mc->fdt, name, "reg", 2, + memmap[VIRT_LOMEM].base, 2, + memmap[VIRT_LOMEM].size); + g_free(name); + + if (mc->ram_size > memmap[VIRT_LOMEM].size) { + name =3D + g_strdup_printf("/memory@%" HWADDR_PRIx, memmap[VIRT_HIGHMEM].= base); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "device_type", "memory"); + qemu_fdt_setprop_sized_cells(mc->fdt, name, "reg", 2, + memmap[VIRT_HIGHMEM].base, 2, + mc->ram_size - memmap[VIRT_LOMEM].siz= e); + g_free(name); + } +} + +static void create_fdt_cpc(MIPSVirtState *s, const MemMapEntry *memmap, + uint32_t clk_ph, uint32_t irq_ph) +{ + MachineState *mc =3D MACHINE(s); + char *name, *gic_name; + + /* GIC with it's timer node */ + gic_name =3D g_strdup_printf("/soc/interrupt-controller@%" HWADDR_PRIx, + memmap[VIRT_GIC].base); + qemu_fdt_add_subnode(mc->fdt, gic_name); + qemu_fdt_setprop_string(mc->fdt, gic_name, "compatible", "mti,gic"); + qemu_fdt_setprop_cells(mc->fdt, gic_name, "reg", 0x0, memmap[VIRT_GIC]= .base, + 0x0, memmap[VIRT_GIC].size); + qemu_fdt_setprop(mc->fdt, gic_name, "interrupt-controller", NULL, 0); + qemu_fdt_setprop_cell(mc->fdt, gic_name, "#interrupt-cells", 3); + qemu_fdt_setprop_cell(mc->fdt, gic_name, "phandle", irq_ph); + + name =3D g_strdup_printf("%s/timer", gic_name); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "mti,gic-timer"); + qemu_fdt_setprop_cells(mc->fdt, name, "interrupts", FDT_GIC_LOCAL, 1, + FDT_IRQ_TYPE_NONE); + qemu_fdt_setprop_cell(mc->fdt, name, "clocks", clk_ph); + g_free(name); + g_free(gic_name); + + /* CDMM node */ + name =3D g_strdup_printf("/soc/cdmm@%" HWADDR_PRIx, memmap[VIRT_CDMM].= base); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "mti,mips-cdmm"); + qemu_fdt_setprop_cells(mc->fdt, name, "reg", 0x0, memmap[VIRT_CDMM].ba= se, + 0x0, memmap[VIRT_CDMM].size); + g_free(name); + + /* CPC node */ + name =3D g_strdup_printf("/soc/cpc@%" HWADDR_PRIx, memmap[VIRT_CPC].ba= se); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "mti,mips-cpc"); + qemu_fdt_setprop_cells(mc->fdt, name, "reg", 0x0, memmap[VIRT_CPC].bas= e, + 0x0, memmap[VIRT_CPC].size); + g_free(name); +} + +static void create_fdt_goldfish_pic(MIPSVirtState *s, const MemMapEntry *m= emmap, + uint32_t irq_ph) +{ + MachineState *mc =3D MACHINE(s); + uint32_t cpuintc_ph; + char *name; + + cpuintc_ph =3D qemu_fdt_alloc_phandle(mc->fdt); + qemu_fdt_add_subnode(mc->fdt, "/interrupt-controller"); + qemu_fdt_setprop_string(mc->fdt, "/interrupt-controller", "compatible", + "mti,cpu-interrupt-controller"); + qemu_fdt_setprop(mc->fdt, "/interrupt-controller", "interrupt-controll= er", + NULL, 0); + qemu_fdt_setprop_cell(mc->fdt, "/interrupt-controller", "#address-cell= s", + 0x0); + qemu_fdt_setprop_cell(mc->fdt, "/interrupt-controller", "#interrupt-ce= lls", + 0x1); + qemu_fdt_setprop_cell(mc->fdt, "/interrupt-controller", "phandle", + cpuintc_ph); + + name =3D g_strdup_printf("/soc/interrupt-controller@%" HWADDR_PRIx, + memmap[VIRT_PIC].base); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "google,goldfish-= pic"); + qemu_fdt_setprop_cells(mc->fdt, name, "reg", 0x0, memmap[VIRT_PIC].bas= e, + 0x0, memmap[VIRT_PIC].size); + qemu_fdt_setprop(mc->fdt, name, "interrupt-controller", NULL, 0); + qemu_fdt_setprop_cell(mc->fdt, name, "#interrupt-cells", 1); + qemu_fdt_setprop_cell(mc->fdt, name, "interrupt-parent", cpuintc_ph); + qemu_fdt_setprop_cell(mc->fdt, name, "interrupts", 0x2); + qemu_fdt_setprop_cell(mc->fdt, name, "phandle", irq_ph); + g_free(name); +} + +static void create_fdt_virtio(MIPSVirtState *s, const MemMapEntry *memmap, + uint32_t irq_ph) +{ + int i; + char *name; + MachineState *mc =3D MACHINE(s); + + for (i =3D 0; i < VIRTIO_COUNT; i++) { + name =3D g_strdup_printf( + "/soc/virtio_mmio@%lx", + (long)(memmap[VIRT_VIRTIO].base + i * memmap[VIRT_VIRTIO].size= )); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "virtio,mmio"= ); + qemu_fdt_setprop_cells(mc->fdt, name, "reg", 0x0, + memmap[VIRT_VIRTIO].base + + i * memmap[VIRT_VIRTIO].size, + 0x0, memmap[VIRT_VIRTIO].size); + qemu_fdt_setprop_cell(mc->fdt, name, "interrupt-parent", irq_ph); + if (s->plat_type =3D=3D VIRT_PLAT_UP) { + qemu_fdt_setprop_cell(mc->fdt, name, "interrupts", VIRTIO_IRQ = + i); + } else { + qemu_fdt_setprop_cells(mc->fdt, name, "interrupts", FDT_GIC_SH= ARED, + VIRTIO_IRQ + i, FDT_IRQ_TYPE_LEVEL_HIGH= ); + } + g_free(name); + } +} + +static void create_pcie_irq_map(MIPSVirtState *s, void *fdt, char *nodenam= e, + uint32_t irq_ph) +{ + int pin, dev; + uint32_t irq_map_stride =3D 0; + uint32_t full_irq_map[GPEX_NUM_IRQS * GPEX_NUM_IRQS * + FDT_MAX_INT_MAP_WIDTH] =3D {}; + uint32_t *irq_map =3D full_irq_map; + + /* This code creates a standard swizzle of interrupts such that + * each device's first interrupt is based on it's PCI_SLOT number. + * (See pci_swizzle_map_irq_fn()) + * + * We only need one entry per interrupt in the table (not one per + * possible slot) seeing the interrupt-map-mask will allow the table + * to wrap to any number of devices. + */ + for (dev =3D 0; dev < GPEX_NUM_IRQS; dev++) { + int devfn =3D dev * 0x8; + + for (pin =3D 0; pin < GPEX_NUM_IRQS; pin++) { + int irq_nr =3D PCIE_IRQ + ((pin + PCI_SLOT(devfn)) % GPEX_NUM_= IRQS); + int i =3D 0; + + /* Fill PCI address cells */ + irq_map[i] =3D cpu_to_be32(devfn << 8); + i +=3D FDT_PCI_ADDR_CELLS; + + /* Fill PCI Interrupt cells */ + irq_map[i] =3D cpu_to_be32(pin + 1); + i +=3D FDT_PCI_INT_CELLS; + + /* Fill interrupt controller phandle and cells */ + irq_map[i++] =3D cpu_to_be32(irq_ph); + if (s->plat_type =3D=3D VIRT_PLAT_CPS) { + irq_map[i++] =3D cpu_to_be32(FDT_GIC_SHARED); + } + irq_map[i++] =3D cpu_to_be32(irq_nr); + if (s->plat_type =3D=3D VIRT_PLAT_CPS) { + irq_map[i++] =3D cpu_to_be32(FDT_IRQ_TYPE_LEVEL_HIGH); + } + + if (!irq_map_stride) { + irq_map_stride =3D i; + } + irq_map +=3D irq_map_stride; + } + } + + qemu_fdt_setprop(fdt, nodename, "interrupt-map", full_irq_map, + GPEX_NUM_IRQS * GPEX_NUM_IRQS * irq_map_stride * + sizeof(uint32_t)); + + qemu_fdt_setprop_cells(fdt, nodename, "interrupt-map-mask", 0x1800, 0,= 0, + 0x7); +} + +static void create_fdt_pcie(MIPSVirtState *s, const MemMapEntry *memmap, + uint32_t irq_ph) +{ + char *name; + MachineState *mc =3D MACHINE(s); + + name =3D g_strdup_printf("/soc/pci@%lx", (long)memmap[VIRT_PCIE_ECAM].= base); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_cell(mc->fdt, name, "#address-cells", FDT_PCI_ADDR_CE= LLS); + qemu_fdt_setprop_cell(mc->fdt, name, "#interrupt-cells", FDT_PCI_INT_C= ELLS); + qemu_fdt_setprop_cell(mc->fdt, name, "#size-cells", 0x2); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", + "pci-host-ecam-generic"); + qemu_fdt_setprop_string(mc->fdt, name, "device_type", "pci"); + qemu_fdt_setprop_cell(mc->fdt, name, "linux,pci-domain", 0); + qemu_fdt_setprop_cells(mc->fdt, name, "bus-range", 0, + memmap[VIRT_PCIE_ECAM].size / PCIE_MMCFG_SIZE_M= IN - + 1); + qemu_fdt_setprop_cells(mc->fdt, name, "reg", 0, memmap[VIRT_PCIE_ECAM]= .base, + 0, memmap[VIRT_PCIE_ECAM].size); + qemu_fdt_setprop_sized_cells( + mc->fdt, name, "ranges", 1, FDT_PCI_RANGE_IOPORT, 2, 0, 2, + memmap[VIRT_PCIE_PIO].base, 2, memmap[VIRT_PCIE_PIO].size, 1, + FDT_PCI_RANGE_MMIO, 2, memmap[VIRT_PCIE_MMIO].base, 2, + memmap[VIRT_PCIE_MMIO].base, 2, memmap[VIRT_PCIE_MMIO].size); + + create_pcie_irq_map(s, mc->fdt, name, irq_ph); + g_free(name); +} + +static void create_fdt_uart(MIPSVirtState *s, const MemMapEntry *memmap, + uint32_t irq_ph) +{ + char *name; + MachineState *mc =3D MACHINE(s); + + name =3D g_strdup_printf("/soc/serial@%lx", (long)memmap[VIRT_UART0].b= ase); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "ns16550a"); + qemu_fdt_setprop_cells(mc->fdt, name, "reg", 0x0, memmap[VIRT_UART0].b= ase, + 0x0, memmap[VIRT_UART0].size); + qemu_fdt_setprop_cell(mc->fdt, name, "clock-frequency", 3686400); + qemu_fdt_setprop_cell(mc->fdt, name, "interrupt-parent", irq_ph); + if (s->plat_type =3D=3D VIRT_PLAT_UP) { + qemu_fdt_setprop_cell(mc->fdt, name, "interrupts", UART0_IRQ); + } else { + qemu_fdt_setprop_cells(mc->fdt, name, "interrupts", FDT_GIC_SHARED, + UART0_IRQ, FDT_IRQ_TYPE_LEVEL_HIGH); + } + + qemu_fdt_add_subnode(mc->fdt, "/chosen"); + qemu_fdt_setprop_string(mc->fdt, "/chosen", "stdout-path", name); + g_free(name); +} + +static void create_fdt_rtc(MIPSVirtState *s, const MemMapEntry *memmap, + uint32_t irq_ph) +{ + char *name; + MachineState *mc =3D MACHINE(s); + + name =3D g_strdup_printf("/soc/rtc@%lx", (long)memmap[VIRT_RTC].base); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "google,goldfish-= rtc"); + qemu_fdt_setprop_cells(mc->fdt, name, "reg", 0x0, memmap[VIRT_RTC].bas= e, + 0x0, memmap[VIRT_RTC].size); + qemu_fdt_setprop_cell(mc->fdt, name, "interrupt-parent", irq_ph); + if (s->plat_type =3D=3D VIRT_PLAT_UP) { + qemu_fdt_setprop_cell(mc->fdt, name, "interrupts", RTC_IRQ); + } else { + qemu_fdt_setprop_cells(mc->fdt, name, "interrupts", FDT_GIC_SHARED, + RTC_IRQ, FDT_IRQ_TYPE_LEVEL_HIGH); + } + g_free(name); +} + +static void create_fdt_reset(MIPSVirtState *s, const MemMapEntry *memmap) +{ + char *name; + uint32_t syscon_ph; + MachineState *mc =3D MACHINE(s); + + syscon_ph =3D qemu_fdt_alloc_phandle(mc->fdt); + name =3D + g_strdup_printf("/soc/trickbox@%lx", (long)memmap[VIRT_TRICKBOX].b= ase); + qemu_fdt_add_subnode(mc->fdt, name); + { + static const char *const compat[2] =3D { "mips,trickbox", "syscon"= }; + qemu_fdt_setprop_string_array(mc->fdt, name, "compatible", + (char **)&compat, ARRAY_SIZE(compat)= ); + } + qemu_fdt_setprop_cells(mc->fdt, name, "reg", 0x0, + memmap[VIRT_TRICKBOX].base, 0x0, + memmap[VIRT_TRICKBOX].size); + qemu_fdt_setprop_cell(mc->fdt, name, "phandle", syscon_ph); + g_free(name); + + name =3D g_strdup_printf("/reboot"); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "syscon-reboot"); + qemu_fdt_setprop_cell(mc->fdt, name, "regmap", syscon_ph); + qemu_fdt_setprop_cell(mc->fdt, name, "offset", REG_SIM_CMD); + qemu_fdt_setprop_cell(mc->fdt, name, "value", TRICK_RESET); + g_free(name); + + name =3D g_strdup_printf("/poweroff"); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "syscon-poweroff"= ); + qemu_fdt_setprop_cell(mc->fdt, name, "regmap", syscon_ph); + qemu_fdt_setprop_cell(mc->fdt, name, "offset", REG_SIM_CMD); + qemu_fdt_setprop_cell(mc->fdt, name, "value", TRICK_HALT); + g_free(name); +} + +static void create_fdt_flash(MIPSVirtState *s, const MemMapEntry *memmap) +{ + char *name; + MachineState *mc =3D MACHINE(s); + hwaddr flashsize =3D virt_memmap[VIRT_FLASH].size; + hwaddr flashbase =3D virt_memmap[VIRT_FLASH].base; + + name =3D g_strdup_printf("/flash@%" PRIx64, flashbase); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "cfi-flash"); + qemu_fdt_setprop_sized_cells(mc->fdt, name, "reg", 2, flashbase, 2, + flashsize, 2, flashbase + flashsize, 2, + flashsize); + qemu_fdt_setprop_cell(mc->fdt, name, "bank-width", 4); + g_free(name); +} + +static void create_fdt_fw_cfg(MIPSVirtState *s, const MemMapEntry *memmap) +{ + char *nodename; + MachineState *mc =3D MACHINE(s); + hwaddr base =3D memmap[VIRT_FW_CFG].base; + hwaddr size =3D memmap[VIRT_FW_CFG].size; + + nodename =3D g_strdup_printf("/fw-cfg@%" PRIx64, base); + qemu_fdt_add_subnode(mc->fdt, nodename); + qemu_fdt_setprop_string(mc->fdt, nodename, "compatible", + "qemu,fw-cfg-mmio"); + qemu_fdt_setprop_sized_cells(mc->fdt, nodename, "reg", 2, base, 2, siz= e); + g_free(nodename); +} + +static void create_fdt(MIPSVirtState *s, const MemMapEntry *memmap, + const char *cmdline) +{ + MachineState *mc =3D MACHINE(s); + uint32_t clk_ph, irq_ph; + uint8_t rng_seed[32]; + + if (mc->dtb) { + mc->fdt =3D load_device_tree(mc->dtb, &s->fdt_size); + if (!mc->fdt) { + error_report("load_device_tree() failed"); + exit(1); + } + goto update_bootargs; + } else { + mc->fdt =3D create_device_tree(&s->fdt_size); + if (!mc->fdt) { + error_report("create_device_tree() failed"); + exit(1); + } + } + + qemu_fdt_setprop_string(mc->fdt, "/", "model", "mips-virtio,qemu"); + qemu_fdt_setprop_string(mc->fdt, "/", "compatible", "mips-virtio"); + qemu_fdt_setprop_cell(mc->fdt, "/", "#size-cells", 0x2); + qemu_fdt_setprop_cell(mc->fdt, "/", "#address-cells", 0x2); + + clk_ph =3D qemu_fdt_alloc_phandle(mc->fdt); + qemu_fdt_add_subnode(mc->fdt, "/cpu-refclk"); + qemu_fdt_setprop_string(mc->fdt, "/cpu-refclk", "compatible", + "fixed-clock"); + qemu_fdt_setprop_cell(mc->fdt, "/cpu-refclk", "#clock-cells", 0x0); + qemu_fdt_setprop_cell(mc->fdt, "/cpu-refclk", "clock-frequency", + VIRT_CPU_REF_CLK_FREQ); + qemu_fdt_setprop_string(mc->fdt, "/cpu-refclk", "clock-output-names", + "cpu-refclk"); + qemu_fdt_setprop_cell(mc->fdt, "/cpu-refclk", "phandle", clk_ph); + + qemu_fdt_add_subnode(mc->fdt, "/cpus"); + qemu_fdt_setprop_cell(mc->fdt, "/cpus", "#size-cells", 0x0); + qemu_fdt_setprop_cell(mc->fdt, "/cpus", "#address-cells", 0x1); + + for (int cpu =3D 0; cpu < mc->smp.cpus; cpu++) { + char *name =3D g_strdup_printf("/cpus/cpu@%d", cpu); + qemu_fdt_add_subnode(mc->fdt, name); + qemu_fdt_setprop_string(mc->fdt, name, "compatible", "img,mips"); + qemu_fdt_setprop_string(mc->fdt, name, "status", "okay"); + qemu_fdt_setprop_cell(mc->fdt, name, "reg", cpu); + qemu_fdt_setprop_string(mc->fdt, name, "device_type", "cpu"); + qemu_fdt_setprop_cell(mc->fdt, name, "clocks", clk_ph); + g_free(name); + } + + create_fdt_memory(s, memmap); + + qemu_fdt_add_subnode(mc->fdt, "/soc"); + qemu_fdt_setprop(mc->fdt, "/soc", "ranges", NULL, 0); + qemu_fdt_setprop_string(mc->fdt, "/soc", "compatible", "simple-bus"); + qemu_fdt_setprop_cell(mc->fdt, "/soc", "#size-cells", 0x2); + qemu_fdt_setprop_cell(mc->fdt, "/soc", "#address-cells", 0x2); + + irq_ph =3D qemu_fdt_alloc_phandle(mc->fdt); + + if (s->plat_type =3D=3D VIRT_PLAT_CPS) { + create_fdt_cpc(s, memmap, clk_ph, irq_ph); + } else if (s->plat_type =3D=3D VIRT_PLAT_UP) { + create_fdt_goldfish_pic(s, memmap, irq_ph); + } + + create_fdt_virtio(s, memmap, irq_ph); + create_fdt_pcie(s, memmap, irq_ph); + create_fdt_reset(s, memmap); + create_fdt_uart(s, memmap, irq_ph); + create_fdt_rtc(s, memmap, irq_ph); + create_fdt_flash(s, memmap); + create_fdt_fw_cfg(s, memmap); + +update_bootargs: + if (cmdline && *cmdline) { + qemu_fdt_setprop_string(mc->fdt, "/chosen", "bootargs", cmdline); + } + + /* Pass seed to RNG */ + qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed)); + qemu_fdt_setprop(mc->fdt, "/chosen", "rng-seed", rng_seed, + sizeof(rng_seed)); + create_fdt_hypervisor(s); +} + +static void main_cpu_reset(void *opaque) +{ + MIPSCPU *cpu =3D opaque; + CPUState *cs =3D CPU(cpu); + + cpu_reset(cs); +} + +static qemu_irq virt_get_irq(MIPSVirtState *s, int pin_number) +{ + if (s->plat_type =3D=3D VIRT_PLAT_UP) { + return qdev_get_gpio_in(DEVICE(s->pic), pin_number); + } else if (s->plat_type =3D=3D VIRT_PLAT_CPS) { + return get_cps_irq(s->cps, pin_number); + } else { + g_assert_not_reached(); + } +} + +static void gen_firmware(void *p, bool has_gcr, hwaddr kernel_entry, + hwaddr fdt_addr) +{ + uint64_t regaddr; + const MemMapEntry *memmap =3D virt_memmap; + + if (has_gcr) { + /* Move CM GCRs */ + regaddr =3D cpu_mips_phys_to_kseg1(NULL, GCR_BASE_ADDR + GCR_BASE_= OFS), + bl_gen_write_ulong(&p, regaddr, memmap[VIRT_CM].base); + + /* Move & enable GIC GCRs */ + regaddr =3D cpu_mips_phys_to_kseg1(NULL, memmap[VIRT_CM].base + + GCR_GIC_BASE_OFS), + bl_gen_write_ulong(&p, regaddr, + memmap[VIRT_GIC].base | GCR_GIC_BASE_GICEN_MSK); + + /* Move & enable CPC GCRs */ + regaddr =3D cpu_mips_phys_to_kseg1(NULL, memmap[VIRT_CM].base + + GCR_CPC_BASE_OFS), + bl_gen_write_ulong(&p, regaddr, + memmap[VIRT_CPC].base | GCR_CPC_BASE_CPCEN_MSK); + } + + /* + * Setup argument registers to follow the UHI boot protocol: + * + * a0/$4 =3D -2 + * a1/$5 =3D virtual address of FDT + * a2/$6 =3D 0 + * a3/$7 =3D 0 + */ + bl_gen_jump_kernel(&p, + true, 0, true, (int32_t)-2, + true, fdt_addr, true, 0, true, 0, + kernel_entry); +} + +static void virt_map_memory(MemoryRegion *sysmem, MemoryRegion *ram, + hwaddr ram_size, hwaddr low_size, hwaddr high_= base) +{ + MemoryRegion *low_alias =3D g_new(MemoryRegion, 1); + + memory_region_init_alias(low_alias, NULL, "mips_virt.lomem", ram, 0, + low_size); + + memory_region_add_subregion(sysmem, 0, low_alias); + + if (ram_size > low_size) { + MemoryRegion *high_alias =3D g_new(MemoryRegion, 1); + memory_region_init_alias(high_alias, NULL, "mips_virt.himem", ram, + low_size, ram_size - low_size); + memory_region_add_subregion(sysmem, high_base, high_alias); + } +} + +static void virt_rom_init(MIPSVirtState *s, MemoryRegion *sysmem) +{ + MemoryRegion *boot_alias =3D g_new(MemoryRegion, 1); + s->rom =3D g_new(MemoryRegion, 1); + memory_region_init_ram(s->rom, NULL, "mips_virt.rom", + virt_memmap[VIRT_ROM].size, &error_fatal); + memory_region_add_subregion(sysmem, virt_memmap[VIRT_ROM_BOOT].base, s= ->rom); + memory_region_init_alias(boot_alias, NULL, "mips_virt.rom_boot", s->ro= m, + 0, virt_memmap[VIRT_ROM_BOOT].size); + memory_region_add_subregion(sysmem, virt_memmap[VIRT_ROM_BOOT].base, + boot_alias); +} + +#define VIRT_FLASH_SECTOR_SIZE (256 * KiB) + +static void virt_flash_init(MIPSVirtState *s, hwaddr base, hwaddr size) +{ + DriveInfo *dinfo; +#if TARGET_BIG_ENDIAN + int be =3D 1; +#else + int be =3D 0; +#endif + + dinfo =3D drive_get(IF_PFLASH, 0, 0); + s->flash =3D pflash_cfi01_register(base, "mips_virt.flash", size, + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + VIRT_FLASH_SECTOR_SIZE, 4, 0x89, 0x18, 0x00, 0x00, be); +} + +static inline DeviceState *gpex_pcie_init(MIPSVirtState *s, + MemoryRegion *sys_mem, + hwaddr ecam_base, hwaddr ecam_si= ze, + hwaddr mmio_base, hwaddr mmio_si= ze, + hwaddr pio_base) +{ + DeviceState *dev; + MemoryRegion *ecam_alias, *ecam_reg; + MemoryRegion *mmio_alias, *mmio_reg; + qemu_irq irq; + int i; + + dev =3D qdev_new(TYPE_GPEX_HOST); + + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + + ecam_alias =3D g_new0(MemoryRegion, 1); + ecam_reg =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_init_alias(ecam_alias, OBJECT(dev), "pcie-ecam", ecam_re= g, 0, + ecam_size); + memory_region_add_subregion(get_system_memory(), ecam_base, ecam_alias= ); + + mmio_alias =3D g_new0(MemoryRegion, 1); + mmio_reg =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); + memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio", mmio_re= g, + mmio_base, mmio_size); + memory_region_add_subregion(get_system_memory(), mmio_base, mmio_alias= ); + + for (i =3D 0; i < GPEX_NUM_IRQS; i++) { + irq =3D virt_get_irq(s, PCIE_IRQ + i); + + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, irq); + gpex_set_irq_num(GPEX_HOST(dev), i, PCIE_IRQ + i); + } + + return dev; +} + +static FWCfgState *create_fw_cfg(const MachineState *mc) +{ + hwaddr base =3D virt_memmap[VIRT_FW_CFG].base; + FWCfgState *fw_cfg; + + fw_cfg =3D fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, + &address_space_memory); + fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)mc->smp.cpus); + + return fw_cfg; +} + +static void create_platform_bus(MIPSVirtState *s) +{ + DeviceState *dev; + SysBusDevice *sysbus; + const MemMapEntry *memmap =3D virt_memmap; + int i; + MemoryRegion *sysmem =3D get_system_memory(); + + dev =3D qdev_new(TYPE_PLATFORM_BUS_DEVICE); + dev->id =3D g_strdup(TYPE_PLATFORM_BUS_DEVICE); + qdev_prop_set_uint32(dev, "num_irqs", VIRT_PLATFORM_BUS_NUM_IRQS); + qdev_prop_set_uint32(dev, "mmio_size", memmap[VIRT_PLATFORM_BUS].size); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + s->platform_bus_dev =3D dev; + + sysbus =3D SYS_BUS_DEVICE(dev); + for (i =3D 0; i < VIRT_PLATFORM_BUS_NUM_IRQS; i++) { + qemu_irq irq =3D virt_get_irq(s, VIRT_PLATFORM_BUS_IRQ + i); + sysbus_connect_irq(sysbus, i, irq); + } + + memory_region_add_subregion(sysmem, memmap[VIRT_PLATFORM_BUS].base, + sysbus_mmio_get_region(sysbus, 0)); +} + +static void virt_machine_done(Notifier *notifier, void *data) +{ + MIPSVirtState *s =3D container_of(notifier, MIPSVirtState, machine_don= e); + MachineState *machine =3D MACHINE(s); + int ret, dt_size; + bool firmware_loaded =3D false; + /* Leave some space for exception vector */ + hwaddr dtb_paddr =3D virt_memmap[VIRT_LOMEM].base + 0x1000; + + if (machine->firmware) { + char *fname; + int fw_size; + + fname =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware); + if (!fname && !qtest_enabled()) { + error_report("Could not find ROM image '%s'", machine->firmwar= e); + exit(1); + } + fw_size =3D load_image_mr(fname, s->rom); + if (fw_size =3D=3D -1) { + error_report("unable to load firmware image '%s'", fname); + exit(1); + } + g_free(fname); + firmware_loaded =3D true; + } + + s->fw_cfg =3D create_fw_cfg(machine); + rom_set_fw(s->fw_cfg); + + if (machine->kernel_filename) { + if (firmware_loaded) { + /* Just pass those files via fw_cfg */ + load_image_to_fw_cfg(s->fw_cfg, FW_CFG_KERNEL_SIZE, + FW_CFG_KERNEL_DATA, machine->kernel_filen= ame, + true); + load_image_to_fw_cfg(s->fw_cfg, FW_CFG_INITRD_SIZE, + FW_CFG_INITRD_DATA, machine->initrd_filen= ame, + false); + + if (machine->kernel_cmdline) { + fw_cfg_add_i32(s->fw_cfg, FW_CFG_CMDLINE_SIZE, + strlen(machine->kernel_cmdline) + 1); + fw_cfg_add_string(s->fw_cfg, FW_CFG_CMDLINE_DATA, + machine->kernel_cmdline); + } + } else { + uint64_t kernel_entry, kernel_high; + ssize_t size; + + size =3D load_elf(machine->kernel_filename, NULL, + cpu_mips_kseg0_to_phys, NULL, &kernel_entry, N= ULL, + &kernel_high, NULL, 0, EM_MIPS, 1, 0); + + if (size =3D=3D -1) { + error_report("could not load kernel '%s'", + machine->kernel_filename); + exit(1); + } + + if (machine->initrd_filename) { + const char *name =3D machine->initrd_filename; + hwaddr kernel_end =3D cpu_mips_kseg0_to_phys(NULL, kernel_= high); + hwaddr start =3D + MAX(64 * MiB, QEMU_ALIGN_UP(kernel_end + 1, 1 * MiB)); + hwaddr maxsz =3D + MIN(machine->ram_size, virt_memmap[VIRT_LOMEM].size) - + start; + + size =3D load_ramdisk(name, start, maxsz); + if (size =3D=3D -1) { + size =3D load_image_targphys(name, start, maxsz); + if (size =3D=3D -1) { + error_report("could not load ramdisk '%s'", name); + exit(1); + } + } + qemu_fdt_setprop_cell(machine->fdt, "/chosen", + "linux,initrd-start", start); + qemu_fdt_setprop_cell(machine->fdt, "/chosen", + "linux,initrd-end", start + size); + } + gen_firmware(memory_region_get_ram_ptr(s->rom), + !!s->cps, kernel_entry, + cpu_mips_phys_to_kseg0(NULL, dtb_paddr)); + } + } + + memory_region_set_readonly(s->rom, true); + ret =3D fdt_pack(machine->fdt); + /* Should only fail if we've built a corrupted tree */ + g_assert(ret =3D=3D 0); + /* Update dt_size after pack */ + dt_size =3D fdt_totalsize(machine->fdt); + /* copy in the device tree */ + qemu_fdt_dumpdtb(machine->fdt, dt_size); + fw_cfg_add_file(s->fw_cfg, "etc/fdt", machine->fdt, dt_size); + rom_add_blob_fixed("dtb", machine->fdt, dt_size, dtb_paddr); + qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds, + rom_ptr(dtb_paddr, dt_size)); +} + +static void virt_machine_init(MachineState *machine) +{ + MIPSVirtState *s =3D MIPS_VIRT_MACHINE(machine); + MemoryRegion *system_memory =3D get_system_memory(); + const MemMapEntry *memmap =3D virt_memmap; + int i; + + s->cpuclk =3D clock_new(OBJECT(machine), "cpu-refclk"); + clock_set_hz(s->cpuclk, VIRT_CPU_REF_CLK_FREQ); + + if (cpu_type_supports_cps_smp(machine->cpu_type)) { + s->cps =3D MIPS_CPS(qdev_new(TYPE_MIPS_CPS)); + object_property_set_str(OBJECT(s->cps), "cpu-type", machine->cpu_t= ype, + &error_fatal); + object_property_set_int(OBJECT(s->cps), "num-vp", machine->smp.cpu= s, + &error_fatal); + qdev_connect_clock_in(DEVICE(s->cps), "clk-in", s->cpuclk); + sysbus_realize(SYS_BUS_DEVICE(s->cps), &error_fatal); + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(s->cps), 0, 0, 1); + s->plat_type =3D VIRT_PLAT_CPS; + } else { + CPUMIPSState *env; + MIPSCPU *cpu; + + for (i =3D 0; i < machine->smp.cpus; i++) { + cpu =3D mips_cpu_create_with_clock(machine->cpu_type, s->cpucl= k); + + /* Init internal devices */ + cpu_mips_irq_init_cpu(cpu); + cpu_mips_clock_init(cpu); + qemu_register_reset(main_cpu_reset, cpu); + } + + cpu =3D MIPS_CPU(first_cpu); + env =3D &cpu->env; + s->pic =3D qdev_new(TYPE_GOLDFISH_PIC); + sysbus_realize_and_unref(SYS_BUS_DEVICE(s->pic), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(s->pic), 0, virt_memmap[VIRT_PIC].b= ase); + sysbus_connect_irq(SYS_BUS_DEVICE(s->pic), 0, env->irq[2]); + s->plat_type =3D VIRT_PLAT_UP; + } + + virt_map_memory(system_memory, machine->ram, machine->ram_size, + virt_memmap[VIRT_LOMEM].size, + virt_memmap[VIRT_HIGHMEM].base); + + virt_rom_init(s, system_memory); + virt_flash_init(s, memmap[VIRT_FLASH].base, memmap[VIRT_FLASH].size); + + serial_mm_init(system_memory, memmap[VIRT_UART0].base, 0, + virt_get_irq(s, UART0_IRQ), 399193, serial_hd(0), + DEVICE_LITTLE_ENDIAN); + + for (i =3D 0; i < VIRTIO_COUNT; i++) { + sysbus_create_simple("virtio-mmio", + memmap[VIRT_VIRTIO].base + + i * memmap[VIRT_VIRTIO].size, + virt_get_irq(s, VIRTIO_IRQ + i)); + } + + gpex_pcie_init(s, system_memory, memmap[VIRT_PCIE_ECAM].base, + memmap[VIRT_PCIE_ECAM].size, memmap[VIRT_PCIE_MMIO].bas= e, + memmap[VIRT_PCIE_MMIO].size, memmap[VIRT_PCIE_PIO].base= ); + + create_platform_bus(s); + + sysbus_create_simple(TYPE_GOLDFISH_RTC, memmap[VIRT_RTC].base, + virt_get_irq(s, RTC_IRQ)); + + sysbus_create_simple(TYPE_MIPS_TRICKBOX, memmap[VIRT_TRICKBOX].base, N= ULL); + + create_fdt(s, memmap, machine->kernel_cmdline); + s->machine_done.notify =3D virt_machine_done; + qemu_add_machine_init_done_notifier(&s->machine_done); +} + +static void virt_machine_instance_init(Object *obj) +{ +} + +static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *mach= ine, + DeviceState *dev) +{ + MachineClass *mc =3D MACHINE_GET_CLASS(machine); + + if (device_is_dynamic_sysbus(mc, dev)) { + return HOTPLUG_HANDLER(machine); + } + return NULL; +} + +static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + MIPSVirtState *s =3D MIPS_VIRT_MACHINE(hotplug_dev); + + if (s->platform_bus_dev) { + MachineClass *mc =3D MACHINE_GET_CLASS(s); + + if (device_is_dynamic_sysbus(mc, dev)) { + platform_bus_link_device(PLATFORM_BUS_DEVICE(s->platform_bus_d= ev), + SYS_BUS_DEVICE(dev)); + } + } +} + +static void virt_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); + + mc->desc =3D "MIPS VirtIO board"; + mc->init =3D virt_machine_init; + mc->max_cpus =3D 16; +#ifdef TARGET_MIPS64 + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("I6400"); +#else + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("P5600"); +#endif + mc->default_ram_id =3D "mips_virt_board.ram"; + mc->block_default_type =3D IF_VIRTIO; + mc->default_display =3D "virtio"; + mc->no_cdrom =3D 1; + mc->get_hotplug_handler =3D virt_machine_get_hotplug_handler; + + hc->plug =3D virt_machine_device_plug_cb; + + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); +#ifdef CONFIG_TPM + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); +#endif +} + +static const TypeInfo virt_machine_typeinfo =3D { + .name =3D MACHINE_TYPE_NAME("virt"), + .parent =3D TYPE_MACHINE, + .class_init =3D virt_machine_class_init, + .instance_init =3D virt_machine_instance_init, + .instance_size =3D sizeof(MIPSVirtState), + .interfaces =3D (InterfaceInfo[]){ { TYPE_HOTPLUG_HANDLER }, {} }, +}; + +static void virt_machine_init_register_types(void) +{ + type_register_static(&virt_machine_typeinfo); +} + +type_init(virt_machine_init_register_types) --=20 2.37.1 (Apple Git-137.1)