From patchwork Fri Jun 21 13:11:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiaxun Yang X-Patchwork-Id: 13707585 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8AA8EC27C4F for ; Fri, 21 Jun 2024 13:11:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKe34-0003wz-Cu; Fri, 21 Jun 2024 09:11:26 -0400 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 1sKe32-0003wX-Mh for qemu-devel@nongnu.org; Fri, 21 Jun 2024 09:11:24 -0400 Received: from fhigh3-smtp.messagingengine.com ([103.168.172.154]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sKe31-0003li-0h for qemu-devel@nongnu.org; Fri, 21 Jun 2024 09:11:24 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 8384211401CF; Fri, 21 Jun 2024 09:11:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 21 Jun 2024 09:11:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1718975482; x=1719061882; bh=u2x+0gd8VZY8SvVX8gjS5XDM/JI0G+QdPIvDtjvOjP0=; b= U4xgWLtDPU41b3PkC86zFfb6ruiJc4uXX6y1b3HAG3MyOqgqP0GxAPu0d9KpFjd1 A95wLAlUHg/ZwANj1DqkHKcERUQWwQ8p5vZmRHAO8Q8ZWT25atKGeS2LHGDi4QbY 7JhzU5crukPCVzyWKgqudiEEYYCloEXSpApqOhmoPXR4q4JhdIXlHPp2k0DGLhHB eL8W+rmp4QmaFnUG7KGAdLgzribsOhlhGJ3++XINMcuxrN0YVZGkY/ustjilQRkU WuVVYqbrGzAlPi+gEOoRWeuFm/OD6MlcFNGobFla6EmJjHiks+f2SdM5qqYB6ToR ZEohxihMo6P6XtkcdwRg6g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1718975482; x= 1719061882; bh=u2x+0gd8VZY8SvVX8gjS5XDM/JI0G+QdPIvDtjvOjP0=; b=d 0bWT+otJ7y/E4mRnz58+Y1jY+pSiyQz2NtCiiHzv9sKfqg6OQzOpt/HhAoj74xoc LfdYsIrtM48ex/pAMhcGxzqoyDwdIQn/kfI3x4Hlvow2Cy4Dljh3Q69sbFxKEsf1 F38SMXPlKXPEOPoW3qbZhmj9Jgw6AzbXrZmi91cgZbxekBRQz7HX1FroAQ/ZumzB 8qrzM5j8FO65MWLL3OpRPB93iiSPGGOHS3aRMZNp1MpvBvir6tkJR+VXIUDnBm9I 9jbfeyFn9WV3nrG9Ccs3us+Z8eqJgtk/b7pOn8csEpUwjob/ESdf0tZRvEi8lrdm CSa7HJCn7YtEDWQzn5IzQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfeefgedgiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtkeertdertdejnecuhfhrohhmpeflihgr gihunhcujggrnhhguceojhhirgiguhhnrdihrghnghesfhhlhihgohgrthdrtghomheqne cuggftrfgrthhtvghrnhepffeiteeufeegtdeuuefgieelffefgfdvffekuedujeevteff hedvgfeikeelueegnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghdpihhotghsrhdrmh hrnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhi rgiguhhnrdihrghnghesfhhlhihgohgrthdrtghomh X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jun 2024 09:11:21 -0400 (EDT) From: Jiaxun Yang Date: Fri, 21 Jun 2024 14:11:13 +0100 Subject: [PATCH v2 1/3] hw/mips/loongson3_virt: Store core_iocsr into LoongsonMachineState MIME-Version: 1.0 Message-Id: <20240621-loongson3-ipi-follow-v2-1-848eafcbb67e@flygoat.com> References: <20240621-loongson3-ipi-follow-v2-0-848eafcbb67e@flygoat.com> In-Reply-To: <20240621-loongson3-ipi-follow-v2-0-848eafcbb67e@flygoat.com> To: qemu-devel@nongnu.org Cc: Huacai Chen , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Laurent Vivier , Jiaxun Yang X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1562; i=jiaxun.yang@flygoat.com; h=from:subject:message-id; bh=JJTq5vovQyir/+eg5RcMhy0QRo8ZD01glX5y5Zk+LsY=; b=owGbwMvMwCXmXMhTe71c8zDjabUkhrTS6p/f3h4NCdWyll4Scts22bdm+lc9i7Dtv7K2Xbr/x 5bJIuFIRykLgxgXg6yYIkuIgFLfhsaLC64/yPoDM4eVCWQIAxenAExkyjaG/7Udn5d2qf1dpZbV aWfP9jp9id98IW/dq/MO/Po6wSFzWS/DH844pblHhWRF4yR4VdUfK7pptEWFfeeTlBYKPJky5fR URgA= X-Developer-Key: i=jiaxun.yang@flygoat.com; a=openpgp; fpr=980379BEFEBFBF477EA04EF9C111949073FC0F67 Received-SPF: pass client-ip=103.168.172.154; envelope-from=jiaxun.yang@flygoat.com; helo=fhigh3-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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Link: https://lore.kernel.org/qemu-devel/972034d6-23b3-415a-b401-b8bc1cc515c9@linaro.org/ Suggested-by: Philippe Mathieu-Daudé Signed-off-by: Jiaxun Yang --- hw/mips/loongson3_virt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index 4ad36f0c5b64..69c1f2275838 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -97,6 +97,7 @@ struct LoongsonMachineState { MemoryRegion *pio_alias; MemoryRegion *mmio_alias; MemoryRegion *ecam_alias; + MemoryRegion *core_iocsr[LOONGSON_MAX_VCPUS]; }; typedef struct LoongsonMachineState LoongsonMachineState; @@ -493,6 +494,7 @@ static void mips_loongson3_virt_init(MachineState *machine) const char *kernel_filename = machine->kernel_filename; const char *initrd_filename = machine->initrd_filename; ram_addr_t ram_size = machine->ram_size; + LoongsonMachineState *s = LOONGSON_MACHINE(machine); MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *bios = g_new(MemoryRegion, 1); @@ -586,6 +588,7 @@ static void mips_loongson3_virt_init(MachineState *machine) iocsr, 0, UINT32_MAX); memory_region_add_subregion(&MIPS_CPU(cpu)->env.iocsr.mr, 0, core_iocsr); + s->core_iocsr[i] = core_iocsr; } if (node > 0) { From patchwork Fri Jun 21 13:11:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaxun Yang X-Patchwork-Id: 13707588 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D6E9C27C4F for ; Fri, 21 Jun 2024 13:12:25 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKe36-0003xo-4o; Fri, 21 Jun 2024 09:11:28 -0400 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 1sKe34-0003wu-9a for qemu-devel@nongnu.org; Fri, 21 Jun 2024 09:11:26 -0400 Received: from fout6-smtp.messagingengine.com ([103.168.172.149]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sKe32-0003lp-HP for qemu-devel@nongnu.org; Fri, 21 Jun 2024 09:11:26 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id A10E713800E0; Fri, 21 Jun 2024 09:11:23 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 21 Jun 2024 09:11:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1718975483; x=1719061883; bh=azHgz7+++vTiiiPExoXJLbgUkrY8ugJohOMXmiSCtC4=; b= F3249s9xGr4J3A/WzoyX3p6cF9fHdFbka1uQj7S/qOypqwQwfMd6XLj3PR4vpF7a 7wnaD4enmisAqcHQWVy8uQuVFpXIW7vXiK6GLQjghbPZepsbLcj89enIiN/wD7K/ EtvpRYBPNDXK74xEzk0uhqlSKZOswSJOQ5VKZBUXMkkmMn74oT6PFHTaVufNTJeE Sr54Um6AnugITX1bM1idloqX6VCEuTd0etwT+dVVModTp7nh/d5dFxCMipTMRseR 9piFOhiwKOn5GdP0uCzWrC21sAe3hIZf8OCktXNJIBZ15Gq4ZrHb2MUyBN6yBW15 EPwykjMjr/t3pFm5gY/Izw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1718975483; x= 1719061883; bh=azHgz7+++vTiiiPExoXJLbgUkrY8ugJohOMXmiSCtC4=; b=c hXrzKdwZ9NV5U2TXouRMwj6Q4u1Byybzn96Ht9FHBTjW689D/KQJDH+wuh6Z8V9C u2Hqv2PGS/euHSMUA0J6m4aHNyM872RpZ9YsHXP/Lf6pLeUB59wrZXxCp+FFXFrO 62dLNOifgO5HaThZw0rOnhpSwEvWBG/BKcjxmAJ1wnwwi4IwV4qa9LSX8s93Jjn8 bFPDFVRwlZZhniQRtc5c2EpyrjKQco7t5iz8PD0CGf6L2Sqr5pSUnefWyCzyXXqC t4dxtGNUZgMn3NTlmmdUDyBZEQDQnDbrXXUCFGy8S6GWqhAYR0iqHlpUvvgf2CJ0 WHQdQCMEAgz2e1BGDSa+w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfeefgedgieduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpeflihgr gihunhcujggrnhhguceojhhirgiguhhnrdihrghnghesfhhlhihgohgrthdrtghomheqne cuggftrfgrthhtvghrnhepvedujefhfffhveekhfffkeetvefgteejkeeutdduieehieeg feejtdelveejtedunecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehjihgrgihunhdrhigrnhhg sehflhihghhorghtrdgtohhm X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jun 2024 09:11:22 -0400 (EDT) From: Jiaxun Yang Date: Fri, 21 Jun 2024 14:11:14 +0100 Subject: [PATCH v2 2/3] hw/mips/loongson3_virt: Fix condition of IPI IOCSR connection MIME-Version: 1.0 Message-Id: <20240621-loongson3-ipi-follow-v2-2-848eafcbb67e@flygoat.com> References: <20240621-loongson3-ipi-follow-v2-0-848eafcbb67e@flygoat.com> In-Reply-To: <20240621-loongson3-ipi-follow-v2-0-848eafcbb67e@flygoat.com> To: qemu-devel@nongnu.org Cc: Huacai Chen , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Laurent Vivier , Jiaxun Yang X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=864; i=jiaxun.yang@flygoat.com; h=from:subject:message-id; bh=k6GUbxEIll8axzNkKFOXUWMVONiN/aabEPRYpHrLCwk=; b=owGbwMvMwCXmXMhTe71c8zDjabUkhrTS6p+ZXwOeSXQc1Wk1Zo8y9uN4fCzKe+GMzaxNmsfEF /5nlanqKGVhEONikBVTZAkRUOrb0HhxwfUHWX9g5rAygQxh4OIUgIkk7GFkOHFyV+fs5/uCVDZc utpUylr7YqP122jrH8+7OtxO8P2fMYWRob1+t+ykVMdjOsfcPm97e+P+uurbLwqm5rnE+bnMO7/ rBAcA X-Developer-Key: i=jiaxun.yang@flygoat.com; a=openpgp; fpr=980379BEFEBFBF477EA04EF9C111949073FC0F67 Received-SPF: pass client-ip=103.168.172.149; envelope-from=jiaxun.yang@flygoat.com; helo=fout6-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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This fixes Coverity CID-1547264. Link: https://lore.kernel.org/qemu-devel/752417ad-ab72-4fed-8d1f-af41f15bc225@app.fastmail.com/ Signed-off-by: Jiaxun Yang --- hw/mips/loongson3_virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index 69c1f2275838..24aa4dd04b18 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -574,7 +574,7 @@ static void mips_loongson3_virt_init(MachineState *machine) cpu_mips_clock_init(cpu); qemu_register_reset(main_cpu_reset, cpu); - if (ipi) { + if (!kvm_enabled()) { hwaddr base = ((hwaddr)node << 44) + virt_memmap[VIRT_IPI].base; base += core * 0x100; qdev_connect_gpio_out(ipi, i, cpu->env.irq[6]); From patchwork Fri Jun 21 13:11:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaxun Yang X-Patchwork-Id: 13707586 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 474FCC27C4F for ; Fri, 21 Jun 2024 13:12:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKe36-0003xu-Sk; Fri, 21 Jun 2024 09:11:28 -0400 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 1sKe35-0003xa-Jn for qemu-devel@nongnu.org; Fri, 21 Jun 2024 09:11:27 -0400 Received: from fout6-smtp.messagingengine.com ([103.168.172.149]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sKe33-0003mF-TP for qemu-devel@nongnu.org; Fri, 21 Jun 2024 09:11:27 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.nyi.internal (Postfix) with ESMTP id 43A551380200; Fri, 21 Jun 2024 09:11:25 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Fri, 21 Jun 2024 09:11:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1718975485; x=1719061885; bh=gT2jLym9c6kJFJ+5mmTK3eAZwFetlVf+TwMnw12Lex4=; b= s7m0ut1kbPaGtC4Ey8UiAd+3fFuFMPpttpFhWm5WPNgOj1IgKjhod8I/y9hlYhqk F+S8G01jgJbVlYtPwAlRWvW08sPeQpLWt+n7XAU5LticB6fIze2x+B950Mchk4G1 Ah2SeNCGyGjPqe8B5l/NmMThHbhbUIl1dDCAKK7zsAh80ASC10cuKCXdmp98Ekck vSGJvUdWDsSe7k9v0mOFXQQ6nSDytCXKzB4mdYrkYdBH/4phqa/e/p0D3mSYFOIJ kRlYjMgCpMeo5uDz3GoXt/iymGHGYgaU4AcfE7svDxMk9TTKYtym3JYCDaMcGZL8 4Zj0oldgh9tfbdl1mBg84A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1718975485; x= 1719061885; bh=gT2jLym9c6kJFJ+5mmTK3eAZwFetlVf+TwMnw12Lex4=; b=s K/X3XRNQjowLDDlDLRqLLp/dk/cFLpsUeCiLVXRdyUw/s3LH/PyjnfBxlsFb4tQ5 t8+eUennaqFQNpGKjgbfbs1+RTTtvgOSshxrp1ATgYJ4Peqj+MRjoSS/6QAT7F/D uzo6xfj8DdsUUVuDghzfTdws+9aTBE+NZK21JeCVxTmn8fODlzRE/Mi164St1BcC vaF8HTy/zsSpEEAP55t9AwCe8kKbAN5/h+Lo8jVvPVkRHLzHik7VhH1/lY+EB8xP NNDinFOXvP1l89+t0vjPMVNe9fnJn7VSIr1BkF/yLedDncR+JF5UGJRq+njDF/gR d+chvqPwYzndEnbAca5Dw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfeefgedgiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpeflihgr gihunhcujggrnhhguceojhhirgiguhhnrdihrghnghesfhhlhihgohgrthdrtghomheqne cuggftrfgrthhtvghrnhepvdekiefhfeevkeeuveetfeelffekgedugefhtdduudeghfeu veegffegudekjeelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepjhhirgiguhhnrdihrghnghesfhhlhihgohgrthdrtghomh X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 21 Jun 2024 09:11:23 -0400 (EDT) From: Jiaxun Yang Date: Fri, 21 Jun 2024 14:11:15 +0100 Subject: [PATCH v2 3/3] linux-user/mips64: Use MIPS64R2-generic as default CPU type MIME-Version: 1.0 Message-Id: <20240621-loongson3-ipi-follow-v2-3-848eafcbb67e@flygoat.com> References: <20240621-loongson3-ipi-follow-v2-0-848eafcbb67e@flygoat.com> In-Reply-To: <20240621-loongson3-ipi-follow-v2-0-848eafcbb67e@flygoat.com> To: qemu-devel@nongnu.org Cc: Huacai Chen , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Laurent Vivier , Jiaxun Yang , stable@vger.kernel.org X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=844; i=jiaxun.yang@flygoat.com; h=from:subject:message-id; bh=g3k3nWcLqtTiZ2wMMOFp6to4dK8fiS1Lxyx+pASHj8Y=; b=owGbwMvMwCXmXMhTe71c8zDjabUkhrTS6p+MrSf+P0yUeaA1S6x+9RKlJiG/JIfIt5lzPimsS jkguNyto5SFQYyLQVZMkSVEQKlvQ+PFBdcfZP2BmcPKBDKEgYtTACbyU4zhrwjbhUeSRiUfZ3xT SVPx+uyuadzWnP6RNWeZvt9N9ecL7jAyfG91satd7OM7R/Zr7e+yPulJcbwaPz6W73rlkrB1sks ZGwA= X-Developer-Key: i=jiaxun.yang@flygoat.com; a=openpgp; fpr=980379BEFEBFBF477EA04EF9C111949073FC0F67 Received-SPF: pass client-ip=103.168.172.149; envelope-from=jiaxun.yang@flygoat.com; helo=fout6-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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 5KEf is some what not standard compliant by having non-functional FCSR condition fields. This is causing glibc test failure in qemu-user. Use MIPS64R2-generic as our default type, which have maximum CPU features. Cc: stable@vger.kernel.org Signed-off-by: Jiaxun Yang --- linux-user/mips64/target_elf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h index 5f2f2df29f7f..82bb7e8b1cbf 100644 --- a/linux-user/mips64/target_elf.h +++ b/linux-user/mips64/target_elf.h @@ -15,6 +15,6 @@ static inline const char *cpu_get_model(uint32_t eflags) if ((eflags & EF_MIPS_MACH) == EF_MIPS_MACH_5900) { return "R5900"; } - return "5KEf"; + return "MIPS64R2-generic"; } #endif