From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779827959; cv=none; d=zohomail.com; s=zohoarc; b=EMmqThGer4zRL+uByfesu2VJDCKUslEVMzhBhuqHHqmdOlUf38S31+KJo1Bl/NF8XwRw4GCS/CW1jdh27IADOjyF+f8vU6vzwRUEoYSZMyuIkdRF9ADK55Dj7TJQANntkQxLFpbGmk5Ztn3vg+Q0IigViJT6eJGHdYrgRFu0rw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779827959; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4EkV7xjSh3pmx79WiPT/ksTz6qONDOK77sE793BSEIw=; b=X8Y/eZIv2npImnlni8P4d6DeEII6pDLuhnvJN9PSzjU+G3tEllsZ83bgaTOCdRpCTFEtQYKYtggO06TI3FmVYg9aB0l9XiVMer1yTSzu/66Sj7OxFm1cjoureuDZgWgXMeYCsvn5rUe/FjT+abh+UMKCOXZGbeeJT/lqVOnh/rk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779827959654120.18024715086813; Tue, 26 May 2026 13:39:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyWu-0000Yk-92; Tue, 26 May 2026 16:37:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyWs-0000YF-Hx for qemu-devel@nongnu.org; Tue, 26 May 2026 16:37:34 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyWq-0006md-QV for qemu-devel@nongnu.org; Tue, 26 May 2026 16:37:34 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4891c00e7aeso76010425e9.2 for ; Tue, 26 May 2026 13:37:32 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb557545sm884805f8f.12.2026.05.26.13.37.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827851; x=1780432651; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4EkV7xjSh3pmx79WiPT/ksTz6qONDOK77sE793BSEIw=; b=vNDLbYi8VDkVQSWUMFgElvv54eqydTLHCTuoziCAKvQvRgb5vdxD1bYw+zz4cTA92F zk12Wm+pHZhHM4zMB9vfPeM5cqacZK8VRh+a8u4LsfanqLFQfQl4aJKgQ33xpns8G/xa WbXn9Rcmb2sLPwhBJaaRWNJpBXljEmE4BaPW1AqqzX47yFXU/3g8Du34jrLUf1/aw9rq sfCQOgPDCsXrNWoKpT2IOMNOESYWT8T5fiEhNxOGtL1oQHe8KxL5b8DWDjV/yDth/5Ti DN8AZHZS4PcT5T+ikW2nREp83i2qGvFefaWE66WfHml5QJANYbz/x6dw0W+xJabTS1ZE T8SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827851; x=1780432651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4EkV7xjSh3pmx79WiPT/ksTz6qONDOK77sE793BSEIw=; b=jq6g9qUjVII/cvnwG1ayizVkjI9oma6+Jctho6GRq4g/CRDK8nRclh2YaBAREY3/wY xStQE4lXJKHar8XwU8s7FXJBdbQNnC7/CUlqEfq3U1IzeYac324eXQq2hrbpENWlfu2y t4SxtLHEKV8bcIbKeIVv46422LhGOcadGwOCvJZFCSfBLH8gEuy0M0aBIWCB0YXKQ73C AYUAgpho+eDXncHZ3ss3pYGNSV/xl9YhghOcp6OxaBjbBf5pl1SD8YaCdJzPKvpuBDlI 3eQAXeSRKCDr/WLVSiQKGUjckWoxKJDiuqxgOk4Z8lhkcOG2CjU7d7lu+7Slwrk0Tgl9 o+Eg== X-Gm-Message-State: AOJu0YywO9AefHdj21jS5eKEEZznB0qX1UjBuIxO5HSMUK0WGXX1ti12 +tYxUY8NN7f0L0Z/t/E64+1b1Y5xwsPC7rumpYPsuIA1VUh2zmYZySAtI826kOg6VTzgsoYlmwv cdhX2xqHT5w== X-Gm-Gg: Acq92OEQyAN5Hya117vyDdU5V0zCIiv907HMPfpfD777l6omW1rpq6g83IKjHMepEnc 3YGNY0pm7faANHTUCaXgB5CfxnVR+oCagCMGdfwOGVWedUQEy9KXpSsMbM02eUOMTooYvGta3fb P6wTQ0wGaDavgDpZCtjjOIXzqgsteRFOGlwEU5+hQ3PEVv790pTsSpym8NnpHIjra4Bo1rA/2q6 C4TPAFCl/pF7YXpyxJqXFDim1HFC1TmoUiPFffYe/RXIViejoP3GLbpwJHaA2dvf3cmuOS9QkTz 7iklB3JPQUUR6LyOCS1fSHACTUCXxiyxHudVPY/FGZqTACS+u5pBuI5vy5KqAqY/zBQZR5TO4nY XTZoh4AqeOq4q1w2OxmnN2dwPDgPyQ9/foZgOKLmIZx8JyJxK0l0xswpOxeNgvkvXd4l2jv8Ln1 ++K+0I4XLfs49PC61SZIhPWmGEDX8rFQCNKVIFBKaiZXvCVVf8wn54B2SaZaZ5IpijVQ== X-Received: by 2002:a05:600c:8681:b0:490:778:4fe8 with SMTP id 5b1f17b1804b1-490428ce8c7mr238361895e9.25.1779827851164; Tue, 26 May 2026 13:37:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 01/17] hw/arm/raspi: Initialize 64-bit CPU types during DeviceRealize() Date: Tue, 26 May 2026 22:37:06 +0200 Message-ID: <20260526203722.79463-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779827961649158500 bcm2836.c models 3 similar SoC: BCM2835, BCM2836 and BCM2837. The BCM2837 is a 64-bit only SoC (Cortex-A53), only available in the 64-bit binary. If we build this file as common object, all BCM SoCs become available in both 32 and 64-bit binaries; however when running the introspection test on the 32-bit binary, the BCM2837 init() method tries to init the Cortex-A53 type -- although not realizing it -- which is not available. This can be avoided by deferring the CPU type initialization to the SoC DeviceRealize step (this is safe because nothing uses the CPU type before, only the GIC access them, just after their realization). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- hw/arm/bcm2836.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index ee2f44debd1..03825e69d06 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -25,12 +25,7 @@ static void bcm283x_base_init(Object *obj) { BCM283XBaseState *s =3D BCM283X_BASE(obj); BCM283XBaseClass *bc =3D BCM283X_BASE_GET_CLASS(obj); - int n; =20 - for (n =3D 0; n < bc->core_count; n++) { - object_initialize_child(obj, "cpu[*]", &s->cpu[n].core, - bc->cpu_type); - } if (bc->core_count > 1) { qdev_property_add_static(DEVICE(obj), &bcm2836_enabled_cores_prope= rty); qdev_prop_set_uint32(DEVICE(obj), "enabled-cpus", bc->core_count); @@ -65,6 +60,11 @@ bool bcm283x_common_realize(DeviceState *dev, BCMSocPeri= pheralBaseState *ps, BCM283XBaseClass *bc =3D BCM283X_BASE_GET_CLASS(dev); Object *obj; =20 + for (int n =3D 0; n < bc->core_count; n++) { + object_initialize_child(OBJECT(dev), "cpu[*]", &s->cpu[n].core, + bc->cpu_type); + } + /* common peripherals from bcm2835 */ =20 obj =3D object_property_get_link(OBJECT(dev), "ram", &error_abort); --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779827916; cv=none; d=zohomail.com; s=zohoarc; b=ZE9UxDolpZF6uEwseGsHKbTqZ1N6GlUR9/q9zttWuN9Q7tmjk8x/824lxkmFK7NbDXNzoVrOjMJFOf792Jpq+GtVINoGw2elYx99fQkvEFLIe2ZQGeetPaAvE3SKtfcYKQtNi94koAFR/cSoM1c6w2PMTginmOIJzA5qIlX9ojI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779827916; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=K7fE/F+6UJ2P7juY/o9Y89pkxTy9idikRNCFiEAOtZY=; b=eFRmwlxFEZnWlND6g4d/mPDpwC3R+o9o+p/tHGV20Tgsp++gCSRuDUZqC+n8Yexu+5JPBps9IsAblvpVlr4V663JsmZDSLf9pE7pfOSpqJRTpQOLlhZ0HxIwGdgcrVjXkTDbexIjHToaZSAIRsZe0eH4cFZTfwE0OMjSQpxBGSw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779827916604576.3930501711543; Tue, 26 May 2026 13:38:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyX2-0000ac-8M; Tue, 26 May 2026 16:37:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyWz-0000Zc-5P for qemu-devel@nongnu.org; Tue, 26 May 2026 16:37:41 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyWx-0006oE-Cu for qemu-devel@nongnu.org; Tue, 26 May 2026 16:37:40 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso94949535e9.2 for ; Tue, 26 May 2026 13:37:39 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb5584b8sm749790f8f.11.2026.05.26.13.37.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827858; x=1780432658; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K7fE/F+6UJ2P7juY/o9Y89pkxTy9idikRNCFiEAOtZY=; b=aAHS0P+ZgxbsENClBsX9lxeyCp4iLZvf1iWRedq+n7pg61aOGnvPRtmIiiLepyNXAp yrddcb4hKY+HTJi/iMXdv7a1Sht5G5nzc5RMsyGlLZiWYXnqbCTIbfNU60su8qjzcCK6 Xb/qin3p4Ej5Uz4Uxp3US0LynwTa3euLLhtnfCEBSejktvXDdGqWxXQGeFq8VrW2WiB/ eCCnyTVyP297jtlCDpWKeMcX0S3wA++ImXSouzTsXgJvz5M+VZKSfqZ/H1Fyo8KOj23M YQCxCCR3NIGFcaMBKCF1pT+Q7CbTW+AaM/4dVTpDAhC/vTvCq0/bYIAGTWswzZU6SAUd IJ1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827858; x=1780432658; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=K7fE/F+6UJ2P7juY/o9Y89pkxTy9idikRNCFiEAOtZY=; b=gdnld0Gd/ws4zHlnzvEBW13bDN6nlJFlD7ifRrX3RzbgYyfUo3PRJtlR003TsVjvUN Vya5Qdi7pIzgixyhuFQZ1r2/gBAuhwbwv4/D84Gs50xcRCn+yzrr16GmbV8309z1jatk r/o1QI2ifaJCZ69XWD2MdRmgO5sSNpnXbuG32VtSHZ8UNCsTl7nr/onzD9O2jJkO1R/F ZEcyr8QTzNqOqzcL88g2UoWiIFAfU1/6L9B5unTpvF8BT8sYDzcvimNcACzzsoZwibsT ZJC0k9AVv+q3DUSJWfieGoDycDM2vM8ZF+cP29KI+q1c5SjzchpCQde9CBjo+GPZcZrF UysQ== X-Gm-Message-State: AOJu0Yx4CjdjCSvvjft1cr88FQqome5zSS1WZnTMV6YztkPfvCtWdeMn gJNGoMWBsWGNTrp4E8CtQazQhkt/R7fxvHxzUpagMECAuDWkgNSasQSIKnGaMzHRTrWb180w5VU As/QrE4lLyg== X-Gm-Gg: Acq92OEAbDIhG7UrxkWgcloAgx8J8hgmWxtuvQ3V5RixS+vhOeDpBStIGtt73BftFt6 0ZHxEBUkYidi4jjb+GsQrENob5JQ0V//VZC3JWArUP8xlL3rFG960Wv95DYPgOi6PUJebcO2hh/ CO9WlFQY/dH3uiqqMS7gqP9+tcAZGJE6jTbQhybXmBatwU5377Dut1a08lylYS9KSewmGwmHq/4 spRc+WpGK7Ic+hfnxi8u23u7ptMNnN19Wr1e+xLv5UsR3NekV1RLXOy4z3rksDRO4ngwFoZxTEG H2C+aGbDLjWNGWQmQkcqeih+M3de2DHbb70OerQiDrIsYnWTUaFqJjWtKbguHVLP218GKq0LYTR FRtwoIB7/cu2FyyV5zaJOgCPFefmkwgrw/6N8DfhI6qfmdvKgBHZ21/sVGH3ABgKkemMDF0v+1j l95nPSc1aG69sELnx52E1VtZHfRlBByXAyXJfkHOPpZ7miWflMCv/R2EX6ndIZgwDdxw== X-Received: by 2002:a05:600c:3b02:b0:48a:581c:ead with SMTP id 5b1f17b1804b1-490425ac8a1mr343418145e9.10.1779827857958; Tue, 26 May 2026 13:37:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 02/17] hw/arm/raspi: Build objects once Date: Tue, 26 May 2026 22:37:07 +0200 Message-ID: <20260526203722.79463-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779827919484158500 Now than Raspi machines can be filtered when running a qemu-system-arm or qemu-system-aarch64 binary, we can remove the TARGET_AARCH64 #ifdef'ry and compile the aspeed.c file once, moving it from arm_ss[] source set to arm_common_ss[]. Note, we expose the TYPE_BCM2837 and TYPE_BCM2838 types to qemu-system-arm, but they are not user-creatable, so not an issue. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Manos Pitsidianakis Acked-by: Peter Maydell --- hw/arm/bcm2836.c | 4 ---- hw/arm/raspi.c | 4 ---- hw/arm/meson.build | 8 ++++++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 03825e69d06..f4ecea908bd 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -195,7 +195,6 @@ static void bcm2836_class_init(ObjectClass *oc, const v= oid *data) dc->realize =3D bcm2836_realize; }; =20 -#ifdef TARGET_AARCH64 static void bcm2837_class_init(ObjectClass *oc, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -208,7 +207,6 @@ static void bcm2837_class_init(ObjectClass *oc, const v= oid *data) bc->clusterid =3D 0x0; dc->realize =3D bcm2836_realize; }; -#endif =20 static const TypeInfo bcm283x_types[] =3D { { @@ -219,12 +217,10 @@ static const TypeInfo bcm283x_types[] =3D { .name =3D TYPE_BCM2836, .parent =3D TYPE_BCM283X, .class_init =3D bcm2836_class_init, -#ifdef TARGET_AARCH64 }, { .name =3D TYPE_BCM2837, .parent =3D TYPE_BCM283X, .class_init =3D bcm2837_class_init, -#endif }, { .name =3D TYPE_BCM283X, .parent =3D TYPE_BCM283X_BASE, diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 00e4a10466a..3f99e87428c 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -367,7 +367,6 @@ static void raspi2b_machine_class_init(ObjectClass *oc,= const void *data) raspi_machine_class_init(mc, rmc->board_rev); }; =20 -#ifdef TARGET_AARCH64 static void raspi3ap_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -387,7 +386,6 @@ static void raspi3b_machine_class_init(ObjectClass *oc,= const void *data) rmc->board_rev =3D 0xa02082; raspi_machine_class_init(mc, rmc->board_rev); }; -#endif /* TARGET_AARCH64 */ =20 static const TypeInfo raspi_machine_types[] =3D { { @@ -405,7 +403,6 @@ static const TypeInfo raspi_machine_types[] =3D { .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, .interfaces =3D arm_machine_interfaces, -#ifdef TARGET_AARCH64 }, { .name =3D MACHINE_TYPE_NAME("raspi3ap"), .parent =3D TYPE_RASPI_MACHINE, @@ -416,7 +413,6 @@ static const TypeInfo raspi_machine_types[] =3D { .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, .interfaces =3D aarch64_machine_interfaces, -#endif }, { .name =3D TYPE_RASPI_MACHINE, .parent =3D TYPE_RASPI_BASE_MACHINE, diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 68d204bb4eb..f149ed68d09 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -27,8 +27,12 @@ arm_common_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true:= files('allwinner-a10.c' arm_common_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h= 3.c', 'orangepi.c')) arm_common_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-= r40.c', 'bananapi_m2u.c')) arm_common_ss.add(when: 'CONFIG_MAX78000_SOC', if_true: files('max78000_so= c.c')) -arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c')) -arm_common_ss.add(when: ['CONFIG_RASPI', 'TARGET_AARCH64'], if_true: files= ('bcm2838.c', 'raspi4b.c')) +arm_common_ss.add(when: 'CONFIG_RASPI', if_true: files( + 'bcm2836.c', + 'bcm2838.c', + 'raspi.c', + 'raspi4b.c' +)) arm_common_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_= soc.c')) arm_common_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_= soc.c')) arm_common_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_= soc.c')) --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779827901; cv=none; d=zohomail.com; s=zohoarc; b=KzP/yCAxNOVVVOaJZgwmS5uDfu3plmJP2LYDYceeE1wMKmAFd0FeoP4Gk/xC5Zc+InAaTT4EUsGdW+zI7UTmsn++cMGdINWiDb9tWv9kuZcLqKwUMh8jgJOQnmoOyblC9aqDJ90Xr7dfiFk8BhtlFbUsqhRR6P2kTJXPecCJqeU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779827901; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GpOhw5w0OQWgKeewy6hW+oiYNCxDv2biTVZ26Aup/v8=; b=PXI6yR89wqIlVKNsrEOU42Kyp21NQtyQAlWS6RdE8KG2NihZp8fmU9daCjf+mzNH8UKeyKMo2vJymDzgxnTXkW+aGrzQRmb4m50QeEs+dP9fGIbfmjmCD8Rm2jZZDpNf8uADG6lG1t//lbwkmdaHpw6iIqQ8HBkpqlc3S4JE2Cc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17798279013391012.8265170902008; Tue, 26 May 2026 13:38:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyXB-0000c5-H7; Tue, 26 May 2026 16:37:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyX6-0000bf-RS for qemu-devel@nongnu.org; Tue, 26 May 2026 16:37:48 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyX5-0006pk-4j for qemu-devel@nongnu.org; Tue, 26 May 2026 16:37:48 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-49041e84237so38131515e9.1 for ; Tue, 26 May 2026 13:37:46 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490454cfcaesm344673275e9.4.2026.05.26.13.37.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:37:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827865; x=1780432665; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GpOhw5w0OQWgKeewy6hW+oiYNCxDv2biTVZ26Aup/v8=; b=xyfFC5L6AyUAaPsBm7FT5irRzk+YAaStAJ5VYIGEOP2RRGrjFwk2dEwMJ5goQ12RI5 76oqnlDO9fSRgZ9ycIPQFXEXDsP+sA/VFiymTKrcO81fvptCTP+67mIUa1yTie+cqKUO y95jzdNNt/wZH+ayhds4qzVvVOjjopN1UfLQfdmK80XWHr6zLTBp0LZn5kVZ8ZqmaPYL Mid2Axdcm3Sw5T8JgwZ/qOLRk+U2W614QZuJSZdzLDEMCPwtg9w3ho+0H1KeUNP4kvhO ar1I6GBvcrK1AiUVs0g8jqwE3qhFoyl2JGDfOOwAmGwc9cxYGhDuZ3veDNBlcw+dhZfX 3jcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827865; x=1780432665; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GpOhw5w0OQWgKeewy6hW+oiYNCxDv2biTVZ26Aup/v8=; b=G/1+7B8vnGG4XzLlay1G6bqKF50l2LLI6c/zEiEy/emRiwqMt+VdTbizX6/xd7qpwq CY1QnmU9yyO15Qa0b1N9kbgTxc7uJ9Z5J3yspWBpzjUOxy9xK9YDBhkTXPFJnbugVSL3 i8tvcijP/iTAHoBOn0h590fm887xD/QG9P42qj+kPosg/5aByWeuisIjX6CsgjNcAvtQ 0Dd/NoAoTspuTAz5O13HG1plW0iI7IVI7CjU3FDVXieDmgeB4iL+rX3ILHBbTMhgB71m 0DIcQD5s1d5Za5ZR6qRUAfwl0WNiuHQNs3nsGUwTraxI/NPlTZnLXSuyTeVmHqgGy/ZR iebw== X-Gm-Message-State: AOJu0YwoDZNZh4r1TAbg8jwJpEyjjegzRrJGqwgNpwc7a9ocMdrWvQMK DaxSc1XgQBhEdm77HjCocMUBV8Udl22Zd9yBGKt0R0TKyLGOtNottqGqVC2N6HEcNoafgNIkdnm Q9VYw6ROXgA== X-Gm-Gg: Acq92OEE4dOwsF7kwCn0OGHnZ4NExWknp/LwMJSCeDY1u9ONdFrR2OpJ6amfN0r1liE SQdcw9zeANkgH224EDbpO+OuYW6E1mUO6nwwq8PKghI1MaAyGn4cMD2+lXJUoQ+3gUApq7I4Sqq w6pzmLMjr33lEPjuiuoqg+PAsFkG5njoASsGPI7czWIQfSXlyGHm2c8S8HRQAksYobr40swpRWz SiKp2uG/E7GxB/npXIaVUrB5BLzxxnUEjHB4uotZTdzuC3Wpxe/es4y3VfcNg/67Jk1Ylc1csi9 B3uQl0M2GPeWzcooOMEzkP4qCKy9gaGguy7Q76D87y3k1gZ/EgjLp83NkIGLys3erhjuEyG3MvS ocHBrz9hb+7U5aoovPKlrKVCDopfndNLpsrQMmo9EEP1T3zMqdatJ4Q55FjL3j5yxpZq6kIVSUJ 1cHJXmF+g7EGxabcqzSqO563+GxbKmr8o7YywnwyVf142Zo7CdMBeYkLFP2pQaakWQmA== X-Received: by 2002:a7b:c7ca:0:b0:490:4b89:5372 with SMTP id 5b1f17b1804b1-4904b8956c5mr176027065e9.11.1779827865492; Tue, 26 May 2026 13:37:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 03/17] hw/arm/aspeed: Do not realize 64-bit CPU types under QTest Date: Tue, 26 May 2026 22:37:08 +0200 Message-ID: <20260526203722.79463-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779827903235154100 aspeed_ast27x0.c models 2 similar SoC based on a 64-bit only CPU (Cortex-A35), only available in the 64-bit binary. If we build this file as common object, these SoCs become available in both 32 and 64-bit binaries; however when running the introspection test on the 32-bit binary, the init() method tries to init the Cortex-A35 type -- although not realizing it -- which is not available. Simply skip CPU initialization when running QTests on a 32-bit binary, asserting the realization step is not reached. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- hw/arm/aspeed_ast27x0.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index d7ce14e8c56..dddd7d21060 100644 --- a/hw/arm/aspeed_ast27x0.c +++ b/hw/arm/aspeed_ast27x0.c @@ -18,6 +18,7 @@ #include "qemu/error-report.h" #include "hw/i2c/aspeed_i2c.h" #include "net/net.h" +#include "system/qtest.h" #include "system/system.h" #include "hw/intc/arm_gicv3.h" #include "qobject/qlist.h" @@ -419,6 +420,15 @@ static void aspeed_soc_ast2700_init(Object *obj) } =20 for (i =3D 0; i < sc->num_cpus; i++) { + if (qtest_enabled() && !target_aarch64()) { + /* + * Introspection qtest just want to create this object + * without realizing it. ARM_CPU_TYPE_NAME("cortex-a35") + * is not available on 32-bit binary: skip it since we + * won't even realize it. + */ + continue; + } object_initialize_child(obj, "cpu[*]", &a->cpu[i], aspeed_soc_cpu_type(sc->valid_cpu_types)); } @@ -693,6 +703,10 @@ static void aspeed_soc_ast2700_realize(DeviceState *de= v, Error **errp) qemu_irq irq; int uart; =20 + if (qtest_enabled() && !target_aarch64()) { + g_assert_not_reached(); + } + /* Default boot region (SPI memory or ROMs) */ memory_region_init(&s->spi_boot_container, OBJECT(s), "aspeed.spi_boot_container", 0x400000000); --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779827928; cv=none; d=zohomail.com; s=zohoarc; b=P2XDRML4hN33eYCTlgQmNEkuV1Qwy8c+TYfvspAVHPKf2HBVmXFoD9hAYUirrYO5mCr9Zgh+OKOfb7GZjo0Ar/k2+rJ6VHJGB99/y9TJFbArRN7ELgBJqEdOPw8xzSKik8pNsbWV8aBkxxMxWpm1pynCKuFtrrQZH7ygIhh0CBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779827928; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vsM35W/WkO5VOGyCq5JTHjDkwnrXsH+8MtcBngCSo5c=; b=ImGMZ9EzxTFunTgJp2GbzUn7xIrG9v0cL4jIeKkLZPdfwR0Bzx19QEEfEn01JYBUn3vA6HxRegcU0iP5Vo1ar1h1+Ndvaa15y3Lv7iMw4rJEVpFlmZCXXYVMXHqR0Fn2ueCXVBbSPFwLkyQTIAh4giqZ+MHCGxDp911HZ1QW6Ws= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779827928037161.14613514099585; Tue, 26 May 2026 13:38:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyXM-0000gb-AB; Tue, 26 May 2026 16:38:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyXE-0000cJ-Ix for qemu-devel@nongnu.org; Tue, 26 May 2026 16:37:57 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyXC-0006xP-KL for qemu-devel@nongnu.org; Tue, 26 May 2026 16:37:56 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-49040362e4aso54175005e9.0 for ; Tue, 26 May 2026 13:37:53 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490454dedd9sm320125765e9.6.2026.05.26.13.37.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:37:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827872; x=1780432672; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vsM35W/WkO5VOGyCq5JTHjDkwnrXsH+8MtcBngCSo5c=; b=h7ySPZ0eCqJbvl2tg1LIJclzDugLFIQh2Cb2VRZ1GoxWSeE++jLcTrP6QKWim9Bb7I 6luKU74OQINfCCQFcTkRbebKrccgnyGgcOf0J8IZxTQvvPbU1P1slnbDz/iafXDtTh9P 8n2qwv4bZNocw4vPznBg0J8hJEw0OfljvesroBt7FAmTZCfctatOnu45JyRw3mAErWCM lJRtHVZGnAU7RUO9HuUe7Atu5606OWS7pN6/j12QeHHtvvGs3xw+tGibcQ2O1MuhLc3f MgeRgs2bTLLDRM6YBMK5INhBT/bs5FxXPbYAIUEpDcVf4eVNhnO8CgFIIN+tWMPMI/HV mVYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827872; x=1780432672; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vsM35W/WkO5VOGyCq5JTHjDkwnrXsH+8MtcBngCSo5c=; b=ZhyiRcr/w8S2aZcoL/1CxPA7W1TVJfQxdJNc3uEO2oOHczEChNcMAWoxc5LN+yapc8 SmBmrxNcctE8hHtd7lyHaag8/5hOJyc2ZU1Z0dz5dS/M5lECjLV5l2V13pdRU47OW3kQ 3cJEUOKO/rI64rbtPpwYZWBs3kM3Wz6VfAJQrtkU5JEsm03zz2SvzGLWeCV04z9hGtjg BrM2rZkYS7+I+Bu12kRiB9ClyoV/Iw2V9zgywUivwoSm50Im4cToJyVvaWB8QaXjPv0t VRKUTGiVghyw3p9CC4HuIvNJrrGfO7hLE76s6/2tbcWR6CnPWcy3TVo6517Y4xBfPeDw OQIA== X-Gm-Message-State: AOJu0YxIkF+noDeP2ydBoGznW5n0sp759lV2AwiCmmFDpzwhxAOHkBBZ 9QhjjdQ2KdHHKk9zP8fKLUcvWHUf4FwDVSpksVme52pIkl7k9tpZOVma3yN7deWHWtnFZ60t/kU Re70PuMrugQ== X-Gm-Gg: Acq92OH9+Az+/EdMw3RM2RF4KXDNRisivUBs31hecxQH/zixwvQqGBWkku7JiISCMyw 2bCEfOuwrpWkVALYhCqs9BJx4SPwAfuAYUWsSVSCzqRJQVTeQgndPxgZOSLcRnniUZWs1Rj5byx FErFPoyebszMvmnzNmhJXRPVpRNqGhbbE+3cQbL/DRqIE0UEColsSHCJMwWVLg8FjCD2A4iyh8v yGN/82x2JQLeljx313MRUKbs7ilJliKe6Dd71R5+tVqYGbPBmwheZL+oKqWzcSGWFDudQ6SmMzJ pRpAh6wSJa37Npf1NPr/soG6NMGEFk1NK3mQkTvR9rP2DzBeCbtCq5Ae1wZRpPqdyMM35O2b5+d nIK8ATEjy5BdOEyWRoyvnVXGGvICQ0uBaa+8zGoiSPnwYI6lXxwc8UlX2RRGEoDgey2U4T8vPC5 EvbXcZ/6oRBVGpzbiA/1UzJWhIhnyYVJXhJU0sZFPFZvZYE60haPfzk9GvGq+gL746MA== X-Received: by 2002:a05:600c:3393:b0:490:4b89:5375 with SMTP id 5b1f17b1804b1-4904b89553dmr168242065e9.10.1779827872251; Tue, 26 May 2026 13:37:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 04/17] hw/arm/aspeed: Build objects once Date: Tue, 26 May 2026 22:37:09 +0200 Message-ID: <20260526203722.79463-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779827929427158500 Commit 064f1ce95fe ("hw/arm/aspeed: Split AST2700 EVB machine into a separate source file for maintainability") remove the last TARGET_AARCH64 use. Now than Aspeed machines can be filtered when running a qemu-system-arm or qemu-system-aarch64 binary, we can compile the aspeed.c file once, moving it from arm_ss[] source set to arm_common_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Manos Pitsidianakis Reviewed-by: C=C3=A9dric Le Goater Acked-by: Peter Maydell --- hw/arm/meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index f149ed68d09..22e8ad924a2 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -43,7 +43,7 @@ arm_common_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: fi= les('xlnx-versal.c', 'x arm_common_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', = 'imx25_pdk.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', = 'kzm.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) -arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( +arm_common_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed.c', 'aspeed_soc_common.c', 'aspeed_ast2400.c', @@ -69,8 +69,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_ast10x0.c', 'aspeed_ast10x0_evb.c', 'aspeed_ast1040.c', - 'aspeed_ast1040_evb.c')) -arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: = files( + 'aspeed_ast1040_evb.c', 'aspeed_ast1700.c', 'aspeed_ast27x0.c', 'aspeed_ast27x0_evb.c', --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779827960; cv=none; d=zohomail.com; s=zohoarc; b=D/ix2sQzwP3pYxGHLnM4hRvCA3CEPFEbB+vY/2rDvuUzlFa0WPqL6CzNSqFmieXRcCF8s56Tj5RhDTTSSBprxmHCuQhKCWDXU8kFulGJ0o5EL6jkzRS14HYKRBXmmjFUEu53dWLVsXGkFwUpzRl3sMZyCxVh40Z0i2Z3Ya9qrlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779827960; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aVB05P7puZs3LFLDZbqNcDYns16Vx3D3vfqn0WFuQ6U=; b=J8Ol6IVsSK0BS6VYvVxIR+0hi+M7Q2n6JwvLXLF1zsUQRUx7VCVTs1fWshYSyv9oxFWxGIjdFCHoWLQEP8wBF7V2uBmKPre3pIYW+mo1lpw2BrSYC26+bfm79r1ZIM5z/Je66CuxYPhQ6kbs3W4xIFrFm7OH81Gu3/7Ow0R8MUA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779827960849184.83850596229968; Tue, 26 May 2026 13:39:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyXU-0000sw-7i; Tue, 26 May 2026 16:38:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyXL-0000kH-Lh for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:08 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyXJ-0007At-I2 for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:02 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso94951935e9.2 for ; Tue, 26 May 2026 13:38:01 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490809c785asm1379765e9.32.2026.05.26.13.37.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:37:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827880; x=1780432680; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aVB05P7puZs3LFLDZbqNcDYns16Vx3D3vfqn0WFuQ6U=; b=oYxdaNJzvBCFlJe2awLzgd6KPZ6Fh6gk+Wut6xXjpRWDSUEhhOLqEjVyD6f3gsxTNW oruISzh4JCH8ns3wBQ7pJ13RQOd+ogA44mbPhqz9lswVsm81ZIVkQI3r2x2enttSNuQQ 6o+gieTjlmCGuAnHvRWnn49XS2X13NegDLdHAm8KGx3N2pET7yUKyhLDofv2vfp1G5kL LOwO6i88rRmMC8BYH6+eCKcf1XlXWsc/4JWE73+Y+0cP3Y+K2rcOuTX5plLqWefXX5Yn OWFltkjbjrCvYiRvEUGUiiRa21H4yRCay2eAkHAyFLAO+3Im2L7YH7ezycgYbItQ1IqI Phcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827880; x=1780432680; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=aVB05P7puZs3LFLDZbqNcDYns16Vx3D3vfqn0WFuQ6U=; b=dnD+565ulmyFgrgJjYfsfvzKhtW5iY/f+IAPoCtqKcBEtnEkh55SdbjWwPla6Ys0Qr Mp4d5UYEc8ZfssUZjc5FEh67gHUxnLkqOU0gMkAb3fh3vVeG2pVCCtoPru9W1pgHAQO+ HXO0E8+isV/EWbtfgsZ79rxe5vePb2fofrwdck2u7o8kLCIBJ8/kujT0slSTM3ZMAnVC 5FFyhAu1D9On8W00nWh2b5VHbPy0L0TSXn990qmzd63DFtMJWcHKaE8h6r2/bXReAoN5 ALC0GgvbnplFxV5lGq5NK+pzy40OzoXchJoSt4b06UuAJ4XDmz6Q+d/DYBVeZ0CAeklW C3ng== X-Gm-Message-State: AOJu0Yzizij8MoWvC6yVs+DWqDx4ZBuSD+QQjaYTu3FDnCRtUDjHjfYf sEaDcATCk8yMI/6fwPqz/i4YRMvrTBgdd1DWlpGgQPqQq82dwWvTuo37FQ0h680yKqfKZwqXuMt 8Xp2tRHHQ/A== X-Gm-Gg: Acq92OFs4APlZ61uome/XvKDO/oin6R7/xRyAIiQHtVIEHMyrXbfzVQT08R/Qb6axR1 h44TkpKslxvFDi7b7dF+r8zcwf1inzk8FPbCkpu7QTX56anQG2OmYy66xtdj4PHHyx/mm/hbUas I5S6K8d5NurUNdMlsVMXCeWMD1jsDjw0ok5YdpOHpIK7IgBH1+reEbCgoL7KxvZHFNl2XBf45/F nEwGU3xWRSsSDmIrcSJ8hHZHVwCvYtZsYI7Vs/Pigth5Z8rtTxeENuoTjEypgw1Cwk2Rsk4JKt1 pIn5hU4LzKWjy7fLv05m/7LCR+JpdUNMik8qUIr7LyMtYCKQeVJLDGyc0DcQwFdEw0P0ob6hwjs J5Bui6fQZNX+qQjsKPveJ0QZYO73kZubsXKnD9nBDCcqw3750pha+7ospW97jl49EKFNWv744GO uzpTj2LpsmyUgDV1YFg8OtCBRECJ1FItOGrB4XqUGlZ0nhHNhcm8LCn+k9X+UFwwKQtw== X-Received: by 2002:a05:600c:8599:b0:485:9a50:3370 with SMTP id 5b1f17b1804b1-490424acb4cmr269218925e9.8.1779827879962; Tue, 26 May 2026 13:37:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 05/17] hw/arm/meson: Remove now unused arm_ss[] source set Date: Tue, 26 May 2026 22:37:10 +0200 Message-ID: <20260526203722.79463-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779827961631158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Manos Pitsidianakis Acked-by: Peter Maydell --- hw/arm/meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 22e8ad924a2..8f66a80e10e 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,4 +1,3 @@ -arm_ss =3D ss.source_set() arm_common_ss =3D ss.source_set() arm_common_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_common_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) @@ -111,5 +110,4 @@ arm_common_ss.add(when: 'CONFIG_VEXPRESS', if_true: fil= es('vexpress.c')) =20 arm_common_ss.add(files('boot.c')) =20 -hw_arch +=3D {'arm': arm_ss} hw_common_arch +=3D {'arm': arm_common_ss} --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779827982; cv=none; d=zohomail.com; s=zohoarc; b=eHkRm8cFL6O7f2dCst+X0pFDyKq8lFpCUyvUuzCbNd5Vn+RmxrqaXFTQC8xBzzVnf3cxgnRUVyfzgPN56G8yXqkn2xdP5duPIDicuKdBsj8QCdoGxV2Bw7SPgDA1VztYna1tGvpSGR4kIpFm37l417Krk314w0rVWKLNtOj2wT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779827982; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+BmrS6PfjgNRH4hAg0Ule6cUXehh+gM7pH213WKG5vs=; b=Y3hpVPn76RobAMCWdbBVom2Mms6jOwazTbU7rZgYBl5NcXfNV2QmagaP5IFotkYzGnXRu+XSpEnjkzgtjL+0iQeh/WWAN+KJh8bUty7mfMOmx9JVR15UPyErSgOeSbj/8OM+tNfamkkxpfri7A8cUfmfbaBhi/KyZGww1cXMqcM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779827982098867.665655269951; Tue, 26 May 2026 13:39:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyXw-00017E-8X; Tue, 26 May 2026 16:38:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyXT-0000tW-NC for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:12 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyXR-0007GT-N9 for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:11 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4906238c62eso24665375e9.3 for ; Tue, 26 May 2026 13:38:09 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490809d84fasm1213755e9.36.2026.05.26.13.38.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827888; x=1780432688; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+BmrS6PfjgNRH4hAg0Ule6cUXehh+gM7pH213WKG5vs=; b=ZmWwKhgoNolNGfss6UgmBPp+z1sFrH6CXfWrl2PlYOzBWr/JghQDXTOFSIfwpWBkP7 +VB/caI1KARGfVxedcGA+5JeDRu4yZpaTck4/Iku4ELcIPnVWPQfa/s9s1iUTtgmsrIF g4W9nF7/a8UPSKcYkqd6FSixtoHMqpYGw/w+++/PVgvkkl+Y2FzxSbnZN1ChLMkanr/w dlJBVCF2/hkHAPJH0qc0Y6Q2l0XW9zTiARD17XsFYckt3IOFZJ/CaAGh0GEjdotC9Dl0 IKtcXOzs794ES/LSCHMjrZrva8JwkPpNRozgA3b1gxo66d4+9wd7u1pm5Q7dO158knuk 8rcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827888; x=1780432688; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+BmrS6PfjgNRH4hAg0Ule6cUXehh+gM7pH213WKG5vs=; b=B2TT4woahQEVBg0S6NXjudPvGZcd01i5s7L6K3Li/A/jqv7kBI9yQXa7b9qljb+SqD D1zK5GXFdVZEu5sFy1BJjYTu1/WYTMu1qOUUCzy0UFuF5zzVQlnusKE/Zj/zedW9dGKa sVhoZJIu7JM+FbOtqWkhO9kWDv0l3e2a9YwmA06JTSmGt2Slt+vWphn38DgenzawhTxv /0+hB2VhD/Av/td3rfbL0WpkkJ8vfgEna7ZjR8hEcpLVamm7hVGe0U/YTqOEYX9YqZG/ g8SXN7TYuEXLfroehmt9mBNr8Q96KD5uD+NRCt7TVI0w69cdTJKfk1vZW4XBKCnQcW8+ IgEg== X-Gm-Message-State: AOJu0YxV0nzH2Nih0PydyCML+91le5SuYzXh0oOBZs3EQEYwVQ2Onfu3 oj0xCws4kV5rlQvdyr22cL1SmNG+eSbSCI/iZ+C0fb3sXXyVVUY8+ydh7awjrRyCZWJ4szyXDya rbg3rRzsYAA== X-Gm-Gg: Acq92OHvHZhe+UiDHaoxWxmAWkfc0Cr6cDZrDml4B7Rl98Da2ZW5B72AORmaTwUzadW azUGODPlU/PmI+sLt6GumUgFG0rSCttPAWsHq40FY5Gn+E2qMgfkCeuLwIGE2Ys5Sp0ZxP2kOZ7 oFPnVjvYIBrHgndAgTa6j5MSWOYnYoeZsDj+Do72QVQtsl3dQ3EG4FPG3gY7ir3MsPwkeneV4ch CR7LKqwdk2a5vcK8N9MNLdtLjKuP13NYSNynkaxIKZy+WVMhDuWK6S1kPS8Ta43X0JBiqQZqyDG DVM/xS61PUPR+zM6xbbd88Ux0g/qlFNUlsyskBRoyeHZaXiqIzcpEtk5/2a5s6nis8qVaVmPfzf /aBwQYTj/g9PlUOrdR67r06MXSLdZ6fZKS4mSpylFVSTm19bTiFnOdEbNoGvsUlt+86Cn/X8D4v bowhYuMXV3ecgcPSLh1zFWhkTGVbD4GD+DwiUeFgpF0ewjypUCzgdtAW4= X-Received: by 2002:a05:600c:46cb:b0:489:1c1f:35f1 with SMTP id 5b1f17b1804b1-49042482762mr345711305e9.4.1779827888066; Tue, 26 May 2026 13:38:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 06/17] target/arm: Introduce common system/user meson source set Date: Tue, 26 May 2026 22:37:11 +0200 Message-ID: <20260526203722.79463-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779827983802158500 Introduce a source set common to system / user. No logical change intended. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/meson.build | 21 +++++++++-------- target/arm/tcg/meson.build | 48 ++++++++++++-------------------------- 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 4723f9f170a..e56fc943bdf 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -1,6 +1,7 @@ arm_ss =3D ss.source_set() arm_common_ss =3D ss.source_set() arm_common_system_ss =3D ss.source_set() +arm_common_user_system_ss =3D ss.source_set() arm_system_ss =3D ss.source_set() arm_stubs_ss =3D ss.source_set() arm_user_ss =3D ss.source_set() @@ -16,6 +17,13 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files( arm_common_ss.add(files( 'mmuidx.c', )) +arm_common_user_system_ss.add(files( + 'cpregs-gcs.c', + 'cpregs-pmu.c', + 'debug_helper.c', + 'helper.c', + 'vfp_fpscr.c', +)) =20 arm_common_system_ss.add(files( 'arm-qmp-cmds.c', @@ -26,11 +34,6 @@ arm_system_ss.add(when: 'CONFIG_HVF', if_true: files('hy= p_gdbstub.c')) arm_user_ss.add(files('cpu.c')) arm_stubs_ss.add(files('cpu32-stubs.c')) arm_user_ss.add(files( - 'cpregs-gcs.c', - 'cpregs-pmu.c', - 'debug_helper.c', - 'helper.c', - 'vfp_fpscr.c', 'el2-stubs.c', 'cpregs-omap-stub.c', )) @@ -45,15 +48,10 @@ arm_common_system_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', 'cortex-regs.c', - 'cpregs-gcs.c', 'cpregs-omap.c', - 'cpregs-pmu.c', 'cpu-irq.c', - 'debug_helper.c', - 'helper.c', 'machine.c', 'ptw.c', - 'vfp_fpscr.c', )) =20 subdir('hvf') @@ -65,6 +63,9 @@ else arm_common_system_ss.add(files('tcg-stubs.c')) endif =20 +arm_user_ss.add_all(arm_common_user_system_ss) +arm_common_system_ss.add_all(arm_common_user_system_ss) + target_arch +=3D {'arm': arm_ss} target_system_arch +=3D {'arm': arm_system_ss} target_user_arch +=3D {'arm': arm_user_ss} diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 1b751d59183..b0f5342245b 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -52,60 +52,42 @@ arm_common_system_ss.add(when: 'CONFIG_ARM_V7M', if_tru= e: files('cpu-v7m.c')) arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files('cpu-v7m.c')) =20 arm_common_ss.add(zlib) - arm_common_ss.add(files( 'arith_helper.c', 'crypto_helper.c', 'idau.c', )) =20 -arm_common_system_ss.add( +arm_common_user_system_ss.add( m_nocp_d, mve_d, neon_d, translate32_d, vfp_d, files( - 'cpregs-at.c', 'debug.c', - 'gicv5-cpuif.c', - 'hflags.c', 'gengvec.c', + 'hflags.c', 'm_helper.c', 'mve_helper.c', 'neon_helper.c', 'op_helper.c', + 'translate.c', + 'translate-m-nocp.c', + 'translate-mve.c', + 'translate-neon.c', + 'translate-vfp.c', + 'vec_helper.c', + 'vfp_helper.c', +)) + +arm_common_system_ss.add(files( + 'cpregs-at.c', + 'gicv5-cpuif.c', 'psci.c', 'tlb_helper.c', 'tlb-insns.c', - 'translate.c', - 'translate-m-nocp.c', - 'translate-mve.c', - 'translate-neon.c', - 'translate-vfp.c', - 'vec_helper.c', - 'vfp_helper.c', )) -arm_user_ss.add( - m_nocp_d, - mve_d, - neon_d, - translate32_d, - vfp_d, - files( - 'debug.c', - 'gengvec.c', - 'hflags.c', - 'm_helper.c', - 'mve_helper.c', - 'neon_helper.c', - 'op_helper.c', +arm_user_ss.add(files( 'tlb_helper.c', - 'translate.c', - 'translate-m-nocp.c', - 'translate-mve.c', - 'translate-neon.c', - 'translate-vfp.c', - 'vec_helper.c', - 'vfp_helper.c', )) --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779828072; cv=none; d=zohomail.com; s=zohoarc; b=Sv2SU7EUpLs+ZIrGtu57eRxkudLNodXSUeJqk6kLNs/25huH9fZa0QFQxwbtmR4gy3vtMIhgnmaxkwAZhvCnfN+xjjpEUL5BTHhMuYtlE3I+IPwllMyAORPXbKE39rlX4Ouu73pbDV9i6msLEKfUb0ak+qFgBEsiDfZ/KUQf9YE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779828072; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=I/2ukhcTbDGFuFPuVDeLKgkGB/+NaX2By6szsnTvhSc=; b=bAb5rrmYoygw/zr5JfWygE9xeGYQhZeLLaWUytVPyInPY2UNDxfaTcICDkUkHIhxPmIl1PZeFFtEcjPjSuCNZuKP4eOoa0c8IxWfbUUVQbt8U5kB6akFF722yvTbLlUzcBucZW2F4gdlZWqjXdY2g76T2s1km/vxRgVhPvP+5Bo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779828072845535.390285060463; Tue, 26 May 2026 13:41:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYG-0001YO-BJ; Tue, 26 May 2026 16:39:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyXb-00011H-1h for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:22 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyXZ-0007Hh-Dq for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:18 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-459bf19e87bso6560956f8f.1 for ; Tue, 26 May 2026 13:38:15 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb5b1a28sm732524f8f.26.2026.05.26.13.38.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:38:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827895; x=1780432695; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I/2ukhcTbDGFuFPuVDeLKgkGB/+NaX2By6szsnTvhSc=; b=iw3Qy5jMMKRazGJc/q0TJwsjUf4DzafqVPYvotq2VKJqQkdLZ4uh2GmA1apR8LvOJ+ g12hdWEbHYZkbXbDZtN6H7NAGnMaHAImobcipgtxNR+1ld9NN+95ZCkKxQjzdFihJ5sa qgCi80M3jl4teoF887+LsfZ4AARm5q/XmNKJv/Uv1XDjDPtuI1o+E/+Q6L149EVl9XwP 0ZoBp3A5FLf5QzaLHQpfUIKqjiPnVhRmw1R1QsvkzNxE4uyJ3Eq6fJtERXG3ZR+faEGz vh7bXzIVM/r5ksh4SVKr1Do3Ghvu47vrlL+a8Df//lLQmTMmHuHxR1LxHkOS3S7l77ti Zfqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827895; x=1780432695; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=I/2ukhcTbDGFuFPuVDeLKgkGB/+NaX2By6szsnTvhSc=; b=rXPIuCbQrm3VpIUT8QFn46kiG7JurCr9ASKXp+sm+Hqo/exqb4pnkEcZM4CDcMfXJ2 aQ/yxu74kox4d1FXS5Gra7wfDgm7jyXJAzPy8f2WPCW6Atx9CKJxfKB+EaM4ti3GHpm6 d6hN2zoRe11U9mwp16YqF0csVo0bBtPJL2xMlaYr9VZoRK4YWPru1EZUMopXjS6uNcHD eWoXTtMl93GU5t+RXEozptZ2MvaQfuG1nAt4gG2HuP43uqBPXgIpNHWOzhXC0gN2ID1r G/qIt/v4OaM+q5tuhF0UVM45BdVsG28wxRq6QGTnAnQSZn+Ur+2czKGHGOznVJNtjbhy w8lw== X-Gm-Message-State: AOJu0Yw7cXNlytHgbReVNZxADt0QWs2kMZyu5lrvP+iOwAGrRYvwWRJM ByaoPx8VgFtxQtpTNPuntn0RD3HlPfh+2wdNCd20C2i+N5SDW4Cr8hnHryiSWtthZyX9Uu1Ww9a 1amKUaSxHWA== X-Gm-Gg: Acq92OGk5RMzJCiY2Bn2WJUpT9fXWAE36XkEhjIPmaYWXV2gjLTdTfgB0XswW48dFud HnZ/srSTHaOxW0kL3SoY/cVxMkbFCDc+//5q6+d702cClqJIeSsoGzRFEzFZSu78GuhzkTUDZzQ KSWxMCqTk+mzMHKfQSDl5k6KAJmaDdttafUpGoJR633FNFckFKh8gMyHQVc1o1IzJ/J9quWudPj HQlspzvIy8IJqutUuDuB61YGohbgqEz62A9glNbCSy0Fvgm3+Y1Ms/48yy94qaXAzroTXw/yMkZ fbYN225AQHSHfCUd7tsXU6VWK2gtyM9CdK6BXZSDKAAXBGDbDebfYyfuA8sPNhWhjeTBCw/kKsg 2fGNXzLxYFfHgKtTyl16oqjHVVxLQypaFHJSgKBGZ3N5g07Nvj6Q1PVRpivnaMHrIio2m44D/fj 78ZQNl1UtKJYrqK+JZuQpKU+KFAyDnJIJbaJJgPenzmNHXAq13syePE7Qj1qBI2te6pQ== X-Received: by 2002:a5d:6f10:0:b0:45e:a19f:22c1 with SMTP id ffacd0b85a97d-45eb38a28a8mr33737700f8f.15.1779827894788; Tue, 26 May 2026 13:38:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 07/17] target/arm: Build gdbstub64.o as common object Date: Tue, 26 May 2026 22:37:12 +0200 Message-ID: <20260526203722.79463-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779828074103158500 While gdbstub64.o is already built once, build it as common object, reducing target-specific set in arm_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index e56fc943bdf..5376be2e3bc 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -11,7 +11,6 @@ arm_user_ss.add(files('gdbstub.c')) =20 arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', - 'gdbstub64.c' )) =20 arm_common_ss.add(files( @@ -24,6 +23,9 @@ arm_common_user_system_ss.add(files( 'helper.c', 'vfp_fpscr.c', )) +arm_common_user_system_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'gdbstub64.c' +)) =20 arm_common_system_ss.add(files( 'arm-qmp-cmds.c', --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779827983; cv=none; d=zohomail.com; s=zohoarc; b=QA2F3Y5gGGPQwvmBJyfSWCdJRPG8H2OY5dOhqv4OAbw8m1cM1lArBpwbIrkAMyc7fX9IJU/SNzIE5tz/cxFp9GcjIHQ8SvNvbyAh2KVXnEUc2ddb5R2KeUoPHrL3IaQYMzWitp9qNlrB24QYr7VcPyNQ703I6KpZQEBrmRuEV7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779827983; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=skQQWk8vIiv1Thq37qgy7Fxu4qHYyoy6S97p36ux/nQ=; b=I60rKerNLtzvVwYlSMQa+PHSil7PT53BXRL5rTyWBCxxSZrSlge3zDxKO7vR4WbMxOAp10CtvzER1QrgZnV6UVxIcw2oeMALQam8/70Dr17RGMI1wtvrkdLTb2rFfy7G3fdFsG9nnRfHpeWncDplg2MMfkru/aB3N8C02YhW1/U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779827983305564.341219587385; Tue, 26 May 2026 13:39:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYQ-0001rn-6V; Tue, 26 May 2026 16:39:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyXh-00018H-Mx for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:32 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyXf-0007NT-5H for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:24 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4896c22fcbaso94345825e9.0 for ; Tue, 26 May 2026 13:38:22 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490456274ebsm333511295e9.15.2026.05.26.13.38.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827902; x=1780432702; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=skQQWk8vIiv1Thq37qgy7Fxu4qHYyoy6S97p36ux/nQ=; b=mDYWnFt0S/HfNvRykVXfQ0n2TJNXvC0fY5ZGeoX19MglI9t+WAAOqkDcT//FnjOzSx OZLIWtRvGT1Cs7M1bFTRQURpXfzIDuSRWAZv9oO3R4xdc9Wt4h4gwLOV47s1VbzoVLaC SU8Hb4zppGAlckjPVyW+dPNtFCbJFxE6p4O61vYWrHSWOkDIbdoCXtBxS81sQCur0HiZ 8f8M4AdzVoFvBjs4G3fdAr7xEHFypLI5xtZMdRKgopBHxEq0yP+HCbBYgZEw/mkSiVs7 70OdqyYgHnmjzp/762kc+rIo6DTxdwLA1LFJGNaNXo0a1O+ImHpUM4dZG2IigmytylfY THDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827902; x=1780432702; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=skQQWk8vIiv1Thq37qgy7Fxu4qHYyoy6S97p36ux/nQ=; b=hfEvh6smcivfszcpV9BV1pN9QYDD5W4W+x5ea/UK2LRfEpU9ZB5JNA7hfVqh1NCOEl Gc/YiOrh76sSJfO7jCpQr2GElwEQWgqmPUsXMxCcH/ae4srNMtlW95Cj47kwn295WSzi UnjbBGuZnldKT0PHqbLkWtdBbbJ34ua73s50luCxEbW/1y92vo3RVqiEs9eyntudPzLQ tsJKZ2xCOMU6PCfampnBisZ8t5gx0xfgmXBKFKQ09BRNKs14/oCWETqlnhu4KWdNXT93 hJVRXRcNX9YfS+Gp7JbFyRNOCe5RiRx4JkCU83K53SMKYHSnexmEsuHF5ZbKQij/vpnO 1daQ== X-Gm-Message-State: AOJu0YyL2av8ISv926hVhPvYMkRnIy7El2LWaenv0VwZG1hJXpT6PjD0 J0yNt5OBc5/1AamkIBOgr84HOUUuqicxfRJaNRkNh0N3D7natnUy64Fob0qeIwbRj+Df/0tTgdX UmNSaFBZzYg== X-Gm-Gg: Acq92OH418UEREQBBi2j/hbstVjLhYwXiVv6LhtNr4CNWpnJd3GFPPzMOcQw9m67OH9 bjDkuvlFhebJfpYubS8x7IIGT0V+1qKy1t9BJrNEO89l7PULYgmNd3Ok1rMyJrB5O/v8G/Sdd4O 3cgui58vRJEeZpMp52qT7YYmyKp42tHwnX5tSiAQitTVFK1WLZZTmk+rn6e5z+Hma7RTYsVsPc2 JpFlWMtSpPvKBfRDX2gnxgTrXWTwp7SqdxJGUlGKedUX/TrnmZ/n2x7QyE3VNkwE5onSsti4Aqm IZ0z/37yU25M5Qpd56nvxmOtIAZPXy46v69TEAL93I2lpjlS+mQZv5XVSq3Tc6tF99js7SObFyE jQqkKfNncBf9odw/Tmer4QGvOMDtxbyz6GWUlsMzs/b8IOq/XRwECy4sCckRVQXXJNdUZtKtgep ANbQ1bE7BX//RdiM7AwgzjJ6Jvl2jrZDHqLwdMn9rWMgbzHmrSHoOmRbA8zW7phlYHxA== X-Received: by 2002:a05:600c:1392:b0:490:46bf:17ab with SMTP id 5b1f17b1804b1-49046ce6026mr321047195e9.29.1779827901732; Tue, 26 May 2026 13:38:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 08/17] target/arm: Build cpu64.o as common object Date: Tue, 26 May 2026 22:37:13 +0200 Message-ID: <20260526203722.79463-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779827983751158500 While gdbstub64.o is already built once, build it as common object, reducing target-specific set in arm_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/tcg/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index b0f5342245b..d5a95bf54f2 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -35,7 +35,6 @@ arm_ss.add(files( )) =20 arm_ss.add(when: 'TARGET_AARCH64', if_true: files( - 'cpu64.c', 'gengvec64.c', 'translate-a64.c', 'translate-sve.c', @@ -80,6 +79,9 @@ arm_common_user_system_ss.add( 'vec_helper.c', 'vfp_helper.c', )) +arm_common_user_system_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', +)) =20 arm_common_system_ss.add(files( 'cpregs-at.c', --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779828157; cv=none; d=zohomail.com; s=zohoarc; b=grN//clOosGmdeEdCufQGgv84Ci6W1y7U3lgw2QG06AEWqJlovJe9hwr6OLhTvujLlpfXpIHWqUrl1s/YtrHTumvosbRgFsRHaJxr9E3fZcdQu3ayj3M1fxnIaSMsW08cqGJHf+gfkWOiEM11ns9lutq3iWbiazgx7UjhoxeDj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779828157; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fySK/xScTn2CZ3lKGQIypYJIa/hnhOcCOUTh8N5ka8Q=; b=P6QEDQeNnqIvNvPJEVX5QAXwgiR//Xtnpa5rGarexaPf6seIH8pMm1vb9yoTrXz/60QFeCh5ecae6SbicEsBSLhRlfm6lZVEnS8jomUohqmzKH5sacGbw4qyOi36vcC5bkE6Moqr5e0Mj4Bc0qrTuGlYvYFXm+O1i47z0I8P8xU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779828157899407.83757885303567; Tue, 26 May 2026 13:42:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYZ-0002EE-O7; Tue, 26 May 2026 16:39:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyY2-0001IG-6K for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:55 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyXm-0007R2-MC for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:38 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-44a14580111so8191523f8f.0 for ; Tue, 26 May 2026 13:38:29 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb54a3c3sm804946f8f.8.2026.05.26.13.38.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:38:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827909; x=1780432709; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fySK/xScTn2CZ3lKGQIypYJIa/hnhOcCOUTh8N5ka8Q=; b=uZlN985dAhl+zaoT+NXTclljGc4EcRddJzZP/ZPXUdplRomMPnXRab0FIUzPmjY87z L1pTipltgOsuv7/FZ0D29x5tTY0g3tJPkGK3sXhmxTz43GDu4MSur8vWaNe/y9h1lfGA DWNlklMy3KIuX9sZpGzRB1JGdKcU0gYZqCRLV7l7QK/2voxB2G9UREbaiTqTa5HxsuNc Ef5EjJobHWLlH4T1Au7PcbjzOB8TjKJJQ9FHIc0WqY2ta8KQURLcgKc0acQe8AA1r6Wl R5sUvO3F9RznMY2DEHueSMZo2BcqRqmGl4c/G3x+jQaMSblRyVF0eHjl8pYbSkZPUUaI 4jyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827909; x=1780432709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fySK/xScTn2CZ3lKGQIypYJIa/hnhOcCOUTh8N5ka8Q=; b=CoSxm3sQS5DUTNj8oyRnb249vGGuXC1kWfP8Tkj2d6gkotlC4idvF9LRZ1Ys1z+7+z 18m03OEED1AG50U4f1lhEbYht9ehEd3dnXQ9KcFiMTxqSpEkyhFTmEhMbRkE4nbv/PaQ nDwRjeUuffkXsKzxTbTmvzStAWYQ/ScXyq07hL7sc2qQZiwJA9Wzx8x5Mn61XAC8XROc NoXHoTV9+O6m/ZeqphdkTnEksbLwYUY5JGryyg95Cc3z0xGkPfh2jRHvhBnHqhasvH9P RnVLhx+xCSotDCHGafP/u8EIJ+zNI4BPZ1J9zCU2HoJAkvkV6lOQYiRpA49qwXCMQGoc gr1Q== X-Gm-Message-State: AOJu0YyxssQjGzwhbe1fzR1sXAQCLTvIO0bK8LK/EVH74xWKkIYJ6RlX cLbC83r+j8c+8N5tuyPbY0VZqfOHG4vkPkgs80JFBjbFoFsraoX1/tdNpcwb8ZaaXI60POScADW H+MDcItWSeA== X-Gm-Gg: Acq92OG82k0WjR4wzQNLx8sjG5DIVSoFIpFc98U+IQ6GkS5Sfv3eo4QlUDF2w6wTyvg BhUvexX7yxhXY9auc5NoVPotp/tklJKLfAyRLKZC+iXNd88SfpplY+kGV4pKaRqzvKiTb/rR+uB wblLfaCsh9aZqFbDglBoPAjg1Tw9CC+qRkMi69W5vkQQ+VvpW9SiLDlaLCzUiUqZ7W7YSB9Q2Az ROTdNxHRWKhu1pUZGkbYxTYo/ef+JVgfvwCYu/5YL7oRlY1mGp9O6j2NYo200cFx3QSnlns2eDz yPfy2i5lDwn55zrTihaj9wVf2Ld1k6uZm1SJlJE7a4n257Z9TgSasMN0Qaac9qXNQKhEW/QODHY A4CgAi3s045evUetoMfP7E1elgKzY4C+LMtnEZBqrA6uUuJg9pYE9PQwZsmnS1TXmk2U4DUy+sn Dgy9D9CMGYpj/clMm3y/PSKDBN9o6mMqfOC+AMbNkbG6MI2dWpDnkKMiU= X-Received: by 2002:a05:6000:41f9:b0:43d:7946:baee with SMTP id ffacd0b85a97d-45eb38af423mr30700185f8f.23.1779827908587; Tue, 26 May 2026 13:38:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 09/17] target/arm: Extract common code related to 'max' CPU Date: Tue, 26 May 2026 22:37:14 +0200 Message-ID: <20260526203722.79463-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UPPERCASE_50_75=0.008 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779828159970158500 Extract common code related to 'max' CPU. This commit only move code used by the 32-bit 'max' CPU, but we will soon add the 64-bit counterpart, so name it generically as "cpu-max.c". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/cpu-max.c | 106 +++++++++++++++++++++++++++++++++++++++++ target/arm/tcg/cpu32.c | 96 ------------------------------------- target/arm/meson.build | 1 + 3 files changed, 107 insertions(+), 96 deletions(-) create mode 100644 target/arm/cpu-max.c diff --git a/target/arm/cpu-max.c b/target/arm/cpu-max.c new file mode 100644 index 00000000000..9fd48ce46e2 --- /dev/null +++ b/target/arm/cpu-max.c @@ -0,0 +1,106 @@ +/* + * QEMU ARM 'max' CPU + * + * Copyright (c) 2018 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "target/arm/internals.h" + +/* Share AArch32 -cpu max features with AArch64. */ +void aa32_max_features(ARMCPU *cpu) +{ + uint32_t t; + ARMISARegisters *isar =3D &cpu->isar; + + /* Add additional features supported by QEMU */ + t =3D GET_IDREG(isar, ID_ISAR5); + t =3D FIELD_DP32(t, ID_ISAR5, AES, 2); /* FEAT_PMULL */ + t =3D FIELD_DP32(t, ID_ISAR5, SHA1, 1); /* FEAT_SHA1 */ + t =3D FIELD_DP32(t, ID_ISAR5, SHA2, 1); /* FEAT_SHA256 */ + t =3D FIELD_DP32(t, ID_ISAR5, CRC32, 1); + t =3D FIELD_DP32(t, ID_ISAR5, RDM, 1); /* FEAT_RDM */ + t =3D FIELD_DP32(t, ID_ISAR5, VCMA, 1); /* FEAT_FCMA */ + SET_IDREG(isar, ID_ISAR5, t); + + t =3D GET_IDREG(isar, ID_ISAR6); + t =3D FIELD_DP32(t, ID_ISAR6, JSCVT, 1); /* FEAT_JSCVT */ + t =3D FIELD_DP32(t, ID_ISAR6, DP, 1); /* Feat_DotProd */ + t =3D FIELD_DP32(t, ID_ISAR6, FHM, 1); /* FEAT_FHM */ + t =3D FIELD_DP32(t, ID_ISAR6, SB, 1); /* FEAT_SB */ + t =3D FIELD_DP32(t, ID_ISAR6, SPECRES, 1); /* FEAT_SPECRES */ + t =3D FIELD_DP32(t, ID_ISAR6, BF16, 1); /* FEAT_AA32BF16 */ + t =3D FIELD_DP32(t, ID_ISAR6, I8MM, 1); /* FEAT_AA32I8MM */ + SET_IDREG(isar, ID_ISAR6, t); + + t =3D cpu->isar.mvfr1; + t =3D FIELD_DP32(t, MVFR1, FPHP, 3); /* FEAT_FP16 */ + t =3D FIELD_DP32(t, MVFR1, SIMDHP, 2); /* FEAT_FP16 */ + cpu->isar.mvfr1 =3D t; + + t =3D cpu->isar.mvfr2; + t =3D FIELD_DP32(t, MVFR2, SIMDMISC, 3); /* SIMD MaxNum */ + t =3D FIELD_DP32(t, MVFR2, FPMISC, 4); /* FP MaxNum */ + cpu->isar.mvfr2 =3D t; + + FIELD_DP32_IDREG(isar, ID_MMFR3, PAN, 2); /* FEAT_PAN2 */ + + t =3D GET_IDREG(isar, ID_MMFR4); + t =3D FIELD_DP32(t, ID_MMFR4, HPDS, 2); /* FEAT_HPDS2 */ + t =3D FIELD_DP32(t, ID_MMFR4, AC2, 1); /* ACTLR2, HACTLR2 */ + t =3D FIELD_DP32(t, ID_MMFR4, CNP, 1); /* FEAT_TTCNP */ + t =3D FIELD_DP32(t, ID_MMFR4, XNX, 1); /* FEAT_XNX */ + t =3D FIELD_DP32(t, ID_MMFR4, EVT, 2); /* FEAT_EVT */ + SET_IDREG(isar, ID_MMFR4, t); + + FIELD_DP32_IDREG(isar, ID_MMFR5, ETS, 2); /* FEAT_ETS2 */ + + t =3D GET_IDREG(isar, ID_PFR0); + t =3D FIELD_DP32(t, ID_PFR0, CSV2, 2); /* FEAT_CSV2 */ + t =3D FIELD_DP32(t, ID_PFR0, DIT, 1); /* FEAT_DIT */ + t =3D FIELD_DP32(t, ID_PFR0, RAS, 1); /* FEAT_RAS */ + SET_IDREG(isar, ID_PFR0, t); + + t =3D GET_IDREG(isar, ID_PFR2); + t =3D FIELD_DP32(t, ID_PFR2, CSV3, 1); /* FEAT_CSV3 */ + t =3D FIELD_DP32(t, ID_PFR2, SSBS, 1); /* FEAT_SSBS */ + SET_IDREG(isar, ID_PFR2, t); + + t =3D GET_IDREG(isar, ID_DFR0); + t =3D FIELD_DP32(t, ID_DFR0, COPDBG, 10); /* FEAT_Debugv8p8 */ + t =3D FIELD_DP32(t, ID_DFR0, COPSDBG, 10); /* FEAT_Debugv8p8 */ + t =3D FIELD_DP32(t, ID_DFR0, PERFMON, 6); /* FEAT_PMUv3p5 */ + SET_IDREG(isar, ID_DFR0, t); + + /* Debug ID registers. */ + + /* Bit[15] is RES1, Bit[13] and Bits[11:0] are RES0. */ + t =3D 0x00008000; + t =3D FIELD_DP32(t, DBGDIDR, SE_IMP, 1); + t =3D FIELD_DP32(t, DBGDIDR, NSUHD_IMP, 1); + t =3D FIELD_DP32(t, DBGDIDR, VERSION, 10); /* FEAT_Debugv8p8 */ + t =3D FIELD_DP32(t, DBGDIDR, CTX_CMPS, 1); + t =3D FIELD_DP32(t, DBGDIDR, BRPS, 5); + t =3D FIELD_DP32(t, DBGDIDR, WRPS, 3); + cpu->isar.dbgdidr =3D t; + + t =3D 0; + t =3D FIELD_DP32(t, DBGDEVID, PCSAMPLE, 3); + t =3D FIELD_DP32(t, DBGDEVID, WPADDRMASK, 1); + t =3D FIELD_DP32(t, DBGDEVID, BPADDRMASK, 15); + t =3D FIELD_DP32(t, DBGDEVID, VECTORCATCH, 0); + t =3D FIELD_DP32(t, DBGDEVID, VIRTEXTNS, 1); + t =3D FIELD_DP32(t, DBGDEVID, DOUBLELOCK, 1); + t =3D FIELD_DP32(t, DBGDEVID, AUXREGS, 0); + t =3D FIELD_DP32(t, DBGDEVID, CIDMASK, 0); + cpu->isar.dbgdevid =3D t; + + /* Bits[31:4] are RES0. */ + t =3D 0; + t =3D FIELD_DP32(t, DBGDEVID1, PCSROFFSET, 2); + cpu->isar.dbgdevid1 =3D t; + + FIELD_DP32_IDREG(isar, ID_DFR1, HPMN0, 1); /* FEAT_HPMN0 */ +} diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index 73d21c6cf7d..919ed8a6cf8 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -18,102 +18,6 @@ #include "cpregs.h" =20 =20 -/* Share AArch32 -cpu max features with AArch64. */ -void aa32_max_features(ARMCPU *cpu) -{ - uint32_t t; - ARMISARegisters *isar =3D &cpu->isar; - - /* Add additional features supported by QEMU */ - t =3D GET_IDREG(isar, ID_ISAR5); - t =3D FIELD_DP32(t, ID_ISAR5, AES, 2); /* FEAT_PMULL */ - t =3D FIELD_DP32(t, ID_ISAR5, SHA1, 1); /* FEAT_SHA1 */ - t =3D FIELD_DP32(t, ID_ISAR5, SHA2, 1); /* FEAT_SHA256 */ - t =3D FIELD_DP32(t, ID_ISAR5, CRC32, 1); - t =3D FIELD_DP32(t, ID_ISAR5, RDM, 1); /* FEAT_RDM */ - t =3D FIELD_DP32(t, ID_ISAR5, VCMA, 1); /* FEAT_FCMA */ - SET_IDREG(isar, ID_ISAR5, t); - - t =3D GET_IDREG(isar, ID_ISAR6); - t =3D FIELD_DP32(t, ID_ISAR6, JSCVT, 1); /* FEAT_JSCVT */ - t =3D FIELD_DP32(t, ID_ISAR6, DP, 1); /* Feat_DotProd */ - t =3D FIELD_DP32(t, ID_ISAR6, FHM, 1); /* FEAT_FHM */ - t =3D FIELD_DP32(t, ID_ISAR6, SB, 1); /* FEAT_SB */ - t =3D FIELD_DP32(t, ID_ISAR6, SPECRES, 1); /* FEAT_SPECRES */ - t =3D FIELD_DP32(t, ID_ISAR6, BF16, 1); /* FEAT_AA32BF16 */ - t =3D FIELD_DP32(t, ID_ISAR6, I8MM, 1); /* FEAT_AA32I8MM */ - SET_IDREG(isar, ID_ISAR6, t); - - t =3D cpu->isar.mvfr1; - t =3D FIELD_DP32(t, MVFR1, FPHP, 3); /* FEAT_FP16 */ - t =3D FIELD_DP32(t, MVFR1, SIMDHP, 2); /* FEAT_FP16 */ - cpu->isar.mvfr1 =3D t; - - t =3D cpu->isar.mvfr2; - t =3D FIELD_DP32(t, MVFR2, SIMDMISC, 3); /* SIMD MaxNum */ - t =3D FIELD_DP32(t, MVFR2, FPMISC, 4); /* FP MaxNum */ - cpu->isar.mvfr2 =3D t; - - FIELD_DP32_IDREG(isar, ID_MMFR3, PAN, 2); /* FEAT_PAN2 */ - - t =3D GET_IDREG(isar, ID_MMFR4); - t =3D FIELD_DP32(t, ID_MMFR4, HPDS, 2); /* FEAT_HPDS2 */ - t =3D FIELD_DP32(t, ID_MMFR4, AC2, 1); /* ACTLR2, HACTLR2 */ - t =3D FIELD_DP32(t, ID_MMFR4, CNP, 1); /* FEAT_TTCNP */ - t =3D FIELD_DP32(t, ID_MMFR4, XNX, 1); /* FEAT_XNX */ - t =3D FIELD_DP32(t, ID_MMFR4, EVT, 2); /* FEAT_EVT */ - SET_IDREG(isar, ID_MMFR4, t); - - FIELD_DP32_IDREG(isar, ID_MMFR5, ETS, 2); /* FEAT_ETS2 */ - - t =3D GET_IDREG(isar, ID_PFR0); - t =3D FIELD_DP32(t, ID_PFR0, CSV2, 2); /* FEAT_CSV2 */ - t =3D FIELD_DP32(t, ID_PFR0, DIT, 1); /* FEAT_DIT */ - t =3D FIELD_DP32(t, ID_PFR0, RAS, 1); /* FEAT_RAS */ - SET_IDREG(isar, ID_PFR0, t); - - t =3D GET_IDREG(isar, ID_PFR2); - t =3D FIELD_DP32(t, ID_PFR2, CSV3, 1); /* FEAT_CSV3 */ - t =3D FIELD_DP32(t, ID_PFR2, SSBS, 1); /* FEAT_SSBS */ - SET_IDREG(isar, ID_PFR2, t); - - t =3D GET_IDREG(isar, ID_DFR0); - t =3D FIELD_DP32(t, ID_DFR0, COPDBG, 10); /* FEAT_Debugv8p8 */ - t =3D FIELD_DP32(t, ID_DFR0, COPSDBG, 10); /* FEAT_Debugv8p8 */ - t =3D FIELD_DP32(t, ID_DFR0, PERFMON, 6); /* FEAT_PMUv3p5 */ - SET_IDREG(isar, ID_DFR0, t); - - /* Debug ID registers. */ - - /* Bit[15] is RES1, Bit[13] and Bits[11:0] are RES0. */ - t =3D 0x00008000; - t =3D FIELD_DP32(t, DBGDIDR, SE_IMP, 1); - t =3D FIELD_DP32(t, DBGDIDR, NSUHD_IMP, 1); - t =3D FIELD_DP32(t, DBGDIDR, VERSION, 10); /* FEAT_Debugv8p8 */ - t =3D FIELD_DP32(t, DBGDIDR, CTX_CMPS, 1); - t =3D FIELD_DP32(t, DBGDIDR, BRPS, 5); - t =3D FIELD_DP32(t, DBGDIDR, WRPS, 3); - cpu->isar.dbgdidr =3D t; - - t =3D 0; - t =3D FIELD_DP32(t, DBGDEVID, PCSAMPLE, 3); - t =3D FIELD_DP32(t, DBGDEVID, WPADDRMASK, 1); - t =3D FIELD_DP32(t, DBGDEVID, BPADDRMASK, 15); - t =3D FIELD_DP32(t, DBGDEVID, VECTORCATCH, 0); - t =3D FIELD_DP32(t, DBGDEVID, VIRTEXTNS, 1); - t =3D FIELD_DP32(t, DBGDEVID, DOUBLELOCK, 1); - t =3D FIELD_DP32(t, DBGDEVID, AUXREGS, 0); - t =3D FIELD_DP32(t, DBGDEVID, CIDMASK, 0); - cpu->isar.dbgdevid =3D t; - - /* Bits[31:4] are RES0. */ - t =3D 0; - t =3D FIELD_DP32(t, DBGDEVID1, PCSROFFSET, 2); - cpu->isar.dbgdevid1 =3D t; - - FIELD_DP32_IDREG(isar, ID_DFR1, HPMN0, 1); /* FEAT_HPMN0 */ -} - /* CPU models. These are not needed for the AArch64 linux-user build. */ #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) =20 diff --git a/target/arm/meson.build b/target/arm/meson.build index 5376be2e3bc..3e02941d0d5 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -9,6 +9,7 @@ arm_user_ss =3D ss.source_set() arm_common_system_ss.add(files('gdbstub.c')) arm_user_ss.add(files('gdbstub.c')) =20 +arm_ss.add(files('cpu-max.c')) arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', )) --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779828095; cv=none; d=zohomail.com; s=zohoarc; b=GMiq6FySxJyGThRDSO7GGdfOi9oJ0VNP00+i3UZuWctHQSMIibp1U0EbGtjBy0f/85f7L6QSbl2T60JUjCskMGfN7nFn+Hx3RU+KynkOrvHGRM36PAji95eOhYjbqCkj0zrevnvvUKXfEbdvaf7uXx13xdZyrcxxSEHR4wIdbsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779828095; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7mHdUlQXGaWyFWOgTCnLIZVkxyrdDDV5OFAs1hIZcGQ=; b=nMgIAdxAsN7E9nv8DlhRTAIYWpzalcEDdBkzRXlKs0VoSB16jhZLVZ+PhOqoTRtc4k2UHpUAUWqlvlpD2Ng7W1tx192nkmpktzb0GKF6WO2FPrNeY6UWXGKhXeFgNvDv88B+NgFg3LxoN0WxGo+I9iqPkBWH7/HqbOCLb0+ff3c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779828095107268.8443079468349; Tue, 26 May 2026 13:41:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYY-00026t-E6; Tue, 26 May 2026 16:39:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyY4-0001K8-8t for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:55 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyY1-0007Ud-Se for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:47 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4903974854dso47685065e9.3 for ; Tue, 26 May 2026 13:38:36 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49045282201sm389760375e9.8.2026.05.26.13.38.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:38:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827915; x=1780432715; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7mHdUlQXGaWyFWOgTCnLIZVkxyrdDDV5OFAs1hIZcGQ=; b=ylPUVU2QURMgd9Xx699Hqwga+3w3XW6AqV6ahLgpUthSanMNh35NCLujT8VP4WaJOB TzfiKMOsI+FNVVec43BAoXs4695uWuEcX8wL8xc+H5ON1I+5RoSxVrVVjJ0345/6yvrz qHeTZHlUur7hBezWFcyMTsPmZyWq0hpgZMkCjLA23VMne/NSvgER3gQfV1FVj19WPTa+ JJnFjvncRwesbfe05C4/pD+T7KT8dcCudlXcz0lNbAA5FNQw8L3XNsH1mQzfufW57XUJ Qlemk7vs4+It4xeEKvd6Z8hJbutJQ/lFW9LaQXLaj+xaYHPC4w+LLimJXICFn3MylJza Peag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827915; x=1780432715; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7mHdUlQXGaWyFWOgTCnLIZVkxyrdDDV5OFAs1hIZcGQ=; b=d4GrlgWvLQUnSXW0+aOIi7MzfQgSSXJotgAEGxIH6Ruw15KSNloq3kffd9vLbENNKL IJllEuaFJLqRa799rvm6uqFsgH/Mezjhq/VVb3m/cdt5s1atlgHmFXRvBUrL5UlfTSZv PkcG6DA+dxGHJDg/3ex8Jf99H+h1aiR4J1EKTKoJcUvZLh02y9FJpREpHG3LhyX6ckMv ktap8CGV1MNcjx063P8GUpUgTHyOVdMZ3Dne/5RzxUa41pUOCa1By9HMQoSROYj/nZm/ 1iA9JpZRbJrhqyF0Iia0c4baBaI16djFTkp9g2ZIpb4u4YjxQUeaYjl8Q/uo68r0Ej53 D9lg== X-Gm-Message-State: AOJu0YztlaB+oDaVtK7js8fWZu3WSJQQXXaL4fkPv5CjHljwbZg8ldww n38Gje+FzOwIz9mGefrAMlc+ObKUmy/EJWxiuqdtn4FpoQl9fx/gX3KZiRpCukXFotz+TmRDgPq WVJp1r3TqjQ== X-Gm-Gg: Acq92OGrHpIntJyFhwHCMmABI1i7VfvuJXIjU1S0JkRkrQ2fTT7noZ3GnWwr1VYCGmb c0xpSbepM07ihkFjz7qwPfGoXHxKno6nYUp/qQIDEJlruDec35po/zXwJAHVBSnDLhYyy8qH7pz enh6Naq9QViTVAtFJUU4fmrNIDl2HCk6V3zsm3/Kk/zHsd3IGa6wXX5ewQtWhYp4ayQAGY5OUI+ njrrgWxPo5SlfIcncE9wqwWXxZjd+sJnVgG3EGGjIPjU4T/xOGYVTYUtzwq68J85/UBidg0TAKe khTgjKjMVcFBBkrRuhLut+RbhFeS7sFz61ZVVAHpc76C71NK1G03zEfW1lVyirXk06UibxoTdXW j26whNJKlM6T97jgudksMaGjAdjkjvQuk12wCGeEUWL3wDGfh3RBrQSWD0+gzcJSBdsNGSSsLJY 4p5n5UFcTIRbwU+PVG1iA3IJgrDhLn77hxiTJQFZVRUbI2/L4WCyPYJFbY8fIfD8mDmg== X-Received: by 2002:a05:600c:8b77:b0:490:5368:743 with SMTP id 5b1f17b1804b1-49053680a94mr284980435e9.32.1779827915418; Tue, 26 May 2026 13:38:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 10/17] target/arm: Use make_ccsidr(LEGACY) in 32 bit 'max' CPU type Date: Tue, 26 May 2026 22:37:15 +0200 Message-ID: <20260526203722.79463-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779828096009154100 Commit 676624d757a ("target/arm/tcg: refine cache descriptions with a wrapper") added the make_ccsidr() helper. Use it. Besides being simpler to review, it also makes arm_max_initfn() more in line which aarch64_a57_initfn(), which it almost duplicates. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/tcg/cpu32.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index 919ed8a6cf8..cf643ce43b1 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -9,6 +9,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "cpu.h" #include "accel/tcg/cpu-ops.h" #include "internals.h" @@ -756,9 +757,12 @@ static void arm_max_initfn(Object *obj) SET_IDREG(isar, ID_ISAR6, 0); cpu->isar.reset_pmcr_el0 =3D 0x41013000; SET_IDREG(isar, CLIDR, 0x0a200023); - cpu->ccsidr[0] =3D 0x701fe00a; /* 32KB L1 dcache */ - cpu->ccsidr[1] =3D 0x201fe012; /* 48KB L1 icache */ - cpu->ccsidr[2] =3D 0x70ffe07a; /* 2048KB L2 cache */ + /* 32KB L1 dcache */ + cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 7); + /* 48KB L1 icache */ + cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, = 2); + /* 2048KB L2 cache */ + cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 2 * MiB, = 7); define_cortex_a72_a57_a53_cp_reginfo(cpu); =20 aa32_max_features(cpu); --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779827963; cv=none; d=zohomail.com; s=zohoarc; b=LtI1ocIAIg83AzVKFfPWBsn1riasRrOODrTTHgXfb9O3boqnlNf4gsWz8ZhzRicPsgCY/g7mN6aMvTDpvAEkVeK/OqT2ebjsOatBqFQAuvBmJRKd1aHV4VaKk/TeHnwMR/Vd1yJRffQMzw2n5jLhLzAX49zzVKnIV/gPpx4VLtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779827963; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Q+taEkHZb9CxjnQO4BHePIfbY9jY0z9KjY9u+7Jb3eA=; b=aE1N6spv2IqR/lmiO85V+fjBB08kVkzIa2xkUJfynO3pSVjMsRv70GWLs9avz/wRoT8VWnCKAXam1kLGeuDetc8PfjokrFiyhx7VXRnmkzQ8tD7bRwiJ4P34ksW7NfToxxkaFM7S29gJfMU3HJyefatLYSQV1yQnk/CBXLJ6eKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177982796388797.4768176324053; Tue, 26 May 2026 13:39:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYM-0001iT-8v; Tue, 26 May 2026 16:39:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyY4-0001KB-JL for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:55 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyY1-0007VO-TF for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:48 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-44e1ebb3122so6737983f8f.2 for ; Tue, 26 May 2026 13:38:43 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb558a47sm749866f8f.15.2026.05.26.13.38.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827922; x=1780432722; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q+taEkHZb9CxjnQO4BHePIfbY9jY0z9KjY9u+7Jb3eA=; b=ELKphlNou1BLMs3+0kFxjjGppFQAJKVaxN+CTPYTcL84DqXpf817pCBG0d2lXJTQNw 0UozA34kzDYiczIEHq3e4k8E9r7gjDMFhR2QaTWo6gf+WW0z0Sy6HK04aZodF78FPRzQ MtS1m+GS+gfSZBB84WZn1wY65A1W/zxXUiEBrq//9H9NeSbL0uOWcJbrsd6ktJrnSvnk AfAHlhuKLYtYNuWL9upUrDlnOO5c3bikMF2I/nM2sQgdbFcczGrOgABA9rw8+1cikOGl 6lM/ubsrnvsNg4vgu0erUqBKwdnrm1Htl4QTVuUsnLlFSZu55pe6cSss0VDANBu4TnD9 3kEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827922; x=1780432722; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Q+taEkHZb9CxjnQO4BHePIfbY9jY0z9KjY9u+7Jb3eA=; b=H/6r9qDHw22tpNjwQdFNgA5LM0vOI1lzpCUNQguuyZ27OIwKWUVDR8NjCFKHjD+KVp Dl67KAeMqaArzWFbKqlkVM/BRyekfiu1RPCjsDHv33NnK9+FXOr+7dRG8fRtpyR5fP5h eF/and+bz3apimIBSRixO8D5DyJpaH8x9mT0RGUpUPxZWbruqu0YxaezVUHlra45GsDu MFrmfc+9wvgPTm1WGGLM+CjvNmhVBDDOsmxHA8oQVo+p07Ju45Wtnz4GTtIT+EK06n72 xtm9DZDKwjcywxpecfFjW3eG9o6yhWgZ3MviASLPPFxucbVyDakypv6411a81D0pl8QD Q5qg== X-Gm-Message-State: AOJu0YyixYuWzkX/lCutALEw8oaX50LbZHmEkEyyKhYMNpXiisU9/Y5F ad5kai1kxtAnLmDxGLiM73NcbwOtsvZ7o1IRCeKnSzmB35HBx4jJkzSbD4Sf7Wd1Cl6GFcZTAW7 qFTrDeeR3nA== X-Gm-Gg: Acq92OF8f09lWrV7xixz32J4mJyyIVzICug/VLLzQwje+FNsviaCcWOpnCtdeANBZh0 ChlJlS7R1v/0nr1MoJdqa75fOSBPYmmxz2lQmRRGSkRjzC9F3an2vuHP799y77rku/7CJ8xRjWR JbFfWJ6g+wWh+hk+KvIBwfa2U6aTMcVmUoKog9uayL89QfadniMG4Q2C2vS7AtTljuzOHLKgifN qpWhX860Al/hRTP89wjoqDEwq9fmHHvsoKVAqXy8CvfcqCgppGzv/Q63K4Zn3AqeaLoZOvY2HLB VD11fSM5EHQPEIqRflsRO1sgvvealQR2m6YFv5sNNGNWmyfoobH8ATFG357omMo0vSTpIge8YzN Xu6uUiBgBsgULh/OWZokRuMPv68YpBQp1LNdz7w2J4lIXMo2hIij27hEvNTOM2Z3VNmyaWxbZAG cJg0nCtNvrtuoNUsOKGLF/Fxf3/lQuLgDc3oY1fFWdW0Ijrhlz4V+J9eU= X-Received: by 2002:a05:6000:4b04:b0:45e:9420:ed16 with SMTP id ffacd0b85a97d-45eb38b0045mr34673111f8f.10.1779827922259; Tue, 26 May 2026 13:38:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 11/17] target/arm: Implement DBGDEVID* registers in max AArch32 CPU Date: Tue, 26 May 2026 22:37:16 +0200 Message-ID: <20260526203722.79463-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779827965756158500 32-bit ARM max CPU is a 'Cortex-A57 advertising none of the AArch64 features'. Keep it as close as possible as the A57, by implementing the debug ID registers, following the changes in aarch64_a57_initfn added by commits 48eb3ae64b3 ("target-arm: Adjust debug ID registers per-CPU") and 09754ca867f ("target/arm: Implement AArch32 DBGDEVID, DBGDEVID1, DBGDEVID2"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/tcg/cpu32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index cf643ce43b1..2e8afc28602 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -755,6 +755,9 @@ static void arm_max_initfn(Object *obj) SET_IDREG(isar, ID_ISAR4, 0x00011142); SET_IDREG(isar, ID_ISAR5, 0x00011121); SET_IDREG(isar, ID_ISAR6, 0); + cpu->isar.dbgdidr =3D 0x3516d000; + cpu->isar.dbgdevid =3D 0x01110f13; + cpu->isar.dbgdevid1 =3D 0x2; cpu->isar.reset_pmcr_el0 =3D 0x41013000; SET_IDREG(isar, CLIDR, 0x0a200023); /* 32KB L1 dcache */ --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779828032; cv=none; d=zohomail.com; s=zohoarc; b=fDiu1A09WstArJU+01GgcjqkMh/ggTmoUeAmOsKor7owN4DqzMktT+sWgeaNsaansTgFV1qlHCrGoWbymwDksbby+hTWkdPH1X3RwJRCNd4FIzIpSqwlQPQVpYELdnsqdfhfAbTkQykg3hVsXdACJrIKofft29nSLu8o08fE8ZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779828032; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nCYbJMob4vkCYkGheUetdxBZMcAjBWQS3OWY1ktJ//s=; b=RfdyYcewR+9oqzP3KycPSO/5eHKIlHVtEAtIrTf9U5gsEllQJumDYwDcUK8vj5I5NYKgAsXEXX2CoO4SPg0MpdzbC18PQ9J/31xabod9wR7E4WfJ+9cjd5N+Bx5AKDx5sG6FZN9bLBoBk6NmHaasvSP3DQjxM4ZOGDYgY3HVOw0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779828031982167.16438511655792; Tue, 26 May 2026 13:40:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYY-00024y-29; Tue, 26 May 2026 16:39:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyY9-0001NR-49 for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:55 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyY7-0007pH-MF for qemu-devel@nongnu.org; Tue, 26 May 2026 16:38:52 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-44b330c5cc6so8488238f8f.1 for ; Tue, 26 May 2026 13:38:50 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb5b1a28sm735903f8f.26.2026.05.26.13.38.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:38:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827929; x=1780432729; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nCYbJMob4vkCYkGheUetdxBZMcAjBWQS3OWY1ktJ//s=; b=nJ4eG2x0dojqfSh+rk8GhpcjPEEuZQ03uj+CoKqINBkdy1wDKYnO41zyy1ce2jHww9 vS/jOO7U2TgJBtpOrDLcB5TiyDP3x/bbph2XOmnGrBiqIyTsGyjILfH3GF1g6HOGa5ck 48hAfVsQCDT8N1EYRi76ZYRSfK1DfSuSlHC+qsKCUSFSX+F7kdcG3/J1iPQyy3SgQgK9 6LhsMjoxlcpCdsZWt93U5fPe1UY6XvejR6euIbzF9l1HbjNgqMNxog4oMWxdhjkb/UJa 9+pMVMQ+Vo2JiT2wCSD0eduQBhpHdTFcls5dfwrjTxSLWA62GtQlm75h6RQGoGSWn4vs Z0Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827929; x=1780432729; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nCYbJMob4vkCYkGheUetdxBZMcAjBWQS3OWY1ktJ//s=; b=Si32rvVjUbLh0buk4U2l/Sf+KoAocsLW0s4j86wB9Ggt/kMsBBLijI1n0nVQLUBYxI HK9KVP7l93X5IumrjUusLBo8t1qSvyi5Na19L4NphVwPwEBQQCW3BvT6mTSa8UEQZMox fjPQc4+b3bZ16ygNctofKfkoffxZm6QGcMGiW2ppMXOuATkoNxikhlUqoxhDOwcHquBN f1iDyIwqVkpvqidAveCWbjeREgFgMIJzZawe0FvI429xcFoIDxtGSShQj98cmj6DIVCi cTXdX+eOMTNJg/MLgK9iwsbqWC9L4oYBGvwHzUsubXO83nBmDTuvJQnVWei0EhTKpL9D nCoA== X-Gm-Message-State: AOJu0YxGpDFC6q6mZ/Cnzo+XqWXxM4Yt6k9PqrSyiUBCdh2AzEsIkDbG WxQ4uMOnmIaV/bz4XMSOntkXk7dtxsA4ppPGpQPGRUvwAOsH5X5Qcx0+ETB4YFyVit8MW+sAZtB sVv23UsQmcQ== X-Gm-Gg: Acq92OFrs+mCQUnh7qs2Lp3NO9T4HartS02Q/Tqg7Sfh4VR3gMTT8sgbZyLYkChYAHI pgI9Cw09DUYmyATDNJMQ+qMwaeZMy03ZyjHZtmmwB1/Cpg2PBPCR6BfFabB+WTSU/B2mZ1w4UD2 aUA08OVEl9M6HD6uzLx7dqphtOMmtk6yVwXag6e9L7x5rzmjS1gCSYnwS2SvEILuBb/lJKL5SWv RkPquNAuXz13P/P8zhKgmR+x4pxbFHjO+Mr5HIvybBhTPhUtJdX6JHHr3xcc447Thyn59HpIlLN qoEDoaZjhWnxcY+OVp652QDat720Xi+cbCiKCxA7SFI7MbDM1o9Ai3GontyFJ//C2J3WYqrg23p w1RMVzd/DtCDCqgIzMWA0pG8ZNmhQ9iZrhjsSCrptAAYyxOivXwXkCfhOS5wTm05kw8LTu97pXH EvOXNmR5BmmHJVZ5SkUDuBZ5q9Zf+rixHOxrieCYLTiXMH/1YvkyRgaJo= X-Received: by 2002:a05:6000:1acd:b0:45d:484b:ec10 with SMTP id ffacd0b85a97d-45eb3689147mr33073775f8f.2.1779827929303; Tue, 26 May 2026 13:38:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 12/17] target/arm: Only set %kvm_target when KVM is enabled Date: Tue, 26 May 2026 22:37:17 +0200 Message-ID: <20260526203722.79463-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779828033950158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/cpu64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index b38a78aac3f..7b2f09cf8ec 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -701,7 +701,9 @@ static void aarch64_a57_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_EL2); set_feature(&cpu->env, ARM_FEATURE_EL3); set_feature(&cpu->env, ARM_FEATURE_PMU); - cpu->kvm_target =3D QEMU_KVM_ARM_TARGET_CORTEX_A57; + if (kvm_enabled()) { + cpu->kvm_target =3D QEMU_KVM_ARM_TARGET_CORTEX_A57; + } cpu->midr =3D 0x411fd070; cpu->revidr =3D 0x00000000; cpu->reset_fpsid =3D 0x41034070; --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779828053; cv=none; d=zohomail.com; s=zohoarc; b=LG6ylbMSFML/fv7Ua1ZNktKX/eog1M4g/R1t5Cr3iMbqMNOV6TEoUqBDIYF2qxSedNIyrX6HPhbvrT20hzHDoLX35oY8SHA3t4qOpz4HPRPcymhQlHLi5naIVePjIn7JSRYUwnviHfx6rgp7cAb7s1x4yP72ZnR+bNCgOi/0OPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779828053; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kdQzEExd/6XIarCtGNcCUUBNB/7ENhjoxJyVnv6NZlA=; b=bmBlZMzk97oLOROncwZ8mHDCW17AD0pxQKIQ+eIxu1AQOaC9S64xrDiL0b+HoA14IGsrq62uVOALrha36OHhci4cuxSEmDvRpOxZaweFT/h2DCLcsNkcXlRmsa93U+6Vi+iUKh9Jg0vqSV5qlPK7273987DuEQU47IPE3WV/V3s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779828053529855.1365846114487; Tue, 26 May 2026 13:40:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYd-0002am-6o; Tue, 26 May 2026 16:39:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyYI-0001eY-76 for qemu-devel@nongnu.org; Tue, 26 May 2026 16:39:03 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyYF-0007sN-OT for qemu-devel@nongnu.org; Tue, 26 May 2026 16:39:01 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-490426d72f7so43548155e9.3 for ; Tue, 26 May 2026 13:38:57 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4904561f2dfsm332552445e9.12.2026.05.26.13.38.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827937; x=1780432737; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kdQzEExd/6XIarCtGNcCUUBNB/7ENhjoxJyVnv6NZlA=; b=rjEG98SFKcxB7Gn5iakvtWLJB25R38piSkNbMIXye45G9K0BdVf0u36Cf/UH3VmcL/ 2eJxwax3a2RzyrUpZ5pSBZMkZKJBeDMI+lR4OILMBvevUMHIuoojKpNfeIPqxxB+tUso l4AKuDgBEiwCM5oo5qGt06JbU9lRaMWC7e4uTsAYdguQzIOScmrLyKm6Y11CeDlDbkX/ E4WI06LsSsxnkmsv3mIEc4l42EAEtU3StBGkBfW7RkaloVxhe/k+s0XQLlUt2B+Xw44v MdwgOLBZR6N1D2MAJDbJ2gfVjpXsievT1KUdNCVbJlXUbZ/FcoY8ZpXlqRA0yB2SAL47 uVaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827937; x=1780432737; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kdQzEExd/6XIarCtGNcCUUBNB/7ENhjoxJyVnv6NZlA=; b=ngpyDhTxQSRMPFHJKNegpAUsS+HFUHScZstqbzg/AVTsvbwb21wjNu8S9OX5BCKodf wTgQhFW3Nvx1D3WiScz1GzO/srmjyp3undup6A6jooZm4WY+obvqbZLeQRT1mqITqRQL MuR9cCeHBQWiQjVj2ALLX1Fl4CMyfUsNHrVJmGJwyEJCec14n2NAQAJUTan1ancpHysE cA7dxhP/TcAc3/dXN7yp5kcVKjm5eE6CJc07Vn7guC4FZjjAMMz8e5YgxL1a9w58lgXk 4FVfNfbFwTguSN24r3cmp8+4eekgMD0CHacEaq4MecQjPE/Zs6wfGRFP0RgAZxxNnqZy jseg== X-Gm-Message-State: AOJu0YzOIlQWLkPlIUB9NWWftni7QTyr6o5qdGjAdKLVglLX4i3Ke18B VgeHRSuflDUob0KlUxdM+VNzO4lPc6k0rqgBm5oGyVrCgL+yQVmyLxo9alURjmW9JJlVgpzWrIi oWqvof3QQbw== X-Gm-Gg: Acq92OF0L2xbSL8P0cLcLY1j1glkdJ58R2c+amY/aITUmpboAY6JmehWFxxhB2h2q0y Bsu1L/FqqFSwXBbEkKHxz1BN2EMpYXbW+w2u/hB9mPBI7/0MCG+u9R2mpyDrVqsZtwrWTHP4JSs YmY1KitofK5XNMKhOQpS0FXAlPEFeqIsru/OHcxJw8lT1Lcpmoy+phEMzi+1J9XwDDtXRPeQT68 HNa0HNWfn+o5i1TzdxaurqgPWVJZU1yp2or71cguLV6qcNikPKbP2t9Zg2Fa+rUJaGKDHUrGtPL 6QHoOQuva/aamSKCt/r+rsDDk2UdcGuGYZoc6X8aZQoTqWBV2XF10oUKY6oVggcJNVZgr/RZIZk gvcPLfuOTv3wH8bB80xUM10kVyig611i74yR9GbyHe78FoEbRFROlZjO7FotzOKbcCoXMeuacp3 Wer2RF1o6l6whRlWX+dzVSW8TVzp+aK4tsr0Q6nsdBGlwwpt5R4gfjQ+Q= X-Received: by 2002:a05:600c:8485:b0:490:5074:651e with SMTP id 5b1f17b1804b1-4905074659bmr253456235e9.25.1779827936908; Tue, 26 May 2026 13:38:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 13/17] target/arm: Factor aarch64_aa32_a57_init() out Date: Tue, 26 May 2026 22:37:18 +0200 Message-ID: <20260526203722.79463-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779828055512154100 In order to make the following commit easier to review, factor aarch64_aa32_a57_init() out of aarch64_a57_initfn() as a preliminary step. We only add a %aa32_only argument to restrict AArch64 features. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/cpu64.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 7b2f09cf8ec..7dce17fdb20 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -686,17 +686,20 @@ void aarch64_cpu_lpa2_finalize(ARMCPU *cpu, Error **e= rrp) SET_IDREG(&cpu->isar, ID_AA64MMFR0, t); } =20 -static void aarch64_a57_initfn(Object *obj) +static void aarch64_aa32_a57_init(Object *obj, bool aa32_only) { ARMCPU *cpu =3D ARM_CPU(obj); ARMISARegisters *isar =3D &cpu->isar; + const bool aarch64_enabled =3D !aa32_only; =20 cpu->dtb_compatible =3D "arm,cortex-a57"; set_feature(&cpu->env, ARM_FEATURE_V8); set_feature(&cpu->env, ARM_FEATURE_NEON); set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); set_feature(&cpu->env, ARM_FEATURE_BACKCOMPAT_CNTFRQ); - set_feature(&cpu->env, ARM_FEATURE_AARCH64); + if (aarch64_enabled) { + set_feature(&cpu->env, ARM_FEATURE_AARCH64); + } set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); set_feature(&cpu->env, ARM_FEATURE_EL2); set_feature(&cpu->env, ARM_FEATURE_EL3); @@ -727,10 +730,12 @@ static void aarch64_a57_initfn(Object *obj) SET_IDREG(isar, ID_ISAR4, 0x00011142); SET_IDREG(isar, ID_ISAR5, 0x00011121); SET_IDREG(isar, ID_ISAR6, 0); - SET_IDREG(isar, ID_AA64PFR0, 0x00002222); - SET_IDREG(isar, ID_AA64DFR0, 0x10305106); - SET_IDREG(isar, ID_AA64ISAR0, 0x00011120); - SET_IDREG(isar, ID_AA64MMFR0, 0x00001124); + if (aarch64_enabled) { + SET_IDREG(isar, ID_AA64PFR0, 0x00002222); + SET_IDREG(isar, ID_AA64DFR0, 0x10305106); + SET_IDREG(isar, ID_AA64ISAR0, 0x00011120); + SET_IDREG(isar, ID_AA64MMFR0, 0x00001124); + } cpu->isar.dbgdidr =3D 0x3516d000; cpu->isar.dbgdevid =3D 0x01110f13; cpu->isar.dbgdevid1 =3D 0x2; @@ -742,14 +747,21 @@ static void aarch64_a57_initfn(Object *obj) cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, = 2); /* 2048KB L2 cache */ cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 2 * MiB, = 7); - set_dczid_bs(cpu, 4); /* 64 bytes */ - cpu->gic_num_lrs =3D 4; - cpu->gic_vpribits =3D 5; - cpu->gic_vprebits =3D 5; - cpu->gic_pribits =3D 5; + if (aarch64_enabled) { + set_dczid_bs(cpu, 4); /* 64 bytes */ + cpu->gic_num_lrs =3D 4; + cpu->gic_vpribits =3D 5; + cpu->gic_vprebits =3D 5; + cpu->gic_pribits =3D 5; + } define_cortex_a72_a57_a53_cp_reginfo(cpu); } =20 +static void aarch64_a57_initfn(Object *obj) +{ + aarch64_aa32_a57_init(obj, false); +} + static void aarch64_a53_initfn(Object *obj) { ARMCPU *cpu =3D ARM_CPU(obj); @@ -886,7 +898,7 @@ static void aarch64_max_initfn(Object *obj) } =20 if (tcg_enabled() || qtest_enabled()) { - aarch64_a57_initfn(obj); + aarch64_aa32_a57_init(obj, false); } =20 /* '-cpu max' for TCG: we currently do this as "A57 with extra things"= */ --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779828061; cv=none; d=zohomail.com; s=zohoarc; b=UArB5gUjALD8Din/798JYWXlT1/aflhwhuMt3xPKwvFdJ0S4khkWqCO6BjK6ljhicq7L6sNyuTRGjulXZmfBYk8aBtcqQvvMHJCWNdn8m6RNN18o6XoAef6I9cMUm6RFL6C9cpeGkfEj0wtyZBayENfCs73rMmRQJcjJAnmd6JM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779828061; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=m0AHGAisTjM3ITx5hjPgrk7zEVV/Rjt8pbSifNV3yhk=; b=jh7QbDL9/ZyF9IA8B92/nilpBoHOrD27fe6cSjqTsHFyyXvqj76AWbz2iNFDvyHudD1MZJTzpNozlEfKOo8kgr64+B8toqT8CC+dKZvbm+8eqUeRSl7g0CFJ1pB3J53NdYrbBwlCqywI8ivOyP+OjwhzodCDdZ2xj0SOP5bGito= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779828061312221.70762739968723; Tue, 26 May 2026 13:41:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYe-0002jx-D4; Tue, 26 May 2026 16:39:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyYO-0001tp-6E for qemu-devel@nongnu.org; Tue, 26 May 2026 16:39:09 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyYL-0007tQ-EP for qemu-devel@nongnu.org; Tue, 26 May 2026 16:39:07 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-49041fb8c23so37139505e9.0 for ; Tue, 26 May 2026 13:39:05 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490454a0b82sm370186785e9.9.2026.05.26.13.39.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:39:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827944; x=1780432744; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m0AHGAisTjM3ITx5hjPgrk7zEVV/Rjt8pbSifNV3yhk=; b=uCrLYnhr3DldtL/n3BWasy1HrgEXR5meLsehxYJQIVXxOUv0SOwe+vUxB8oHGAQk9j t0v0Al/cv9woSDTzHTEmVPxTEPs3hbDw/l13p/dVpC/a9aZBVSk+T/x/qyKxKceCk6bS NMnK+zYGXl2FnGOVjMB/0QY5I8FtP17UjwnpMMc4yyJV1K+TPej69oozY8tz698FVHWd zem5BXTu7gy2jNdzaiSKTo35wZZDBuB1fPGS/xIvIZHxvVKmUFe/SJO90+Y2ZuAPT076 PAXPizag72R4LR3g9Vj8ATH51YR39Rf97DdeMRmmaT4Pwzx2xhpHW4MkoTb1XBU7Cpa+ AALg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827944; x=1780432744; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=m0AHGAisTjM3ITx5hjPgrk7zEVV/Rjt8pbSifNV3yhk=; b=J8xvaUBP7JDLG7VWvdgBsWRz5RE4NAHuEQc27BzS4xXrBYx4GxvAVE57qrw+IzZjaH da6fP2warSiGdkrNt0cUUMOLyprGKtd9N9+pLJ/R61uvwJ461p5/a2gGVtny3Q/PSOXG 0LMjQJuejElyyJqdgkUoBNYl4ROo48ZQDFfaPQZ2S9ugFBCZO+0Kv6CYTi/b7Titvoru YdPQe9fcORZ5d9hzEv8ZdjLE+7k83j+TAdiWBJ9QlGhP3VUrAhRup4cvB1Sjl62fPbbR gSDnRaof9ADFffr6Kr8JYWg6xxYSve4QVuxqbUynnFQ9McZwHGKykTdp+0CjhDgHy0vM 8j0w== X-Gm-Message-State: AOJu0YxSm7iZK2dZ/w89a4jPECO4765Eezme3eVoKjCkpJ80lUmEtrxy DCx76+SNMhrX90vDydOdBWNIEFeQlWvebfvCb9GQlcZazRPDLWPyc/3IKN3ajW16bNVJPbAW3wv 3KSSH8rA9Ew== X-Gm-Gg: Acq92OGMnT8aEXUou9hHfSaUTL1Uy3jjhvDjetOWbRAAC+/cKz8TG/QYPxPwoazlYPQ 9qf/D6eBWbL8bTNe/Pb/6J6LK2A3nfI0xFN9UAPr3PE7apWTg0okKtnQNtgyPWNm2OXmUf+WRDk cNNyg/ZD5JWKU1wfAwNQTx0AgAcUF3ml5USQvfTYRO6+hjXB4bXEyVoPfpsI1jzt+TGp2+cdPA4 vGCBbz7oV6PplwawiWR2Nme/Jvx5UfF+dzAqEf0ewr+p9YTbZovb5T708P2yE42FiCMPleirW3G Ikq5UQEx4uQIimZ0nkcpRn+PMchsiwcRYloClsHFAa6PcmUPbICc9SqKfGhB0tMXkAYbKRGEWEG FC1jfHlo4fM9rWnKpOFu3PEANU7AKbrpCXRul+pfi7AdeMIz4ghEOHSHo5xa54qPwvJbFOfvzYe xMRCcqc+s+skUhWcpSNzQElNJ/iloE4rbhUd5g68YjBXKCiPTL354u46k= X-Received: by 2002:a05:600c:3b02:b0:48a:5821:5ff2 with SMTP id 5b1f17b1804b1-490425aa70fmr344586435e9.8.1779827943780; Tue, 26 May 2026 13:39:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 14/17] target/arm: Re-use common aarch64_aa32_a57_init() helper Date: Tue, 26 May 2026 22:37:19 +0200 Message-ID: <20260526203722.79463-15-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779828062038158500 Make aarch64_aa32_a57_init() common by exposing its prototype and defining it in cpu-max.c. Call it in arm_max_initfn() restricted to AArch32. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/internals.h | 1 + target/arm/cpu-max.c | 74 ++++++++++++++++++++++++++++++++++++++++++ target/arm/cpu64.c | 71 ---------------------------------------- target/arm/tcg/cpu32.c | 48 ++------------------------- 4 files changed, 77 insertions(+), 117 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 5a2263799c7..27414e7481f 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1773,6 +1773,7 @@ void aarch64_max_tcg_initfn(Object *obj); void aarch64_add_pauth_properties(Object *obj); void aarch64_add_sve_properties(Object *obj); void aarch64_add_sme_properties(Object *obj); +void aarch64_aa32_a57_init(Object *obj, bool aa32_only); =20 /* Return true if the gdbstub is presenting an AArch64 CPU */ static inline bool arm_gdbstub_is_aarch64(ARMCPU *cpu) diff --git a/target/arm/cpu-max.c b/target/arm/cpu-max.c index 9fd48ce46e2..6fc54ebe74e 100644 --- a/target/arm/cpu-max.c +++ b/target/arm/cpu-max.c @@ -7,7 +7,81 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" +#include "system/kvm.h" #include "target/arm/internals.h" +#include "target/arm/cpregs.h" + +void aarch64_aa32_a57_init(Object *obj, bool aa32_only) +{ + ARMCPU *cpu =3D ARM_CPU(obj); + ARMISARegisters *isar =3D &cpu->isar; + const bool aarch64_enabled =3D !aa32_only; + + cpu->dtb_compatible =3D "arm,cortex-a57"; + set_feature(&cpu->env, ARM_FEATURE_V8); + set_feature(&cpu->env, ARM_FEATURE_NEON); + set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); + set_feature(&cpu->env, ARM_FEATURE_BACKCOMPAT_CNTFRQ); + if (aarch64_enabled) { + set_feature(&cpu->env, ARM_FEATURE_AARCH64); + } + set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); + set_feature(&cpu->env, ARM_FEATURE_EL2); + set_feature(&cpu->env, ARM_FEATURE_EL3); + set_feature(&cpu->env, ARM_FEATURE_PMU); + if (kvm_enabled()) { + cpu->kvm_target =3D QEMU_KVM_ARM_TARGET_CORTEX_A57; + } + cpu->midr =3D 0x411fd070; + cpu->revidr =3D 0x00000000; + cpu->reset_fpsid =3D 0x41034070; + cpu->isar.mvfr0 =3D 0x10110222; + cpu->isar.mvfr1 =3D 0x12111111; + cpu->isar.mvfr2 =3D 0x00000043; + cpu->ctr =3D 0x8444c004; + cpu->reset_sctlr =3D 0x00c50838; + SET_IDREG(isar, ID_PFR0, 0x00000131); + SET_IDREG(isar, ID_PFR1, 0x00011011); + SET_IDREG(isar, ID_DFR0, 0x03010066); + SET_IDREG(isar, ID_AFR0, 0x00000000); + SET_IDREG(isar, ID_MMFR0, 0x10101105); + SET_IDREG(isar, ID_MMFR1, 0x40000000); + SET_IDREG(isar, ID_MMFR2, 0x01260000); + SET_IDREG(isar, ID_MMFR3, 0x02102211); + SET_IDREG(isar, ID_ISAR0, 0x02101110); + SET_IDREG(isar, ID_ISAR1, 0x13112111); + SET_IDREG(isar, ID_ISAR2, 0x21232042); + SET_IDREG(isar, ID_ISAR3, 0x01112131); + SET_IDREG(isar, ID_ISAR4, 0x00011142); + SET_IDREG(isar, ID_ISAR5, 0x00011121); + SET_IDREG(isar, ID_ISAR6, 0); + if (aarch64_enabled) { + SET_IDREG(isar, ID_AA64PFR0, 0x00002222); + SET_IDREG(isar, ID_AA64DFR0, 0x10305106); + SET_IDREG(isar, ID_AA64ISAR0, 0x00011120); + SET_IDREG(isar, ID_AA64MMFR0, 0x00001124); + } + cpu->isar.dbgdidr =3D 0x3516d000; + cpu->isar.dbgdevid =3D 0x01110f13; + cpu->isar.dbgdevid1 =3D 0x2; + cpu->isar.reset_pmcr_el0 =3D 0x41013000; + SET_IDREG(isar, CLIDR, 0x0a200023); + /* 32KB L1 dcache */ + cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 7); + /* 48KB L1 icache */ + cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, = 2); + /* 2048KB L2 cache */ + cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 2 * MiB, = 7); + if (aarch64_enabled) { + set_dczid_bs(cpu, 4); /* 64 bytes */ + cpu->gic_num_lrs =3D 4; + cpu->gic_vpribits =3D 5; + cpu->gic_vprebits =3D 5; + cpu->gic_pribits =3D 5; + } + define_cortex_a72_a57_a53_cp_reginfo(cpu); +} =20 /* Share AArch32 -cpu max features with AArch64. */ void aa32_max_features(ARMCPU *cpu) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 7dce17fdb20..499d154dace 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -686,77 +686,6 @@ void aarch64_cpu_lpa2_finalize(ARMCPU *cpu, Error **er= rp) SET_IDREG(&cpu->isar, ID_AA64MMFR0, t); } =20 -static void aarch64_aa32_a57_init(Object *obj, bool aa32_only) -{ - ARMCPU *cpu =3D ARM_CPU(obj); - ARMISARegisters *isar =3D &cpu->isar; - const bool aarch64_enabled =3D !aa32_only; - - cpu->dtb_compatible =3D "arm,cortex-a57"; - set_feature(&cpu->env, ARM_FEATURE_V8); - set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); - set_feature(&cpu->env, ARM_FEATURE_BACKCOMPAT_CNTFRQ); - if (aarch64_enabled) { - set_feature(&cpu->env, ARM_FEATURE_AARCH64); - } - set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); - set_feature(&cpu->env, ARM_FEATURE_EL2); - set_feature(&cpu->env, ARM_FEATURE_EL3); - set_feature(&cpu->env, ARM_FEATURE_PMU); - if (kvm_enabled()) { - cpu->kvm_target =3D QEMU_KVM_ARM_TARGET_CORTEX_A57; - } - cpu->midr =3D 0x411fd070; - cpu->revidr =3D 0x00000000; - cpu->reset_fpsid =3D 0x41034070; - cpu->isar.mvfr0 =3D 0x10110222; - cpu->isar.mvfr1 =3D 0x12111111; - cpu->isar.mvfr2 =3D 0x00000043; - cpu->ctr =3D 0x8444c004; - cpu->reset_sctlr =3D 0x00c50838; - SET_IDREG(isar, ID_PFR0, 0x00000131); - SET_IDREG(isar, ID_PFR1, 0x00011011); - SET_IDREG(isar, ID_DFR0, 0x03010066); - SET_IDREG(isar, ID_AFR0, 0x00000000); - SET_IDREG(isar, ID_MMFR0, 0x10101105); - SET_IDREG(isar, ID_MMFR1, 0x40000000); - SET_IDREG(isar, ID_MMFR2, 0x01260000); - SET_IDREG(isar, ID_MMFR3, 0x02102211); - SET_IDREG(isar, ID_ISAR0, 0x02101110); - SET_IDREG(isar, ID_ISAR1, 0x13112111); - SET_IDREG(isar, ID_ISAR2, 0x21232042); - SET_IDREG(isar, ID_ISAR3, 0x01112131); - SET_IDREG(isar, ID_ISAR4, 0x00011142); - SET_IDREG(isar, ID_ISAR5, 0x00011121); - SET_IDREG(isar, ID_ISAR6, 0); - if (aarch64_enabled) { - SET_IDREG(isar, ID_AA64PFR0, 0x00002222); - SET_IDREG(isar, ID_AA64DFR0, 0x10305106); - SET_IDREG(isar, ID_AA64ISAR0, 0x00011120); - SET_IDREG(isar, ID_AA64MMFR0, 0x00001124); - } - cpu->isar.dbgdidr =3D 0x3516d000; - cpu->isar.dbgdevid =3D 0x01110f13; - cpu->isar.dbgdevid1 =3D 0x2; - cpu->isar.reset_pmcr_el0 =3D 0x41013000; - SET_IDREG(isar, CLIDR, 0x0a200023); - /* 32KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 7); - /* 48KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, = 2); - /* 2048KB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 2 * MiB, = 7); - if (aarch64_enabled) { - set_dczid_bs(cpu, 4); /* 64 bytes */ - cpu->gic_num_lrs =3D 4; - cpu->gic_vpribits =3D 5; - cpu->gic_vprebits =3D 5; - cpu->gic_pribits =3D 5; - } - define_cortex_a72_a57_a53_cp_reginfo(cpu); -} - static void aarch64_a57_initfn(Object *obj) { aarch64_aa32_a57_init(obj, false); diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index 2e8afc28602..a2f730451fb 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -720,53 +720,9 @@ static void sa1110_initfn(Object *obj) static void arm_max_initfn(Object *obj) { ARMCPU *cpu =3D ARM_CPU(obj); - ARMISARegisters *isar =3D &cpu->isar; =20 - /* aarch64_a57_initfn, advertising none of the aarch64 features */ - cpu->dtb_compatible =3D "arm,cortex-a57"; - set_feature(&cpu->env, ARM_FEATURE_V8); - set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); - set_feature(&cpu->env, ARM_FEATURE_BACKCOMPAT_CNTFRQ); - set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); - set_feature(&cpu->env, ARM_FEATURE_EL2); - set_feature(&cpu->env, ARM_FEATURE_EL3); - set_feature(&cpu->env, ARM_FEATURE_PMU); - cpu->midr =3D 0x411fd070; - cpu->revidr =3D 0x00000000; - cpu->reset_fpsid =3D 0x41034070; - cpu->isar.mvfr0 =3D 0x10110222; - cpu->isar.mvfr1 =3D 0x12111111; - cpu->isar.mvfr2 =3D 0x00000043; - cpu->ctr =3D 0x8444c004; - cpu->reset_sctlr =3D 0x00c50838; - SET_IDREG(isar, ID_PFR0, 0x00000131); - SET_IDREG(isar, ID_PFR1, 0x00011011); - SET_IDREG(isar, ID_DFR0, 0x03010066); - SET_IDREG(isar, ID_AFR0, 0x00000000); - SET_IDREG(isar, ID_MMFR0, 0x10101105); - SET_IDREG(isar, ID_MMFR1, 0x40000000); - SET_IDREG(isar, ID_MMFR2, 0x01260000); - SET_IDREG(isar, ID_MMFR3, 0x02102211); - SET_IDREG(isar, ID_ISAR0, 0x02101110); - SET_IDREG(isar, ID_ISAR1, 0x13112111); - SET_IDREG(isar, ID_ISAR2, 0x21232042); - SET_IDREG(isar, ID_ISAR3, 0x01112131); - SET_IDREG(isar, ID_ISAR4, 0x00011142); - SET_IDREG(isar, ID_ISAR5, 0x00011121); - SET_IDREG(isar, ID_ISAR6, 0); - cpu->isar.dbgdidr =3D 0x3516d000; - cpu->isar.dbgdevid =3D 0x01110f13; - cpu->isar.dbgdevid1 =3D 0x2; - cpu->isar.reset_pmcr_el0 =3D 0x41013000; - SET_IDREG(isar, CLIDR, 0x0a200023); - /* 32KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 7); - /* 48KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, = 2); - /* 2048KB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 2 * MiB, = 7); - define_cortex_a72_a57_a53_cp_reginfo(cpu); + /* Cortex-A57 advertising none of the aarch64 features */ + aarch64_aa32_a57_init(obj, true); =20 aa32_max_features(cpu); =20 --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779828111; cv=none; d=zohomail.com; s=zohoarc; b=TMfbfbNB6xrsEQaS0Fo27flc8TLmHMj1hnjgkZgBc7Rm9GiZNOpYb1cNvj8T3nVG+nUu3ZweV2IoMjAW3xjnSejofbOtPSDBBEdPg4HPE26Z/xMvaDsNMh1bi5tmH0ht6th1qGrQ01i4zcsiK8dm/F4va9xXvmPdL29FmnQ0BPc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779828111; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xkK88+3jHGcINXY+jcF1wE1btGI3VrUmoUuXWEDarr0=; b=et0scQ6hZc37eusnTBAjdGNhUgs6PxPZBSD+d1xGeiytuzdMbuj/U9AWzjawamPx529YazeSqndb302xojmqoovaAnVYtFyJzYXZMnPME/TrUZ0CGdSLp1lmBgS40pnDOsaD3QYE5oNGS2pH6ZUsPqcaiGCRyGbbHCK/Y9gb46o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779828111544540.8227141916313; Tue, 26 May 2026 13:41:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYf-0002td-TA; Tue, 26 May 2026 16:39:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyYW-00024m-24 for qemu-devel@nongnu.org; Tue, 26 May 2026 16:39:17 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyYS-0007u3-2A for qemu-devel@nongnu.org; Tue, 26 May 2026 16:39:14 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4905e190c71so30910525e9.3 for ; Tue, 26 May 2026 13:39:11 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb5b314dsm676183f8f.30.2026.05.26.13.39.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827950; x=1780432750; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xkK88+3jHGcINXY+jcF1wE1btGI3VrUmoUuXWEDarr0=; b=mMPMJxSzUxP+QeUkPBPXsUgGvqJj87VgiAV9STo5WWyG1v4tutH7h/CmULRq2FXkjp Z/BBbiO2l1bwwCqwX7S/8glpH1+/Kw6IwnorojNuh2ay2ZVL9G066U9YhWdQ09ZfdRzd 5zpCu+wHwTd3K03A133xW8MGDTio+FSLCpzisZqewlfFr+jJmYEyou2hpfnQpCbNrag+ FGXRuOZA93eYOp0qxCKR+72iEfzsffWsQOwA9S6zk3KVvz5trfwRneUePnZaZUrA0GMc EZSkSjDzcw1pKqKcu5ILDQmLfhY7s1fAImF2E710SCeVjSeHKttVBdzxQwo2bdJL2Y/9 XHLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827950; x=1780432750; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xkK88+3jHGcINXY+jcF1wE1btGI3VrUmoUuXWEDarr0=; b=YYG0oKWxg5Y7T5bctIxCOHfOeb/EvdxD0VO//X3roGviqaCtlz57JNSe6eEIdOqhz5 Mp6BvlNczmlcNYqCye6xlLZ7gaMGJP7hpt4Z6PY/led7pOmXMyozfq3yshFC4B+RA/0Q IK+RWvK7YUTbZjNFNQpTnWlCE1J0FcJZmepJ9IlxUou2pZkW1nNkqBNs1Fqq1Tycb9F9 T36/oNB3fcmsRqFRhVh6qWMOk00F7N8+VGLuPzjblkZbdf9O/S+37QCuLhWsXQkXC9Hj aj5Ii9wCRFNc8hLRgkdCC35+w1owizbmqoiVZOtLVqycFxkRIXWXX/YBJE8N6qg+ydBf AA1w== X-Gm-Message-State: AOJu0YxOvWFoJFLXKimvgnCtYvVPL/Pj5hl7lEqfj8HkaTbiWUjj0Gc9 vjtt8wz7w1Nbzz/akQPCAq4QSVmBkufjhUcxCTdLD18lw/HLJNdbB09MwBQYVP1y+/PxzZ8xQ+x fa919JIEHEQ== X-Gm-Gg: Acq92OH1InFj8AQbljOJuykHgIG2ZcTg09ZPlGBDDXO9C/IZqwiMNOzWvWioeI3xqwS i8+fO0J+awM2dGzy5PqKnXcZmEmYalOiWtFwpP7NxIX9lv4WhyxHLUOaKz80A1L+blc3lZ6Uhrq YK70z3a5Yr88KnE5XNB9YIg1nVaFqws8dXBWSe0fqVaS7Vj5qRwv6qNBX1I+8MZka4KBBIRc9hR t29Bv0DPiqbrJNXQi1ZhfMcpZBEszvtV8I2+GJjONg133pUIjQPSsv4rhASny2B55uzTPa00rXm PTwJ29dzFDF1t9SfkYo8JHxcewGLSpzZmCLpp+73i02S5PCqumnLP931rXPmyDIFxgEQhWWNKfi Hrh7suf9RiOyzEMSaua4L3Gh9ADvPvMf8+doJYpLK2tuq4AzhAMgKNy6/7xAdojobodqaSmUb6j obOlT3kAL5z3XfVPL/wRYXOlyjmiXSDabmtAWrSz0tUnPT4dEWcke+PqxqGfHubrNE1B7n5FMpg 5YJ X-Received: by 2002:a05:600c:35c8:b0:48f:f7cc:f703 with SMTP id 5b1f17b1804b1-490428e2d58mr376738515e9.30.1779827950487; Tue, 26 May 2026 13:39:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 15/17] target/arm: Define 'max' CPU type in cpu-max.c Date: Tue, 26 May 2026 22:37:20 +0200 Message-ID: <20260526203722.79463-16-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779828114320154100 Rather than having the 32-bit 'max' CPU type defined in cpu32.c and the 64-bit counter part in cpu64.c, unify the code in a single place in cpu-max.c. Define stubs for aarch64_host_initfn() and aarch64_max_tcg_initfn() in the 32-bit binary. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/internals.h | 1 + target/arm/cpu-max.c | 65 ++++++++++++++++++++++++++++++++++++++++ target/arm/cpu64.c | 21 +------------ target/arm/tcg/cpu32.c | 29 ------------------ target/arm/tcg/stubs32.c | 10 +++++++ 5 files changed, 77 insertions(+), 49 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 27414e7481f..ae5afc5362e 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1774,6 +1774,7 @@ void aarch64_add_pauth_properties(Object *obj); void aarch64_add_sve_properties(Object *obj); void aarch64_add_sme_properties(Object *obj); void aarch64_aa32_a57_init(Object *obj, bool aa32_only); +void aarch64_host_initfn(Object *obj); =20 /* Return true if the gdbstub is presenting an AArch64 CPU */ static inline bool arm_gdbstub_is_aarch64(ARMCPU *cpu) diff --git a/target/arm/cpu-max.c b/target/arm/cpu-max.c index 6fc54ebe74e..8cf8edc6535 100644 --- a/target/arm/cpu-max.c +++ b/target/arm/cpu-max.c @@ -8,7 +8,10 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" +#include "system/hw_accel.h" #include "system/kvm.h" +#include "system/qtest.h" +#include "system/tcg.h" #include "target/arm/internals.h" #include "target/arm/cpregs.h" =20 @@ -178,3 +181,65 @@ void aa32_max_features(ARMCPU *cpu) =20 FIELD_DP32_IDREG(isar, ID_DFR1, HPMN0, 1); /* FEAT_HPMN0 */ } + +/* + * -cpu max: a CPU with as many features enabled as our emulation supports. + * The version of '-cpu max' for qemu-system-aarch64 is defined in cpu64.c; + * this only needs to handle 32 bits, and need not care about KVM. + */ +static void cpu_max_initfn(Object *obj) +{ + ARMCPU *cpu =3D ARM_CPU(obj); + +#ifdef TARGET_AARCH64 + const bool aarch64_enabled =3D true; +#else + const bool aarch64_enabled =3D false; +#endif /* !TARGET_AARCH64 */ + + if (hwaccel_enabled()) { + assert(aarch64_enabled); + /* + * When hardware acceleration enabled, '-cpu max' is + * identical to '-cpu host' + */ + aarch64_host_initfn(obj); + return; + } + + if (tcg_enabled() || qtest_enabled()) { + aarch64_aa32_a57_init(obj, !aarch64_enabled); + } + + if (!aarch64_enabled) { + aa32_max_features(cpu); +#ifdef CONFIG_USER_ONLY + /* + * Break with true ARMv8 and add back old-style VFP short-vector + * support. Only do this for user-mode, where -cpu max is the defa= ult, + * so that older v6 and v7 programs are more likely to work without + * adjustment. + */ + cpu->isar.mvfr0 =3D FIELD_DP32(cpu->isar.mvfr0, MVFR0, FPSHVEC, 1); +#endif + } else if (tcg_enabled()) { + assert(aarch64_enabled); + /* + * '-cpu max' for TCG: we currently do this as + * "A57 with extra things" + */ + aarch64_max_tcg_initfn(obj); + } +} + +static const ARMCPUInfo arm_max_cpu =3D { + .name =3D "max", + .initfn =3D cpu_max_initfn, +}; + +static void arm_max_cpu_register_types(void) +{ + arm_cpu_register(&arm_max_cpu); +} + +type_init(arm_max_cpu_register_types) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 499d154dace..28167355773 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -791,7 +791,7 @@ static void kvm_arm_set_cpreg_mig_tolerances(ARMCPU *cp= u) } #endif =20 -static void aarch64_host_initfn(Object *obj) +void aarch64_host_initfn(Object *obj) { ARMCPU *cpu =3D ARM_CPU(obj); =20 @@ -818,28 +818,9 @@ static void aarch64_host_initfn(Object *obj) } } =20 -static void aarch64_max_initfn(Object *obj) -{ - if (hwaccel_enabled()) { - /* When hardware acceleration enabled, '-cpu max' is identical to = '-cpu host' */ - aarch64_host_initfn(obj); - return; - } - - if (tcg_enabled() || qtest_enabled()) { - aarch64_aa32_a57_init(obj, false); - } - - /* '-cpu max' for TCG: we currently do this as "A57 with extra things"= */ - if (tcg_enabled()) { - aarch64_max_tcg_initfn(obj); - } -} - static const ARMCPUInfo aarch64_cpus[] =3D { { .name =3D "cortex-a57", .initfn =3D aarch64_a57_initfn }, { .name =3D "cortex-a53", .initfn =3D aarch64_a53_initfn }, - { .name =3D "max", .initfn =3D aarch64_max_initfn }, #if defined(CONFIG_KVM) || defined(CONFIG_HVF) || defined(CONFIG_WHPX) { .name =3D "host", .initfn =3D aarch64_host_initfn }, #endif diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index a2f730451fb..8220d785f5b 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -711,32 +711,6 @@ static void sa1110_initfn(Object *obj) cpu->reset_sctlr =3D 0x00000070; } =20 -#ifndef TARGET_AARCH64 -/* - * -cpu max: a CPU with as many features enabled as our emulation supports. - * The version of '-cpu max' for qemu-system-aarch64 is defined in cpu64.c; - * this only needs to handle 32 bits, and need not care about KVM. - */ -static void arm_max_initfn(Object *obj) -{ - ARMCPU *cpu =3D ARM_CPU(obj); - - /* Cortex-A57 advertising none of the aarch64 features */ - aarch64_aa32_a57_init(obj, true); - - aa32_max_features(cpu); - -#ifdef CONFIG_USER_ONLY - /* - * Break with true ARMv8 and add back old-style VFP short-vector suppo= rt. - * Only do this for user-mode, where -cpu max is the default, so that - * older v6 and v7 programs are more likely to work without adjustment. - */ - cpu->isar.mvfr0 =3D FIELD_DP32(cpu->isar.mvfr0, MVFR0, FPSHVEC, 1); -#endif -} -#endif /* !TARGET_AARCH64 */ - static const ARMCPUInfo arm_tcg_cpus[] =3D { { .name =3D "arm926", .initfn =3D arm926_initfn }, { .name =3D "arm946", .initfn =3D arm946_initfn }, @@ -760,9 +734,6 @@ static const ARMCPUInfo arm_tcg_cpus[] =3D { { .name =3D "ti925t", .initfn =3D ti925t_initfn }, { .name =3D "sa1100", .initfn =3D sa1100_initfn }, { .name =3D "sa1110", .initfn =3D sa1110_initfn }, -#ifndef TARGET_AARCH64 - { .name =3D "max", .initfn =3D arm_max_initfn }, -#endif }; =20 static void arm_tcg_cpu_register_types(void) diff --git a/target/arm/tcg/stubs32.c b/target/arm/tcg/stubs32.c index 3945dc49e5e..78f819ef6ff 100644 --- a/target/arm/tcg/stubs32.c +++ b/target/arm/tcg/stubs32.c @@ -22,3 +22,13 @@ void aarch64_translate_code(CPUState *cs, TranslationBlo= ck *tb, { g_assert_not_reached(); } + +void aarch64_host_initfn(Object *obj) +{ + g_assert_not_reached(); +} + +void aarch64_max_tcg_initfn(Object *obj) +{ + g_assert_not_reached(); +} --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779827999; cv=none; d=zohomail.com; s=zohoarc; b=buh2rPJQYFY8ahiNaS0oc70yeP0ZhmowbkCEebLFy1Q7+XgcwWYqozVAqroMEhcuBNOyEk/bo4v2E/OyXu0lErsePZqGdsa90gAprLb6gffhytWI7C8tln33eSslXXM1y0u3xhiT60gVq26Quo3L7teWPk5iYtBPK/qUdYOvHc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779827999; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=e9RfiJaGaTxvcmkspycX1omqRDuYiIKpPiWhd16yBBk=; b=YLRBKnzkVLzQNA4Gc2PTpvowTnmcNNhsBC3wkUkD/G1jeQebRSjbg9ZXmmK06RVsoxyVt6RZiChs+CxZ+FRXlu96N/ikFTkIIWrhWatZ6glFhB9tR7SS/b7J/j8b0IigMM4aHaZciZJ31FO67aUOdVJunwIT+uTLfD34xRCYc5g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779827999140155.18371389972833; Tue, 26 May 2026 13:39:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYj-00035R-KR; Tue, 26 May 2026 16:39:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyYb-0002Ny-6Z for qemu-devel@nongnu.org; Tue, 26 May 2026 16:39:21 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyYY-0007vf-WE for qemu-devel@nongnu.org; Tue, 26 May 2026 16:39:20 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4891b0786beso73968575e9.1 for ; Tue, 26 May 2026 13:39:18 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb557545sm894674f8f.12.2026.05.26.13.39.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827957; x=1780432757; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e9RfiJaGaTxvcmkspycX1omqRDuYiIKpPiWhd16yBBk=; b=bAdb5SCnXs9LTbQZ39K06/KlDnoeNgj50hJKm+5EWAyfcX+PqPgZ+G/wWvVVHO2cZr fLBQHVsWC7vZ7hAz75cZRhhYjJDY20pCsJ9onlpff7JvQhVi8vrkLApkV8R8LuQZRjCs jCFUdumwLzwZawUwZUK0850x0q1kMqjJfCxfRx6XksEpiIFihP1H/cloEb8sogT2diN5 jrGxmCF30pfO4dMC3ia1lrtrDcqP3kihMOvDVkKQmRaYZY7NsVvpvQbtQbBnNZEwxuwy d30MKwQLVmQwPjPfUmPiv8yhG3uPxbdl3zX21ngNHCEjdm0BLEID7CTIWLVgxnpTxbJv fHHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827957; x=1780432757; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=e9RfiJaGaTxvcmkspycX1omqRDuYiIKpPiWhd16yBBk=; b=IcARhVVGmrI+FOE4ewDQqwwPtOGPIeb1xqtAQ2KGbgtSWI5N1/y2/UwhBabnYO6sfi 76MUTXi8Fwk7CT7errotxS2JvppFaw20xwmuoaXg80XJH3X3O3VIWnlmoFKWA9PW7z6X v+jwQjcbT0t2pJ3V+tcRCtBl3PwBqAxZt9kuNXT994oKjSrZ9W7Ark+hPMU/+EiMtclB ZB8YfjiXFXffaTRPfLKtM55FJv5NfHabRoo5YxW426eDvaCqiLeetlJlI5QfRKp8y88n oKm/oO4LYkxugWpuWiBIuyCkTiXmEQ1PtlrgWWT+Uc0YLXMeBpksUkI0rVMw2Qh1SCWU Ktyw== X-Gm-Message-State: AOJu0YxAjLNFD/1A2yrM/VaE7+MWDLqrwQTGpwADwhginmy86DsuRUIW RNzdfikVasIZEPhKG7VxiR6iz1xiL4TzkA/NxZniOk4rje9Qcwj0BDYY1fJu6NhXN6DHBJjGe6y 94mLD4z3MYg== X-Gm-Gg: Acq92OEsHljsGa6T/Bf24C7TqlSRJxhXZvd2WPGavdHhSlXycYCPLSQ8OVSgig6Og1l fdoKPFhptQq03kVJwS3RDv2ktI20zj6AjscVjkWQChQadIu732zS/8g76eLSRG5fbsDBHoANJSX j611yTlxkF71Uj5wZNb089Lcvrt2Y7HctqcP+ohVytTsZIcenhUZ6ihVdPrns8mOENhAJM17+gc mbcHnrJd5F8PHPeEC2Fg6CkKvpSMYs8x+4lyoExRFcoSIOmCuXP5PVPsKw6UMHYf9mPJDjoPVZV tcHQEYsnmPgBzg3mZlVPMjCl0GDNok+0FNS/hwxppWfeF4G91QdZiTNiGguAv3mTeALSYe2+17v Y9FZ6uyajlmkJ3ksZNbCUKEstQiUKP5eiWphObCSwYS+YOIIBLWSrhyFsHvpR8AXBp6W5GxPfcR 7REo4yu71CqJOonthgFZh+Q0NVU14Sdi+yX8npDnpH6Y9w453j3HyV2uYq2ZXxFXVOrg== X-Received: by 2002:a05:600c:4f53:b0:490:7136:ad05 with SMTP id 5b1f17b1804b1-4907136ae08mr97548415e9.31.1779827957434; Tue, 26 May 2026 13:39:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 16/17] target/arm: Build cpu32-system.o as common object Date: Tue, 26 May 2026 22:37:21 +0200 Message-ID: <20260526203722.79463-17-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779827999849158500 cpu32.c only contains CPU types used in 32-bit system emulation: rename it as cpu32-system.c; always compile the file but only register the QOM types for the 32-bit binary. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/tcg/{cpu32.c =3D> cpu32-system.c} | 10 +--------- target/arm/tcg/meson.build | 5 +---- 2 files changed, 2 insertions(+), 13 deletions(-) rename target/arm/tcg/{cpu32.c =3D> cpu32-system.c} (99%) diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32-system.c similarity index 99% rename from target/arm/tcg/cpu32.c rename to target/arm/tcg/cpu32-system.c index 8220d785f5b..6e983900899 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32-system.c @@ -1,5 +1,5 @@ /* - * QEMU ARM TCG-only CPUs. + * QEMU ARM TCG-only CPUs (not needed for the AArch64 linux-user build) * * Copyright (c) 2012 SUSE LINUX Products GmbH * @@ -13,15 +13,9 @@ #include "cpu.h" #include "accel/tcg/cpu-ops.h" #include "internals.h" -#if !defined(CONFIG_USER_ONLY) #include "hw/core/boards.h" -#endif #include "cpregs.h" =20 - -/* CPU models. These are not needed for the AArch64 linux-user build. */ -#if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) - static void arm926_initfn(Object *obj) { ARMCPU *cpu =3D ARM_CPU(obj); @@ -746,5 +740,3 @@ static void arm_tcg_cpu_register_types(void) } =20 type_init(arm_tcg_cpu_register_types) - -#endif /* !CONFIG_USER_ONLY || !TARGET_AARCH64 */ diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index d5a95bf54f2..9b859892ed8 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -30,10 +30,6 @@ translate32_d =3D [ arm_ss.add(when: 'TARGET_AARCH64', if_true: gen_a64) arm_stubs_ss.add(files('stubs32.c')) =20 -arm_ss.add(files( - 'cpu32.c', -)) - arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'gengvec64.c', 'translate-a64.c', @@ -85,6 +81,7 @@ arm_common_user_system_ss.add(when: 'TARGET_AARCH64', if_= true: files( =20 arm_common_system_ss.add(files( 'cpregs-at.c', + 'cpu32-system.c', 'gicv5-cpuif.c', 'psci.c', 'tlb_helper.c', --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1779827995; cv=none; d=zohomail.com; s=zohoarc; b=T7zXkMsdUbb5JPnTOzzqmTJohoEWLGYR9oY0F+iZBzdKc1uREwZf5/OUHryHZoZCeMesgTZIa6brTO7sOzZOp1EaBevkLhX45QRzG9PPPmDSJWH8Mz3nelBPce5ecnl+tqY3h1XWRTSz+IP2MjVeemvaVw1EVmmxcSuEgE54UNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779827995; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FwX4TVNJjORfo35og2hvhoAxKst8+SezncN2NkLhWnk=; b=Uim1uSq3UQ6mJ7APCsfDrXInR+94m0eqzAD6EtGzgxVSkUmWW/fOrJaxkm9P4jg+6RvcX+QKaH2MljgQnZ7lL3bZgZw1ohzhPR6etzO2+mcPmt+3bglnCMHIt86z0nVguzWSm1waBB9buZkpqa/RT6+WtPokxDionbQcMQKhNM8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779827995124213.74661082938803; Tue, 26 May 2026 13:39:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRyYp-0003RL-Tp; Tue, 26 May 2026 16:39:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRyYi-00038W-IX for qemu-devel@nongnu.org; Tue, 26 May 2026 16:39:29 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRyYg-00083i-O1 for qemu-devel@nongnu.org; Tue, 26 May 2026 16:39:28 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-441209fb77eso6845112f8f.1 for ; Tue, 26 May 2026 13:39:26 -0700 (PDT) Received: from m17.home (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb558dd0sm768005f8f.16.2026.05.26.13.39.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 26 May 2026 13:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779827964; x=1780432764; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FwX4TVNJjORfo35og2hvhoAxKst8+SezncN2NkLhWnk=; b=pWS7fULhh4JuX5GNL5hinZlFjcmdeRSUSv2G7tdG35Ux1YuAfAAD427cQOfdU/kOnr rv0jdls8cm7/0fQgboyjtCtXyCkqtkv1DuSU7Y+6aBYQ5nMwStCJL0x+DRLV7nqmnE63 tcJ0G/+R+IB4GgG7fhrPMYibKhpjUQhMAgWsSq9kXSos9shmNnK9yn1v/Czc8RdxLwXu PN7zlYSwlts3McMaC68j8j/WAKkxQS+XebML6JBCrdm70FIAIMcy5d9MGPMSQukMjYzq cCw8clnTvaYVQO4eFAK71sw/TrIyU5mKg7MOUVpTlIM9tdvTio7AysCBqrFuC09A4nrz OpqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779827964; x=1780432764; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FwX4TVNJjORfo35og2hvhoAxKst8+SezncN2NkLhWnk=; b=e7Fvnry0epplH0YLOfIT+gbVGh16y311J2uGLtnJMZ+COxzTZBjeKUZ3SfB/VBieKm JHQOSeB9yRsyCIyQWAG8+2o0rKNt7lP32GIRC45LYc0N98tP+7el4bhCNP/4UV5BwlAK 0EFq4byNBNX2afs+prhi9UeA6rh1A5yoeJno9IO/BvcTBs14PCFXckSscBa0iSZl3Ion dN73iXTvihMHkUg+H10SIsivR9PAhzfCSiu/xCX57soeyatJLYtApQkJSTfwbCRQOlA2 kUPEKH998UwDVIYGO7Ogq1YCnjC9Wn1Oaiq/Kdvxw8ubT2ULJC+ES2E6Mi1BNKvEItds rrlQ== X-Gm-Message-State: AOJu0YzCUcrO+ii0ryEig1RNZeDFzi0+67GQyBYHFJ0GRyoh3dkWufcJ cnY7ZrsKCJfK/sYGIoG0yEDGdkNe5RR9uHhlHQQ6UwrcEo4nkB7w/TIr4aqYDSy6fcAEl+0Bs4o yrfUi/z8ixw== X-Gm-Gg: Acq92OHVZhzNRygFacCtDWVCmCfWdqy4eSlSdKfaFzezlE57/xv6bGI2LOYRKGRsjQ8 LUhXLWtUwrRcRW8Kwcp4ex0S/yGTNu+vY9fOV1u4tuht+4SmpHLA+q14VQFfOexIbjRfaglilqP ThO9D3DDwGOCMiqgVNTTcDj8MjlyX0obxU89Nerh4TUPV5q6/SoouGqTf/ZE8by6xNQSG73UdXl gAgDjTFNR3cevkq4tIRkMxPBzmx3idZRv87j7S25nkM48oXFpvuanbh4efC0Hnso6TMAhhcR4d6 Btzi69LYUK0wWQ28K25zpo1+WR7zDWBaiPo8Dm6ZSHdxzO7ASf8bW3Si8gnIAbp+30fYFeHPyFi DHUdGUWC0oxR35k9e5jEsD0pxwYtP4CO8lhSDvwSqlcZ6XGPBVBHCmKeXN9UPvtKpfeyE7ET0UP q1YnY5mlm5FDP9z6hkKrSTZDYuaNJ7yhtwMZy5dITjx5tEGQrLESDCg7mxB+yUIP98jQ== X-Received: by 2002:a05:6000:2f89:b0:45e:7792:6e6d with SMTP id ffacd0b85a97d-45eb3123abbmr32460019f8f.13.1779827964252; Tue, 26 May 2026 13:39:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v9 17/17] target/arm: Build cpu-max.c once Date: Tue, 26 May 2026 22:37:22 +0200 Message-ID: <20260526203722.79463-18-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526203722.79463-1-philmd@linaro.org> References: <20260526203722.79463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1779827995726158500 Call TargetInfo::target_aarch64() at runtime, allowing to remove the target-specific TARGET_AARCH64 definition and build cpu-max.c once as common object. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell --- target/arm/cpu-max.c | 8 ++------ target/arm/meson.build | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/target/arm/cpu-max.c b/target/arm/cpu-max.c index 8cf8edc6535..d38bdfcf811 100644 --- a/target/arm/cpu-max.c +++ b/target/arm/cpu-max.c @@ -8,6 +8,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/target-info.h" #include "system/hw_accel.h" #include "system/kvm.h" #include "system/qtest.h" @@ -190,12 +191,7 @@ void aa32_max_features(ARMCPU *cpu) static void cpu_max_initfn(Object *obj) { ARMCPU *cpu =3D ARM_CPU(obj); - -#ifdef TARGET_AARCH64 - const bool aarch64_enabled =3D true; -#else - const bool aarch64_enabled =3D false; -#endif /* !TARGET_AARCH64 */ + const bool aarch64_enabled =3D target_aarch64(); =20 if (hwaccel_enabled()) { assert(aarch64_enabled); diff --git a/target/arm/meson.build b/target/arm/meson.build index 3e02941d0d5..9408131d178 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -9,7 +9,6 @@ arm_user_ss =3D ss.source_set() arm_common_system_ss.add(files('gdbstub.c')) arm_user_ss.add(files('gdbstub.c')) =20 -arm_ss.add(files('cpu-max.c')) arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', )) @@ -20,6 +19,7 @@ arm_common_ss.add(files( arm_common_user_system_ss.add(files( 'cpregs-gcs.c', 'cpregs-pmu.c', + 'cpu-max.c', 'debug_helper.c', 'helper.c', 'vfp_fpscr.c', --=20 2.53.0