From nobody Thu May 28 00:44:24 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=1778951783; cv=none; d=zohomail.com; s=zohoarc; b=TWvWt7ae2+2SHMAHGBp2Lw5MSMGljfrfXBDwVogAiH+vG3N/dAGTrb4frQIAsnrVRZeHALBY5jnFU4i5nhh9KYsPbNaTOj06vedU5LjjZQZYiJbwjka/lFdD5hJZVstJ0b/+ekBHv4nyxRxpPAVHKD6d7yRLQfftM05SAcLchpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951783; 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=JoC5aVY3wsA7Tr9sMDHut313VOmzZIA5hIv5t4xmyNl37ActbwNmqyNut0XXDTHGKeC51X1eeMQ7LcCqrSdQrLj7FFGFjVKX59a8iVEry+bqIrmq/+GTQYQlXkqqP7MaV1+/KLYF5n7GbMf3dDjXUg7k1dakXaDmv7dTerllFWk= 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 1778951783858821.6059050760302; Sat, 16 May 2026 10:16:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIcC-0002Kc-0Y; Sat, 16 May 2026 13:15: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 1wOIbz-0002Ib-1l for qemu-devel@nongnu.org; Sat, 16 May 2026 13:15:40 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wOIbw-0007wk-Tr for qemu-devel@nongnu.org; Sat, 16 May 2026 13:15:38 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-48984d29fe3so9267735e9.0 for ; Sat, 16 May 2026 10:15:36 -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-48fe53ab773sm146381125e9.3.2026.05.16.10.15.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:15:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951734; x=1779556534; 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=ol34DBFuewsCoFEFKHoTuleOmV4Xf2WKIQ7SH83VGFW1BtwfdPRHz4CDMGMq0ot3XK 2eNQn4giSLbkUw0dMOYixjX1p/VbGGHGC60Aq4PrnhlOG1k7U9yHplq8DENBc3C0RNrO foDKjp2v0wiPWoMLz6+LS4HPfErh0PesdZweFqMlej9FeH/dZ++PBTuYWJkJwuhVEBiZ XsFDv8+TNPhXku9xVWv+O/IvhaLwXwRNv/2GGHGNTpfnbckI6pq1ZgQIYnzMlQTEhtya 9tzFOi4gbETOZtun1jSSnObnaFYqr1/raKwiVyZDjRBcQvRmCUWIjy0+GYLjHRk1j1j4 ZN2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951734; x=1779556534; 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=s6LNJez7HvEREDt/OPkZH29h4EcTCqvbOjrjGWhNQIuS3n1E1QZLhmg97t/PMHfhne Q4TEv2oihpJp2EUlTpmwhPBuLIhgVO/3Y0RGev3sLxsl+aq/t2zlfNDx+slb3hcpZWhb hMEj6ASNDclmHZzLMdh7lH6vcFgVN/bMrFmQ0yZYO/zzQSDqnLeVMNFRhWLJfO6wRJUV JlT/pHdiYrYdlpTWjGFDGhqw0slu/ISYKfokYvJbkB0L4/cesifqevYJV11MpoQT1/Ht 67HvRoZ8KhOvAJh0sZmjdMDmkjkdAsuYqLWUmMC0y06zwSbo1SlH2GyTBvv55GCv34HP nB3w== X-Gm-Message-State: AOJu0YyIQ0llXkoGM4wz7nE/VMFFvlBUOqEELz+vPZZKShHvmRHw+uDl hQFdCj9wOAHaQb4VAcDdnWpLm1o1s0bIogN3R4tlx9WqdnjVGDDdgLo7AGMyX/R7b9WT3yyALat XxDfi0mU= X-Gm-Gg: Acq92OHcBcj87Y+O0B6CGNKAUXRZ0Tu8aPrLh9o8qZM/rhOfhk3P656R93vMfyE0UjX +H/wUTgZiTnCiLd8s5FyeSmwtqHQ6kRfayhZCsmYhYXXeAZazMN+ygkBvLNf4lpR5Zj5zJE0BWg oG14F55AJ7eD1TPlW/pxavyLKGp3wggXHMaudpyPjBO+AxEJjxwE41OdIQTGF53/Mo9TfWdTdLN EtewQr38mljFrxlrvP47y6iikUimYm9NK8durqiWSWpL+Ioq4aKJ2MiJMjunek4a//P4LQj9ztI m3KJhA+aUfhacnKWhjMUN+erZL/+ZSVWxWF9qplLbhjJBbnVSY7mrH6CaajZ5M7L10hrktnyaYM yithrp9Ju2fXFE4iW2NSRoEfFl3SLFN2I7Ld/3tcprja/1uYOJ+Q4Ftj0XwXeZfXi6bSuK5GM/N E0txsrP5/57f0tzZeok4OcCYJ1v7d78eFicuuZAjjgfgm1YvkCvjNZ9t+AhzC31lzPwifvlxD/ X-Received: by 2002:a05:600d:b:b0:48e:8741:fd42 with SMTP id 5b1f17b1804b1-48fe60ee64amr95588555e9.12.1778951734492; Sat, 16 May 2026 10:15:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas , Matthew Penney , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth Subject: [PATCH v7 01/21] tests/qtest: fix discarded const qualifier warning Date: Sat, 16 May 2026 19:15:03 +0200 Message-ID: <20260516171524.19184-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1778951786926158500 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 --- 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:24 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=1778951784; cv=none; d=zohomail.com; s=zohoarc; b=Q66XPihd5ouA/fXVSCGDYYlsfVjMfcxuiYluThwCsgKI+vP/zzfuCglArPPkYGRYTpcX29ZNnU/dXR8fsuZikbBV756qd/XwzP+T2+lYd8YDRoMWLqnHYM3d5EET5tR5MfqLiez94RYAsPA88fm85AxU6GJV2tRMB3/opAApLWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951784; 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=2gO7kH8C8rZvwRXohHJ8ISNs5J2Ughnu3Zfsenumg60=; b=JNSW8hRo3ce7mfc1dvBWdScaGkWhQFJkZm5yz/MfJxipESH8FS2z5OEpy0ZeZuZPt6MENdQKHKQrQncLajCyee8j45UfUPulpUiEdPSVzkiqrE6yH+e3C/xMpLYSRPT6MqTtB8BGL2vU8BZ3Fyam6BRqGkbxLXxqdyaHxICEM7Y= 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 1778951784070547.6724156320995; Sat, 16 May 2026 10:16:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIcF-0002LG-6c; Sat, 16 May 2026 13:15:55 -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 1wOIc6-0002Jv-C0 for qemu-devel@nongnu.org; Sat, 16 May 2026 13:15:48 -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 1wOIc4-00080E-JI for qemu-devel@nongnu.org; Sat, 16 May 2026 13:15:46 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-44ce78ab5feso700771f8f.0 for ; Sat, 16 May 2026 10:15:43 -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-45da0a178adsm24942751f8f.18.2026.05.16.10.15.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:15:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951742; x=1779556542; 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=2gO7kH8C8rZvwRXohHJ8ISNs5J2Ughnu3Zfsenumg60=; b=zbt88k100yiCnI+NzJUC/mI6p4yOUFYRLtWktiTIj0yAzf1Uiv5t3ushIt4zU+t4gZ Rer9xU7aLPm9V46QYEaBIquceiiFoJ6pPCD3ihUwWquUwh8eUD7GQronObpt/fMjaVXk x396XkFnkrR/NlLiD37J+iL9bSqTOkRDWOYwrF0jJUuLyBfWVwyKFCHAgeMJEap/69j3 sTns6ExaL8flu57w9XHVzhnD2m2xhgYhCnviZx45oG44SwfmSc6Yy1/F9kPRKFF+hgJE dH/xOwWy/5Pq0jvXXt0ICIUewjAWoghflkm/LZ5Iks2kg201Do6/2ZYYlZCBAtxGvR43 b/vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951742; x=1779556542; 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=2gO7kH8C8rZvwRXohHJ8ISNs5J2Ughnu3Zfsenumg60=; b=s08C9AHengbGykY6DtMcniwx7/QNVFFNctAazk7+Ma86/0vBlzKTS/ByORK3olQngR HQmyETf8hywWbtdkz8VEsaAwwWc4CNudb24rXrDekt1hxQa0TfxNHg62hxwTx6mYLu81 3NIr3b5amCr9I3IpnaKJkhSrHYiGwig0FIWW3ykSasTAERUJszsC52K8IQZ1Bv6gLljP BB+VOyHvSomUFKYVeENq9UViRAX+vm+HET0G8vLQcftR819ShwAgrQnWJ/CSbo9Uufys qCA4MywbhZgVQFQRkIUqJRU7Yr3ozNGg6KFGUd/bbrlbBz7dz7O0p+OJyme/hGD9UTUz m1Ew== X-Gm-Message-State: AOJu0YwCsAj5lf/5pxFvnLskQogbix7VMaWU9Yb+vFc1rGl7COuaOQPA DYkHsFsyQXNqERFo0Frt2whX1gkz1SHy0jVqiQWAIwAVf0Ed6Pt7aU99ZwSNRML7rVVIq7THOfb iht0XM/4= X-Gm-Gg: Acq92OEIjhs3v5SWnAwFQLAO3f/c7p+BMIXtSku5btElt8w8chwB+AIMuM1cyiSm3MU PA6XMAkOZ0GUFQ4Cm8ALvV5lybkht9v5bTWPUT/DADIt1+KnagGJQqrs2xuz5Q4daSpRxxuzVR7 oGNxiJemtLQmkl/j2uY8fkAHQUtfnG/aabfEf+QvjTHeqHicDERBAufEx7Xo9k2r+BHxgpK+cok 1jPPGs4LXj25OOUcoK6rbKUebODj0NoBMSFWxENgOwIdPNxX4mCyU4B5FxA+nNVI6ESGIaFqEpl 9rZB0HIcrHmaBSmIksPlJoMibDYsN5xoJ64WKKdK20lGiqqzwqMOl3w31HIZkg19ULK/Ts4QRNY Z3kJqf21NEkd0+BhVkkR5hqlI6xpmvMd4v1rk/Ss/k2h0Qyo6mkHE9HcLHe09ArY3eErYY6Lq4K YiFVgnBmO3ATy3/y1rbSad3NG7uRa9V5bp99kWsafsEOuniWXFkcYqCFZ8OCl9Dpmtq9zRTkfH X-Received: by 2002:a05:6000:2893:b0:452:d67:5020 with SMTP id ffacd0b85a97d-45e5c362753mr11883251f8f.1.1778951741892; Sat, 16 May 2026 10:15:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas , Mohamed Mediouni Subject: [PATCH v7 02/21] hw/arm: Build ARM/HVF GICv3 stub once Date: Sat, 16 May 2026 19:15:04 +0200 Message-ID: <20260516171524.19184-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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: 1778951786939158500 Move arm_gicv3_hvf_stub.c, introduced in commit 48396ad6ce9 ("hw/intc: arm_gicv3_hvf: save/restore Apple GIC state"), to the global stub_ss[] source set which holds stub files being built once for all binaries, instead of one time per system binary. This prevents symbol clash when trying to build a single QEMU system binary: clang: error: linker command failed with exit code 1 (use -v to see invoc= ation) duplicate symbol '_vmstate_gicv3_hvf' in: libqemu-aarch64-softmmu.a.p/hw_intc_arm_gicv3_hvf_stub.c.o libqemu-arm-softmmu.a.p/hw_intc_arm_gicv3_hvf_stub.c.o ld: 1 duplicate symbols Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Mohamed Mediouni Reviewed-by: Pierrick Bouvier --- hw/intc/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/meson.build b/hw/intc/meson.build index d7db99ce354..fac2d228f9b 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -47,7 +47,7 @@ arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: file= s('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'= )) specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('a= rm_gicv3_whpx.c')) specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_true: files('= arm_gicv3_hvf.c')) -specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_false: files(= 'arm_gicv3_hvf_stub.c')) +stub_ss.add(files('arm_gicv3_hvf_stub.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: f= iles('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c')) --=20 2.53.0 From nobody Thu May 28 00:44:24 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=1778951844; cv=none; d=zohomail.com; s=zohoarc; b=MIfcgNHE44ILbTRHgMyOnM/15eWOdIyCi8u4Ok54B19opBy2LiD308GE9/PU8DpXZKAf9yZdRMG1Vn50LaJXZyR1ltsCYkkOLJDhNY7SlZROSdH74qFL1KclvF/ojlfm8oTE0H6+ohXDXnBitWa+bSbUKG8W74qMg9B8t8bXdlE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951844; 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=NleCbmVQceDDY0rQ+m2gxOGLhYI+zuJ6ItSswafGmt9v0y02C96axbtucaGiRvCyf/xhF8hnckEIEIbria2EzK1NhBsL+7FvfK08lOTAwqmVy+27JEpkBhef4OfB5DMofUUSbd0OkjEFfOXldp/ypfzrQnGR6vkfs0PcPfB8v3w= 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 1778951844344823.7757318926634; Sat, 16 May 2026 10:17:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIcK-0002N4-A3; Sat, 16 May 2026 13:16:00 -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 1wOIcD-0002LT-RU for qemu-devel@nongnu.org; Sat, 16 May 2026 13:15: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 1wOIcB-00080y-1y for qemu-devel@nongnu.org; Sat, 16 May 2026 13:15:53 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-4526a8170ceso293822f8f.2 for ; Sat, 16 May 2026 10:15:50 -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-48fe5ab3977sm154920995e9.9.2026.05.16.10.15.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951749; x=1779556549; 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=Hhq0eejZDnIqfbHUarw6LN0F6GiNDVrNgweAvNBOczsNzN795HHsyElGWG1Zk5hTCD Cx9IbTTqf9dBDTUPkhBGvAJzqeltExUjk0Fv+as+n7W2Z095bDTCB1avU5TYnZpzodE9 Rn6LeJVOxOkP3jp/YSerJwiZ32Qefffdntn9zq6scSDqHY4Ji7RWMFf0bXUDhPoox6M+ pRdDa86ajwnwFB3p3xVMVEk5fripG1DMCAg0eYY73j2atEZR4MjuA/5UxrN2OQS8dj9j 3Z0Hxt6V7DWfKSrCiuKNBnk159JEfUl+syB5goOk06Ie0UAOMw6UvRlwSKRq23ni1g0v tYTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951749; x=1779556549; 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=YNTHhLJNzM5iro29f5DBD2GV2gPXQ3mhfY3o9gf22BIg5c5RsQmWM8QYKJRX1Ugkqd uAL1IX1isNO/wDPEh5H/WGsiMMlzUKrOVhxUdSYcUtqe7wUClZZTBtZaRrarj2csPOkj g1NVgnAgMrkw2DjThQFm4XhmihnkYcD3KLoTgjBjkSVoTBiFV5IGFISLg8zL8hnTd2iv FuWrEMcBP013xZQcxs+yH7OcdW+1/InLXAYfsoY32uHwtvDDeQ+KQ/wqjUpEa+gYynXp IBGN929RRHg18YC2G+x/UQrOrwUEbab373Cmko6UuqGbcIvMM/A3ZLrqN+/MFnjBAxFp 1TKw== X-Gm-Message-State: AOJu0YxR94BdIhtL4fjFBAooUJaw7S+5pseA8ci6MK/1z9DiRQWyFqym OW6yNrGM6ZcebodYXDkyFVxRy9dK8/rRx4CF1QXkynDMZEAIdN6A0sSCCw8WNfpVah6vpxUQhUt 4FX+7xaM= X-Gm-Gg: Acq92OFWDmlvCktBB/XIMIiaQWxIqNkWqKiYlF5//SPgJ0/fv2Yrd/iypbg8NFSG5Ni TM5i0LfQwOXmIEs/gKgugprXonDvjrRzmw14RuuX2UgYUvUIV4GPdhSspPvujozpzWKRkY8cwuJ Do1/K0BnsK4xtNkeEgXovGfSAzDQKpBxkf6ePISUgOxzvPIFLX3Y1wAZ7JS5vLVKvz7ctweskI9 DwT/2i3TUM7mEZsUM12d6OcRkJBaROhNJ8wJN8w5ozmARBa2fynw9Z1ViqD6LZO6cCL7JVV7bpt tpsC+NHtzR7UzAv4u84CCXHclI4D/SjBnb1NH8sLOkFDt+9ClYx/XYK1O3Y7/Dqqfq8OkykZeAd ExhwTCIMd4ecasCC89oIFSp+RciME6W5q7MxYr7q+igXcQ7aJTCFbmLKH+fUpt4uxCisx1RMlnL RU04Da5OmxeKf4k61I8wjDkSlicjDz7oOZiYkT+mUOn7U6615qJ30LM3c+pkFZpxsaeF0tZE9V X-Received: by 2002:a05:600c:c10b:b0:489:1c2d:211e with SMTP id 5b1f17b1804b1-48fe5fcdedemr91035025e9.5.1778951749102; Sat, 16 May 2026 10:15:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 03/21] hw/arm/raspi: Initialize 64-bit CPU types during DeviceRealize() Date: Sat, 16 May 2026 19:15:05 +0200 Message-ID: <20260516171524.19184-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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=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: 1778951846446158500 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 --- 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:24 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=1778951867; cv=none; d=zohomail.com; s=zohoarc; b=CqL+bCXho+PebdNlpuQDzNDCGyLrhEG+dFS7VciVjN3dC8EC0XzhGD+zXs0J6SB33enyVaTtuwzlThvbZOu3h/A6b+wOdYTi9AY2iRCZEDgoyHjyWKJNty9wiBnogkYwe3H8DumZ/+YpLzzQmhQ0zPqy6vYob8yeHq46uJD7oF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951867; 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=Io+pyqUrp0uC+Xhio7GQyF4/8VHUDB5SfXUreE99YCaWWMlRjldAUoZBnFjZ5k9KKLuPUEzBEqBEGMGqYPUhN11pI/L9YgHoPZEoTbTPK0nsNuT9qu1oAh1wpj391Y+jE31YyNMGndbZMpCN/L+ie4fDKq61BltkCR2DqFJd854= 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 1778951867265763.9616970750392; Sat, 16 May 2026 10:17:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIcN-0002Om-FV; Sat, 16 May 2026 13:16:03 -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 1wOIcL-0002Nt-Dv for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:01 -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 1wOIcJ-00081z-Ol for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:01 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-48d146705b4so8965305e9.3 for ; Sat, 16 May 2026 10:15:58 -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-48fe4c88e5asm146639245e9.6.2026.05.16.10.15.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:15:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951757; x=1779556557; 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=NO+r8ADZtufSrCDC+hsDFQB5ypoW3Ba42+iM8WLSjhkGrOsk/zd033WfDdAapEYtL4 hcwTJeG0VzFPvvroS/JeW8QHmbVPwwVWsjCeY8Wv9QL6d09/T897boecZezq3CWUsK4r AtorWTHD/agyGb9CSTYLVfJlT+1Swf4Q2B89r/8jT23FEsSyep5Y+ba1lF4CTbjmv8Is FK5qmcVXCBVa7gTwOqGrdo3GFqeA07JCxj6415XsT+vjcdpEzKzc/R4Xh2baYNPlmbQY WeLuedk+VHrgsNfT4eylvCrJWXttjwdKSIiiQss9i1eTW3l6yl7iqwNwQj5Tx5Y+8acn poPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951757; x=1779556557; 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=GwF4LGAcYs6ZK7GqY9Fh9BOF+cdExEGZcv7YTFDgTu4dD33MIwh6M1adIayr65DHw8 4cT1gGb5h4gFFUCSbbvc8w2ls3cdccISjL7ftmABablGIBz+SNxikksjw/uqQLaPLzQI acEbnCrf1mMsYtsSkp4n6lFph+f5zrvAOXrWnF1Xauv0fNfLHb+tMyv/OETxRJLG1n4G Lw/ctYfve9ZZPg+HStaPELrCR38tov2NazYCgTbfCphC8kOqDgcA1Ex5onMWE8mTpAsQ uqBQUCLX4eCuJ138XBdZaMruR6sawGfisuzmM0Jd1pHGEQ2HpeIJglVgV1rSMfjr5fdh zFog== X-Gm-Message-State: AOJu0Yx7K0+AeTSFAs/TsbFKWDdSmqOcwZ7ZdVHE60RsZOy0xHR4DH1P 3C3NzpBWaiqhua1lxZezqWOl7mZ6LK8Mj4oWKZOicvX5ccaEA3jbxXL6CuTtUn6H6j4UNdPuQ4E gKE9x2fI= X-Gm-Gg: Acq92OFBsona72+iNuGNqpjN1gJb5VGLa/O5gOe7P8e3hJfnz/Lu10mOXBMZ5DLRBRD xAquA0HJ7QgvyUNagree0QX4hP8M4Zqmulr/bnxtWRrLWZeKJkEtgvJXcORckq4tFkRwnmCz+zY T5D5FI6s/oKGe2dGDa0S9aD5djKgVYgiP8tXWMAyA0IHS7j9WHWs5a9PrkHT83oMmirb+y1rBar d9w7hAk4Ae0I9PzfwcNtR5ksvi6MVjhoJuKFoyHxn+J4xYRvmL1aV3J9UOo4H1zveZFs35YVEGd 4JvVkdcufO6Z636Vs4+jv4hiIus4IrCwzFjJQc+hxacuPcq+JUnPFOvweAQ0B6pXoWWjzIJxQEs /vEzm78YTxCtXwmkzbmmffFbNsCld/mnGBIjXwn5L5qN704hMYrejR37jZqjIoDq4zrDp8w8ABu 9M0bhRa/tgrmJ53IQBpPlLCXm8YJQInOzwM/W/uFSQ0Zsh62WU2CMCXgfxgOQLKuf6Gon7UblD0 AY6NH0JCh4= X-Received: by 2002:a05:600c:4692:b0:48a:906b:14ca with SMTP id 5b1f17b1804b1-48fe632579dmr119569725e9.20.1778951756525; Sat, 16 May 2026 10:15:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas , Pierrick Bouvier Subject: [PATCH v7 04/21] hw/arm/raspi: Build objects once Date: Sat, 16 May 2026 19:15:06 +0200 Message-ID: <20260516171524.19184-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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=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: 1778951868473158500 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 --- 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:24 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=1778951786; cv=none; d=zohomail.com; s=zohoarc; b=YvXM+9IoI5nPEqVNB32AdNp7U6l7Wbw5ugnmxraqds2bldrWaO8DsAb3lheSQB4X2DcLC8ymmletz5Yb0hNqVhqb0uWf13dxXkWR7KQvOLVAl+KlIijQPVUiVbLcHy0nK31T6Q4uqKEq6yYsQ30F8cnHilTSUq9N5cJ8xgONkTw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951786; 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=AsSTIk+0JSWuno3/dEFZUZlrRwN5mUJXqdEg56UWohE=; b=R2kp9tu+VkobrBlTwh3+hh0NaGh+cVjz9hcjul4l6iriFNW/o6+lqXSTWzcFcNk8nYF9I5HVMCx2nOy0DhY619CEJMBGeQBJIk0SaHvcoJLsHdFUTiQ37mToAvYNhvwgoUvJ0gBeuOeHmZIbLBoLXhmZsTFBHd9LiC0IiedEfNg= 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 1778951786098788.7981153790902; Sat, 16 May 2026 10:16:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIcS-0002Q4-JA; Sat, 16 May 2026 13:16: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 1wOIcR-0002PW-C5 for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:07 -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 1wOIcP-00084q-Oy for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:07 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-488b3f8fa2bso14966285e9.1 for ; Sat, 16 May 2026 10:16: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-48fead15bf3sm42602285e9.6.2026.05.16.10.16.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951764; x=1779556564; 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=AsSTIk+0JSWuno3/dEFZUZlrRwN5mUJXqdEg56UWohE=; b=OLKNG/Tog/r1CyFig2kVI1i+s0KPWjYGl4YXADXC1HR/fNH6u1MBRbF2ws18ZgHe0/ SU0mNBOKv+HjgW0VSuDfarBJ0E5LXxp5xYhaFheOR8ES8qrpGw80N3O+mcqYf2GW8Gan 2pnDusbKfHZU/Qt/nX+z/OueqQ4KRv7Okf/7t5l9rq/VJRH5GQIdrjJ+tCeR+4G8DHoe cpJPL0HNtBpoiKq375SWqlXwGJ5maaza2AR2LwIIILVY5Q7RX9HLNoHQ5aDdBeSapKU7 jZHRhqEAYlHITEnPPTsmzhEF8R6POyCxJY7CvBLnDe1u1nn0C7fkdwHDrGUFDbk+BODK 2NtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951764; x=1779556564; 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=AsSTIk+0JSWuno3/dEFZUZlrRwN5mUJXqdEg56UWohE=; b=lojRtDrxoOiKZ62YzTVQEAFyX5MwV/EwzMEQtFzSIGZ34KlODsdcgaj31qxGPX3eJo hDbwwGEt7WTXgd7o2NI1dTkhjyd7ncz31aCY0Jfz8o9spymIhXtgyJUcgna7OSPKdDGP CC78Ugy7cSMlvKyh6YhsWHL1hB0NR8v86g7CwZbvlue4zBrk9cJzmymaXfCJqUYVPfYK OcwEKPv+tLr2p6mDY4XXiDK3aYZ+lE5Jsm4nHC05yvvX5NmY368WRxx45YdsNxT3iIsW lqIMEIUSuy/H+N2bixG+5dxzrE7v7BVxdaQ6EMTyFlzI6ZM9/ZKXhsYypC7ZzKxf1f7B cwvg== X-Gm-Message-State: AOJu0Yw1vAMh2FuT1Dz6xfBVlLDqnEuz/DzoNM+m4wNyL+p0eivRwW5z ufMiW+8KsLF25iUUPDCn147T4nP3o+CvYP2ur4yoC2dODy5eqk7QtL9oiCSBhBxS7kfHltpvnEC V8n1QpvY= X-Gm-Gg: Acq92OEB9Dix1y2x80EOJ8ZB/xQOvI++0X/LghJkilh+eZacfy33a+vhyUXxlhN6jxd I7JAB+z+hx6H5DqPJsQGyZKotfqx/Ttm151svKn+FKoirDkN84GDyuqHkwj9Y51Nb+G/LhXngZR pNijPMzt6NvM1Q21JwJj5dYR0Q1QuYZkP2/6sIRoFpPguVenGqbt3avVADmD7t/Si0hGTNv57S+ 4x/GtG/uy65/OR9m6eZ9mZB2i/IRlhG27fLp4yLWAHcSYdI9tR8GqnXO9+jGZT6iKk9CCWsYQR6 uIdF43rXRVuixkIu26LMHV6S07w8+N8PrurCJ1J+3LCIG70tsEdGDRCBgFVynasktU3RVpcOBO5 r3191BgCEwWDn8SsHpJpRiPTVg62irnMnwkoJE2Ts3jWLFPwcVOR8IlqFE6agsBVzHQCwBLBHmR CrgHt2f/Udv6KS/S8KHcDyZNi8JLtWwzjhRjtMzGIf8jrbm3XKUM9bTGUOjLlKozDW1BUaNN7U X-Received: by 2002:a05:600c:46d0:b0:489:1abb:5559 with SMTP id 5b1f17b1804b1-48fe4dad784mr107868645e9.5.1778951763841; Sat, 16 May 2026 10:16:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 05/21] hw/arm/aspeed: Do not realize 64-bit CPU types under QTest Date: Sat, 16 May 2026 19:15:07 +0200 Message-ID: <20260516171524.19184-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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=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: 1778951787912158500 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 --- 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:24 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=1778951829; cv=none; d=zohomail.com; s=zohoarc; b=oIHRGIm9knhuGYNCMTpE9h9Ky1vU9aJtWfPwDaSLzFxQVoi/T6SdiySrMiO0Pw5L5wZw/YlGvnpobxfpDyOt+jBnEKkDp05DH4dktB33EzS6QaP00O+1AedV0tuNdvDeLi+Ke7kINPUkipNW2Gc23Ik8XbebWu/0UzdH6hkotd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951829; 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=Xr7AB72ORRy71rA35bL81bHEuFs70DepQLKA20BG1Qg=; b=SHbe1vnBoheMTUlaYgyCw5JELBS5ITjGCNb2ZT8lBh5nfEwA15mSKc76pMlm/M8orE8K36ygHd2oLmbA5i2KTiRCK86YTW/q1YnIiQcPDPBGtHe5TJ974C0XM1DDQxnRSkzGvZ8hD7PHx01RiwzeKcD6lnBcr6NZYxL/a9TsBnE= 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 1778951829749310.87023534720834; Sat, 16 May 2026 10:17:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIca-0002S4-4F; Sat, 16 May 2026 13:16:16 -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 1wOIcY-0002Rl-Sk for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:14 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wOIcX-00086T-5r for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:14 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso6330385e9.2 for ; Sat, 16 May 2026 10:16: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 5b1f17b1804b1-48fffb9aac4sm22165725e9.9.2026.05.16.10.16.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951771; x=1779556571; 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=Xr7AB72ORRy71rA35bL81bHEuFs70DepQLKA20BG1Qg=; b=nZ3uuSnYWWuc7qtc4dQbNiJwTBK9peBjptfM4uy2wgXrHi6IMI7HwC3DeGFYbRreS6 R1fM75ZMWee8JLf33kx4hue97AlYKNdQgHe1v4yO23lt0grwEOZUkTYFaWC6/1vbYrRD GcmQWBx2ZBPJILZsnCOqgbn2yfdpWUXOHBNCoU9uXAHEFT2mMRGG31kw2jI9+h1sErqU gCf3XQc0z3KO1FwQ8CmXyjSRZ17j0erMzyIEjfsZuuhUAhn5qR1Bkl+8tiG+VHEbh+iX XrNQufi2JqP1ubEU8omvA8SBSGO7X0mh4EyYrPTvfV4KM04a2eLxsMK/gC85al70dH+m +vdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951771; x=1779556571; 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=Xr7AB72ORRy71rA35bL81bHEuFs70DepQLKA20BG1Qg=; b=Y4fLcOvgu6TWH8A0CGICRCABvpTcLeNpau9mlqgE088WH4MLz+jEZg+e8NBo8/qbeS r1PifzRUrEWsu/EamKvK47zxGTOlhGoRHgcUrB2jrp8moz9NzaPLUuKizrIYdT0BumWG wiOZuvZW6ip9jM3P+Hwp1nQDsnhqkxqO+kdr5CjnWGT/Rijsl8LjjraojJLRg6IISzsM gqdWgbnrvRy5vrVMbTwqXFVij2vvq+uMmEdci/ftvn4SiYOi7HocDgmzxW817MpcpPqB HWJDBBoQ3DPFahfEMm5mNMQ2yjAU/RELfWOem26lZvH0OZcySNjQ/4jvbYu7TLVmThEq dO7w== X-Gm-Message-State: AOJu0Ywu5o8S9jnxMr8SkzrEIHd4LrXO+AOf0WaK1USEBJTpGi7HlSHE 23tikD8aamQ81x38aM+wn/s+rSn6/Aq6h8pYeCmsuUX9q/S5UiHVi2yIRL0d2ehsRglG4XWlap3 //U23V9U= X-Gm-Gg: Acq92OGn5rdPeREedoX17y4jzj8bb1lrhNWMTXcoxPQzuPoysrRf9la9Y7KGL+qT111 DNJlyug6trF++LBFAZDEoHPRPypyadGOg5ND5jR0AqpRfabTuADudBpC1ZVlU7iUxXlK/r0b9L8 gT4CTkzTIpNPGc5I+eME2egTM4oxDOQFAQ5oUfTJ1Ur4zamlZhOU6Kwx2BBW7NiWd1/TIyi+z44 pJjUrm5a0w6Yq6ti5Do2I+UxHAPI0FcSfI8NTe9Mkp30WYOQVok25TKqE9V3NCRXSNSmhBwOgUj n6+YizWQo4/1h9xjxGI5njiJ4+wHiEWtiw7C+kBhPo4Tukhm+ApR5CSOp1bi+Tl7eZ22N8FEBdB vHWUt2r8LnDH/kg0cx8dWxXrCV4u5/V0owyWkyqhoweDe3titH63bonytXUIxW4TBTEY/9HTqZt u4nkUo4ciJsYbbQ0EwfkEHKZxzhufokbBUT0gt+lQWzK8PSt1IU6/xlx/hflfHIz+PD7vfNCLck YOUmIt7CNI= X-Received: by 2002:a05:600c:5298:b0:48e:635a:18d2 with SMTP id 5b1f17b1804b1-48fe60e51d1mr122723765e9.2.1778951771167; Sat, 16 May 2026 10:16:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas , Pierrick Bouvier Subject: [PATCH v7 06/21] hw/arm/aspeed: Build objects once Date: Sat, 16 May 2026 19:15:08 +0200 Message-ID: <20260516171524.19184-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1778951830420158500 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 --- 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:24 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=1778951837; cv=none; d=zohomail.com; s=zohoarc; b=e+CXWyk4eKU65EgxrVM2DOD35yffo5qKZ3lM8eXKwPaGh50wfyBux1fekmCx28/WhRD1VgYfdsMaxmG+Mpw3S3WAMzvgMKuauvIzwubKvuK4qeZEv45mRFb7Tz0EzJOR6GuG4N8qZJVqBR6KYmCLlQnS5iIK1LN3KBewcLQ7mPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951837; 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=jomb+GgnLfvJ3nWYtY3HLxbyHNUoMkIER/Eg80eeXNS6nD/EM4RVatmrkUljTKBazMiAELpS9hYJAf9mocEsp5Z76dUZw+6mXkzvugHcr+1x4Ljzj6OFuN17Yd1a8ZeTD2j+aKFHvv6fVcHbjJaaSt7qO1DwXo706rtZcnpQl/E= 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 1778951837391731.4720256586562; Sat, 16 May 2026 10:17:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIcg-0002Xx-N4; Sat, 16 May 2026 13:16:22 -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 1wOIcf-0002Wq-6q for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:21 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wOIcd-000875-PU for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:20 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4891c00e7aeso5525145e9.2 for ; Sat, 16 May 2026 10:16: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-48fe4c8344asm230344605e9.1.2026.05.16.10.16.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:16:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951778; x=1779556578; 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=GN2L/S6OrSa7FNC7lxdCY5px1DtIer9IZ1WhgA+RNUuE9frk71NU6cym/BkFEcv9oi dxRBWM3sSlygk4GUc1MS7uZ1paIEAtFp1NhEUFi5jcZk0F6+w9MEbOKdSV0plulwDR19 uhY7CWmuyr3LBc711Ir7N6eBYggywXtGgJAn6Seh2pDvP6J1fC0b8uJxSDm12PlSqcGJ 3lyILqOtJfQohkmt3ZQGb2xnQrnlxGbzUckH8nveIo3KiEVLaO9zEwRLxTpYhUYcN2Bz hSg0HF1BZw1RJ1GfDDUjgSNFc9xR1LzhGd8LvsTdViUoiTv6WXO6aVkJ+B/yznJ/36iA /kWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951778; x=1779556578; 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=ccaWxhEc7u3uSYm3BSsZHyINAiF0of8j58r4IFrhL/JnPW52pbX6HX9f0+k+scFcAe KD+aV4XO6Fc99+UY5adcx5NJi18QDIh7koA3jL9Oi/vb5/ELVEHGCybVA2YbJwRXlRZG +IPuTtEDxJ5aYW151aeH5DVjcxI18NvII4IQDd9I9Wu07zn4fn2TZf0JXXzxftJkoQrJ scawK1rHlcphCplx8J7K2RkLfqtiw+2fVP8qdRl8NjAYmqBWXwvCJ9TpQt7nj75SEBvy Oru+tQSW/4EmMGCweHL4Wlo7a+uFjewtCgicS60wqOtHrTAbrfiPhX9QRx08bx1QVJFs RBoA== X-Gm-Message-State: AOJu0Yzf96xWDX228MqxRgTaYx93AgzUj/1zb0Bs4Vf7tlOFLBeOoqRw lu/dHXs11lr9r+jEgThnEALfwdq7QyJ1BjWj5Z7ULEbP6l5ooOkmrisVbwvf25vUH9L117uQrNZ EHqRhTfY= X-Gm-Gg: Acq92OG5niMJgu4kdVqebtYcx5STAbcDcVfuaMiyv061cuwdfYPQuceWGBuD4ZGBO4r kK+E45+4i2L8bqGcuaXxqXlcm5MNXFDD5l1JvZLwHiPpjVc8qMJG9EE9sRIJmti0E/h4Z2Pp6Ah dMYk0FTGoWj34YAFiWSwUjmo4CidgqlQE5b4tr/yRWbef/IMuLPHMFeTHrkWIVuh8U2RgDpN3Hg ZyAYK9XVbRa8mEkU9yD8s7PNDOYV5nVoj4bMU7cuD0N2w7uodML00pzGWIQzztZsETDscrMAgod W94PMMbqlm76VJ4tis3ciPUeqbbE4nLpDYXvTt3CdcKpNkaanEgCH41qTp6Olj8FnO3fGql3Idp PFwvp2LRNhMaFON29NwLbvmybJjYSQ1q41rOlup/ZboSCQ4KZ20QelkdFLwjIApGOzOB4g3yh1Z /uV4Xld5/qDHc/rwsOOjcbPAG1GkPDwApV+wf87C0xQxZVYoWC81GXTD8whrJZRGeRKQu6iOqzM zhlgsCdBfQ= X-Received: by 2002:a05:600c:4fc9:b0:485:3abe:ab86 with SMTP id 5b1f17b1804b1-48fe60e3b17mr111829615e9.4.1778951778367; Sat, 16 May 2026 10:16:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas , Pierrick Bouvier Subject: [PATCH v7 07/21] hw/arm/meson: Remove now unused arm_ss[] source set Date: Sat, 16 May 2026 19:15:09 +0200 Message-ID: <20260516171524.19184-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1778951838199158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Manos Pitsidianakis --- 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:24 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=1778951822; cv=none; d=zohomail.com; s=zohoarc; b=GGZF0wHggz/GL34eyRLkFJx7UM/A52/jkFvkuNFSryokRdTL6isUlTQvuLsUGZfhh/zuC1ruR9r7cGrFuQRynAhJR5n3yTTfkgbNTAX/iCGE2X/116fzTp5U6ZBgaE7WPb0szC9897N71+lKlinb0mnNL1ix5bvd5JVtBkOVsY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951822; 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=M2n9oCOj54/RZ9uOY9lkyK7EyfxiRBivNaFySHMZgJY=; b=iQ1HswYZG2vajS21hbH07bml4AZNr2YDkQd93ZOQqpNTe/BTMxwspQ4F/nOQV+Qvwr5iml5Qz2XWM8UA5QVmjnOY2G0cg3sOuxB5DUBnEzCKvzpH3JzgMxXuORUshuxJbB2Xp4x7E7JTTRVf7da+bT4oxDJKMZSlsgKEJxXv30M= 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 17789518226211000.343841226375; Sat, 16 May 2026 10:17:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIcs-0002sB-NV; Sat, 16 May 2026 13:16:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wOIcn-0002g9-Pj for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:30 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wOIcl-00088y-It for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:29 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-43d7e23defbso390900f8f.0 for ; Sat, 16 May 2026 10:16:27 -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-45da0fe248dsm23236131f8f.30.2026.05.16.10.16.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:16:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951786; x=1779556586; 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=M2n9oCOj54/RZ9uOY9lkyK7EyfxiRBivNaFySHMZgJY=; b=e2AXJHzl0jW3xq3I84yi/7MxeiNE1BJhNyjBBFd0BePKKywlGCZdTh8OKDQx2ikPll kBmIC0atNpo1x4YZbhd6UYKQXx0nPIbR5v9ivqkGthtmWObmhcRIt5qxpOD0dm4JUANz KavSWY3E22uWphsF9wbCcRTehp2XpQc5YQG+XX/okTi+DhjfKahdY2KCIIbLZaKWIW8M DOywkLEzQgy0zHLutpafk6SAOtRRp4UjXHX5YBuoq0MUmR22n/9mh6UuxAciivWyK4Yd F/IL9ZgAzhU4ZfvyUOe9PFeoxn44sA/TvnzIyI+Ap3QHX2tO2FaXuWReLuAxItD833Ep myrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951786; x=1779556586; 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=M2n9oCOj54/RZ9uOY9lkyK7EyfxiRBivNaFySHMZgJY=; b=nZzg2ulJ6TLVK/ZOG+cmxEbapYpUte7ii1B5kL3veITcnFStU00h14388bTILNwDQj 68bpUR0LSui9/ejeTXxGtMiOPpDhy9neyB0EKa0ne56lfoeeYcJ7VH1iIqkdrwXvNjTj QPZUw1jeUb99xa2ttEBJsNd2zX30lMSkI0A8fP67oqDwI/Rk68xvkreg1N77UIqxK306 OE/gkZQyqqIJ0vF8+3OFB5b5P+1Alwr4h2Ywo7q+mh+dV23l9csBB2p+OWWLwqYuoT8z GWecQ5ecJlOT7uh1LdJzGK7pcJu5iw72i+Ji/Bp8j316BnISu+PR0SgpYdw8hTmJj2Vr f9Kg== X-Gm-Message-State: AOJu0YxV50jvEgGjxf3kpfEpI36JuuihR65Pwik/Pb+JLX2DcW80/43O ArI5AjwVuTdLVz31UbmEVoDbgDTXOQyNmm0bkb8OT1iRE0Tml/VnHRCFjg7aGalcg/2523vZNcf u/vOnNv4= X-Gm-Gg: Acq92OEmU1+5lMsUau0dB1hbgzaWxx9iU7akegMdnBuE6N0x5EHbK+FYnDM7pLx6oJS YAzw2LifzL5urC0Gcd3L7iicBSnK4R8DsMr02sFNvF2T/B3LzCtNHPgYjOsXQc0LyeZpaT6SbJc mygGQrcgiewI5yts++iFbTifgYJF2wd9/UyRov1pS+B8D6GWLAjDDXMV9/Ys3etopd0f9O+RaWE xiYN/nznKalt3UVZBaNeggBg+rM5qQYxSKEXR+LH7YHLrH3NDo6Y7tmA+hNOwwVubmUyT9rNc3N xeEtHBisAUt6lc3ShgquULo37pNI6Du6N5G5E5W3BOZt64NkF3g6jTN+8MY2yinFQQTiuJE2ePT 5khGEHXPnNfKiamb2COLOqANIKtymR2+cW2HoVGEt7x2wzkLCLsuy1S97XUixaZC1q/lQt1A1c3 6j+4Cf2LAzx7cNpWprnZVsgQMnwKEiHmXcD2negs64uOhswegz9YY27KvPF/ITbl9i2NGBNYpt X-Received: by 2002:a05:6000:2601:b0:456:e27d:d6aa with SMTP id ffacd0b85a97d-45e5c5b3975mr12006870f8f.2.1778951785612; Sat, 16 May 2026 10:16:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 08/21] target/arm: Introduce common system/user meson source set Date: Sat, 16 May 2026 19:15:10 +0200 Message-ID: <20260516171524.19184-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: 1778951824615158500 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 --- 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 4fb2c15f7e0..9eeccb2adca 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -52,59 +52,41 @@ 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', )) =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:24 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=1778951822; cv=none; d=zohomail.com; s=zohoarc; b=Ym44I9xBrSNTmJ/lTl5zzl5QzI25pHRZibqyG662+OeH/aknqlQFc7yLEGLRQSJAFfbh4FvG6nO75nBw61qBdbwJW/OssjeKZkP5lByI5Nhzt5sdbI0fipWjZse5BtCDjryDWczOLkHFKmi6rDL8Ppkx3C9bxKDkyRZGSO2CzbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951822; 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=iy1BA/Ui0hjTxXz8XEAJ7bupYYu0czPgBe1e4aVxVJazF06ojEPdqgxXOpk5XfCX/jbJrNdjdb0yST4Rn77yE/vXTFkNZIHN/nZGzMD4IgN/P7zDi4oUIuuw03WUJI3ZuAeMzjs7/XmRF0uCcAPIwTePPT0R+PpA7OC+NKWGFUw= 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 1778951822463559.5622803842384; Sat, 16 May 2026 10:17:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIcw-00039n-Ao; Sat, 16 May 2026 13:16:38 -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 1wOIcu-000318-IY for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:36 -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 1wOIct-00089l-2F for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:36 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so9791105e9.2 for ; Sat, 16 May 2026 10:16:34 -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-45d9e767ee0sm22053530f8f.1.2026.05.16.10.16.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951793; x=1779556593; 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=DIfPrY+e08zeA5EikmBlse5txwu2tHr1+24TQ2QPsPHtK26GfjAW8s5M5tUPwdDOmX 4mWq2/n0gd+YLX/Wlt1VDpOQlxd9SCA1H2As0nvElX2vcdF5QY1KggAhhwfJsvGRlC0w kM9zfYXf7oBXgUdIXWz1NDmoND8PS8F9PEOJzd2kjN3rsIOu1AnI4S5kR1F1SQyp8jQR FioGqYA1ioGNAULBR3JuGr837W1IrPwOZnwuBkcQvYYhBMsLZTM1z3dq37L1IJgN/RQL m/jAOfvJOhlvTba152e0wu2YkSd+QOhnJ8XVr4wAlZG2YsvZjKQE6HFE+Qp4qhQTU9Yr Yj2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951793; x=1779556593; 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=D0ZWjmkhnNyYEkyNU9RHEMSgVoI4VGeFBA0fop+gpwbrwXa2bXC6LPre3raK33vxAA i67JX8OGFlOexh5aqm9e5RitNpfRCjDOzvfvLfh77CGgAXUEhY9IuivNCxG+pZZukBkK tG06Mm6PwLaRfKQuGjn2K0RVmiWomTKB4b/knHIQnFSYzIXEStRuCJXvHBCKWw/sgs4d v4mnv5rMppddPXh3dq3/xYU4vZBfZlsvRjjNhCV2/psWQfSzi+nTyrQs0I6276QldgLW 3BzDdDMj8lEJj+Y3zNGsLVieOS2KCmbKKAB+Ltpv04bhrB7bxRhCEDd8wjZ3oNWjdSt7 zraQ== X-Gm-Message-State: AOJu0Yx8clRKJGRXe4M9G6wqq3QKhtLh9eozNACOAJt7Xraz+pFNvvDE MnQGLLCn4T4A3n30Xb4hS6+ww73l6w/5DBAhHhPDIjGSHgtVH2wEd/0PBVF7VqH6ywrO4Zic8Qu /f9JdWxk= X-Gm-Gg: Acq92OHtSsT/oMHABi+Xhbvn81+MWixKFmgaAfIgutWb5NF8TLKzKruht/5zx/gq3c2 PqHBsFkJ599tdvPfk/DZvam8wI0gPeqD0BAM1k2B0Hv5c+3r8JjjYzIOuDg8dgiCRSK5MoOcg2L /MbvUmGVgpxOKie85sjKQ9JMLkKIp9UE/UZKS5spOdYUqxSCujBrlwIHsQq0x33L+kmQLZw26Rj 3/jXtNPpSEaV9LMleXTseROC/9edn3rKD0WxfAqpmiKs956WMeRfpdN6pGfGmne62FZ5VJ2ux4Z QZEBULi211j6U2pbaJTjQV3AETFVX5JbYm2+GnjnB1Z8zCvMPesphGO5U8s3sshE84rk2DorA5E 300CthsZSlCc0Vs+FGuPIAKrPMpqaOEPK0fGzx9UraT42BdP6z+D1QdRQpxMY7/tnM18iBGuNr0 iJoaE87cFhXFgYdCzT/xiGGeoeujPSQbvAqHJWp2AVjvWk/KJOTKukpQM98E0FVGjWnHmS8trXy JJkPCCB8PY= X-Received: by 2002:a05:600c:3506:b0:48f:e44c:e058 with SMTP id 5b1f17b1804b1-48fe60e13e7mr119641455e9.1.1778951792937; Sat, 16 May 2026 10:16:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 09/21] target/arm: Build gdbstub64.o as common object Date: Sat, 16 May 2026 19:15:11 +0200 Message-ID: <20260516171524.19184-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1778951824571158500 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 --- 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:24 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=1778952005; cv=none; d=zohomail.com; s=zohoarc; b=PkchqhgnGKrBCU9e6WteLvNGUxuy5maQMkP03rUMLWk9IX25ljAa4qBziGyvrB5PmkI+JO6G35y/IneRNSHqI0iO7YmA5dQAVcq82UsKKEqIYlMBeqFQLKEwX4V0Tg4GckHTlnNunowG5142yJipLwKovkkIQVXNWDZymjgHVOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778952005; 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=0/8BFtttVT3g+0FRyeC1PPimTkeRBXGfBRsBUAZi9y4=; b=MNBBuudhPZnUPmrfpSZXCtQ6xuDuDdzjmBV4RT6Wvx6HmH8XBwMyNbBQTtpB7tABpJpp0NKlo7ywbq1zsVO4DkXr77w6xF/ceYuZX/543MrD7Tsa72rP9txYjI2zqMKvfcmFdxgquM1tOxV/M7EopIrG6XXfBWe6yp30tDpmtQc= 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 1778952005621202.45685983717294; Sat, 16 May 2026 10:20:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIdT-000441-2t; Sat, 16 May 2026 13:17:11 -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 1wOId1-0003ZK-CL for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:49 -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 1wOIcz-0008Ao-RM for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:43 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-44a14580111so612181f8f.0 for ; Sat, 16 May 2026 10:16:41 -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-45da0a178adsm24948033f8f.18.2026.05.16.10.16.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951800; x=1779556600; 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=0/8BFtttVT3g+0FRyeC1PPimTkeRBXGfBRsBUAZi9y4=; b=sKdXmDqyjs0tVzeHMcfqfZN2FtZomB8VKkQAmVwlKXfX/mwCZPE+5mLGYDesy0FEFN FsMm09b0qUnrCRjXxFqWbOxa53n/f9UHAFNEyNDi1GGLQOU1pa1O8vNFQtNExlAPM5VU SKpovTkTB+kjw4TyjxJ96ONbQzWAHsIFCkueGqeyILYtMted/DAUrT/3unc/BEYootFq j5c+NS052rRybMv6m815V7UCskr6XTElyUZXx5qfmIQHDuTB4s4YaxjR5EFlVsCiiP/V mVTZOq+SE9/9NQUbIIJU6TJBC48dEBkpEay2KY9My+FLOGzz34N+Xm3rnwrlbjuXzrlt KslQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951800; x=1779556600; 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=0/8BFtttVT3g+0FRyeC1PPimTkeRBXGfBRsBUAZi9y4=; b=tQPFB1IRNFXTi7sR3gXAKjYO6lJRBeHCAJRbPoyJCyPs6P05jguoTSLReRX6vg7Xh6 KBfU4yZmi3yMIXM/OfN5O87f/Zf988Kp6vsGWkqPBuz4Jnow+sW1zrbZTTJbUeSM8AzC trQYBaeSCkZ4tGuYWSnI/MqpYIFsPOLRYh5yoxMM4f1+MkRyAr9iQo7KdW+CsNkROLke PXvJ7scj9PKvTTqjo4dzPnHjC4QiucyhsGjkZko6x7NpQLcRF/H53JhrCETBFwh41bU7 bvCrAjekDEIMfXn4uMOnW2Uh1v/dFyZp658aK32UW5O/OHsG3H3lQej5VUdjSRBXCqub 3X7w== X-Gm-Message-State: AOJu0YyUBexKTgAjO8ROCijI8Ec7SCfO8RKUuo2aU7v0K4mI840J/8PX aM3lPsIml8y2+OB/7HiwnseD4ynFSvscFKagyr4s7q6Hvo4XfVCJ6RWuhzfN2+/slm7fiM2rORa Vcv3aRmg= X-Gm-Gg: Acq92OFbrojTZca2lDOkcctoO5HgB7o46+KvpMH7h5K7UaNBl4jWoV6c4O8fyKhSAY4 lOtdm8sCHSPRI8siOr9CUy8jce+bBq+Oq8ut2brYzzKXd5D7ePbfy5gjU6vyzJjtcaXiksT05lD uoGB5kp+lycniEsHlHOT7/uCYykIV+/L59TyEw99nB93fz6MCBL+asfbq6npae8lvservrJJ4HS EnzCKXD7m9N3YG7Qa9JRD9qbB/3w28EnsqShLR6d7clnV9r9hYZFJ9yw5U+9A5yFBT0DNMEw2z0 scjOpNd5qe9NiUx9xz9nmCpUBmp404zHHVgFsD71eelfMhIoojIM7nZ3L7Ax3Cao7NpfU+7Xnm0 Usv1qDUor8qEv0zFsYCX7MnewtbPrSai+UPKnvrRHb6hG/TPp0y2gXVvgxRA2hIvOjEkXsvvgle IS8LQddtWghcWJRjtZaE2hRDCLEjmN4qnQjSNl13iy6YHO3HmaH5uGObTS5YVCndrswdTDNriK X-Received: by 2002:a05:6000:2c12:b0:43d:7af0:3a7c with SMTP id ffacd0b85a97d-45e5c608d29mr12287288f8f.29.1778951800226; Sat, 16 May 2026 10:16:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 10/21] target/arm: Build cpu64.o as common object Date: Sat, 16 May 2026 19:15:12 +0200 Message-ID: <20260516171524.19184-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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: 1778952007328158500 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 --- 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 9eeccb2adca..97d31b7515e 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', @@ -79,6 +78,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:24 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=1778951854; cv=none; d=zohomail.com; s=zohoarc; b=DNq4yZbHDByVX8c/T1/qPhP1fgnfLaVE7Mj80EIhN8tNbgIGrXIvNQ81jFt4QF0HzNZXPymVhcBOBX4FaZMl85fzMreMAu7RFc2SsynzVMmwkI+OPdQ5KzR9o+vTFKCtAzLMxoLtyIUMBsMuzeKXsNE8rpHFfjRQoOiMZPeIgCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951854; 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=hV4e73UNbUO8rrTdoZ6Judcl7l+pcK6HO82RHoEBX8M=; b=Yy9Knp4N+xcalJqTqOps//yONUfHbryPSp/FSQmofTxDLsK28Agf/NlQjdGaubiThqksb7WaW0QRyhvamMnjkHaBHsIyVnKP1nwoOl4Qd7o9fQZtaZVJqHipg/szpxfDSY/rba2I84ESm8mHfbih36QQNfFJXyAD8C6qfJRSDzA= 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 1778951854915169.1866306682216; Sat, 16 May 2026 10:17:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIdP-0003pa-Pn; Sat, 16 May 2026 13:17:10 -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 1wOId8-0003bo-RM for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:58 -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 1wOId7-0008BX-0c for qemu-devel@nongnu.org; Sat, 16 May 2026 13:16:50 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488ad135063so5767005e9.0 for ; Sat, 16 May 2026 10:16:48 -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-48fe5cab818sm143121975e9.14.2026.05.16.10.16.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951808; x=1779556608; 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=hV4e73UNbUO8rrTdoZ6Judcl7l+pcK6HO82RHoEBX8M=; b=xLVQZ1DU+4QQo02BqSLq7k1GWXdU1fll4Z7KmrtKsvkdhPOrUn0NMbKUN5lwzgvHhq C3frGrnLwH7/oRrQgXgKv4kMzr7IvcSLZUUGCnGhSpYG8d0VN4y6EDT7eIUNdBodRem0 liC6unFlcRq6ZCLm6ESnCCXd2U1orrgro1j4bfGKSjrw7oSBnb2GpddGF/lYJ4YE9w8l io3iU84cVsinmVmWHkE7EqjY/syYdkVcC1RtY1O4Dsl2X7rV9SjZsDHQsAh8q2Ici+Ll 9ttJh0flEbhOUPAUfAD4s0tQlkhPEJHNVY0vR7Os+CIZL+iEZOYIHZbq8qoKihSQ/nLq 9h8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951808; x=1779556608; 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=hV4e73UNbUO8rrTdoZ6Judcl7l+pcK6HO82RHoEBX8M=; b=rnO2z78xm7crBrUxUza0bmLn9yBXwIKHPt3SMIJiEJoJEX0E8AaPVmfD5moN4s4v8g 1JxCvClSwSaftez5AK59lyKp6Dg6pEB6bjTF9egHOVJclLYZPF93QhENvNEBqePdB1Y+ WlwMh09by+OCI2crCfw31ompfrWn+4Wq/bPJOySfZXd1nQvn0r1jp9nzyA8bkH4A4yrK LPLDcZSaXysnglX8WwJYPkS9wzB1QWiR0tQfc4Wq8DH+lnhm85Vkt7DrDjNLNWrWXmq2 DGjfsXeS0p8eOs89LCrSQiC0tvjs+ALdTgpJRTmyfV0kLDoRrL8Wi9cqcjDU0o10gYfX w/Yg== X-Gm-Message-State: AOJu0YzSHGzh87n01k+xjeDXNtZ0oDCaF3f44TPlhgNTQJ+zH55WLPvT rSiA2X19qNJRjCun0whdBVaEHcSiPLQRoehrFDkUEMIk5YdkjGWN1unKlQrUyulxVmt2pMLAbYT 7iRD93ps= X-Gm-Gg: Acq92OGDWOoOZNhofRbypkJ2p1rZoHW1nyMo/a8DrNplGfYEuGnGebxtujx+jwSb3aH MDxY0PFUXYaP+whDUmDnm9yqgchqjcmkBFZ12dJuBsiehzKDymfZmsv3qagD1mcW9nMOvbND1pQ W7E8VwFebnWA1OCqPRV/NnDaLJlbMvylh8U//oPiWx88f7nI8aqeA35hE26tZz4D8d6Bpna5Mk1 zLAnxWhukjdQMYsTJpvkHI3LeUlQPDKdEATik+xCXBXZvNUiuBm6bo5ePowtQAmb9gom/MBTRxK /sW9Nog7Y5gg/mP+c/x3/yitujL0dOWnNllrO2jD+9QQq8K5v6GZh1xXcMR/Ba4gBNUJs3rkcTf qfhjVUI7dxu9ucEsRtwF8ppu0vwQNVOFMJWpbQf4L0DhprwEK+bU2AW2dGmbukWtZW1auIaDGX4 GyTGgaJFN+7q8J/NYlkk0Zvt1YXWb+yPIANKWh0+mn6esFrkyNSWt/5m2oh6QjW0M+Ffc/dD2K X-Received: by 2002:a05:600c:8b45:b0:489:1ba8:5bf0 with SMTP id 5b1f17b1804b1-48fe63253f3mr116708325e9.21.1778951807634; Sat, 16 May 2026 10:16:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 11/21] target/arm: Restrict IDAU interface to TCG namespace Date: Sat, 16 May 2026 19:15:13 +0200 Message-ID: <20260516171524.19184-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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: 1778951856961158500 Emphasize the IDAU interface is restricted to TCG by moving the header under target/arm/tcg/. Move the definition to cpu-v7m.c which also contains v7/v8 hardware (NVIC), keeping only CPU types in cpu32.c. Reviewed-by: Pierrick Bouvier Reviewed-by: Manos Pitsidianakis Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/armv7m.h | 2 +- include/hw/misc/tz-msc.h | 2 +- target/arm/{ =3D> tcg}/idau.h | 4 ++-- hw/arm/armv7m.c | 2 +- target/arm/cpu.c | 2 +- target/arm/ptw.c | 2 +- target/arm/tcg/cpu-v7m.c | 11 +++++++++++ target/arm/tcg/cpu32.c | 8 -------- 8 files changed, 18 insertions(+), 15 deletions(-) rename target/arm/{ =3D> tcg}/idau.h (97%) diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h index 98ad08db036..70555962bb9 100644 --- a/include/hw/arm/armv7m.h +++ b/include/hw/arm/armv7m.h @@ -13,7 +13,7 @@ #include "hw/core/sysbus.h" #include "hw/intc/armv7m_nvic.h" #include "hw/misc/armv7m_ras.h" -#include "target/arm/idau.h" +#include "target/arm/tcg/idau.h" #include "qom/object.h" #include "hw/core/clock.h" =20 diff --git a/include/hw/misc/tz-msc.h b/include/hw/misc/tz-msc.h index 07112d8caa3..6cf4c6b09eb 100644 --- a/include/hw/misc/tz-msc.h +++ b/include/hw/misc/tz-msc.h @@ -51,7 +51,7 @@ #define TZ_MSC_H =20 #include "hw/core/sysbus.h" -#include "target/arm/idau.h" +#include "target/arm/tcg/idau.h" #include "qom/object.h" =20 #define TYPE_TZ_MSC "tz-msc" diff --git a/target/arm/idau.h b/target/arm/tcg/idau.h similarity index 97% rename from target/arm/idau.h rename to target/arm/tcg/idau.h index 0ef5251971d..e5736ad848d 100644 --- a/target/arm/idau.h +++ b/target/arm/tcg/idau.h @@ -25,8 +25,8 @@ * connected to the CPU using a link property. */ =20 -#ifndef TARGET_ARM_IDAU_H -#define TARGET_ARM_IDAU_H +#ifndef TARGET_ARM_TCG_IDAU_H +#define TARGET_ARM_TCG_IDAU_H =20 #include "qom/object.h" =20 diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index a29eab6c915..68a1cbd6316 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -20,7 +20,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/log.h" -#include "target/arm/idau.h" +#include "target/arm/tcg/idau.h" #include "target/arm/cpu.h" #include "target/arm/cpu-features.h" #include "target/arm/cpu-qom.h" diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 31e0a12a986..a4eb6a2de5e 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -24,7 +24,7 @@ #include "qemu/log.h" #include "exec/page-vary.h" #include "system/whpx.h" -#include "target/arm/idau.h" +#include "target/arm/tcg/idau.h" #include "qemu/module.h" #include "qapi/error.h" #include "cpu.h" diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 8706dd59dd6..a4842a4b62b 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -17,7 +17,7 @@ #include "cpu.h" #include "internals.h" #include "cpu-features.h" -#include "idau.h" +#include "target/arm/tcg/idau.h" =20 typedef struct S1Translate { /* diff --git a/target/arm/tcg/cpu-v7m.c b/target/arm/tcg/cpu-v7m.c index dc249ce1f14..02abd831e6a 100644 --- a/target/arm/tcg/cpu-v7m.c +++ b/target/arm/tcg/cpu-v7m.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "accel/tcg/cpu-ops.h" +#include "target/arm/tcg/idau.h" #include "internals.h" =20 #if !defined(CONFIG_USER_ONLY) @@ -40,6 +41,16 @@ static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int= interrupt_request) return ret; } =20 +static const TypeInfo arm_v8m_types[] =3D { + { + .name =3D TYPE_IDAU_INTERFACE, + .parent =3D TYPE_INTERFACE, + .class_size =3D sizeof(IDAUInterfaceClass), + } +}; + +DEFINE_TYPES(arm_v8m_types) + #endif /* !CONFIG_USER_ONLY */ =20 static void cortex_m0_initfn(Object *obj) diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index 2127d456ad6..73d21c6cf7d 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -12,7 +12,6 @@ #include "cpu.h" #include "accel/tcg/cpu-ops.h" #include "internals.h" -#include "target/arm/idau.h" #if !defined(CONFIG_USER_ONLY) #include "hw/core/boards.h" #endif @@ -899,17 +898,10 @@ static const ARMCPUInfo arm_tcg_cpus[] =3D { #endif }; =20 -static const TypeInfo idau_interface_type_info =3D { - .name =3D TYPE_IDAU_INTERFACE, - .parent =3D TYPE_INTERFACE, - .class_size =3D sizeof(IDAUInterfaceClass), -}; - static void arm_tcg_cpu_register_types(void) { size_t i; =20 - type_register_static(&idau_interface_type_info); for (i =3D 0; i < ARRAY_SIZE(arm_tcg_cpus); ++i) { arm_cpu_register(&arm_tcg_cpus[i]); } --=20 2.53.0 From nobody Thu May 28 00:44:24 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=1778951863; cv=none; d=zohomail.com; s=zohoarc; b=mn8wLvVO71riSKkkTGkMkN6JJwEZgMcMWqItExOaG5JwsImG8lXMHJh5YQYbuZduGaQqdnc/0OxsAUv8/eF/lSTYUqFztyAzAn/t76d/5TFs7Szs9pcT6Afqgt7tHMFGaF0AWXHyhwq78Jc0WFZ+R62wP0wHa/keAsVn0EaxOH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951863; 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=jK7qGzHLhnk2A1+FDhnQPXqGGZvsf0GaBoX/NZPQKsM=; b=I4nmqFFHCw/Iy+bzN5IKFYgwHyEXoMI+qEMmnvgwx10Mq1fJyVkH6zl9LqHKOmE0vvI7KX0q5nv7EGb5eIEI6YXWwdPXL1V/JRNNwiI8fRxH1gtCQ8rKoP2JyuqwoqqosjHMq+5bWlvgiYe+nBxDRpgWolS75bJeK8e3UEQdy/8= 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 1778951863073915.5847029932434; Sat, 16 May 2026 10:17:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIdV-0004LQ-1n; Sat, 16 May 2026 13:17: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 1wOIdI-0003iZ-FS for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:02 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wOIdG-0008CH-Jk for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:00 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-449d6c68ed8so752318f8f.0 for ; Sat, 16 May 2026 10:16:56 -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-45d9e768bcesm25526974f8f.4.2026.05.16.10.16.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951815; x=1779556615; 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=jK7qGzHLhnk2A1+FDhnQPXqGGZvsf0GaBoX/NZPQKsM=; b=E5Rnc7B0adAp4msZ5JwNTOZJu3SIRsXcuEYnQvvVomlJDKYFV8nDg7I1v35/vzmmxF CfD2wiTVMiWvNzGlVWa4ZB176BC0nb1doge02JNEx+WqQI5kyMcyA4ApSxGGghxeG0Kn Uol61DX+gnrjopJRaeom6N0oVHioft1RqQz2snRfnJg6V6xOCmeBwIbSVxT3qai4G23u DI1eOeXpojycojpiFbZF8fYnnVr7E2pkOjlinpUwIr2n/GQztYB1quU++j66zYs1oB+7 9z6Tz6XZaKSnpJuCgyLVynXrIwdbmd+9W/yViRkYW8tiHLuN9amDMIWxpwmWWx2BxJ35 9qew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951815; x=1779556615; 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=jK7qGzHLhnk2A1+FDhnQPXqGGZvsf0GaBoX/NZPQKsM=; b=AZYLiWt2/Wi6RTe6Cf+Qp6q1SiQiGOLk7KE3ACcOtDDYRhG8XC6c8HIuawV/JbuT0M pqDdmmVYWAiLPSY1yAjjbr/ANAZfwk2fYdff2rxGCZCnqQfgddxZnGqsGapVZBzh9w/K XWGf/bZ0yA6jO5dX57903x1w6TcC+BlQistg2n4Azzd01zlcFx5fEAyIdd9qkkJJLAyQ oMqUYXcMFfqqwkNvhxflyzK3/s9cKdPsr0ySZDEkGKo8LsrdKEdi0Mwptr3Pf06IrUMZ 1baewAe4+1AK3fz4NqHWpjgzyz0oxFVNe1Bdkkc8+UvzBmMsIpvKGUqYRpGnrBVpA+iP LG/A== X-Gm-Message-State: AOJu0YzWtPcbm483I6edov39yY+ZRtUfmzcLZLmN8fc2ouZtQ+yWFBWE wRKo5gq3EbZb1TrZU2AKWOe2xWfkQ9spmJRwShSJW3rPHs7ll1FznlOkrXJqd36Bw+R7oY/ciSN vGbXsEDk= X-Gm-Gg: Acq92OFluyJAbR/w8aD0iSHLyUzu5BlIIChovnjm7KcMORW44NoJWtWKajs5Y07zQ3D mNFjACI3QrUeiImS1ey134Jm5RmfXrIHqNWzXKNQTTe3fUSeZU0LJV7ua4xTwd76SFIY5fkMatU ghtZJ0kh+vDVF4U5bv2dORBmuMhdAlKA3+rLM063tdEF6m9WQeCqpXJWxeodLZIkrFjF5a/Llag SPhPKPYm1G2LhqDOSOO7X+J2cXBsGY6FAbWBdFOWk6wtRtFyW+lWAJsUG53XlgaKlyVro5fznVZ 9S4y4yHVpMlqjBCj/Q8P9bSGbv8P6/zqi7l91pn/I9LYAbuE3CgBPt5iQhESAn4kEEhYyfLskgI 1XGAac0tjzZIt4poFGCsLZoShyvOxTMtLC6ULfxADl5uHzKmKp/mDg/ue/7xZlMgvDeWmSVJkJ0 YBXIYYPSHnJxlz/j0nCefQke6oZGagcnQRZnKKcdDRfLJMQYli9zfPvnzMfdG7FaiuLYaR6Oxt X-Received: by 2002:a5d:584c:0:b0:446:db72:e8ec with SMTP id ffacd0b85a97d-45e5c587281mr12343588f8f.23.1778951815008; Sat, 16 May 2026 10:16:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 12/21] target/arm: Rename Aarch64-specific methods Date: Sat, 16 May 2026 19:15:14 +0200 Message-ID: <20260516171524.19184-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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: 1778951864409158501 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Manos Pitsidianakis --- target/arm/internals.h | 8 ++++---- target/arm/cpu.c | 8 ++++---- target/arm/cpu32-stubs.c | 8 ++++---- target/arm/cpu64.c | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 3edc15c7b4a..00830b17248 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1750,10 +1750,10 @@ int aarch64_gdb_get_tag_ctl_reg(CPUState *cs, GByte= Array *buf, int reg); int aarch64_gdb_set_tag_ctl_reg(CPUState *cs, uint8_t *buf, int reg); int aarch64_gdb_get_tls_reg(CPUState *cs, GByteArray *buf, int reg); int aarch64_gdb_set_tls_reg(CPUState *cs, uint8_t *buf, int reg); -void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp); -void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp); -void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp); -void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp); +void aarch64_cpu_sve_finalize(ARMCPU *cpu, Error **errp); +void aarch64_cpu_sme_finalize(ARMCPU *cpu, Error **errp); +void aarch64_cpu_pauth_finalize(ARMCPU *cpu, Error **errp); +void aarch64_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp); void aarch64_max_tcg_initfn(Object *obj); void aarch64_add_pauth_properties(Object *obj); void aarch64_add_sve_properties(Object *obj); diff --git a/target/arm/cpu.c b/target/arm/cpu.c index a4eb6a2de5e..c47b70ac694 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1707,25 +1707,25 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error *= *errp) Error *local_err =3D NULL; =20 if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { - arm_cpu_sve_finalize(cpu, &local_err); + aarch64_cpu_sve_finalize(cpu, &local_err); if (local_err !=3D NULL) { error_propagate(errp, local_err); return; } =20 - arm_cpu_sme_finalize(cpu, &local_err); + aarch64_cpu_sme_finalize(cpu, &local_err); if (local_err !=3D NULL) { error_propagate(errp, local_err); return; } =20 - arm_cpu_pauth_finalize(cpu, &local_err); + aarch64_cpu_pauth_finalize(cpu, &local_err); if (local_err !=3D NULL) { error_propagate(errp, local_err); return; } =20 - arm_cpu_lpa2_finalize(cpu, &local_err); + aarch64_cpu_lpa2_finalize(cpu, &local_err); if (local_err !=3D NULL) { error_propagate(errp, local_err); return; diff --git a/target/arm/cpu32-stubs.c b/target/arm/cpu32-stubs.c index 9e50bb1b0b5..d42b1a5d6a6 100644 --- a/target/arm/cpu32-stubs.c +++ b/target/arm/cpu32-stubs.c @@ -4,22 +4,22 @@ #include "target/arm/cpu.h" #include "target/arm/internals.h" =20 -void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp) +void aarch64_cpu_sme_finalize(ARMCPU *cpu, Error **errp) { g_assert_not_reached(); } =20 -void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) +void aarch64_cpu_sve_finalize(ARMCPU *cpu, Error **errp) { g_assert_not_reached(); } =20 -void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) +void aarch64_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) { g_assert_not_reached(); } =20 -void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) +void aarch64_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) { g_assert_not_reached(); } diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index a93ad2da5ad..b38a78aac3f 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -60,7 +60,7 @@ int get_sysreg_idx(ARMSysRegs sysreg) =20 #undef DEF =20 -void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) +void aarch64_cpu_sve_finalize(ARMCPU *cpu, Error **errp) { /* * If any vector lengths are explicitly enabled with sve properties, @@ -121,7 +121,7 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) * Disable all SVE extensions as well. Note that some ZFR0 * fields are used also by SME so must not be wiped in * an SME-no-SVE config. We will clear the rest in - * arm_cpu_sme_finalize() if necessary. + * aarch_cpu_sme_finalize() if necessary. */ FIELD_DP64_IDREG(&cpu->isar, ID_AA64ZFR0, F64MM, 0); FIELD_DP64_IDREG(&cpu->isar, ID_AA64ZFR0, F32MM, 0); @@ -336,7 +336,7 @@ static void cpu_arm_set_sve(Object *obj, bool value, Er= ror **errp) FIELD_DP64_IDREG(&cpu->isar, ID_AA64PFR0, SVE, value); } =20 -void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp) +void aarch64_cpu_sme_finalize(ARMCPU *cpu, Error **errp) { uint32_t vq_map =3D cpu->sme_vq.map; uint32_t vq_init =3D cpu->sme_vq.init; @@ -408,7 +408,7 @@ static void cpu_arm_set_sme(Object *obj, bool value, Er= ror **errp) /* * For now, write 0 for "off" and 1 for "on" into the PFR1 field. * We will correct this value to report the right SME - * level (SME vs SME2) in arm_cpu_sme_finalize() later. + * level (SME vs SME2) in aarch_cpu_sme_finalize() later. */ FIELD_DP64_IDREG(&cpu->isar, ID_AA64PFR1, SME, value); } @@ -548,7 +548,7 @@ void aarch64_add_sme_properties(Object *obj) #endif } =20 -void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) +void aarch64_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) { ARMPauthFeature features =3D cpu_isar_feature(pauth_feature, cpu); ARMISARegisters *isar =3D &cpu->isar; @@ -666,7 +666,7 @@ void aarch64_add_pauth_properties(Object *obj) } } =20 -void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) +void aarch64_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) { uint64_t t; =20 --=20 2.53.0 From nobody Thu May 28 00:44:24 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=1778951865; cv=none; d=zohomail.com; s=zohoarc; b=mnlqvyWvTiobJU/4ytrWY//nAnrQ0ujN91ZV9jCaA9gfM1ta9bINS+7FhpGfpZMYabcakfoEjt2IAQOHCPnijAi102YOFKxU/MYRZupl/ALti08PXnH0p5//L7mbcg75pQdr/ZwnEUh4tpFo6EUh6JbmIzA4AJnkDTkxBahgQMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951865; 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=SIeO02T+WVb3RoLBOwE7/oBax7vXDWW6ZWvhgyatOe5JeTAnDT1PHKgGeq0zl6MHtLIrJb9zxi2JF3elBWZfPCR3DK3Nq6DoshTHvJBLgdf7hz5SAofexSQIYC59Y+xYw5EkofCpy98y4QW/iVdQqAqlBaaWVkHgFHBv0BfR3os= 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 1778951865498897.8965359033033; Sat, 16 May 2026 10:17:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIdV-0004NG-E1; Sat, 16 May 2026 13:17: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 1wOIdO-0003ue-Ns for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:10 -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 1wOIdM-0008FK-Go for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:06 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so12715295e9.2 for ; Sat, 16 May 2026 10:17:03 -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-45da0fe0fecsm21690570f8f.26.2026.05.16.10.17.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:17:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951822; x=1779556622; 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=VtKemxTHy/zstbZkbQs6SFtVQ1Ln6e9RQRtu/VruCj16452nSfPXEFuL+Dx+LEcgLC DMg0Z6/HgcdgTIgYZAkdsKF3oxMlOfSidM2J+4E1Q+L+cmPciYHfDAPoKBDUfAmp862h yvTzTH8pJBdqxNEJaB1T3dDyHM6fjPdPMkoazPaij4ziCvfH+V9+u5qT6/q3Fzn9fS4X UDEdpmrnPoVGX7gipKZr+N/eKHpzl1FVwgIJcMRpGierUwkXUpWjfAXoItzWGJjCGBI7 ISNuFqph+kBoCkpThaIVX0RbyHlCLknmnu/iAIZoqtAp/nwThrM6raZmQUWabFyV2/6x Lelw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951822; x=1779556622; 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=TC8o8QFNu+yu3MQtZndbfriYJQsDsWHIYhNCHwmYb+hoPMe7EIXRfN4/st5zSOTrXD wch4gt43ENuwYRR2IUlWFOgdo3qXE493Qx7bcHyzkaR3FTuaDNSXNZDtFDP1Jz0BLAf7 GP4IYVmkEbAvEhxIhht9dM3ACjgYQlayWTIDGDyGgDFhDNEGnwgdyqQT6p/SwdQCJoIu cnzyx5/0C1PFfQdzy2aF1Y8Pjn6k0JHa16AIIk6MVNp4zSTe/c+lSuprQ9AwhClQoOMC q1EEE5q/d/Aki5C1/ESMF3QyxtNkr/MP/anQY7ecckAkMW0nIRSYAec7vX5MPkp+P3H5 3D9g== X-Gm-Message-State: AOJu0YxpaYjYK3kYeVg7xSEhKP+Ez/Y9ihfb1aePeQDsScXdA+FuPR4K jxV5fMRk4etCjSC46LD23XYNWRv7vv/Dry/ka497gxvOlV3omx9AXBGPe0YA+Ly2nKk7gpS6vT6 fFt4h7E0= X-Gm-Gg: Acq92OEiHqQ+GMyjcZ8TEpiMIIzQXVePAgxs1BOhmDnnAm+5z+vjRk6BNKta+b/6vyV X7/uqbsJrcy2GUv/jBF5p7g1vheT2ZykV5eN2KT6iQnnWhXbQaY4LeAvlWzSxbULqUuNvkUvjRC XPsRIfgMUI/r6jWSCKDpzYjkAZtQUjHrhD8p1NNJVFV1LvRoNRvKMdjXLBAzQgwQVloRnv/5Lt9 B8L/jW7XapxZT51DGmjizex6ONpVp02zxNW6I6wxRXjgdIWy62SsOKMh8P+sY/DF1V9zZtH9w2M lWdduVN+G4amd9ESYnuaXqJX9MHBHvMraaYK5G1B+/FZ1Azl1qRC1NVUerjxV1GAg5TJw3HylZv cEfMPw5LNQhBTK/WjGZCB6wXi/lUL2dZqy8qOfU5Tgv2wRrc8W656LNqvz/spAPRPtqgrC5OM0S +CbelafPmUUjw4voleoN4btrFLJLhmB32ef03Y/h3IsoByA0irkfi5c5l6ihcxqC5XElkb+O+A X-Received: by 2002:a05:600c:46ce:b0:48f:d2b5:d7 with SMTP id 5b1f17b1804b1-48fe60edd2dmr119506495e9.12.1778951822353; Sat, 16 May 2026 10:17:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 13/21] target/arm: Extract common code related to 'max' CPU Date: Sat, 16 May 2026 19:15:15 +0200 Message-ID: <20260516171524.19184-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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, 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: 1778951866331158500 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 --- 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:24 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=1778951880; cv=none; d=zohomail.com; s=zohoarc; b=MNwCPKuyQkbbIny70PPZTZBzJ2R6B0wvpq4B4xS5f4j1bifXRcDI9G1im6KMquaivOYO9aRLLR45Yb3jNOwFVIeU1T0b38k+EhCb+qYqHvgacJCoRMa2XJwaW/nSLZBS9DsQxmwsIYOWTmwA21u1JTdCTVzIzPazLGbnE2adRDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951880; 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=jlaND3XglT3TI8js+dRmAQGWSyi9zeaZ5uIfynwpLGFVJMfyzOmqbeojXomUb/P2PYt4oEKXTeNnQi186dZZzbSw+18+5zNrmYAwVeUOyR4KeKK+t47D5orx7XHkRIk3PMpjm/4jHLBAFprledpnvjGxnsEegyow8Xh7ec3NnUY= 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 1778951880818111.68331444392675; Sat, 16 May 2026 10:18:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIdX-0004eg-G7; Sat, 16 May 2026 13:17:15 -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 1wOIdV-0004Ml-2y for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:13 -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 1wOIdT-0008Js-8W for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:12 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so12716335e9.2 for ; Sat, 16 May 2026 10:17: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 ffacd0b85a97d-45da0a17ec2sm21342752f8f.24.2026.05.16.10.17.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951830; x=1779556630; 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=PAalJzhY6kKgozaAaFt8d4/Z8h97vNJgrmDcJoCG9hMVfsq1gEiPa3BKNrBGyqoFFj UjKsRP6PJwwq46C3/ouW0KVuwiCZM3lHg/GxTXdPi1TsNYevo2wlY3OVexRF6xHiDpAr AoNJgo9zd52SMxU8jPqr9ykgOfenQJtE1PtVfwGnwfhsZn6mn5FCFs8pJtM3q/c0Vl6F Fj72Nn9Rwdt9Qmmj/dCXikq+3Xw1YpRQ04H+HX2fufdMOy+y0aYJsE6ioHxKlqkXklYV SQgeA+1Lcrx+foWWeRbbpGOLkXuAw18CPdACWW2I4Ft2QjojgblXKMmr4WhFg5JcG2ix 7E/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951830; x=1779556630; 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=Z15XL4AG3Ck5fwX3sOBIFsLr/MB7M+Ftu0bC6nHrzGCpzAgiqpICOFxUs3KSvsh5ke oXHF43YfsP/BByHh7CagvZU84mwlGGoGQU79PZYsCtDU99fkJcceSq5Fw/TqrF8b/u4P 7uBohnei6yPyfZ7hZT1XLXkVMa1oVsTi5vCOcyNgNJ69Oq7drgx5IZTwZzNl2lFnfF7Q jlMvB71aEr+xU+WpWJHdscA5mVwPRmtjuGSEh4wVDaLAMDgbIlehA3MopTbmBJldJ2vZ xumQ0BK9CX/HQyxdRlaB3QIYqOeyvv1FAnsmK1tNRPsr5XVi6JV8i6rpm9cKlVGquffO adCw== X-Gm-Message-State: AOJu0YzxEToZ5T+9wI6z+EZ3wDaXyeLwOwfM1bosraqqnUy8UIOMC2Z2 5RdSIx7TYDIxmAm8kJ2wGqSQAtWEfh6aDYFESDRlHt+g47nC+QA7trXhF/d/r26Bvd0Sklf5a7o b/TcunjQ= X-Gm-Gg: Acq92OGiYnuyWHnI1FpQ51IAMr6nN8xN6DZsdYPW+Hbx1bvMaeF7sI0IKXiyro4pIOi EXxBWulPZe0qdinGPvJV9kQyRa5TscNY+j1BAUmcQxQK/3nErh1YUybpXyWGlwtHqTONKBWNgMf MXPcS9qLisLHCYNZI6x2JSK5hSKvAn16GzrOlKKbDvwSXYScx8XUu/t0dsZdzX6jGOCmej9wrIo 8Ff2d7PlL2dgXadQrAio4LHFm3ngh8vKpMx99pFc6WHCjKEXtGi36KGIGlP/nLTEzMZ0Mg8aD7B 4W3ArE7ymIFvvaRy1XID69Ibu4GO+bENeLh87JOmcvkaIRQgNFqqGK3dd0hqdVceDq8MKkS+T50 weJSOOtHUiS/h27WKeG1LApmBFj4XwryGLi2/Y/gYRdRR1U0YBsh5uOrtBNm9HoYA1BabXHDmve w8gmZIArhtbS1ZfjFSIqV69mCl+ZTjMAUAaJoULtRk3L/z4f89DIZ6fbLSl4kl+Q0Er/LKV1S6 X-Received: by 2002:a05:6000:4007:b0:441:1e8e:d8fd with SMTP id ffacd0b85a97d-45e5c5ccbebmr12960261f8f.29.1778951829790; Sat, 16 May 2026 10:17:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 14/21] target/arm: Use make_ccsidr(LEGACY) in 32 bit 'max' CPU type Date: Sat, 16 May 2026 19:15:16 +0200 Message-ID: <20260516171524.19184-15-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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: 1778951882460158500 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 --- 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:24 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=1778951881; cv=none; d=zohomail.com; s=zohoarc; b=divw7XmDrWxIl7HdL4RaDOpbq0BsNFaWfsLmbSzs/ImrKlOWCD83KGe5um5S4tXRStbbKIDNHizbtCrhdfEVEZwKWS5TrLkNajItn4slDpRv53wUHPT2hByH9WK0hMOEnX6wuQFWhFNEjXhjTsaQ1QkWYscG0/Y3B3v1vApXvXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951881; 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=Ra7EXO5EhZaRCUBpDoYAXx3H87/3I6hLLRwzmXBQOfMzZjJXYtWhUNy6AKPagSQh0hbKnv5OJMQ77+AiMHXoIjjf5NQLppsIaDqU+n+e4ZyHavpS6xD/BO/bw3fqWlc/fJcSxG0OwiApVG4tiTfEhFVqTS223V/IIRx/SFsXXqs= 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 1778951881571657.8133561001172; Sat, 16 May 2026 10:18:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIdu-0005ly-0z; Sat, 16 May 2026 13:17:38 -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 1wOIdc-0005MJ-KK for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:21 -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 1wOIdb-0008Md-4S for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:20 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-43eb05b1875so355245f8f.3 for ; Sat, 16 May 2026 10:17:18 -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-45e6a135f0csm5607369f8f.27.2026.05.16.10.17.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951837; x=1779556637; 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=o6EOgSE6yJxEIp9FCvdOUDVKSswAN+ABrb0+C3UE2tcm9tix/qjCVzi/nBTuE2jlzd 4PwrEDjm83/6zEm3AtrEn2gL+Xc7s6elqI5slpkKQYy9xXfClbGOLNKxKxK67I3Gx8ON VtZd8jy7Bj02A19FlBXESY+/uTy7ZlKnCotNIYJaChqEaykEGxo1a7O+QPbCBhau64J9 sEDW7MLtmm+s9QvMtAOp4V9FfopTKKASike1nWyTPnwN7R88RMl+TxsLvcjB/6LhreoD uFQT9XS5yerUuoew1uY2hgH6EsX0RNQd6uTdWp78kYtkjHlD8j+nyDs/LcB4ejRvkkF3 Q+qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951837; x=1779556637; 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=jjosOogEBxSMeUT+fBk0QA0SQTMVLdveUbNfp/IIElbXwYexAuB1f5KBwCxDC/VQBg a27NOkuHquRrzzIwwI9gfEdMEiA+Xa66N9c6cUCkij+r8kTnM8vrbaHAUX9uktnsOo4X 20L6l3LSJ10zoYdcQPWzW0OdZWJFxaW1jR8siqnxq55AjJJt5ENHypgcBQ2CTFpsrUfF wlj3wcku8l/TGsdW/fxWoy0X9gYYAZPSgCjxOSkS7r+FpKsHA/Za/sH49WkEmZPHHVct kPo3YwHzt9conBw/7+sKTeqI8jBz7ltdkhExolzgwvpv14+xTu6y/433YnHLH84HcAhB 5+0Q== X-Gm-Message-State: AOJu0YxepTF5Aj9Nbg0I2BzZYhnyCEwLJv1cp2INDkmRdrLQ4cZp2Ckz 5fdbyAl3L4TNwC684if6aYTqbMvSmRm+xjKGUWsWbjuejV0j2FM7ADWLc+SAvURu26U0Qh1SGkD Qbd68fS4= X-Gm-Gg: Acq92OEbxNE79TYqCrcAXBd9/3E971727B/MN4zGGCqeAZiMJka2CemPG35RdeFpbAN cbU0R/VQhenJzCrRDieLnxvaFTyEqyPcfD/WuHYhz3KyY+FltqwmZ3jYItI2W6/414eSHauxiZe GvWc9VAju733dvsD34nS3rYDeO7qVoj5ahs8YVNLW/aVvvkHmpOMw+oRCqaxcIyEOEubussZLMl 1yLuoCC2eIPsI+wRcP+TfGWUoHiqZO0vuYMSNFMnsmA3fEGq84Q5jvR+0b3NMNMaGqXdNLwVNbt bteqXld6FN7J7Q7czL715h7GyvzoTetDdk1BYN9b3VC1OM5roJGB0jg/Ej2n0fK/79LMfYogJcb CsZT1OQRoo1Ci8GKR3EOXZoihJ1DAg9p0FUMo74tEIGfuXPpfWrYb+So97oZP192N8XdZxW20VI cnYmX4j33uRYJ3yk1F/2ZNjN6ay4CS5AxKSNxwoodtunK21ip0zz8uPeStshCIKdevfrgj+nAe X-Received: by 2002:a05:6000:2383:b0:43f:dbbf:6d93 with SMTP id ffacd0b85a97d-45e5c5f2032mr11787940f8f.27.1778951837035; Sat, 16 May 2026 10:17:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 15/21] target/arm: Implement DBGDEVID* registers in max AArch32 CPU Date: Sat, 16 May 2026 19:15:17 +0200 Message-ID: <20260516171524.19184-16-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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: 1778951882495158500 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 --- 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:24 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=1778951937; cv=none; d=zohomail.com; s=zohoarc; b=M6DhA6gPv4W0IJKemdXrEWmYUgGLrcZsGpbIPgjHGf6vZxeNs41j/CGmPt/p9akFb/qJk3jJwiqkvdway87VhCTak9ICwVbi0knpW5KA76vj2ZmU6m6qluaHjvjhNoNDTvFsp2CPm9bqglROH5LLqgz7pVtKtts3euiULtsHle8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951937; 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=OnkWPDSVr6dbm6OlqF6oMJnf3Pa1ciGYuFP+K8T8pmvzad3tDhywQ3srOF++KlHPCdJQ66M01bPoLBZSbEPd8pJPp+SW0yqMhSo04G8RcosySgc2TcXYM+GmUMFzvmm7rFstIsywVFe6v8oaT/hnUBnoNJxZ6fvSxDVEsYxBD9w= 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 1778951937248202.12754291348097; Sat, 16 May 2026 10:18:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIdv-00064t-RM; Sat, 16 May 2026 13:17:39 -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 1wOIdl-0005Xt-Fn for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:35 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wOIdi-0008OC-N1 for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:28 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4893940bb5eso4061165e9.3 for ; Sat, 16 May 2026 10:17: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 5b1f17b1804b1-48fe53804aesm133414005e9.15.2026.05.16.10.17.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:17:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951844; x=1779556644; 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=rchOoRpqownsSUKCcJdNMdYCZCXr/lr06dkqtXPjY8ULjouxGfjiJYo89cULPe5I5l 34Zv7ogfijOd7zvBg0LLCiDS6NnlOsvIKbVtfXW7lWMcfjbmB5aOUc4cVnuCG13keOld +XVoZRN3aQZE/ivu0gDyE3mdsYATXv8SLV6ZEElEcmxf2Ym36N/E+Tr4ezH658t+Pi42 rpcghLVzOWVZMVVr/7D/6y7Rdhnb88LWdIbbCM+O1UhkQIFz32s9CjqHzPfaAbR0ZB+U uh3k6fuE8rkImyt81sI6j5mJnd/TWIRyn+zpRTFvNGoaIsF/JsCvtWcTlGWG2sxnSJLt I1qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951844; x=1779556644; 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=YiRU13x8t6dv6NfmvTyjjXXMmyWeu5RZN5o0hBJcWNMlOBlvoIbupu7p158DyWkRu4 DMmXE5s23c1QneieTetunCz8PjoaWj/v8BAPSNwAfE1k5UxPsImIZBDCyqKLYP4i1uCn p+PTFNFIsFEbJ/PtKmc3d239yiNNSSFf76b2MXPCgtQ2s3qR1BkrjILFFMZK3U7QL+aQ irQtj4JH/MexIEel0zdwwiF/R+nWyY1NHWF2qE/FcGkAe13D4ENZUoM+RAfJ4BwFu4RU SW6oCprgpDOjv9tGhivPeKR9fYv8nR9VyzEuPq2YW9Z63+QU+0otMz0fT9qaB57YIdh6 67rw== X-Gm-Message-State: AOJu0YzH+lBLLBKkGm6/MZi4XkxKRAAWL+6JFE8IyKVbYxV1SEUbFtfJ Z1QhGvfccAZyJ9yJYjSw/j7vbHLCuBQpmEF5/1g1Ti13J8RF0pxchnmimmcw/H31IDfafNbpmgd lVpfU1pU= X-Gm-Gg: Acq92OGRP67B/d02VII9ypNQ5vc1mXz/VrejE2OnQenFtVhHpan7W4kAdzJiK4KQ2Fq lTWc82G0lkShUk5jLfNgzNC7EjA6vDsld2zzXNK+Q5c8ahgEpJo/F4CMLdwQk/qYhyAPg5xFHiS 6VhoINvSXNfqXhC0s90KjOfoM+bR1gc+ed0MDmePIOSz7J8YTOXVuVKXkrNIYp640PZwfc95W1f qqyhufBqiFkQXApNzaOnR9NAMqmaANs4ApZMI4Qb3AVUvHnIVoMDNApsTbq1Lf0x6E+andSWARl 4Fyxl5X5J5VrMX6byG3Qu7kgQxqRDWMM9G6PliayoMcNKHn1ru6ZidOwpNu+kjPxO2zxG+vW61z CH65IPLmGUXD8bZSl9W8MfIz+6S9UyIg22bhnBwalb2FDSX/tkFTx7kwwYCc/1EKrnOUlfHuDlI 7aOyTMPX6cdXQ1ZbWy6fYz7uBAHKJB1TTd9qfrtdCvPSXWd7txk9G59jfiXmuWBX3p69dNj3l50 XOaItOl8u0= X-Received: by 2002:a05:600c:a405:b0:48a:52ce:a4b1 with SMTP id 5b1f17b1804b1-48fe60dd5e8mr123054445e9.15.1778951844160; Sat, 16 May 2026 10:17:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 16/21] target/arm: Only set %kvm_target when KVM is enabled Date: Sat, 16 May 2026 19:15:18 +0200 Message-ID: <20260516171524.19184-17-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1778951938904158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Pierrick Bouvier --- 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:24 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=1778951972; cv=none; d=zohomail.com; s=zohoarc; b=mhNSo5+DrQ1RiOuosQPItY5FE4ZAKGGrQiHHi1eqJdPdYZpd9EuBYFlBBIqb3Y0B0tCOjOLn8cAIs/bOtntAC6Av1HLNwd41YxxaLdHT5IApA3yj+bGsG2adKwzI4PWfo3nl5Lry//1MtO61iicKIsrQGyFCzycqDyrnSlyLErQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951972; 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=ah/u/xxceeIKXyIINS8Ots5JWOXXafWA3pzjCnOJVpw4r76qOa5dDoV7EdMbtN64dGa2phEewCBxuqWUdv9lqlI50diIZlEN3X2YfE6zAzXi+Uq07J8iGIL7zXx6BzuXP8bbiXCiBAySN4JLkQLFvPAYzW28YE0cF0skGmg8Cd4= 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 1778951972390890.3959594601937; Sat, 16 May 2026 10:19:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIdu-0005vN-UC; Sat, 16 May 2026 13:17:38 -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 1wOIdq-0005cG-PA for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:35 -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 1wOIdp-0008Ow-70 for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:34 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-488b8bc6bc9so4346435e9.3 for ; Sat, 16 May 2026 10:17: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 5b1f17b1804b1-48fe4c833fcsm138060665e9.2.2026.05.16.10.17.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951851; x=1779556651; 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=BsSK19C+ZMaM1rn5nUSGEevXEmn2h+INVQHIu5S0u+jIf6X7xL314mS395S+Av0oyN Mp++2Auxm7rQJsnoPysmdFtEUtlS/Qrz563Rw2bZgR0ODPugXMk/SY0xnsn4br712yH1 N11Rgb6HfdQLop1QxqoKZmMnpuPVb5S63OI/8VlqT0VDjdMIPo6gIKjfLe5texsyOU+d nLP4oE1FKUMU5HWa0IMrhHDobDLWQVeOsp9e/S+XXjeQ+RCZA53dbF3eJAVKFclsCVPX v67qzCoKeGP+A2b2cqOmcrR/dZypPhmq+9zk63ItQ+4eTFlbrayhcH4qhV8/J8DPnBil yATQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951851; x=1779556651; 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=IxhASFxTcXLTk7tkE+ckGsYQ2O56hlNtVPqZsilZK6S5HtMuW+3KhKpWkPmruonn1a cjUUphyO3KoeHZw373gIhXSOlHxgveNA1L93zfBQO03wYIHa0HnMvfEtbDzZVGgmV2Li CTYf7GopHDWpP9m4v9fo4SoGaPy+DV7A49UKkSaBPdrsDUzNv/6lwFLXtypdo1fEBkMg YWeDhtvK5My57Zn/cJAod2qPnVc2SnQ8p2bm15dFB8/Pq+GPiGnxlqgV++wQ7G9ub5p0 jpYixZbSmiI8IhorTZh+BA/Z4Jdfn6yGo7CkAz3d6CQ34BGM1Or6Mu4DNQpeO9NJgrXg ev0Q== X-Gm-Message-State: AOJu0YyU3RfjFP5COUGbENpZ3gGOVXc2UFrSfe0LImIDmkBVzX+94fCq O798cKFxN3MWbwPIFL7IYNtdm5DYql2X1srTd7C+qD5890drHkXYkw1oYKx91gYVJkehyoVv0Wk 5VP1mYgk= X-Gm-Gg: Acq92OHTrkYAC0p4ysHhX7sGXbGKeWJ8WhaVOnpIiYZl/z+7IX0gGzpik7Bc+d7CzyR vCxmLt4B//ZpT7E3trhzNagynDBctHQN65LZb95xMr+TWBmqz2Jmh3zegNogmVx3nksKqyudXJ5 yy23juXPtczQIMUlGUGEYWMuvhD+rIXypPoI0NcRv1xvCn3W2VvITpYp0OOyEQuqIY8t68e93EC 875CRIlxwqnaP7/q51DK9E0em1YNsMbef3YKO9zRy3OSd77KT06msOQaBXObXfHo0yV4emQz2dC +RfLLfc6b+jBSIQnP2n+pin4W1lmRboF23/vhg9ZYasLiA6EItlScgN/tXLito+IR3QY+fE8tgP GkqVrrbomoiMSrBxQVBA1UrTebMT2O4pLU7A1JVT04lwUQu6P8xasy//RiSgwgnq9lSg07B32pO gdooZMK+Fma8dM6xbELgsBJTkOvXZZ4tr4nvOib4gCDAc8DQ3PDoV2M/hJrU4sUATLAwyLfhVK X-Received: by 2002:a05:600c:4fcb:b0:488:a797:f0ac with SMTP id 5b1f17b1804b1-48fe6613ab3mr115062185e9.28.1778951851393; Sat, 16 May 2026 10:17:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 17/21] target/arm: Factor aarch64_aa32_a57_init() out Date: Sat, 16 May 2026 19:15:19 +0200 Message-ID: <20260516171524.19184-18-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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: 1778951973160158500 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 --- 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:24 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=1778951936; cv=none; d=zohomail.com; s=zohoarc; b=Tz0d0B1q7Udv0BereCSjmlnC28Bob9jcMw/9RlgOGN8dS1dvmazsHFpABHdk7u1PebIWGYiHLmOzEH2olskp/xa8X0tw98sPQoZKQipB8utE0kn4UXfMUTPoG9/+yFrsZbaoa3RQVMpuJacc2Nk2hs+0hH0ZNVaCHhbtalv8J0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951936; 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=W+16j+CpZqWJ0edLhEZxNxb8lKM1ds0+TtvlQjxP1bVHcbr5DrffafqxziznCyqHUTHZxmKAh4y4FDiC1a1lZs85urGIzCuBKrBs3oQxyckl31pLI2jMe2v/gpcoJK6FqrrsL/aBxDwTy8a8tqlOoF5bbeF975Y1dmR/tlfOcb8= 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 1778951936540407.75469995660706; Sat, 16 May 2026 10:18:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIe1-0006Wu-Ly; Sat, 16 May 2026 13:17:45 -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 1wOIdz-0006N1-63 for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:44 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wOIdw-0008Pd-8J for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:42 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-48e82c23840so5622535e9.3 for ; Sat, 16 May 2026 10:17:39 -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-45d9e768c4fsm23913768f8f.8.2026.05.16.10.17.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951859; x=1779556659; 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=r3eVZqeX0nyD/ltoUCPQ2PSlbmeIWJo+OBGfSVXzgfLDC/EBzjZLI7sG1TC211vgLP xA43knv67gZzYW+3E0wmfpqe2qABC11gD+P/rPJM6Ec8X6U+hv75ZIvEREJvtb2Kf2LX hwyDNMFkZoo+03sz2h4porqyrDiNimE6TpPN5fXPi4DGnmpkVhiKI3FwMe72oreiZAdF uezlDcrUrNK+lC/TgxV1jD2wHDsZ2PPobeLGv55abhErBjVqO3zcs/xWZqWNxlsecyzj BvPGM0nOskKbYgI6uBYkE1f/aDUhsu4hQH95CPoiO8FuHwlM+IpQRD3TWfvTVyPaqcGN rUjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951859; x=1779556659; 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=BRuHYZdGcoLPOZMS62f2V8YvK8dpZZytsrFJDA/eRdgP8dq2Te6duq4Y98BNv64nGg Yqq+kRvpbMpOzFPu5tR9yQiNfPE/yXKz3tJk+riXJqo1Q+AEpPxtnk/D58XTVtPDBTY/ EYwsJTSy8bYtP0/hr6FGVOuWw256HEx3BApsv4qMdYYvaTdhr+1sDNGoZxWVmdz/MsI4 f/zeNtyMVKZYqhb+GCDThV1i39snfCMPefbrIA94LQaduYUSrSTFS3VbOoS+mrBXjcLo rtY9rmibG0P2Z+ZyqlyDoFYYJ3EUDIDyjhQBJzigIVZRxytQoTQYcqEXO5VA9rFY4BPJ yNUw== X-Gm-Message-State: AOJu0Yw+DV275Kk63RIx04JSSBaMPSFeknBhTEnIn8GVTxvTB3w3j6dj FmVXkvyABDXEPruz4XkEF0LmMFnAnU6j4anm48eCI+u+zTVADIn8TnXvgFl4CBq62gojXDxu4f8 vrSbVvKo= X-Gm-Gg: Acq92OFQ7TgeAOqOHPPQ7nRe7JCTJjU13Xy7UhiaVXEh92OAOt8AprBUBU7jLG4wtyN 7mHSgztNTx1MbYToaQhAsamaKFBw7PTrGLMW77I1gF1S0ai5jkaf6K58VG9ggmDqJAt3rrceHyP 51Uc7zGeFxkcFyQotFy5RVXEHIygRbppRuEbyt4L/aR3q/6vJ6g+Ub1+HBjMRhwSlmapjtFaY/F Ah/xOUsI8qvYAtadVmK52TwISpHt5GSTb4TlY2Y66yiiNGlCWjg+tMSsv+9wJsuFvhOWb3KB2SU gnORqTTkPwZKCPyfLOoJJmNr71aBc+bG2ohoxrAP9X9IiValiCqwj5z5u3Oe8Uc7wnTQSaXuuJN fMAeEVD2xu/OirQmWQSzCgNvKsxEDDXU8ourQEqXKhf0YUlx/3W80xHBcOTAbdWen0PMuYI9fjz jWjB56LCin2d40nNXlR56khmit2ST6t7x9op04hB5OfvIaBL2c3u9ZI53yTTPXf0EYr4GZGJKh X-Received: by 2002:a05:600c:8b53:b0:48e:7f1c:8760 with SMTP id 5b1f17b1804b1-48fe6513161mr138320665e9.27.1778951858719; Sat, 16 May 2026 10:17:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 18/21] target/arm: Re-use common aarch64_aa32_a57_init() helper Date: Sat, 16 May 2026 19:15:20 +0200 Message-ID: <20260516171524.19184-19-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1778951936997158500 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 --- 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:24 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=1778951942; cv=none; d=zohomail.com; s=zohoarc; b=fWJm8u083+fJlXZhLwbKM92SKsTfVYt52INAlzMjRttLBpjSpcFONEI7oyusFRqurDEWCWfkk+F8ESCOeLbMMjIT77qhuJjLLR+/Jm2zFZ6okmPww/7UrxJq1hpL+XFMSLFO0utID9IEko4BiiQdlt9p9/PPDJTbAdbAHxTOLuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951942; 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=DHwXMgngISVB3JNx4uXoy8eFbLsPM7eW8DAkNFHmYnYQK3m2mZhLbP/kP4+vveF8AjDhNg4KMd0X7oLtLFRhqkh6r3KF0VuXNTSsVEMQa90VzU1J6XN3uaQNnO/0iJ22W9bEA5Na79Mft+ovQTVRuGUGcAXTEoEeTlJOTH/FeCI= 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 1778951942085487.1314913300441; Sat, 16 May 2026 10:19:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIe7-000735-T7; Sat, 16 May 2026 13:17: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 1wOIe6-0006sP-0q for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:50 -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 1wOIe3-0008UK-O8 for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:49 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-488a8ca4aadso7830705e9.3 for ; Sat, 16 May 2026 10:17:47 -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-48feab2a23dsm41555855e9.5.2026.05.16.10.17.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:17:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951866; x=1779556666; 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=HLawme6nRauGn3tSTRvLPCN1kRDq2is+lUy8quD7OP6M8hoUFtmw82AxbXVrEZtILo VGPcyJE/E8AzBwnR8chRLCpa5p392q/rvj8ieufFM2rY5g/j0Yis/HYv7Sjo5SKbwgdI A6ZMnY3beO+DKK52lN2MVXjKb2KFJkx8RK7LROtzXfVisZWJ7xt2WmWJCnp9YC4Eem6A DuoPqXByZM3fn0OcC1gEAlnQt/Dbf3Yai+VqgeQDCeonzH1t++++FBNiR06I8GgPdAhl K+cwm1U7mlrHQCtpeNqULc4a10ynq6a/0Go2Sp9xQz+LjiZE/tGaBqzzd7hhe/t8Ffma iLkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951866; x=1779556666; 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=ig9ucg75iLf5eqJaj3fSWWcfANWuH9xBHNST9ivlyTVvP8KsyjB+Ktj8IHwYpxz4Dc lt84wEoA5L3T9C1QLyrMVW+IhcRd+s8mD6WNHJXXM8+G3qbKMT883/g3YjyInezwQ5hA PQ8lje10PJXjDgcSlEgRt7arJH/bQMhFSYrVYSdZ480FtZ4iSpODAsOLRxcNINq1nxYV SisglsMxiG+mHlqpsCMz3Pliy7YebSwOxQ+EV1wfmweJXPmdyqALAzv6EqWAqgNiYPYq e7UITBslSvKG8LoWsA0wRlwPkUwxOvrrtccDsPmSR5NHDnoHUMInCHFh65oa9rsNFMZ2 nFzg== X-Gm-Message-State: AOJu0YzKntbZVH2uESCSCGNGUM+9pFCmOKtYg3R9vYyphDbF3ggzU2EF xqxqpu3zm76nXUlXWno7swjGPsdIv6tskhfcZl178p/dekpH2U3U8ro0rp7YNY0FtVa3DYQJHfn g1fjSj/w= X-Gm-Gg: Acq92OFd/Rpt4w3TzrOxnvS/fzbkSfMRFTa+Znwtpt9freLLSamzP9MwMXM8D72M4Tn 7Xb2oR+3+d7FLPftzZRFf7CPms2U+Kl5KCuPbQsF5/hmn/ymy5Yb+p3ykkkBR4351XIRHqUJf87 MCp1NB+FbVf4HPuJGf3MQ3xBzk/0zKn4LWwMGUvQxHvVMZpXphIoQrZrEa4OZx0u73K8Fx7s+MI xf/ybXHx5VZvC7dzeWfc+xRZER1a7vY8WhnH25/aqLxfpYMqMDRAOG/acW/atT5UgZqgw9nT37r 87CzJd2JiFn0YLRgJGBx7Lc7fGBEeuw38uWENzDwo4qY/U8nYwUC5JjJCF2rs2q8vvm0YBSKDMX WznMccax27J35T+mkM5Niqp6wlFoYad7sI0iwQDI4hFhqVBvVELZN9IODH55yidUHqXQjEpcbM0 /DY4DzfPkO26JIZbiBECg4BLxfaOL8W7L2bq6dDqZ5BDuFdhQ8coOpOQtEzmdp1OsxNsp2ZcL6W sACiKmNGJU= X-Received: by 2002:a05:600c:3e1b:b0:48a:9562:7a30 with SMTP id 5b1f17b1804b1-48fe6515f20mr112814825e9.24.1778951866223; Sat, 16 May 2026 10:17:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 19/21] target/arm: Define 'max' CPU type in cpu-max.c Date: Sat, 16 May 2026 19:15:21 +0200 Message-ID: <20260516171524.19184-20-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1778951943008158500 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 --- 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:24 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=1778951931; cv=none; d=zohomail.com; s=zohoarc; b=XZvb9MXtDrHVDl0ddzpKfu7I4fGJ6LIRAQOYbbpjYnyr5EwKanYPS/bJKhbjjuXeIbMHwWZnzegWVwsYd2TgYNf1qHc0EX1dOUTNnLvnWjO5gluAMZMG3tsnw4eFpsEdceI0Up8Yg1dyIU01X1iRlHTaLwxWVz4HCZWZ0uv/jKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951931; 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=YmD4sp5440Auzy57VBkVy85eXe6fk5EYMJ3PbOMhuoY=; b=J543+/ighVtM1gVpVaHbrimxUbRh4/zCtDaO8GSra3JRZ+9Qbs9Ausx2Axw7dKio86GV1i/BiWjPCNB1L4uoCYAoeZv6j7129ANrs9xhQpNrTgnqR1BrwSoeqEKTUtzN6OY1AadAooBV1MJiYr4M4QNeBlCQCfdbLdpaqMjbY/I= 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 1778951931891861.1845281099411; Sat, 16 May 2026 10:18:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIeG-0007xh-Fy; Sat, 16 May 2026 13:18:00 -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 1wOIeD-0007iq-VQ for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:58 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wOIeB-0008Vf-SO for qemu-devel@nongnu.org; Sat, 16 May 2026 13:17:57 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-48a563e4ef7so6231905e9.0 for ; Sat, 16 May 2026 10:17:55 -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-45d9e767d16sm24468445f8f.6.2026.05.16.10.17.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:17:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951873; x=1779556673; 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=YmD4sp5440Auzy57VBkVy85eXe6fk5EYMJ3PbOMhuoY=; b=BM+hL2XqIl4OUOhcTxZVD3uIQ3FCo26mVOwXTa9dIcXtx2SZuZJn9MYFW/rjATrWM/ LQ2RngKAKeUB5ZYaeBjI2fkeDG92eLipdYaYnxWpnhn1KMhqw2zHFP6oxf4JznMKNjuK 0xsLxdnFS6FrNwXFvykGu6epytdwodVAvDcyqFbX88GFrnvj+iWdnQ7Q9EPHMCFaADtN ugc358KwduG4LLvag/NQbIbl6QW3gMJ4los6rlNX48pTxQSKn2zm7QtWbrAncWJOZ62W 3/k+shHG2WcdTbDSrTTN2m9NGQVBAeA2j/lU5//mcKblES49hj1Y4ADkW6VZWdZyl14x cZEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951873; x=1779556673; 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=YmD4sp5440Auzy57VBkVy85eXe6fk5EYMJ3PbOMhuoY=; b=ar5lqUNp4Vb3N7Lr6cqr8nIkknmVrca3qXWZ/srW1vzpQ/bFhhaMBZH6X6kPeHnxu4 YIEky9W3PN6X5O2pZ5kiV7fWEO0QeQRaJT9BzarjSp57D+6NrjXL3qQEI9japGQteVCH +fglOw3eKgukZ6CB4EFkdpG0vFZnJ3RphxG9feBTrhmF8loqKVrwX8rWH+QyiT4Eja7J jDqVEeWHMKlzhuBl+UzGqDcXVMkE0agDuQsPHDQAr7nJdOwr3g1roOkqGKr+qxrTTRh5 vyDbbjv0rJeoDRUWHsTPrFYqUzV5KPzA5XJm43l5fPSrmiEXlRkXCqSVU93TuHjSDNHb h2ng== X-Gm-Message-State: AOJu0YwEhaHrPZlpKLrApwRLdy8Ug+nEeY3emBs7r8AoZBnmh4+chNjK fUL/FsfYBm/zLpdlEc6N6Py0oWT+p/d0B5MnQ7QF43vfN4NiepY3QPyPrqFmsAOw4wC5f4/66R0 P7jXOl9E= X-Gm-Gg: Acq92OHV57VP+RM8HGrRMa0WtRwPDVIHOxzuMkJlkrzT8ch2gpkamrjRBpul/78XL0r MLqYou/7kupJrGkgI4vdoIgRfSRz6jSN09Et1HCK5lEJmvw0JMQ787p9JYrLFKK3UNO381LvkKA ZJlXYElZd17594UsXM9OoF0z3xknyHxuipgg2Qp4Q7+mY/wfvkYYqmSb8vUP1FhWVG6u3zn4RT7 PDkqQFvWFcdqIsvSHQZcDwUA2axbi/CRHxJwIDpez1TkY4eU+bp0qP9GrzD7WpOLSJ4hS1kKdT1 ANiOeE58F6/AklKfMR28X9gbuqKC0p2x8oD4lY2lCenKVgzjKTiDjyFP+A+9GmXXyR7OWSRedja O4yTvoDMPYLS/to/pDPOuJOJHysmTVik27sIaHkeUc30DgCXbYXYeMvsVo2Z21esyDAekiiC3ih PUQF+/wIOaccHGXFV1cczXJE2RIxAxOTLIRnH1IxeJRQScu68LZKstrR1zAd/t+nkbsXoGD88u X-Received: by 2002:a05:600c:3541:b0:48e:75fd:9f9e with SMTP id 5b1f17b1804b1-48fe63264ebmr107714465e9.20.1778951873441; Sat, 16 May 2026 10:17:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 20/21] target/arm: Build cpu32-system.o as common object Date: Sat, 16 May 2026 19:15:22 +0200 Message-ID: <20260516171524.19184-21-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1778951932973158500 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 --- 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 97d31b7515e..2d08fccef12 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', @@ -84,6 +80,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:24 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=1778951987; cv=none; d=zohomail.com; s=zohoarc; b=NEssoSu8jpP/J1YLnX3SJJF3ta3cF7dObE5ozA2HiZG9LWG5PGxaE8jpdXTlGWXL4jemUotd/h2rU0o3EoJpThcFM582yK5VZF4MH/gVEitdSVW+Ri600dwBNI4ZtyNvjp6s4vgeZvaXxviwQmaF4sgqB0x5lzIe3gJFoG9s1eM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778951987; 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=VuNA7VcFmcA70jRkUGMcLGvgri2gUZFBdBz873lzwB3SAx9huFR8s0YIhjcgZzGolSG4WjvU2slCmGUvjlPv/zrW3XDfcHVhqwZf+D1FRvINCVJu3gpJRRmiOinsatlgyyRhhWIX5nAaOe02tx833nTuWk/rUv952e9wjIHf2UY= 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 1778951987061265.2458212154685; Sat, 16 May 2026 10:19:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wOIeu-0008SD-Hp; Sat, 16 May 2026 13:18:40 -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 1wOIeL-000891-6b for qemu-devel@nongnu.org; Sat, 16 May 2026 13:18:06 -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 1wOIeI-0008WD-Lg for qemu-devel@nongnu.org; Sat, 16 May 2026 13:18:04 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-488af96f6b2so9851865e9.0 for ; Sat, 16 May 2026 10:18:02 -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-45da0fe13a7sm24578791f8f.29.2026.05.16.10.17.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 16 May 2026 10:18:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778951881; x=1779556681; 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=A4rZQ0YuJlf5RIRB2Gk6ovsDdGBDzJcV4OVVZkHitGSxDUt54SuDR27ueWulnB6uoY DOfcmH2s0RC7b7wYvdVD3vTczaQYBiJ6dgwhyuzjIdvWQY7ioaNDnI1LgWr0IMYvYFa1 1HxnpfNw/lEcgLZUTjuSf1I3ge+7vMIabcq329vvFu8DGk38kfFKNu5sq3/eJ0QoJW58 t1nErDi2wdGdGDLik5pWuzfV+N2hJVIn5ZU9I/bIr8xu5UEASpDq8xQPetoaYnqxtWNP s/2/talisK7Dpvtubi9JkuhjEnW7ktI/xZyHVv75PQPTKCw3iEg/L/KD/c7M2BM+M24O lh4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778951881; x=1779556681; 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=OYgdX1VTZ0Cf/Jdpv+evDJLC4o9yQyxKwAWCxquXIUpM6ryZsgpP0GuU+qeplpCGnT OvTaWqYZFizWk+fTzdAIEdsVGKY3MglQAZsEprTX3nSEBUYJCVcNhbXsa+XvvlurpW08 /H1+NvHZ0Jmj8bCyoixsz00QvjTX/FCrvyAP29UYthJYe9NWetwwYISCAdIhh1VB5Nbm pqZQ7dE30aMQc5ZvsZeH5auaj0h2onyGQ9G8C5I1NdBOYKMFBIizVXcoT9PfsLBO3eVo Dq4nDv2Bso5ibSs1RVehN0Q6qIh4xq2nx2Vu154WnWufcg/UvHD6tg5J5ipOTJ8Mgc41 1jsA== X-Gm-Message-State: AOJu0Yyy7XeEghxpDIbj/02904v684rtd6DqMiorxSqQuI/FTeE7iaph k/w+pxHIrIWa78KstAQ73PbHOIsX/m2ge5cQhX+OpOTf6Kbu6sHH8/vZdTA8NABTgYOxn/SuFvQ Mvtj7rxI= X-Gm-Gg: Acq92OHpe18Qjq8HijruRn9zDw7F+Ih74WqbmT1CsIeNyaXO4icTzbCUlVVMbj8QJdt bHSFfJ2MsJ+EfLDI82Dg4xC/l7udKLC+2ElmQmwWSHl3r47o9LKIFhZyoZ80ChReX6B4Evk1zz0 ox0lBEF3BwH8/IUVvAsZ0CSswogH2I9joFbqj5xZk6hWZOmKT++qhYXtHIOZACL0pudixqpI9If wh2nBSCRhjChsijFVh9idmGhxsx5OLcd09/DbI7JfFUh8zyAnBaqeQqyunEXYkSWNXn8lRDLHG6 tprMNAddPMmBQRaJrE7WltBvM/2ol8TaRASHTapPEwjLiLlu+5eQMgqdfg7oHnNBwEGnVEC5GRV W7RrFzXzxwEfu576/3jEXDnV6g4HY+jJFJemc9UydR1n/OetontU6KR/lCLoQcN+oY2QI597nWZ cqOLc8qjCv7/9yYZieOHJ1CgVui4FNllHDu1CzdzWZwgobHaTIirTD18nquVre4v2kv+aXG8fS X-Received: by 2002:a05:600c:46cf:b0:48e:8974:c377 with SMTP id 5b1f17b1804b1-48fe6626ba1mr119634925e9.29.1778951880657; Sat, 16 May 2026 10:18:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Steven Lee , Pierrick Bouvier , Joel Stanley , Jamin Lin , Laurent Vivier , Andrew Jeffery , Kane Chen , Manos Pitsidianakis , Peter Maydell , Paolo Bonzini , Troy Lee , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Fabiano Rosas Subject: [PATCH v7 21/21] target/arm: Build cpu-max.c once Date: Sat, 16 May 2026 19:15:23 +0200 Message-ID: <20260516171524.19184-22-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516171524.19184-1-philmd@linaro.org> References: <20260516171524.19184-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: 1778951989242158500 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 --- 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