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=1779202001; cv=none; d=zohomail.com; s=zohoarc; b=TTwRUGFoMPCeFyQFJiBcdiY+389beZck/7aULf2gciw40PtVcFnl0FzAj3dP7qmbIcHbuODab+LhgSu2Z0uvWrXXTODfP9sOYzu24FzRmpjjeXsbsk0deqL35nkpSHqgY6Jc/dIOJjXGhommg9yOUROK58fpj9ppfcD+7FueI8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202001; 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=K1V+GWtucxSZl1YZ8nu1MtklisKojriGnpVCnzAvOg4=; b=RKX8umAomaejn3riefLI4NuQrV/vIqG70QR6Phcc3WkkL55/EQJtWjq2Z8lNuETNpKATFtI70xsMLwgIhFUJQ8NgQHQgoyHQ3N9hkwAhTI5zkfGIhXVoPF0nGaZHjnf3eHj7ZrZ4sNXRAR8dLhbeCCUSey5CtHLt88GZKiapd9w= 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 1779202001843381.92782892960383; Tue, 19 May 2026 07:46:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLhw-0007pP-Hi; Tue, 19 May 2026 10:46: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 1wPLhu-0007oT-F1 for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:06 -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 1wPLhs-0007ew-K8 for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:05 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-488ad135063so29223125e9.0 for ; Tue, 19 May 2026 07:46:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48feae166dasm124982975e9.9.2026.05.19.07.46.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:46:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779201963; x=1779806763; 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=K1V+GWtucxSZl1YZ8nu1MtklisKojriGnpVCnzAvOg4=; b=xkn6a+qV+avhcrRTRKNN2qMlXjRY/eh0qKNxbGbnrc6cVtskrcPAwuyAMu4PKqvIW2 VhjxYHY2n4mBuRNndvOP0toHcfZD6EY8ebYOG0F5Sdel7JWABQr8Q2iCbB4MdcRt2DB7 8spTb5YuOGWEWZPvsRZ+lbGCiHIy0IreMRB82vuY3Yx8Odo/fukpax5YwIsR0p4TNeij V6xWbkGuhdESDsML40vjBSqwHsaL9KQVT4xB66oPHIibtqJfvfNIx4TIcCvpOtutdeZH SXSgs7IOu9/qaD9GWb4gbNsUEOe/McXmDjYOMs43T0OkS7+8RZWZQhdSs1yaKuV4LM2U 1nWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779201963; x=1779806763; 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=K1V+GWtucxSZl1YZ8nu1MtklisKojriGnpVCnzAvOg4=; b=XMYDSLRDvQcG1tNYf7QPLJlwYvk8hjKouMp4nRiqMF1+eyYDBxUwFKU1sdGdZqP3qC I5VIbZ+zoTDSuKaYxZizhnSaNoS0FtdvcMHx61KKcAGZHkmD/yfmGwH6K24Kx8RkFEAb 88IdlbfsliUE/nDmzbynXmByuSPbYlRf5Jtl7rMh53zRUogHrZf2glJ3lKoelv4udlPc 0O0ppsNLV9HrHTMXsLJFNoc2M25uPOmIBUN8d/aQ8VcTq6McFmT4oEdDu7MrGEbDhgUS vkCGgQpHX1cOvFeVP9FaGCXpv1m0RgfHJCsxK1E6VWnY24/zT84iAsesjg2LNtkiCQPb 9lKw== X-Gm-Message-State: AOJu0YzIKZDlOjc0JdwRvIXjpAksZA9rePgMSZQq88WfVTRhJ5Gc6sn3 17k0Ev7QvxzjrLkZSZBOm7eCTErObkYwBYkCsHC23MulPWb89X108oLBA95WkYjFMjC0KsA7lQc EP50LD/4= X-Gm-Gg: Acq92OFzkVIyKWglUuLp93L3qiK9FvzK11gpZULTc7HUMHeTOGU8XtHW2oKzlz0PkIZ fcSWR+g+/P3fQHMuGMVmEPnFp1dqsCKAP/+g24uQrg99/lBZzh9mqxJBtmjN1ytHlmPvTXZIdCg XX/X3xV0Pzj2IVdfWdPC7ZXqP/QbgHDo6Df1jZVQAKmKGp4Usy52AWoI7V5Fp7zFmvBazCK50Uw /mbs0YdrC4Py6YU7rsb92efKZd15Ew1L+4VJ3P+iDSK/woc68XAKtGETA82i2NL9MOeXp3XkNnb TU0acHgjEedQpi3lpiZoogtFCR6IlkXZyQsW+2CtC6LbAs8eO+3CGkNP4hPNznS5aMSKBbJc1bm mxQAIjQDVYJpf2hJbP/NnGd9/kt4ZgRafYn0zMGP6Ew/83+p3LrnjvytlbVtNxic3zLMGFyMfk2 EBruEEs3/3Uv7LDpwsG4BxnMQ42nClNYG8qRlkzNkauL10TISaWo63aoumiyvPrPtFKUctAooi X-Received: by 2002:a05:600c:4fc9:b0:48a:5821:5ffc with SMTP id 5b1f17b1804b1-48fe60e473bmr275437895e9.2.1779201962193; Tue, 19 May 2026 07:46:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 01/18] tests/qtest: fix discarded const qualifier warning Date: Tue, 19 May 2026 16:45:36 +0200 Message-ID: <20260519144553.91483-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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=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: 1779202003524158500 From: Matthew Penney Modern compilers warn that the result of strstr() may discard const qualifiers when assigned to a non-const pointer. Make 'found' a const char * to fix the warning. Signed-off-by: Matthew Penney Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Thomas Huth Tested-by: Thomas Huth Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260514191844.105888-1-matt@matthewpenney.net> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell --- tests/qtest/libqtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index bf9284b9a13..b1e06ea364e 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -2146,7 +2146,7 @@ bool mkimg(const char *file, const char *fmt, unsigne= d size_mb) bool qtest_verbose(const char *domain) { const char *log =3D getenv("QTEST_LOG"); - char *found; + const char *found; =20 assert(domain); =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=1779202028; cv=none; d=zohomail.com; s=zohoarc; b=njaLlZbfYkVIzsJPA1ONZN/pcneJ1YjW6AarP7PFf3B/aCSNCQOsbsxZSSIl82m+i7RP3wZ/yXIuYlWb8eQnnXz2c4BYU9ZkgODiz7eHtwpXHUQMRdDX+es72Z2dR1LMMNGkXcfy6hGyDdEKEMkal/NSSgiXhNLWhtioXtFlcbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202028; 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=9/EN5KK+nl5d6BIRkDfVqDEaOJypmF4gAousWcjTwio=; b=Yx8jEjiBxyhukm2AaVcH2OcU2c8c0hkmvfOH7OAnE6Df4TgoAmNGBmtpVZjzWbO+F5Z4hu67BBxuk73lYpd4wT7wD2xohjMQzl1XDvoHhsURWVlIdlGg9hT/o1TAIOPbMuYFs22lQIF0fBrkL+gxdBqEhCCJquxRZHvTOgoCNlM= 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 1779202028450372.1069085123536; Tue, 19 May 2026 07:47:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLiI-0007sw-67; Tue, 19 May 2026 10:46:30 -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 1wPLi0-0007pu-EK for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:21 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLhy-0007jI-Uf for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:12 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-49021532ebdso6683195e9.2 for ; Tue, 19 May 2026 07:46:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48febe81b2dsm109154185e9.34.2026.05.19.07.46.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779201969; x=1779806769; 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=9/EN5KK+nl5d6BIRkDfVqDEaOJypmF4gAousWcjTwio=; b=FeAd2WIVQ5H52CqnyFMrL05eKQZ/E+BvagZ0qfJgc64BaHA7BVIbb9MkO2qF2lQiSf O0DJSUZiKuyn66CtMd2WTjtdW+OXeyn4JlHksbSJ4QDeShf4Kzwt9GDROc0BAUatUYuU sJqQXVLwXpHAOpZtUATjNBio2iyUPQb64G+6lCC25NC/1pUPv3DSUdoLpHvXC1wKjnhl yyykvO6xMWUbC06D9udpZXnLbqB38ySltX6Ut9GdEWuqDKsPwRRtAnERzy/poIEg1VtG n3CQrXItxYG4WOMqpq2/BFm+0rnb/4VQhAPB03XJciHeI/4n5S4SpB48agHXQpEy/fhC 4aVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779201969; x=1779806769; 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=9/EN5KK+nl5d6BIRkDfVqDEaOJypmF4gAousWcjTwio=; b=KQKY4jqJMFIeaNZNuB//HHluQ+hMHX3sOKxHVrhXwhzCg15Gxq6dezBMxQ9/qvuzf3 69wSHiD8VKurD26oRys1iAJr9Gs+kvkd4Ca9uzblM/nk6mh+/XIAss3Vwp5lubBh6iJy RQGY+MxnhT4c0GoemtJvWOO8kn4gB121XNxpRY+rWN0wavxptvYjqHoblozyuXFHmKgs B3wv8AupeIoAeF08ET4+GNVx9LJFvZbhNp7cQZ2i/Y2fbGfrfWZbimGmmUSFkfSg1G7y VnKEpL5o/VtFsPq1rYGdHzJM+t/tMGq8sFzdmo+R9NbBYOYsqR7P0B5fKgy5QIkdsQY4 rhPw== X-Gm-Message-State: AOJu0Yyhe3O+P4ej4GKYD/eO6/j461oWv40C2wr4FwwaZdSwgX41eXFX nAfY8J+AJXQThl2Ma6NQ2kLnsrwUMXPESfCk54/I6ietmAkifbjHh9hJmmEeeJEWyHUdULRLRX7 dNVUu9ZM= X-Gm-Gg: Acq92OH+983FJz9r1ye5zp0bsE0D+b1yyXbeK6ZMUGYTL87b8xx23uUCs9Q0Kg1QFgd 1owTDLLzaFBvvQXRQss0ZBLnNkiZc5mL7MKHjMcnO7wvj+xAG0SbyEkTvbBtDiGObyrhAGm0DkW OktU/VF3rPKIL4ifwOFl9h4dRIlLqnkdOFf4YoIRFgyafnhgyb0SE4tTSszJCLNWZjVX0CctSRv 2+3RFdtnXSLmtHQex32Zfo6syqBzNM/o2eeB2dBuSuphU0etyqFUJAglnY7eOF5KMO8l09j3+F2 jAV5gFWdaZ7aDelHjDQNMg9OnShkp8UwBSWFW53+SmtN57np5g20t6hCVuT2j68VhudTAY28ZOZ 89zubHZ82RBnprnfhn1oo0mprqNRSR54HjamU24EOPBHt/RWEfkZ3Ddv1H1c8+ZHtP4Sxnp0mQG qblGZ+Ys21/fRVLzTABuAwmkGXmWlke2mqlaKjAKuMgYBdQMlzzxtlEiwETxq++9oQ2foFJ4Xs X-Received: by 2002:a05:600c:858d:b0:48f:e230:80a3 with SMTP id 5b1f17b1804b1-48fe6514c31mr243194305e9.33.1779201968986; Tue, 19 May 2026 07:46:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 02/18] hw/arm/raspi: Initialize 64-bit CPU types during DeviceRealize() Date: Tue, 19 May 2026 16:45:37 +0200 Message-ID: <20260519144553.91483-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: 1779202030695158500 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=1779202013; cv=none; d=zohomail.com; s=zohoarc; b=fmAOxcVmPoV5mr2R3pIrikBV2oGsz4D6Fp4oXJZyCOdAapQby0M0V4yV2k6tpobtoGhTPniLcQRdblhvHO2yU9vhgNfoCVfZp7wzolUjwjZCvCw9Qsjn5pv2JkfQC+UYVM5+5YuTAF/uR1T9gl137skI+xVCzfleiRQ8kTDv3wY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202013; 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=3MSvt4pC1T/tB32g6+6vYeAfLkMq952qd4lIsXfdj2M=; b=nERdKFw0sGHl6sqxgWCzSJh1E4Rdy5oMiiE6AFJm6x9Pk4MXWn8xPlkTROHUgm9IoEr7tv3kkwh3L533MyBNw1tvJW2mbJYBfGy1zLcRBXiU3dSiEiBzfNQKFbfZouHhae+jGzR5a/tljGgxt7+w25fKkJk/3UiePBd79tLHsfo= 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 1779202013145129.98608115883178; Tue, 19 May 2026 07:46:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLiS-0007u7-Mk; Tue, 19 May 2026 10:46:47 -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 1wPLiL-0007tY-Qf for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:34 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLiF-0007l1-Q8 for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:31 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-490229aa522so4685425e9.3 for ; Tue, 19 May 2026 07:46:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fe537c516sm356247775e9.13.2026.05.19.07.46.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779201976; x=1779806776; 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=3MSvt4pC1T/tB32g6+6vYeAfLkMq952qd4lIsXfdj2M=; b=aIiGkaTT2FcS2UaGJIhvJOaDSWZjde5faOKr1yK3ZHZ5yuFe01xiY74V7zAOjc+uXl sOiHlL5X8VsHiyUeb4BiAls65BSt8edUCKO6Q2gWNT9s60W+f7Ao/Vqo9URUexlZ2PxB fTDO4tHybzvSQIoEWBgcW2H131Do4jAHtkoc2vFfGZWdnEL211eedEVJEgYkTrylYCgK NvtqZbleiai32K3Tw2Pxzk6m8WzbqUSs0vpRkrvduH79t9Bl1NQbNJE0dvc0NZr7rvOx yP49JUwnvBKDM5IfD0BSvAlQBhb46heTZ93Gg2SD2gm8ZflUz1jUpQa9km7CnnLeG9Mo OyEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779201976; x=1779806776; 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=3MSvt4pC1T/tB32g6+6vYeAfLkMq952qd4lIsXfdj2M=; b=f0Za2VZZr+FIaUtANYB7xMMILvaLL7CNBOOGPV9YuwOvQYyXYdkhNWizCucr9gblc9 TQN4bdX60gEUv9UpkBAkJvhCuZD5SwVZUGRvjAiliGWPQ5Goh9yUOVEttY5rKK/rGcI1 hYlrwMak7La1N6Ud0gQZaf+t3qsSEpxwcbTuRu9RsseZd9n8H9iLLH0Kb4qe26bL5D9E UcBGntCk/wueJhs8JyTyMK6dy1ulq9UOaOcx+CIIsNSjcy+FVusgkLXKwIustxH38bPH Os2I35HikwqALweJkrVi4aIgp065kr2X0/slyDnZiunAWgM7TvVCW/asI1BNvNPKno9h XB2g== X-Gm-Message-State: AOJu0Yy4JsFMdZFQT659+l5kaxqmtnU0LN9SVUeEtSz2rLy5d9i+BR3I HwSDmL6qgVD5/mSOJtF0yLVxyMzCts91XiIrP2dLArnWh/AUtxdw1wRlDyhwnLs0MyKv2ArLVKV P5Smd2cU= X-Gm-Gg: Acq92OGJRZEN46hZwMELvgxNhnna2QijKhfdy32naHaZqOvcQTaoWTRyi9rfq6tXadj glv8gZIogZCX2vbro9ix9mKVVzRXvGAuPl1e3iQiRGOAJFlc+dyISYZ5SGFkYz2SP9SkWFUQ2PP AU1egRnWvMSgRxN3TpCxskg7mA3qjRWtUw+uaavSCnCNFfZT9CRBKOMIk7PlEFnviqgt/aBSdZ4 3Xt6UdN40OrNFDgiM2wJKf6vUKXjMjTwlyJSZ6N5KjsSkzueuEOn/qYZMKiwVmJmz3tI072bi/b HM2GusvtNvAKnsf4UFLLguHEhW5kJlw2UHWz4f5/tjmt7L/k+LXA2ihuWz+tVtGZwTFm8/k9x0o uZP2J2T333ODnMZ6TmE1h1kiTW3BQAOnAFqnEXtPSxnDa0d/n91mCRyqLc3u3rvztcoH48366u4 hWxw3AVjTNV98x/fiq3hMcekAE7PKUb+2N/DatTRh9/hJ2pt9AzeR4PuoBB2bIbZBQanyDnf/n X-Received: by 2002:a05:600c:4e02:b0:48a:906a:9050 with SMTP id 5b1f17b1804b1-48fe5fdb076mr316167035e9.10.1779201975686; Tue, 19 May 2026 07:46:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 03/18] hw/arm/raspi: Build objects once Date: Tue, 19 May 2026 16:45:38 +0200 Message-ID: <20260519144553.91483-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1779202015529154100 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 80068f70bb9..144e4827660 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=1779202064; cv=none; d=zohomail.com; s=zohoarc; b=LQ1tbVkfYZdPhnnr6e2wYiQRN9EpJq4LPolRS89yNzuqYa6XMXAG/oWUmGcDFi0WMFwBBmbIe3qgyCj+QF/MdMgwcQcSv5igvPG3lts5/6Gf7OSc6DDFjY/TtGiqVoyOIZ8kCzko+kjxt3/kilDvjhzFzzE5K/QSKlgy7okB+NM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202064; 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=I0StEuL9GLXulveXowFLLLdh8qkEvL46xRR1raUMNj0=; b=Y28Df854Ga6l+Vr5g7MQibXwHEVdzcEi5ljlN1HxTOEIXWeEZGueIxf9jigQI6zLP1DiDi1NqKpnaYNiuGZ1L1JM8e/BSxNioiiDCieJD5vIpt240LFADF3OfUfVKmpW0fFy82pjRzGmtl1IMtZy9yJDDYLF1hZgRRryZTK3ATI= 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 1779202064574341.0495727652641; Tue, 19 May 2026 07:47:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLic-000836-Ek; Tue, 19 May 2026 10:46:50 -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 1wPLiL-0007tX-Qp for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:34 -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 1wPLiH-0007lS-Or for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:31 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-488af96f6b2so40096745e9.0 for ; Tue, 19 May 2026 07:46:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490191b5244sm24524335e9.3.2026.05.19.07.46.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:46:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779201983; x=1779806783; 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=I0StEuL9GLXulveXowFLLLdh8qkEvL46xRR1raUMNj0=; b=FIE7ofxfytuBLh511WK+hBC7VUucpgipYrMExkBVoMhhRT7U2jaosKwKHxQ83oH0i2 t/ojh2IWQN93EdJiVUEAa3AA77yZ8dTT4f60ra2K0uYUXcsbqgHMq60ZKPjQKgZY2TQk b47SnHJASFVHQRc6M630IjZ796m3ZB2yYRGWlbA5khYdzoXhn3lnKYGMq0095ojWbBcW pINjcUyhOFbb5U6A74CTgqvCdU50U0cJZDxpv+Rv0DztK/4ewdIyDLPofOWCEqpYCFRH 1WO0nENXhgqSBNMVIhbVGzA6p128i0I1tFXlLYFzKCRBeFEQUjUQhsT96pmhyCyBzfsn 5G9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779201983; x=1779806783; 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=I0StEuL9GLXulveXowFLLLdh8qkEvL46xRR1raUMNj0=; b=Y8vNBADS4nBBjqZI0SzI1zgRTrbpB4mBUE2HBubTueIBxQdGkWfNiRcrXMOMHyPS/t MdHr+Z1nclZFhT+mgK39ZEchNvdwmnNxACtkusfhhOawekvyfBLDmXNoTtwhnIOPBR8x iWVTkaoM1fd5tyQJc1T1i9otpbzYJN6S4wYk+Hm1htNo2GrXdyFAPtfId2+hhu8ygAW7 Mj1+ntVwa7Uk7IqVv7SH48jwF50FkfWdg2I5oxIvTTqhQEHCw/X51dRTRrXX3+dVX8TC vS5hdQMHdO3w3224p4hvHnfxm5EF1JnHxF/iiXKVvwlpxrau4g0l1kzU1qNQvDD+xicz 3l2A== X-Gm-Message-State: AOJu0Yyd4if8LohbU/X25623l1PD4fF7jGOZ9a+jHx4cHsieS1phvhJK XMCabkzCxQhARXJSIhgD8dO4ehyrSyW5enxxtfTpRYq/3sci9hyCnMpYWi7c8ErsipNqmGoIf6N DA68h1OA= X-Gm-Gg: Acq92OGNGq7Vjz7yVPMsdirabYIpsuq4juM5lzfJVnFCUwl0tLR6n5u2SZn4aPbnyeU DqPkW2B9YYZeW98j+gLHgeR0oGNUKAUlhrZ/Ox0gCOPmeAuy+y3xXmKkQT8QKN0401P+TM2kgN8 Y7KffYsEg+HM6aWDH/+Gk9ZQdsWo3GX2MbbQ2eVN4bgRjzjqRaxz5So2kaNhg86du3Q2fuvA8Zr uRYmnaVlebWBROI7MAJkKQdO06V7p8JoKpNJp88QEC7chHpQ5Xh18TqIMV6GWOeNP2AMgPA//fv RQX6r6l/1RBt3NaAQ6tHS6/3Ki2omEbXSzrgGohUdHE2ekgwmuZVmLA7YVgGCHt2qxeTG111FGj zqsqEY1hQFGG41hfIw0C7MpQOtDEZnOiP/6r7Hnam+JsTK/HPQxkTf+HOhi8J/Y3KIsmDMtQj/R JodqUtI3tjUozVXTrx7HJ03Yprp/pcQ28oo/moZkFECjwx0pfiOuZIBEkCpXPaDCVhzyAJQeGjF HHRE2GyChM= X-Received: by 2002:a05:600c:4e02:b0:483:2c98:4368 with SMTP id 5b1f17b1804b1-48fe6322416mr323420225e9.18.1779201983149; Tue, 19 May 2026 07:46:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 04/18] hw/arm/aspeed: Do not realize 64-bit CPU types under QTest Date: Tue, 19 May 2026 16:45:39 +0200 Message-ID: <20260519144553.91483-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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: 1779202066124158500 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 87dcb82e1b0..8311902f0c7 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=1779202063; cv=none; d=zohomail.com; s=zohoarc; b=APuifRRXwpSwfIYHDID8vyXcF4paCx5umc65h5tKk3erDM1ZoXQLZ2ofkhIZSTwNGgEb/FRlcQwvJEVWi43qVtRIicNRyQxMVJdWN84BEoVvOpQgo+B1qxwEgw2VaFOpV1ODnoasWq/J02EpN8RMc4G+aOf+QFRg4r2lquIClXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202063; 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=5NIGEOt2zUGFv3m4O6PBpXuGj8ui5ErAdHnNsmYMfOI=; b=NUbUxUdUWNTn6MgpU+rtQpe3PcKuGpBKks6H3Fxs1iBx3KW21+nFpdA+CkWiqMrYKbKwQwcjutmQ+WQ34svbY7/WW9uNZC/A2gwzoxynSTlSFCMIjLOwIrj4Sn7iDdhbHy+MnEWvxDaaGT/Mtf2r6hDUOBTHcnLUGXnFykj6U5o= 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 1779202063505860.4522057467505; Tue, 19 May 2026 07:47:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLih-0008CB-VT; Tue, 19 May 2026 10:46:56 -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 1wPLiN-0007u3-SY for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:36 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLiK-0007mL-9k for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:34 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so54855425e9.2 for ; Tue, 19 May 2026 07:46:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fe4c8d39esm336102715e9.7.2026.05.19.07.46.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:46:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779201990; x=1779806790; 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=5NIGEOt2zUGFv3m4O6PBpXuGj8ui5ErAdHnNsmYMfOI=; b=FyeThAMAO0QO348D058sU1hzv5MirVqA/B9WAP4JIgactDP8CmzgnmuwDsZ7x6BiAB TzMCl0LfCGYbYan5RbUKWPQuRy/MNE72naKEXw8QSMemTJ5iVlzkuegzxzvS/cKgIPRr qmtsDpUxCUYKeaXA1EKsjgdj5yC378e06Ih4W2R4WG1+NuLF3279EMiHTXUWP9hW8xfv tvrNdK1RhELGGkCTvlnn08byUGpr7A71I73eep0kVTJ/7bccCsJkp4VsnF8XBFCWejmz BLh/v+fOu2upJkqsq6GvCAG8SF0yNM5noHO95vCgChtadMNgy/9UeAfMwfEaK7ONll6f JzEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779201990; x=1779806790; 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=5NIGEOt2zUGFv3m4O6PBpXuGj8ui5ErAdHnNsmYMfOI=; b=ZkpSGdVMSo8SRQjQ2mbId/hXjw5KS9pTTD1uWrlSs5lshezY2Qfdc9E5+epQJ89Sx5 U9u3/CkiIkngUxZmo1ll6h2sGKSIvtQdRaUH9RDPB2l3RyP1EPe5B76X6uFfnz0XaX2r odwMTHfxUK3c/s3pu4+f3+GF8M96l90UQwdAZhdjoh0kfNqtmqy1ZWMU6k30OcH678Wz z3G+LJBmn/9Bu8czAlLCvud0sP1f0Fu7Rr3mQfm8/q9CPWrqRyY3Py+alac+0ezpi6ae //O5ljWGBnX/8RS+u2AhE3iUUaiIcJX38hd4eQ6fBvU6zLMmnuB64yxNDr7zzJncWHxa nw9A== X-Gm-Message-State: AOJu0YynHIuL923iEZxwWG1l7PLKKrzQcu8kL17UKjtwaA/X3mZO6Uli tvsYUjNC9Y/o0gY3XivkIEnnPS3l/rHLE5Oa61qaPgkIiDKvCOvF1IHDX1mBUCbBysWe29Yp4aX EUu7w3Q8= X-Gm-Gg: Acq92OGJT9I36vEnwhpxEMtpymY7GF6qE6Dn7nkEs/Au6Rv505eUqpyKlslJ5vPCFz3 wQtP8J311PTvXyyj9np9lf6EAFQPbkqDdiaD61MJNG7xtnGsRTbKfrBrVhA7qzcmLenIm/EWjFb DUMhSeD2Fy30zxdrmlY/zYOySjY+0Pyacy5+16KzrDG9VRyl4uQ1WDVbiKcPHHI3UXWph3yiJk+ MbhzJykzmMYCxzDC3c2di+kg4tlnVJgLLDYOsw2w/VT7gYRrwvyqttXcvy2n+NtatTPQFRXZwtp +EeX2g0SO6UQg7odaqBPp6B31MDunT20rySsCL7pO+aZiY1ksoebMM76H+mneWX5ouvVCL9VrJZ vzWh8QEF/SrxBjlyzm/6aH9GlBG51CC3JafVEblZL0ReeHqBV6dIunTaw3Lr1E5XS2A/iu5A49p mTfxTznBmpV5atncFGTFh7wWynPjmDbMnLnNrFm9z30AGZ1JB40aY0+1oaZACrQcWa8XseYQbI X-Received: by 2002:a05:600c:528c:b0:48f:d612:3c6e with SMTP id 5b1f17b1804b1-48fe60de745mr303191525e9.2.1779201989726; Tue, 19 May 2026 07:46:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 05/18] hw/arm/aspeed: Build objects once Date: Tue, 19 May 2026 16:45:40 +0200 Message-ID: <20260519144553.91483-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1779202066245154100 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 144e4827660..7c3d66f4378 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', @@ -66,8 +66,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_ast2600_gb200nvl.c', 'aspeed_ast2600_rainier.c', 'aspeed_ast10x0.c', - 'aspeed_ast10x0_evb.c')) -arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: = files( + 'aspeed_ast10x0_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=1779202029; cv=none; d=zohomail.com; s=zohoarc; b=Zhugnm/E5xVb9CNFWJoUSsOOuAFpoEnpf+4eDh1bYGNEQrrhrNuiWLvE6mUJB4ytYaGYEqtQ8sUjLRutmxrheKNwRu0Zkq59ZBFOgzD0yPgB8xycrnGQG8ZS7S6a9NK1KoUKfYCZd98PLGEtwE04B5jZjhfK1AiRPnUT/b1n4X0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202029; 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=8t1iShycKMOk9DKixWKJ+LNY4Nu+iOM690vC3QqkeQY=; b=NFiiaDCe0iDH+HQQdO4cB+6GIylLRUUFGCNjqFeeOvMocSAwhzCuDOFnXTn7oyeugooD+TpbNSQh8nrr1uq9vjUfhawA2LQ/9935sAAUhtxGPbB6/B3EOdeU7PmFmpjkPoAtJnzFmbgG5tVqfS+HLLnMb19Ulvm6IKnTCii4dM4= 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 1779202029409211.9216614122655; Tue, 19 May 2026 07:47:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLie-00088q-2H; Tue, 19 May 2026 10:46:52 -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 1wPLia-0007zb-3u for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:49 -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 1wPLiX-0007nj-Ac for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:47 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4891e86fabeso49349695e9.1 for ; Tue, 19 May 2026 07:46:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fe5694f2csm333008815e9.4.2026.05.19.07.46.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779201997; x=1779806797; 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=8t1iShycKMOk9DKixWKJ+LNY4Nu+iOM690vC3QqkeQY=; b=NZW8Tw6IkZQOyvMpTxqciqdgWw9ZGBc4Y1JQP8Tiv+hbbmLIeuKrZOGb9QIMKxKwrA YxCWuYjo4ex95xUUt/jAOCo4I8iXLz0pbRKQ7XP684GRJYkSjLlfztwsWMd4G5n0sr0j Rfy7Q2/34eRlwsparwr31sLtgrPiCZiLy/U0SviwizUo7HxPCh/Ce7WUTCZZClDvE1bf 0Fp+G6pviCvJ9EVmxg13AAqXS7WfGhHyiyyvujXUdIpIQbqp8bLjBiAVRzfIa2AZa3UN 6+heDSDB2LW2IUXJvgVSdUzsUxRt3lZluaOfEE2AYEq3rQh/y81UJpKArMuw2ERlr+qL QNgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779201997; x=1779806797; 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=8t1iShycKMOk9DKixWKJ+LNY4Nu+iOM690vC3QqkeQY=; b=U//1xYIi0wxxfMBAXIzEv88d8aLS/vgEyx9O/gInGwWkKL6aVBEWfPg9NPVXiqSObe jBwVkpkn+PnpG2Kn1l8Dp8eTnlGpoleiotayQW5TKBOGJ1/ubZTAaItbGtFjiFgP7IHD yk1KY72mh3GoaYhRsn2Ff1iKbebNjDkypu8f2CJ8Hn5sivLNFYAcyIVBBaaxBFqcpOsO ddD/71pyg46bt/X+00bPXqBW4KbJjrn/6o3vDFs8N20e4CSVoe3lJECLJzstsuXaPLTG 3UOyLAUhATofXvqK9LogJWxOqIiHTH0Iop4A06qN5pBt4zMMCZPOZh+jqNO4WU/0L8iE DeeQ== X-Gm-Message-State: AOJu0YzOPOMHMV4ikGalXdn7HhY58oI9Jqn4WMIS6y/wyiWX8ht9blN6 jlPMnmV4WxjSsHaoZ3WUASk4Jpp4t34gDey7TtT0VLrDj3ER2wk/Tsrr6aQl+JyPvoDL+5a6FLq h4HH+ZzQ= X-Gm-Gg: Acq92OHU6TcS7ptB9qilVmV2q9YFLP9YD5GZk3SKcks04mXmAQwKv3YQZwbOe8clrl4 +YAUpOxncX3yCczI7DUEXiFAtflVQIo6OK35WmhUPGm5poWulxxUHh5b96UYh48Ud4NQA5jBeo3 HUM5oezj4OQXU1zqBO2wqXsb55JXCQ5a9KBUBNDKdLjJyNpkoUm7bJ0LcTTTljVaTl2mIgok/Hp 6obNGYd2hkv0txLfGW04FeoMmvWiBPG1WIBgmvO6OsPI93zRR9J+cpLTOvz9ZsjjpNnAU8ch5FX m8JBd7enG2J0s9uXsmboVUtlT61Dds7XnC10PW8DsJG9+DXXheOO1MlKhpQ7KB2N9jkTFkl1agP Biy9SzY8wYiYTgUsVrHzRHMigZoiAd+o031LPloyU+bU6lYKKJbKDqJbgMTM3rdwhgdEOYTWX4y JWyJNeWt8f9k7gg/b+UT0EEicCANNPoWJqerqwRJJQkU9dfkvC93bftOdZHcyCsL6jnie5yUpr X-Received: by 2002:a05:600c:4692:b0:483:7903:c3b1 with SMTP id 5b1f17b1804b1-48fe6325978mr309489685e9.20.1779201996709; Tue, 19 May 2026 07:46:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 06/18] hw/arm/meson: Remove now unused arm_ss[] source set Date: Tue, 19 May 2026 16:45:41 +0200 Message-ID: <20260519144553.91483-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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: 1779202031465154100 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 7c3d66f4378..88e7ad1a3ed 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')) @@ -108,5 +107,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=1779202143; cv=none; d=zohomail.com; s=zohoarc; b=N+ckXz7P5WUGVXvemDM+x2BeoGzQkf+ye7C7pIffwZGGeBHoArHQpu/GoGEJZYpkdtWvajwmd58A5jX8lFRqA3r+LbIKLOL3C7wBan0Ez4djGfKU9CW3GHlifaNjQEZtyeKFX6trUzsSefesoySfc9PiGdTESvyzlOTJiiJc3IY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202143; 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=DIYh6J4qeeRTQHfvKlvZCgBlqlTwiarImjNJm+8cQwY=; b=BeGnuiv6KXFDXbPk8nFwldtPgjCL5MPJkWqImNATMLdaZ7wzRWmUAb2PiTfwO7rw3+NyFKOUzot2au9s+MMd/KwEbUS67KV91CfLXIs2zhrZOeqHg0dRbsQZ33FRQ6MbcgphuS0wP26PcmTf7itZfKkyUOT6p3wD/j1m8P/9rLc= 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 1779202143600422.00137725357513; Tue, 19 May 2026 07:49:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLid-00086t-FI; Tue, 19 May 2026 10:46:51 -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 1wPLia-0007zd-FZ for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:49 -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 1wPLiX-0007oL-CC for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:48 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-488d2079582so35718835e9.2 for ; Tue, 19 May 2026 07:46:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48ff2cb4ae0sm157964445e9.0.2026.05.19.07.46.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202003; x=1779806803; 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=DIYh6J4qeeRTQHfvKlvZCgBlqlTwiarImjNJm+8cQwY=; b=Q+SaUBKnOwInaFvqRq/hnnjrJfPaFI8PMcQgoJpy+xnhWT3AtgtaZ9J8pSp9ba35FR nDUkHmARP8u9lFTtAko3TLMPFynXcYATpM/iyqW5cBbEssx7KvIVw/XIm+vqcnZlYxz5 t7U4qWf3S8GGg6zgiTHYQKV36uGEY0XqZPb2P4vySNjw3T8jE3iX8bLWU8mt6Xok91FV qH7E/ZPdxIyCISLCl5BJ8+Z6Qa98Efdw3zjxu5OVgHeYrzZbYuOoG/qZZQ83wkhLwJja 7UZGbDZvGAinYsW5aPZt8goxedq021/35IFRv7hX1o9J0tVd8RNyWtcJi4vaf+MZ2knW LTsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202003; x=1779806803; 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=DIYh6J4qeeRTQHfvKlvZCgBlqlTwiarImjNJm+8cQwY=; b=FelaB6BLLg4zhDnqJ9QOTxeB20QmCAtWql/kpBamy2FPZeR5elbpEqyLouwIdR1pp4 P52J4UBwfQZpoIb4dJdfRwhy9ycYBYS4/SgG4/Zmy8LEH8ArL9nCvko8FD8LYIPjCtRF TTM9N2M4tN67dkLa09yZmN8lgX62dOe2uFkcmSqGMwPLj0O7Hcj0/1PTG6tbh3rmF0Bn 2xAcQ+awZtAfqKBH7ouVqzCU/fxxyPSeKmx3tAtkOhLY7oF6wu0Ug8doMo3HSvUOa7qR aVGvvWmM41x74Av4irGSRMQiRMO6docVwmk3hclhhLqaIHJNcVTQA00uKM7KMwIq7G52 I3Rg== X-Gm-Message-State: AOJu0Yw3RYFT/LKwZqt3DYjVEKU2zlDDsI8SzScyaKSkYEQGWlyamllO I0kEoXYbxEwO14oHzXoO0mou3WSXYOwRcC0R/Zp4UpXHpP4JsO8P1Awii+MTt9UXiBEyrQ8l26L iswAD8+8= X-Gm-Gg: Acq92OFvRuF0930LXYFDDbDuuQZmSgwXNRofUeyGw67KLs6tZSs/+GCYH8kPT229d6B mOH+xVOnicMahssK/VB3UipsJAsmim5sz/PYYE6nCO6e0oLuMUf7DIs9HxKSe1WLi7myqKqhHe6 Wltu2PEVx6zHPvv/nCzAXXp1kuG+uSagGIMTfmb9WdwELDzsuOidrHdzQMb6rsqd1LwZFsZ3Git 3g0ma27R50+ZkGCjyj/PB3e/Be1fn8lShXVxDXiIAwQ14HAvI9hC96RKHdSp0QiExFe7Zf2x2I3 B0nPkIvmRVHvzCeBGe3N9RCX+EWnkGogeLFWAPToPJCI2S986jcVJrwpdci7CH5D24IaUfQX20B +r+RZ/h8SBNrhezI7JH2go30lEOunHcAqsZ5V+cjGuGa5fI/ITeb7Iwk8RpApI6oxOYA+41yKWY o1nICx53B+dbgC/b8Z9lno4/OhDC721u8sr4zt+mbKfrsyNhyCdaioICnHCwYbuofMv/buKSiy X-Received: by 2002:a05:600c:48a8:b0:48f:e230:d5ab with SMTP id 5b1f17b1804b1-48fe651e11cmr190837715e9.31.1779202003347; Tue, 19 May 2026 07:46:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 07/18] target/arm: Introduce common system/user meson source set Date: Tue, 19 May 2026 16:45:42 +0200 Message-ID: <20260519144553.91483-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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: 1779202145365158500 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=1779202078; cv=none; d=zohomail.com; s=zohoarc; b=MCH/JBmjutxPNu19ztGgbkxP3erTFUOvitfjk8xwKI6E9JU0Yff+5OwfeV2iQEUuoWISjHZIvW6kVY13WpgjsOf9a48ZPMY5MaeUBWqGTbKl1qQT7kqnHK0UVNePvTbnRR89fn7jv8KXoW0UVzi1aRSWC2c2rWfjaUT7oNP+JFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202078; 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=dUuTbzCBsTPa5fDwZzVMcoJRytIYgj0mVcNOroys3ic=; b=TKPnAqK9Byz7noWK3Jezu67/Uq90NI1Tqi0a1x3gz4DftCc4+c5oYWlH+zWy9IhXZVdvQj8Xm6CRpymACjAVkaIe/TYQnzCFScQYuWARr19OYjHrVe7bK2ohziYoJAqWKr98C0rw+NHe2Ss6qPVun1qBWYpQQHOC+RF0nJAMJCI= 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 1779202078642651.6447455514658; Tue, 19 May 2026 07:47:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLiz-0000Pt-To; Tue, 19 May 2026 10:47:13 -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 1wPLif-0008CF-HC for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:54 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLie-0007qr-38 for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:53 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-43d77f6092eso2026521f8f.2 for ; Tue, 19 May 2026 07:46:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fe5e9d5d9sm386449315e9.15.2026.05.19.07.46.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:46:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202010; x=1779806810; 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=dUuTbzCBsTPa5fDwZzVMcoJRytIYgj0mVcNOroys3ic=; b=JJ8XKrMdrNT3I3nhJrW7GXQHsf2Wm0WM+SRCXT21TpQ2oMVMA3L3WGLx31kHKPwMLG QRiKnNaxRuuowXcAL91f3L+ofRbGoe0185bKJSKuQbS48Bgou5fffN1Uwp4GV8NZJgwp Ju4Y6r7T85MrUK853NXUA+y5eCmzzm+EUrSn3loLz+Mc1ook4VyVQX8T/q6GU0sFN00i bJQFMkCuFRcCs+PVBr5PpQpq01ZEYRvqVfQn06egxlG0N2ky64VxxrVx2RWP50rE6Iw6 866q7DMklMU5NMPQZ58i5VgizL+4SGHj45nKyHKyMBs8C1ot2jw0iexPBAjpid1nBHZd VDBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202010; x=1779806810; 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=dUuTbzCBsTPa5fDwZzVMcoJRytIYgj0mVcNOroys3ic=; b=deWG4oJRuwNQOYOZuTE3yy+0+ebvJO4xmyPrUv5Fh3tq8qL9og8Z1qTVtv17KqKtXr c77pRtamT3sTwfryRmJlnjavcJfl/f0/vzq4XafYrKP7FC+mMwiEaEAfejTJnwd0nvx7 HTV4cLvx+aUs+IyEWwZh+OT+sBi2GQ/BNwRkacWAKplNwiFRjI6wvzDO1yTaANf2I6BY zEgLo2Tv5q3wy/3Y2ygfUEdgnwuGsAamYSPSH/jEREfQp06QO4rFugRN1zYJwmnqOnVk uXCne2BLY0PGmmZlGTgTNplRGjPHn43YuNugW8wQ6RhoBBMbCdFv3APKWWxXdz5gyrW8 iWYA== X-Gm-Message-State: AOJu0YzKLYdoav8xyjMxQcYsUHJSm2WAftGu3ihN/wSaFsYfB4+2EwJB C46T4GzUgU/0v6osTXJChMJT5yIX8oCrquUMVhYj13z+MptcK3DABstDsVekfWed2Ln2sDAcpZg jN+5ANKc= X-Gm-Gg: Acq92OEGBO/cXo/smOVZKmDSy3AgEIH7o2OLcdlxM8/dtC18XEHZPUijwkxytVCnw1d J1Fj1R31n9OfKsDoR8jNqNUhgdkdawLuIh+EHZTlxqjz75jDse6CytpTpC1C8TAmNWjEBSTIZpX 2mKC6pFZ7N95aKgeEAyUDvl0kU/0YVqjev8iKq9tHVxVyjmRZRBzkXEXHqaDxy9gDula25T5sq7 Pt1X6gdqv1q9OTtcy2ksGDRmfYLlhAhUzwoHmG/CIpw3/yWRj7xLDpAiRD4d32Da2JrAmiC67lf McYdeSP9se+D9c9w0cU7A4mh36NV3Z0/+qcVBeUMPvvXMYLuMcnJoFmdcPddg2gMucgimiDTt3w t7eJBCljHHe6XuKV/uGFuQLSYe/fs3kZX9p6VAlcXyP70mtBO4m9v+7Zb0x94a7OaWBiYcdCqw0 wIZ74hwg4EYrlnqxoX92iHlMWBM8Z9nSOryGPKGjGnW32Db+HuukDopzOJ4wqfA75AibH1brZ6N 3IjG0THO2Y= X-Received: by 2002:a05:600c:3b27:b0:48e:6275:27e1 with SMTP id 5b1f17b1804b1-48fe6516b49mr286700015e9.26.1779202010036; Tue, 19 May 2026 07:46:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 08/18] target/arm: Build gdbstub64.o as common object Date: Tue, 19 May 2026 16:45:43 +0200 Message-ID: <20260519144553.91483-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1779202080362158500 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=1779202076; cv=none; d=zohomail.com; s=zohoarc; b=RADQFuCsE6q1U68M/xA5VgJeW3Xz8bcIkE8zlcL89/UsLIeYl1b+eZ2JJerOgwADZt9TememDDpNki8UoFS49mTUn5PBBDgHhT4iDeU/tuQViFykb8+GVzYOFn/sZgl0eC+iJ4pP7G5FXJdbwt9HTD5QV4amDcsQ30+eq/AVkbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202076; 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=jfq5AHy2S4W9XZ4bc/kPkATQGz/95IgvOsICubzDZ4E=; b=NOM4ihoJmSEK3uygbbvOaigF7+IsREsGWTa8/9W/gSKYIzL64aUDCoL1PE/CsV0VzHScKO+ZPD/reekH9j6Dg8IZu31llTiJh6oeVV6NasHK8cU6h8dfebBFibyc/aP6WBu+bp4rEJWDSsGHmm8E+OyQ+1V1j/5Ijt6Emt0oL5k= 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 1779202076656337.008929915944; Tue, 19 May 2026 07:47:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLj0-0000SK-Io; Tue, 19 May 2026 10:47:14 -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 1wPLil-0008Jl-Uk for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:07 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLik-0007rU-CG for qemu-devel@nongnu.org; Tue, 19 May 2026 10:46:59 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-44e1ebb3122so2157793f8f.2 for ; Tue, 19 May 2026 07:46:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9ec3acf7sm46288114f8f.12.2026.05.19.07.46.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202017; x=1779806817; 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=jfq5AHy2S4W9XZ4bc/kPkATQGz/95IgvOsICubzDZ4E=; b=SqwtBHYONmuNdvV90A1qJq578nNRD87tV/Yt42WN+8eba+tQ8lneUJXm+3MZyXSfjE s7uPCqqXmI87EERDUDV/nkSL+wzFKD48pfC4q1MLVcmdj1dkpc2LKIBMnbuVGMmT12Ay ivmrRDJlvUu2oipQzj6ljhi/4ul94cYQ5YpeeeW0O3B7Tqptmgaj2zXAZ7xEHhqZ70Ca 4tMgAvlk20qoGOR95glL+mHCK89i/mDBep0E/pHwqnmc/gF4Kgiw3kIbKI7/KEnwTl7x KlFDZ4ldf5b72DP8xOcgnc55zJoe1S3ZHMa+qwzjdrAVdCyyesiRxtggd8PrRV/pIluu JhIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202017; x=1779806817; 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=jfq5AHy2S4W9XZ4bc/kPkATQGz/95IgvOsICubzDZ4E=; b=pV0ZXX9nGeO4ycyMh19gwfSOuupfgBnNfPbZTSMPFxtVCbJEeD7UkucRCXgMC2OOMm MZOq89bW7ioEDr0WV7opty58I7wl5CyVutrq63M37ifhRKeArHk+jMWaCqDiMwrMoOvd vhSgwCqqVSmzCguNbAyjkGwBSX1zlhC9BckKoTzBeh57x1hzZxVf720SWvVbcm43XcHL yayDwot9XXq0EHxTkkQxIdu/jxGHY9Kn+qTHeiCzS9CN3TDQGteec/PJEiv0ehTTSS95 FNx+tSJ9zzwtS7ILQ8rnIhzQZsa9C0+DDu8bNRq3GFBXP5aeBTgDWe9ZZfbunsytnwhv IM+w== X-Gm-Message-State: AOJu0YwokRGor0l4ayyYGAbwvsSGypdKFRrU/P6o2seZWH8xn5Kb3IzZ 5leGSF2fU/M9NkPy2lmp9gewrpvvpPPS3NZLNjMj/mSWnEsHHYiUsDbfsh5rzp6iH29DFsVDiBn np34xDmQ= X-Gm-Gg: Acq92OE5TmGTAzoHhmAQpgCbGM0/0nDijqlyfN/tYk/EnRwQHVfej/qtVfl13BPoUOK 0+TTKbVRdhcwtbCfHKfRsL3JJqIVASz+/heOIoi5Wfr/GfKYAGvOZYTc1BveOMgyl05JKH/PxYi smbfJdlvAQsn6l0MS28eF8KxhpAl9K/n/o1ai+dDTfilnv93HpLXdj7V1RCZSDL78M7zz4TsemV fubXzM22UboBT5OjheNr4A/Z2OZHzk4uwih441RMirtT8g2jgVRaIHfGCpu/1H0N3w//qeM2uUl 4+WGCWIk3ibbd/J5Q8L7x2cm3L6rhvwhqJOOkemCTIJu08Lbyh5O+UzQEZGY0ggifTNVZE7l06J kmOM7BfwJe7qZKPvA2whKEpSRev3rd1KjwYmSlGg6VZ6KVXCalz5bB6Gxvzhx8is5MlHO3Zv0+f idhMN389nzE4coGgHzE0gGSxXnW3ETS3fachY4+uOYWZw6xfGP4rxqYKoe6Cu5vV+grVLMOOXyM HGUX2+qKd0w7ZI6y8R0/A== X-Received: by 2002:a05:6000:1ac7:b0:43d:762e:76c6 with SMTP id ffacd0b85a97d-45e5c35da8fmr32071116f8f.7.1779202016672; Tue, 19 May 2026 07:46:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 09/18] target/arm: Build cpu64.o as common object Date: Tue, 19 May 2026 16:45:44 +0200 Message-ID: <20260519144553.91483-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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: 1779202078520158500 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=1779202059; cv=none; d=zohomail.com; s=zohoarc; b=gjXMdzjeOV+ToOcPQ1feC5dMRr2mSpro7scLq6jQORDWnlcBVZNhiWfIDYlFnziys0OqPzsIslDM4jf1boO8rEVnuqV+fJDDGKlBWIrntTd3nixBOrQ9biyFNl88DnAYflNq6m2GauOSazfj6cQtGCgerfeZ4XR1xVTY1pwdekI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202059; 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=SDXabr5XNvsuIZqtdyV2diy9S67LIoK2rFOl6OVzvXw=; b=LegoO+5b5t+lU6oQWHEuuomDvjZVVJH8IYA7uatsMBjlqeOvKnUiBkvdRUHUHg8qLgNtnY9+F3y6uEZL+gYY5BEGnxGJqdeJ6kEAJA0OsHaNQb/FaV96AeeFxiI+zeJxL3dZDGDgZTSYb0SawYAyQo5LjDiCm8QfA6k6p5Jws54= 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 1779202059790361.154277448809; Tue, 19 May 2026 07:47:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLiy-0000OC-RD; Tue, 19 May 2026 10:47: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 1wPLiv-0008UH-6K for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:10 -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 1wPLis-0007tP-8k for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:08 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48fde648a71so26860505e9.0 for ; Tue, 19 May 2026 07:47:05 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48feae166dasm125003285e9.9.2026.05.19.07.47.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:47:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202024; x=1779806824; 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=SDXabr5XNvsuIZqtdyV2diy9S67LIoK2rFOl6OVzvXw=; b=hZZsCkgi6oacop0qGlbOgWtXMbmYWY9Rinm3+90NwWCo19LipsXcBuxvy5407LZm1V 4YkwGgrMW4xPyECplzRR6e3FuVxiHArCf+PxMUcMVIUCisyYeETyhZUPkOup9gxs4YqG +gtXTgfwyY4QjQOse6CM7xMHLSgAOHt5kXmi0cdFFevn4XACIjSxF7qmmSAvFH2tairb hyBkbdoQ4JhiT1FMrxeaTbgDIQcmv+ET0L5Ng18R0yFoYlObVmDGdUXbB9uw7yehjE+f 7KliNlXPjtdfvH8iOBESH17R/R68Z27JvKFTXHFVj9c8nBrsGKmzysG9aaZ2yaX0Jwz6 k7fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202024; x=1779806824; 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=SDXabr5XNvsuIZqtdyV2diy9S67LIoK2rFOl6OVzvXw=; b=fkGk2nrSR92Xcj+g5E7oksd1xdm7/FjdftXs/0zR3bNcCnXYJWHMWUQxt8y/EHykP5 Bk+nR75FVn7jqdL7n1MZtAzvBIGULu7mFrrgFXjKv3KjyAy3DQxd6SkUBktYML0Vnsvd 74yi+IZZ3HDCwXf6uSLVvRZTBQJg5jX45D667Q9XyugG31R+zJKXahZf5+HiYsi62OT6 3fqDmBJk1DpIWVZ5Tk5OTtnVBW/e0i/YhK4uCPHrwqVCSWqG1snEzIlrrvtPtxWb8Ncy 4SQ25kSOn2TyKxIvUUtwqToQ1zHu6QkFFLvzkm0j2RQqJdQWVmahTx3b4q03bY2caLki A1LQ== X-Gm-Message-State: AOJu0YxZ7UAkglMjIhLT1uVLczCR3RokH2UC2g4fKf0EHIF1n8w7x2yI v1nTDWHuG8A40z5s+jRVd7c2AHvMlDJk/d7tQ8R03Kqb56oQQ9/b+TQfvOEwHcJhqTCENRTl//S kDmBrTBQ= X-Gm-Gg: Acq92OHixFq2mPWCB2iBzId2EZ5sTkpE1RHZB18Tq6moWdnzxoz5tY8Jvhsiz+7alvS tsL7D4C9HHmHwEHXlLUStGfseg8dwO6NV7PnJa/etjtAjho0+cSToLMmXln8BU1isoV72tKOsaG 3Mz48VmAtN083vuxxd7ViUFFIORqFzKOIqM0ChhsBxaYxVMNZMJ7ciN2Bct7Y45vd+jY2AZsCAd EwJ1L1e4zn83j5WoHaAo6BaRnqncSVaeDe3tYaJrhy4qp4c+RgLR2+H5BF2h9b2Gm2Qo+7/WLTn 0UDGcwxn2PqAfnljhWFhfNhJwgnO4bJ9cvG4ZtDO4XNLgfQU7H3PUjJwInAa+yLWwGcmkWT5x51 a/c/vo0rBwwzq5JcyqS8qGQEZQMyFTGbRMImv7eVC5xrSEkeSqCR7ei0TnRROHd7NXR4zDCFzCD BKxjXCqsNCPKKysNvDCDiA26wH7kFOZuFbY3eff7+zWmXmgbjpW4Vyw0RsPFL1dfPIxmoJxVqA X-Received: by 2002:a05:600c:609b:b0:485:3c2e:60d5 with SMTP id 5b1f17b1804b1-48fe4cadfeemr301240525e9.2.1779202024174; Tue, 19 May 2026 07:47:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 10/18] target/arm: Extract common code related to 'max' CPU Date: Tue, 19 May 2026 16:45:45 +0200 Message-ID: <20260519144553.91483-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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, 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: 1779202062098158500 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=1779202068; cv=none; d=zohomail.com; s=zohoarc; b=RVjr7TwuxnXzLrPZrLThm0v664YvJKZr1T+QPuW1pibz1ZZQm1mCng5sGCvcoFWtFOGTRWcnNhvhajrzH5czrSSON9hfuSm/LcWiRMGEY9X0+mDaCz76t2koI2RpkaXDSh7Ie/J2kIlFneR6wJLohdRJXVCy2tDb73WvNU1UrU0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202068; 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=HVBWmui2gRqhhcBVAajrDH3fSaJghOrYunK4qpZkBCg=; b=HjHgXRn6GhhKsRNCeqsY8woaahbBMM97df0+uQ0u9mmh47dnDG708Q4kY8hTATmL2io0FT6AbrCzbbgry2qaWyIoLPN9vV+bk+NB7ykQy+pMw+YG/S7aKCxWSvSXA2a92k/1jFNOzoZu0+Jl/0UEDbzrLbc5TqSm/EnCj8/xaoI= 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 1779202068045418.84907727137283; Tue, 19 May 2026 07:47:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLjU-0001H9-Ij; Tue, 19 May 2026 10:47: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 1wPLj0-0000Tw-Km for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:14 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLiy-0007vJ-O7 for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:14 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-45e7c636e74so1640102f8f.0 for ; Tue, 19 May 2026 07:47:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9e768c4fsm46645952f8f.8.2026.05.19.07.47.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202031; x=1779806831; 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=HVBWmui2gRqhhcBVAajrDH3fSaJghOrYunK4qpZkBCg=; b=X3GlQ4s3TG0r8N5LeU9FTTl+RzCy2yAseyMlngn+a1faAhn4espCssY/scTNXXbNdg VYTuffkcNag93s4jonIp9v86xW9dkRgNJBIPfc1x3E/IgToXLdR5OpbqE5ABtBLX3fE0 RY0KZPVwfvMst9MdNkkeXgsSO9Lfb2xGC9dGsvgx7mXsytJ4WnTaVY5++BqdBQ0Ge9wn JyDe2214UOU70dO6pB7PYA5GRZcWTL+szYvHl/6ydVqhCYW+79CKOJ2iCkCYwtJmNDaa LPNU+N1pmtUfmuI7CAZhOcHIfo2fIrw3EzmrTfZEipduWvKN2BykF/QWTe5btr3zzckZ v/Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202031; x=1779806831; 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=HVBWmui2gRqhhcBVAajrDH3fSaJghOrYunK4qpZkBCg=; b=mpkIjHKz3lQOUfZlO0GwOUcuJscSatia+rBIH70MSRMX2m5S+p5T4/5UG2aJqBIeE5 ccrQ8KtiAE6mmqI/k2jS/4HYNbqhwSFJRLGuj8Wwt7d0rsn8uqxh2BCRZ+eNHKPhKk0G Ge1sRDNuqPsfUgkKKZiuLmlFCKNqDv6O6aAPjZOClJCpmwEao8LAP/DRe29L4aUaH1LB PgCml26oqDaIUG6wpKOj+sB3PgbiqRlmy5KNWePx0D6s1USbigrgUsRrkhTHeOpysbkb Ckj/wGNLS9CS2fQRedhOZdMajHJVVrgN1eJy6/05pGH1jM+DOxaJdDZkeuj9YUgD9Rv2 j99Q== X-Gm-Message-State: AOJu0YwKBBf5Z9EonaRXf8QQ3Z8a5nw+VogkJpHXwqU/cyXvxvWt3xg4 iYrPkJ0mKrHrzivXN9L++eKHn/0bvUx6/M8ErQ4xiy7hC3jdJRLPUooji5UkKaoaBtHh7//K+yO G+xHEa14= X-Gm-Gg: Acq92OESeoFMlvNmHYuuTlAYrbuT1U70XhuDw3qBbqa3LmR3WI5h04DdQwNptvlHdZ9 JF7NtwptB2Mh/E8SKtF1Ot1qIYIgCBkC/SQXTs2XxBqYgUA9UpoQi73lljt1TCpXzUd+Ca+V+Ap ar3exsQ/oYQ7w7SpOPBNVVd+h74lPmZAM6h+jzRI8RHe+xW+VrZXMWQCr0QHWsHdfNXkiHhUP9c X0pRwdZrq4OjI/Z/tj3TGMHMbzC8POqFS6KDCxitw5R7o7oyVgTjEOvVKTHbTg18lOXKDvI/+hT fXJLv7WJAq9THqDIReNmCyq56w1UhGfPPHD3k5vGYVj/PojFpgC2uO8Av0qbrBWB3NbbfypmohA kyT87QaK9of9ClQOowavT6ALtPioxEpiym4q9tatdhih6fhAYZrkUKUh+sM8c9Fk9tS2qqQOVYn 5wH9BQaiR/zyeelUmYcpl6sMTQt4l5C1B+IInEDtKsT+bDLFW9PF7me1Grzuq2IJTozt8+e80xK vKap+bPnVk= X-Received: by 2002:a05:6000:4011:b0:441:1fa5:457c with SMTP id ffacd0b85a97d-45e5c5a5d38mr30735216f8f.5.1779202030772; Tue, 19 May 2026 07:47:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 11/18] target/arm: Use make_ccsidr(LEGACY) in 32 bit 'max' CPU type Date: Tue, 19 May 2026 16:45:46 +0200 Message-ID: <20260519144553.91483-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1779202070324154100 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=1779202073; cv=none; d=zohomail.com; s=zohoarc; b=LT4GsIMHZ4LBgFWYVLWpnQTfqLwOgqR54kd7nE/UhPkirJIpvLRisd2m+2XEyfnPF0vubcLOgNlcihplOZ5B3tRh/N6Rdinpnz3D2LgPhbfgf4OvG2LyVaFDmV3jFwIamN7aCLQcw52bREQ7/XjfO8wt29G5B5ydj5BtKxrkvS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202073; 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=SS8dMyDjoox81LYiCY5mlEBMje5OFAuSHdoJLo5BrGA=; b=BfTNFYD5xl0l4IxdxA3tT9JXulfJ21lkwlX/lwK6j7T6lGwBP5J4DoX+/oQJoVXGckUA0OqjddNrzh1xwamkcPpaJGutwgHUPFRm4vkWAf4mAWVZaU7IB8uICO2P/gYZml0vljCFK61Z1xmnmYT70waJEk+02UAVD2BMc5GR4rM= 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 1779202073660973.4071938234109; Tue, 19 May 2026 07:47:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLjW-0001Vn-Lh; Tue, 19 May 2026 10:47: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 1wPLjK-0000w9-Ml for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:36 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLj8-0007wV-W0 for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:27 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so43656125e9.2 for ; Tue, 19 May 2026 07:47:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48febe6b60csm158156585e9.6.2026.05.19.07.47.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202038; x=1779806838; 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=SS8dMyDjoox81LYiCY5mlEBMje5OFAuSHdoJLo5BrGA=; b=py6hyU458MG/m8nukbg17DO1aro4xOQXsL5V3FtsegScNd4uNdxO3AhlKv/WhG64Yb WJxdPEpvtJX70pjhWRHPyv0m3SlYKfagEA4WB/GXjTxslcmhfLw+FnNT7wRajDq8aih2 CDL4obTgTMEv+q5I1Krtheh4hZOyX+FsHsGn7//F+4oCxo3UiHHsoMw4eIdDSpFBkyHz s35nD1S9RFMZRPg2SmJ1Tv0FnDTQeYtH8ngU3WkF6FoGe5t9F1xEIcvbt2lo+SOgOJfe M0pKzO5IM+JN9jNUrnP8IDe7k3G5a00Kjh/b3lQ0NUOEOT1ewspCNKQ/BSS48aFNE6ih baeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202038; x=1779806838; 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=SS8dMyDjoox81LYiCY5mlEBMje5OFAuSHdoJLo5BrGA=; b=TyfQmLcx06DUt1l1wScQnbH0Gxiqy0//Tu1qX6WDiM5situOXVtBIZjo+BbPAFqWHe I70buy4V6x+xqFl4xB4y6ySn3ZziFQ/DvPM+OgbjjP2jyB9V2UPhrb45Re3CRtWS2+wt ovrYv9Ges0dX2dlMqW1/fBhDYC2r29wvL1zLToMGjBlZ95O62iYZH9zTiEi0Mf9RSu5C VlYoVvSIzLtFsDpLP2bzsTmYd/vDjOrbckLVRlAbUA6L+hCDpeUKKDKIvvhRSwg18ren rYE3Ou0MrQNVophUKXrB9A93imJM2ewXWj0RBd6eNhoj5QJsHQ2HxgVdas8ys4OzE75J +KUQ== X-Gm-Message-State: AOJu0Ywv0lCp7xF1giZ5r5je5IYXkaJekgbu0jbKE/JkmFS5swScxw0L WpUDYblSzRFuzdDCVEQsGLKsZLXxykrsmo1UtM5zHofCvImSwl/SQr22mFDCcnnWZ2FXXb3txlo o/WbNvyI= X-Gm-Gg: Acq92OHYlzkzDe/ElYs/g7rtuaESKfn7QxDu5QmiJDMpg1QhUnYA34lBN5vM2ViV63C vQw1P2kGfEVaKQ0ABMd5FHLI/4WVeUIqFFV0bqAZygHa1SLsbYnG9lWVVtsCE8Y8qJhJokrHDtf cw/c7e1I1PzyvyNY9+VsbhfmpZ3nD84/pEzMi7DcEcg57LKECc6nd1pw2Adw3l72li5b7o0iHHB api4d4d3E2HRwVZwXHlFBpH/1/GNCZ0ugC6HXzFZ2j80+YYa5yBkCk3JaSuWaAdKSz7WSUKbpF1 sSgTkzFuMXDonXGybc+8S6BL7P888J5AQ5kF6rf2AamlrF234Q/CJ9gYUKIYWzcxSra0Da+uoKp Q0g1ASDy9pPYwbU69QgRQAFbSiQ89SGs+FzXV0oqzPuzuefg/Xar7PCYiE5FYgUnciVBli39Wf3 WPPhb0a2+OOejBZpbXPI08V7Ij4bCdg/MYZxQRTWAmfNytLOWk1cGO8gwf/dAMigpYKaoFv1LI X-Received: by 2002:a05:600c:8905:b0:48e:5d91:cffb with SMTP id 5b1f17b1804b1-48fe60e7d6emr255041275e9.10.1779202037523; Tue, 19 May 2026 07:47:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 12/18] target/arm: Implement DBGDEVID* registers in max AArch32 CPU Date: Tue, 19 May 2026 16:45:47 +0200 Message-ID: <20260519144553.91483-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1779202074373158500 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=1779202109; cv=none; d=zohomail.com; s=zohoarc; b=itHqa988ei5OKEvXkC4GAoPpTMp+b3Nj8wBlbTLjvjfkBj+QIcWnfH8P+cHkNvvjaYhtVdSDkQIVgaXsmnxSyRqQBpB9D3WEzF8kGzMHGn0GSH8TlXGuuVZDGQ3xSHYa6auburv/l9VUQjNVp+/f0kYYG1uDSUaA5Cm/+DLHwEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202109; 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=1RNRxHUIKIoHhD2L2k2Kf0WRpvOKC9u30TJYtxRtPNw=; b=iECLfo1jBtM+2FsUBHPDSFJpCjWx1KwXBwt0dVOyQA31yvBTdd8d57T+afsychVCn9b9qgC/qQez40rSFG1P+8jCYWhqpsoNdWHiGDQxfwSE8bP4myOmeUGvFTKr2C59Vo/ftxENy3pw5cywnEK34rzM4zDkCIzQXGZFp8HdlLE= 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 1779202109685541.8263228371115; Tue, 19 May 2026 07:48:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLjY-0001k7-5n; Tue, 19 May 2026 10:47:48 -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 1wPLjM-0000wo-Ni for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:38 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLjI-0007xY-1d for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:35 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-43d73422431so2525336f8f.2 for ; Tue, 19 May 2026 07:47:26 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe0fecsm42595487f8f.26.2026.05.19.07.47.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202045; x=1779806845; 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=1RNRxHUIKIoHhD2L2k2Kf0WRpvOKC9u30TJYtxRtPNw=; b=HFU9fuvSYr0yRESLSFAl1u9Ep9gY3+oE/CdqI6cS0L3IX7XJEn14Zq5GbBdnR/jRBd d9YPRf98JiVCPmJPCqt7Fyzq6kdHpfSlnlv03XO/nIctb2B/kGB438iqP/Fd2y7d57Fd 8d8BFl42rkfiS97NoY40znIku3RpbTR0s47lZGozqVBhUVAISDcZWQdSqW/LU6t5Ns9C 8y2NeAj1JTrf0g6d8mKm8cFzz8WcFiCPtvTHCQjSEA98pNoaw4oSQ9TCRlCPbAL3QfnW CRZcssEFsIczPEZWCTDYQ3nmL8KdszetLClYFW47EOGh5Rk3LxeLyT85ekB/MR5mYVOb 3HTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202045; x=1779806845; 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=1RNRxHUIKIoHhD2L2k2Kf0WRpvOKC9u30TJYtxRtPNw=; b=PPEjyhv+oQIspYOTkxbw7enrPcn3WGs9bZ0oCzdA4V1UtjNnUoGrcAu/n1errI1xrL WgEg1xutPubIlKIQiQjGAtTxGVd/VE5Y0YlexFbc+IWGWjqVupKSxNwNDWLpfOiLp5Ud T1Xm/GISw3qPGGjlbibUyDkiPZ6ZJEXG4QSE/VgK26fHwssNSAUoZZE6qFrS8tl4R6vP cYQjDG434tksrVlMw3JSkw7m2vSKAm/ZMe9H2xFUYDaFthfoxxMvsK0Dv2008JQoUUyR 6SvOSWJPi/EFvMmTNcFD/xPxjqW9Fy7FzW+kqOsH1nk2MyGSYPbqq/zMe+GbyYtAe0dx GjoQ== X-Gm-Message-State: AOJu0YxeVGmltgggKny0xEEQOsNebwsDx8+ifbNgwixwlBRTqWmM27vt oUgFJY55DziMtL2RWmAneyrrhxkUhvQRYQ9wnU3Mfu/PoYzRi+r9nobXPfKde7LUF/URdVyfa69 lu8lR1kg= X-Gm-Gg: Acq92OHVemwRS9pbuqtvMotG3K9uW7iTep4M7rt9t2XJvsPYQhmZTKzLc345gde3Uaj y/dVkJBEaFdX5VxYfOi9VYi/lgnL0qPdwa2y89zofTFxZkaifWiIXZ9gmdM/dCFcstIGqa3+zQB Qz9Mc7NMtrbLotpJNn+SS93z8/wQ57Sx1Ei39NBtgj4NMyrc04bfixS+ceuYD0Hq5+cSXVxlpht lCWiCm3rECTT0s/ypVPLriJLmL1HIZ1HIQTX2BMvZiCHoPDt7q8IMER/OT54tRqLU7mZZ7yOSZW e2CxKXgn1trniKE1PZyOAraKuuA3o+d4bq6w9rC60tEmgl8NW8EnidajQbAkiZXf22kS/rtbTSv OpPQ9svaORIYFB/wwsUTANATgS7EOi2D3ZaayaU8IyGbbNRAroN4v0rjQuXinLAN5zh0lqsjlBY rUoZaKcHbS2HF9cp1QvqbklhzdwfMz+GSy4eNQ37QR+cY+1HVTeDpKh7fgJUfMZe/g1O2yP1Rvg e5WofJkwDQ= X-Received: by 2002:a05:6000:2304:b0:44b:e349:e6bc with SMTP id ffacd0b85a97d-45e5c5bbd76mr30216412f8f.3.1779202044162; Tue, 19 May 2026 07:47:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 13/18] target/arm: Only set %kvm_target when KVM is enabled Date: Tue, 19 May 2026 16:45:48 +0200 Message-ID: <20260519144553.91483-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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: 1779202110757158500 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=1779202111; cv=none; d=zohomail.com; s=zohoarc; b=b09xqNtMxjFYbr+FcLWnX+Ehj7RUe83y1a4+wCwRt2d1OxxhFFJ3elJqrVKjJNBmVeNqXGezsuWss0bVFfsSAe4B23yljg3PcfaQAzB3mVqhfHyUeOIZwF6BJ2S0lthI7/LeAESX4b2xW8114leJK/rGQJ+TOWhM6akLfIRX93Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202111; 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=PWZdLVhlhSLtHCNbbyN0ZgO/iZgjO8xlliAMjKdmLuw=; b=YVhwYWuWDZKmmvUDGoy/F8zrqUpihE6nCyVoUgBH7xwVDHVNB9yru0GpYZJBmQXHm9D3IaSWt2M1us0zp99u5FaddW2Zo0QIaT8ty2ZGRKeKm/cFC6MIL2q1wskg+SfnP/3AWAkL+xufkXzQt5OMmg74N0nUuWMnDNRiF67WLv8= 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 1779202111732701.8444261366022; Tue, 19 May 2026 07:48:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLja-00020I-3Y; Tue, 19 May 2026 10:47:50 -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 1wPLjS-00016t-IU for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:42 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLjM-0007zj-F4 for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:41 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-48a3e9862f0so21435185e9.1 for ; Tue, 19 May 2026 07:47:32 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0a1aeafsm48611239f8f.23.2026.05.19.07.47.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202051; x=1779806851; 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=PWZdLVhlhSLtHCNbbyN0ZgO/iZgjO8xlliAMjKdmLuw=; b=XOLmsddvCUDhwE5kVL+JVAhwcRQV9i4IPq3m+iaG5imYHbksYitEoLbLhClDb+0zW3 Oj5YodUXfgxt8p+XcTqbChciH8614TV/xJ6poJR/Q6SMg3kP3WlD2LE7AkCarz8l3Q+2 vZW0XAlFoiPnoOP5iYtojuIjRrR1cnCFiLnc7BfeZvhwA7oiMETkIrUyFvauh/tKqXyo 1I7Che7Hf/prSp0QqdlgmLSzpYOba6pTR2AAaA8kwuCrGw7lzwcQppJKl5I7mntdeTWs 0rY/clgB0jj91PNvE24HCpAzsc3gtNnZVXcYxQfNGh6naJIVZJQ4YHRtwGWd1waH0Knc Omxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202051; x=1779806851; 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=PWZdLVhlhSLtHCNbbyN0ZgO/iZgjO8xlliAMjKdmLuw=; b=e4G1dCVGwCXBWapg+iTsrcR+3XTn5nlOckKPl1vd4j0nC4Xx/NtoWYNo4jeA9fTXFY OmjMMC3jAs7zt2YZf3D/4wMSN6RcJqM9E1YN5xdJ3O0dKGKcfYZeKBctLbLeSkahEa4r ib0a9NYQS+c0kieBx5IZb/rBScHLSsEUnxP7F4hXpiAPUDHJwiZ6BCjtGfepQmVgP3i0 I0JImBOfWDtHvorMyKIEc4zNNglbL3lqu/U64eEDg/UJTVLJ1jSwDVG84UnGX1GwX9JA GAY4yZzKahAQGWz9jxwo+nKN4GWo0gsCGY8UIrHQZy6F+yg/eYTW7ge78gE4fHFk+QcI KsKA== X-Gm-Message-State: AOJu0YyKWXxLRniaQi75b//gQytokkuVJAmm5ZRzF/C44OTnWhdQ+Lzw 7REnIYz8uZisn3VBOro6mHIGupXjuivRL+L+9yetf0qW7O9yyBkPy9/yjM89YvOH31wQj8DpBYD JeNyEs1U= X-Gm-Gg: Acq92OFRlJkow7ssXzligtuIdY3EfJAkY3mZZ4hbdr4m1I1iDhY1CgiQe8tjY5C3XU5 oA6XYPrBr6vPDsFDTaRxo79tfqyGlGe/ksu353dPmvwXdUB52CKgjGMFO5OaCZJaOxglH+s4190 oqufmLthnFlnLtxSVKGLb3Zx4eUAuzDjRApsWZ1ApVAxoOzdOF6qpMiz5fca1HIOifb/nqwtwhL 6wwWQ7NvJTOIqfQVEFb20keYoJks1786fjqIgqQe6CFEeH7KFBPzaomGSMq0P1Zs8ipyKXem7+e eOovusYfrkOJ4uDBqNJWq2pA70rk8s+wc5EjHFOATzvfZdtwuWY6IubGWiUuB/HQph2pRYUUmeY CA1x7JnDDdH3W9Rnzuu/MLwtGZB7x9E8XozbLzT4X0Yt9kFDy+YKn3P/oaXSm/JifPIGE1h2Yk9 a/HKydC8fJR7gBitVZAqba81Ap9RC8Vhg19paBc1mO6+EJ+jDg4ga+vuq8+VPsS09+K4Fs8JeN X-Received: by 2002:a05:600c:364b:b0:48a:5f32:62c6 with SMTP id 5b1f17b1804b1-48fd635962cmr257416045e9.11.1779202050941; Tue, 19 May 2026 07:47:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 14/18] target/arm: Factor aarch64_aa32_a57_init() out Date: Tue, 19 May 2026 16:45:49 +0200 Message-ID: <20260519144553.91483-15-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1779202112856158500 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=1779202114; cv=none; d=zohomail.com; s=zohoarc; b=Zh/UNGjUM99JaVHPM9Y9ux7TMt9qa6idD8rqns6TslsmzT1bO9jyrGfVUC6LplpB7/xWSUCPmpZ2PNvGjasUvl2ME9+ipxZixKD9/rbkH3SDE/NiBYpDdfCnwOqooKDJJEsuDM4zSNyNDM/bmKWYj1zugyTNaLVvHT8KElS3Qek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202114; 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=ZHwh1FZTUu6ERWrpKvF2wEv63euU5zFwa0Qc7kGzxu0=; b=ZuUniEM/doDd8/c+zkLtv/4h3IRe6XCAvUN1uIHDlEPup26CmfWYQTejmB4BxFRxMCPm+Gtxr1iDQENYNqoaJ8L+Lc8eBOFt4Vr//EkqDaft/eyw2NF4QLHEDSkQ7QjqlqcTOgtqwJTYWwq/ffSiS+GLbuFBe+J2/g9bi+I8wf4= 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 1779202114726121.02320184923099; Tue, 19 May 2026 07:48:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLjY-0001qJ-U9; Tue, 19 May 2026 10:47:49 -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 1wPLjV-0001Sg-Ku for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:45 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLjP-000813-DB for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:45 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-449de065cb3so3440511f8f.2 for ; Tue, 19 May 2026 07:47:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9e768c4fsm46648634f8f.8.2026.05.19.07.47.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:47:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202058; x=1779806858; 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=ZHwh1FZTUu6ERWrpKvF2wEv63euU5zFwa0Qc7kGzxu0=; b=U8b8m0sl8wob5+CpKyoRcK4QZZQ/wz44ggmzdzX7ikdaZ5Fx5CoajB8uettGLXrmBf CGQSLwJbCGrRhaKb6Z5QzBh01/vav+PVzjXEyYBbQfioJY+tmE4t7s7Lio4RE9Od+q5F wc37pZrXvZKSIHKMAgEZHhHuv+pYqFuh8/jpDo1fX47OfT8PO5M1XDLHxzhBdqv9jZE3 PCIS6iSj72Ni0l1T0tLfXhETrXDCWyBwfvD8rQaV0gN2NiWD58Ti5jw9RZ/k37smP6H8 l+Q/YyWfvTk9a+UNvOQStYeGw3SDdP2KllCCJO6NvcnNJunJhrTsPigOqmqNW72Ad4+J fURA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202058; x=1779806858; 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=ZHwh1FZTUu6ERWrpKvF2wEv63euU5zFwa0Qc7kGzxu0=; b=B/1DK4C5r7kwZ18q7SVBtiEBjrrkqRPJCLjqmClbToqM3ddtO1NQDO5HlEaRXOv9TH ejTSkQWew+0F5GxnQC7fhoAC0PpmmZQUF4JSdJ6m2YkI2K/knjdt6Oekf5JEo948I6Wm Bn49pBccOWNKX9YOAEmTW1tLow+ANNsAiiC998t3Q2A0e8tSAPyfRHfUTrU1C6uRC3Fb j9gIRPWJZLp/6sYU8EYpenqEABpet3cJDUekuWN7z5QrEQLJ3pqDfe3CgBn7kWvn4U74 NvywCNj93JrXXLSjpqJIGj2nyIDpUjf1SJAhIuyj1Z+9AA2PUk2B4O/zDN9Td7hJekYQ fsQg== X-Gm-Message-State: AOJu0Yzi0ulSSWroRv5DkSElGDiUQGIURZtTx3fcLnKHgIeQ20yQVVra 2cu7uqCxquSNIgy9GO8pUUpbcloh5fpYucmlOaeOiMlXNJYr7em4PRWsbT1krEF+M3iDaCMrbmr fKiT8AfI= X-Gm-Gg: Acq92OFWmrg7tTItLPZeQS8NRAERR94vgpA+ZdUoTx//hTiODRVnPt94zrJTSv4Ht/3 lucyhHo0+FbFVi4DOAT15WILzBC/W+KRiRtZSCvWEaSwBYF28Zw/6OKR/hM+5j81ICmDtfW6VJx +/VbaOY6eOmGjyoqtWZJFQ75YzIwcOWQd8iyAO1Nk5EaRwcumVh8v3QAwN4Kc5V9FAMnkrhHSdd puOINHInZsV/un0YVYfdfwkXiOK7MogPRO4NIv+qnzMQnfY/PytxVBs3fshoDBepYoNtZLSwtMO 3P9IOo3N0Cs/RnSP2RY3T87oQJbZjZW2P1Hc94S5C9rGnjvjSG2j7dmiFXd6Nondn0DoiIIDCgK F/zmlX/WPOpP+NUWfCxfrnNZKFxvzz5+7/0+h6GJmai+ouT668rTfZJw0tQHhW/ON6XFD02Thy9 cjLM6scO1WPmQJ67easaID+xX8rHf9MfZlQ5L3hnmdDQsCypZRKHuKZdDQD3GDicr2qH4AKScaQ JpKcCdwDdU= X-Received: by 2002:a5d:5f45:0:b0:45b:d891:56bb with SMTP id ffacd0b85a97d-45e5c5db696mr31829955f8f.38.1779202057629; Tue, 19 May 2026 07:47:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 15/18] target/arm: Re-use common aarch64_aa32_a57_init() helper Date: Tue, 19 May 2026 16:45:50 +0200 Message-ID: <20260519144553.91483-16-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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: 1779202115622154100 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 00830b17248..c95f3d63138 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1758,6 +1758,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=1779202114; cv=none; d=zohomail.com; s=zohoarc; b=SDIXSe2rNozs4FLQEhXXNpzbuHktHScmfB5u7qKuj+2Kk/0Wtau6UaQhTxJoa/k0zx0Atv+ZlVpi4UPb9lyIjGtDcCqWv410g4yB3bwdkRc63ssGlu5RcKlTKV7BXr7Udq46JxTMD3q9+vPZaVz2v0bxmUWkxK/2dcV+OWPB7NI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202114; 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=2B+NBXajc/QmvN9GPFw1CKwqetwZlIhbn6ldsGmgu/E=; b=fB9k8MrqWeteKRZpwJk9U+GZqZ20J3IilRMIECR628NgvdvN+tWa3oDHp+H5inMSlU5hLI66t4IThwdzko9N1sEr+vZqaVT840W2I885EEB8OfTEy2OQnALwBBNFq/QOSNHxRq0ckbXEeI2ey86HpRcmXxvgB7vmCI6X/jrFaV4= 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 1779202114247503.56759981574726; Tue, 19 May 2026 07:48:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLjd-0002aI-OS; Tue, 19 May 2026 10:47: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 1wPLjY-0001vk-Uv for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:49 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLjW-00084d-Kg for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:48 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-488e1a8ac40so35835235e9.2 for ; Tue, 19 May 2026 07:47:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fe4c834besm353962775e9.3.2026.05.19.07.47.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202065; x=1779806865; 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=2B+NBXajc/QmvN9GPFw1CKwqetwZlIhbn6ldsGmgu/E=; b=Dj07LmIbCiuErAxqe/N4LmkWIbl+WDqv/+uBUgWuvcKsl5H11LXMlZjUAcxd0/MGBF 5GwtfKtxx5KZIT8+wnUFFMRBIBbR9HPcjZIUPYzgOGlZiY4wCIjZGwfkOXXyRbaPAExG 7DDlfAQctOubCoXotZpBnzPBcyxyXxrWylSjNn6cB+KiYHheTivNeX5ll3jQ20X3tpYv 8axUp/L/uuo05gjdZJ/5C71mLI/7EyAyfCT7NV6Rb3lgM9G3lRMS7b6uKF3O77ekMYLh enFI+Pai09enHQnnRUX7tVf+N4EzcOPXcSVe+QzQw7YDoYdOC0Hxf9nmrvZcvqqAsTM3 5qsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202065; x=1779806865; 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=2B+NBXajc/QmvN9GPFw1CKwqetwZlIhbn6ldsGmgu/E=; b=iIh1aLHIxJRgu3A5jUTdauAiEKSzEUhVMIc/JMHxy3sTC66iTMZQ29fy1vQdYRYos6 dFJlzgx7FaphkWqPQvJWKQ9qz8ekm7cQcCCz50/fQa46qlOrJL9Xoao3kjxkK/pYeu6M R6QnEfamrPxiXmTWX4O4maM/4t2W03OEjot5auyn4TNGH8lmo+PkV3CHXDOKP9rO5Uh1 VISuOp+krukcttg3lOT/8fU4C9tbnqFuHqE+2Cf3CXu2PXNAnHew61xhLbyuWlQeomd0 1deI/FihKG2JWc5PyJxUEcNpgs/ElwaUOLeCHW6fLAvWMAsxYJhrU1WP2MvL3JvakzjS 33Yw== X-Gm-Message-State: AOJu0YzRShlguTQIFS11GmF+c3uR7NWVEtqxW1M/181wG2MlsOz/3njA YOGVap82fdORyW4HbjSShGcnosKo6J1JzaZlpVdMf4YZGFLkmZYKLW5cnKuqrxfpKZ1TwEo0gb/ SwE9T+KA= X-Gm-Gg: Acq92OFwMjZlSXLD3xKwaWQgOIp9544wuDYq+kYZlDNT7BEn3nfaaGlDCjJDg7BrJiM bhcR3NINfMKLQn7N1o8eXA2yqg4WjZUXnQZGTFMJMXFw37+Q27eQVq4a1wznHDpYFPk0VHo8NjJ 4hatb6ifM7M61uShSfEXjfzyy9dlFwFUMZD7HxfOmPntjxZ8cCz41hgHfbiwEzqYfiFVnes1Lp4 2WJrgUq6pZJFr1rJyNFbM1dohZtpaGigyfpfanFosH9/jxzsMC0mSs+NaNr0IMqgNwXo+GhODEe S4xj1pSH5N7+nqTt+yASJ9PfQIWBpYcCMyw+eIm6Fbc0IIzXELbLRwzbIpLBNULCxsYLAHd83pp XgnkFbyDVv9Of0acDhjB0XVHKeLD9s141o/TIS4WlDrH/a0ZYIClXEUfTYwWY2IRai11cMaqAaa dD/qLUEiIAS3dE/Ii3zMMzsNdEawnvF8X6zz9t1UGmMa1na1yofxfZkAqjPW+FlSqAdFkWNmowl TNuqgMyxJc= X-Received: by 2002:a05:600c:4692:b0:48a:592c:e632 with SMTP id 5b1f17b1804b1-48fe6325f18mr318049835e9.16.1779202064513; Tue, 19 May 2026 07:47:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 16/18] target/arm: Define 'max' CPU type in cpu-max.c Date: Tue, 19 May 2026 16:45:51 +0200 Message-ID: <20260519144553.91483-17-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1779202115353154100 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 c95f3d63138..ccada1c9018 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1759,6 +1759,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=1779202090; cv=none; d=zohomail.com; s=zohoarc; b=SDPRXHhAVEtptH2+NoXGKoCbOJlHhK5vilOt6t37iOADQnbTD34YiZaXSl1Mu2jtX4NsFQ3ZyxdQitDuM4fJk0XAZ/N0CaxmLd+7LWdsS36vDbgvsy2uPyInBbnepM8wBv7T+p5gD4TJhJ9Ffm1yS2/RiCIQLCmlaLgApua0KCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202090; 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=qVonUyeaGXe0vVGZ9plcAaTFWYP/F7HODdZmRljC+Qk=; b=Rg0PhMrbg5uFiApxe/bNXE8cluJUYtl/B/px9gienrXhDWEGrb7uYyOGoCnOyyvBXysn9zfUIIpKowEdLRNEJcWRt8fZRbZwnOZTdz6SFK/aB14EzF1QIezTuNkoH39ywDdvuODWl4iFYFZbT1sYeKsHke/y+3h62HAPqi33sk8= 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 1779202090707395.0901886009185; Tue, 19 May 2026 07:48:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLjg-00030f-VN; Tue, 19 May 2026 10:47:57 -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 1wPLjf-0002mb-4X for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:55 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLjd-0008AU-5e for qemu-devel@nongnu.org; Tue, 19 May 2026 10:47:54 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-44b330c5cc6so2660180f8f.1 for ; Tue, 19 May 2026 07:47:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe248dsm45543115f8f.30.2026.05.19.07.47.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202071; x=1779806871; 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=qVonUyeaGXe0vVGZ9plcAaTFWYP/F7HODdZmRljC+Qk=; b=s6MmW/4Tce8gKYku7hm5MEhv8gfVb5JxAxvfBqR/9UkU9wumnhOIfA0A7dDgCLffx8 /uCYwh12raJQLTRGSm+AYHaMczc1iffOsyviUEHOr45NckjVLxmjkgjPnPNKgV62Q9wT 8jsGpO5A0FmkRBtDaMnQsKhz39eNuLzqzj9FECLBdscCLoO1PUaNTjHtxAsarCoi9uk4 C+dAz8w6aDiJ+i4BF7+MbW/0cq1w2P5iq/p+2Gge1oIee0BSX7yfdw92sZXfggGzOJLy YpNEp/pqvbIOStI7KjNLzDdSPnSjuU6HQ1vMN1o2qsrzPT1ri90jtgQGY4D05ZP0cGO+ GIHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202071; x=1779806871; 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=qVonUyeaGXe0vVGZ9plcAaTFWYP/F7HODdZmRljC+Qk=; b=s5Hca22y3x24FDcH8pl0rnvVALpSJd/xbOXHlKBs7QXIAqajus4TQPQLyBmYV7Fg+P S+x+pslbRcOhw5ILOqMN0DVHtMOqcYGWZD7ai3Jv6HDZEbPyz7kwk7z3xXWKa+BBJS3y J/qsbll2gKbTqhjiN3iO8NLS43mAsEGmFC//PSykhxMjNplYBfG4jKtNUsKowwA9Oemi c48ZKnP5aa7rusDOpr58teWi8o0WqjqxM7pFPCXqbFoRmEo4kSgeTgIClY+BFwIalmUU kR0I5zEhejEE1XQ7M7tN6iZxZNEWmW66qLzYawskl+kI16hmWV4OXPJZasxlmrhkhAcs 34DA== X-Gm-Message-State: AOJu0YzWfxBDDRfp9/Qwd0znAjmB69hXamwyG5nku4I0gcNKWxlbFIJf 7ABDrK12ASGkxSIPkO4Q8acsQ9C9en+FGnJhKlr6W5tz21zmEbaJ3kneCsrbsQTEQNoITK0iFkD fFQ8NUMg= X-Gm-Gg: Acq92OGYgrHxdDfpTrPkZJ5s+PpRwmfJxnKlwrz0JfcFRrBVCFHJiVAfAib1IEi05Hs j4Qjku6wBRQUeNaqrcCBq0JcgpJ/127pESqDBglojDnxCR38C8Ma5aFlNXG3RfyZenLxBWyB/z8 mSMr4U7ejh1evfSwUFPQf80hP1NbuXAqhptmXhP4SlGbOdq7VmjWKZqV4XqNltp0ocNWtNKVNCR bZxWpvffNWyNQtFVv27wmpO7h8jZxoCdJBvnc1EwtE3YP78eXpNPAvX5uIg6An6LzOO8iy75bhX nHhnD4J6aKJkf44N3qtSbYEtPE+afdondVPLFuwGWJrYNByT2a2BVU1LpKJs8If0zwgNp2aX4bc yEzjefrqWDH9bItnxH1ES6ardOcc8TElVdhe19mPsnBIDrAFZmNTcX8Qxc6GyGxQ0Zs+HRrpOoL 2s3xdBy1UpPZyLXvlxijam3w8jngCiYRjW4xLl3ot36ih5AIIbV2tzoBFb6WWZQTyuyNaj6ZK/ X-Received: by 2002:a05:6000:d90:b0:45e:5c98:c8ed with SMTP id ffacd0b85a97d-45e5c98c926mr24555471f8f.21.1779202071165; Tue, 19 May 2026 07:47:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 17/18] target/arm: Build cpu32-system.o as common object Date: Tue, 19 May 2026 16:45:52 +0200 Message-ID: <20260519144553.91483-18-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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: 1779202092944154100 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=1779202118; cv=none; d=zohomail.com; s=zohoarc; b=Gia+HVonOxImA5TmPFrGYJaJv9DagNjiVr33LTWHzz5+M/bhHw9GJU8hCxDWIw5/59an5rFxo/fDUmOSGv3vEdqPp7sToc0RV+Y03eoy33UYOyDfHkCRHImaGtRX7qL0N4kpSvRV2WbiIlPvvu1btHaSUeNHH3puE/5myjG5gvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779202118; 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=hrqG8E5vo4+DPxnoXgzD37IiU6lxoPHb9HCDmG94Di4=; b=dA4F5Uf2HMxD15Tf0m6vUroc11gkIwPGa4azc3UyIB4IjC97BwRlngXqGOy2CKfAvC3sastnVD2fWbOKaLVI5poH15Ie3b/lYuiZPPcU+bUK3hJvq+RTzo/GpkS5xpIF51BF4hEcHrwz1QGgP9xC2ZoOH/Y9V4D9ZhNQS98q0Ug= 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 1779202118747385.8752482000366; Tue, 19 May 2026 07:48:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPLjt-00049v-JZ; Tue, 19 May 2026 10:48:09 -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 1wPLjn-0003jr-2N for qemu-devel@nongnu.org; Tue, 19 May 2026 10:48:03 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPLjj-0008DG-Up for qemu-devel@nongnu.org; Tue, 19 May 2026 10:48:02 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-43d77f6092eso2027483f8f.2 for ; Tue, 19 May 2026 07:47:59 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe13a7sm48215448f8f.29.2026.05.19.07.47.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 07:47:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779202078; x=1779806878; 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=hrqG8E5vo4+DPxnoXgzD37IiU6lxoPHb9HCDmG94Di4=; b=OPjVAhs+DpaiFLUkHG7jegJi1YD4CLc17eHeoMtuLS7xi1Fd51Jg4WP+m7YQ+gho3+ 0SV28zAGcOoacuZE8uq272a8uJrFuLys71qrGcyGRYnJspuk5oCbbG4II4yKp4QxXRCd f60Udh3N3k6T1kpKfdvvYbbBpuVVj1vtrWBILaNSB/A/+LJPtMKJvvbUGXyj3zH33qOK MlNuwPVxiVawqkytRhHvP2kzza++n7uK/04sMgReuprSnjNqJ0IKXBtlqmaRGX+F06bh eKFwj+mJh2757V7NTJ8HZmKuG7zIDCF1tTMtvkMsUjN4wZFp0/3QUPSgf8vE3RKNkAsM 1FTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779202078; x=1779806878; 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=hrqG8E5vo4+DPxnoXgzD37IiU6lxoPHb9HCDmG94Di4=; b=RTmThuPEysNlRPps00+EpgZOnWlPWSJ6F3hNWyryLVHHN56VDi7V28p4CETPiXbQiE OhowY/3b3NeLgZDKxZg6U9QN/oOvGD1E2W7Cet62VH14JmnkBtnPS8upkgHXHNKQsJnb YMhxDQd5ULE4MAH6VdJk5B1Bvx+JEJY8Z4oaF9888jYUdudoxwwsTGhZE/Sw2Ndsr1Zi rXWyEewXycYmem2r4ZVNbNU8cqoSMnC65PNjgbtd0lLo+2FJT3r8HFahLemxZHj2kPpl BPdZqlqHYXEzq/yvhayQYWg2mBK51l1Mdbgs7EAE1dSNL1h5ujJm2Dcexd6GUD3eCpfP nRzQ== X-Gm-Message-State: AOJu0YzkJU7xYbaIFtp1mtDoX9tacO4A1j6dT2N1a7R64XYoQeJD4xGu 5kJNajSCAxrGAYagL4U5rUsZj6gw2Jpl5pbmznIvTFdFiixjXrqMmzSe5O753qkKGkzZSiDUt6X V91ico4o= X-Gm-Gg: Acq92OFZmGVrDiolFTY+NeM/fhAqoTij+QNbFF52ki4bP+oPXjvpUh9OZdUhhj9wDCt qxTsN0zAGjJHnMaYshKvwVWbYD58MxbFSkGXWyKVBZPysod1r6PSGO8HfeK6rBIgHYpidw7Mca7 GwJGRrNU71iu7IhxXqpUlFTUlfxDZqtGcb8GlQlRPfnoHzxZV5wrKDNxguIGU/gMDsqHqltORU5 G4aer9o/nkYifI8i8ioSuzVKCRUeC8DUDcwmnfTTTM4mNMMIccTr7yyxTS5S9LWERaObfkOkaoA 6TLNQcaP+ynCycHKo3H4GMHLDMEwHOZlygTF1WtfD6OYpdjPcXzp4Ciz7XYfaqq9TMG6u90vBr1 Y4cpy9YNHIoV5zGvqhlSbyXFF9wHgAl9Vuxhl4oNH6txIDrFxOUaMOhIUEm5vdqoqtTiMpv0Xlp GfMY6TG1vquc5E1JqPefpuqlLMQita52jY15ICN5Eh1a8qhN8MLRTc1AaNv79jn2BmJSQ+F65A X-Received: by 2002:a05:6000:4305:b0:43c:fe66:43ec with SMTP id ffacd0b85a97d-45e5c5af3e1mr33745917f8f.14.1779202077754; Tue, 19 May 2026 07:47:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v8 18/18] target/arm: Build cpu-max.c once Date: Tue, 19 May 2026 16:45:53 +0200 Message-ID: <20260519144553.91483-19-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519144553.91483-1-philmd@linaro.org> References: <20260519144553.91483-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::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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: 1779202118898158500 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