From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778854606; cv=none; d=zohomail.com; s=zohoarc; b=hTesGzrqtodQ8pmrWUdMmZ8JIZIVHKE54fDzyVxJ65Mm2Ka2BSX3PRmaJjXUYaU13Q5v3utBlAR9EzhQxSmV9HRSlKAO8qhKtrVUKQNAv4y5VrMUKMcJCb8oJHgrQFmh1RGWDm7WbZkqBpQ3bixj6wXMkpq87Ryz2GkpfyT+YsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854606; 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=ItINZxJcyXmGmwOm0WYPhb5KBATTrt6cbx40ypDwqrk=; b=HznRrfNT11crCUXaFgV9mh/Qs/eoBoq2HI9wcjDoM/EGdGGesheQPgyq+V3RsSA0ekgWuVKG+Z9dmasPVJW2IQtp9NY8A4A16+875Y0PQceS6R753pz0r8qAJoxUqNp6mW7UDAo5CKAWwx10Shj5v1nHXzlnIw5EexGaGX8/ps0= 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 1778854606329894.8364149507047; Fri, 15 May 2026 07:16:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtFZ-0005KI-L0; Fri, 15 May 2026 10:10:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtFX-0005Jb-K9 for qemu-devel@nongnu.org; Fri, 15 May 2026 10:10:47 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wNtFU-0003aO-RA for qemu-devel@nongnu.org; Fri, 15 May 2026 10:10:46 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-45ae6a0e523so2918452f8f.1 for ; Fri, 15 May 2026 07:10:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da15a562dsm15393181f8f.33.2026.05.15.07.10.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854243; x=1779459043; 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=ItINZxJcyXmGmwOm0WYPhb5KBATTrt6cbx40ypDwqrk=; b=r/zDXUwF/XJ3o3l/KYQn4FxddpGjzJETwSvVFIfx3uKfKNSvZTiF0mAX/I/XiaAi/F JA5fpQU4Oq9MR0dDihAlYEDwmHFgoEbocAhR8no0weAOcer1QECaT9zUo140xiKY4Dj0 TcFW6yuHSBj5cK2RSv+0fl9oZDkB0AP9KTL4acv8GHxn92caxDLz7zIwHJnAN6cvNQc6 sxLKbFkO+HRCwr8iSNy8NiOvxyHqXfl/Cuep5skqSlTkw1aRoWpL4RoBfnOWV/QlTlZ3 YrKvMiA8yChftLIT2EjMMLRhpwzYon9Yz7qTmTWYPuBG8KrgDsOCL4kVLZQTWemXFoAQ YDsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854243; x=1779459043; 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=ItINZxJcyXmGmwOm0WYPhb5KBATTrt6cbx40ypDwqrk=; b=fjlpK2vM/jmjQuN+VRo6zqUZOz7mv9/BQxXZkvv9VjfhMyIIrjEsEBFHnUHLj+UtWl PUTwVVnl1Z2QhoRO3cR1EKkfue/gqrWf4tMky1MljU8qawqxIp1p6XW01xo4NPuGoiz8 glTdoZa5DQwpTxff7d6yp4zdkgxLMqbGVatjn9IzkbsKcbQ4X19lmi0mIIbKzYDyXYwO oU7+zFBRgqcVmyq6R0QDj56Su2OXkkyIGHv9rSJEZVHzONsnq+XL4GKp1wn6mpZfw3pU nnSc9byW6j8UaS8vMy02e8IV8JympNfEoMZ3QQXFVNXjW1SCbb8sg4wXhW0YQzg5M9Mp gVKQ== X-Gm-Message-State: AOJu0Yxa4NZ2GHzzvVm7s9VtUULN1qKvI9boIwEb7Yv/r/QtUs3E4uuX WtZjvBYml/OA2crgH4Aiy8cTZjoz4EgOycyRiLyhtVe8cSiKxpaqVeCSs4uOZJv7ACLGuCVZIxA l65FYSBQ= X-Gm-Gg: Acq92OHnPjjPJ8zDJpNj4FPq9JeXsTN1rlKp6bIXPMTj+qxLeL7mIuUzHa5gNG+Tfjy UIE06C0Z1krnShGWp1Q1czm/VLvJlN39vu+NXUjCbtctjrpurhk13FvgEOF706pRB15Wz/RZQBf JXOIUhz8szkAL9ciHpqVWWdR4H6TJ1LM3grC0xM7kugmyTEV/7pS/hxxXsvJKnp9rQ9g0bqq9Qv C2DH8LqDcG9jAcANUHfjvETjI0/0Y2KR7nYWk7flAkLqqmzpkT2VdtPXeGvpbNfcKAYrNEE/te8 ijOmDLk98LI3cCRLnwc9Sqhu9ijEdqcWIhyjPx3TF5Yk2gFVClQrWanCu4reNRNbj+dxk7nqmNc +lZVrIu191JuCz/P8/7awr5K0epU9vYprSWyx/XlRDco+74Xgsn7pzURvTWdgC5+sjRQIZQz70d kFfkEVqvFxer2G8CuGlnPGGYmsNBIy4j15linoz/3mCNPxuDSABMK08itWruyvAM/R5vPeJGDcn AKEabzJxXY= X-Received: by 2002:a05:6000:230d:b0:43c:ef4f:79dc with SMTP id ffacd0b85a97d-45e5c35e3b4mr5522658f8f.8.1778854242627; Fri, 15 May 2026 07:10:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis , Mohamed Mediouni Subject: [PATCH v6 01/20] hw/arm: Build ARM/HVF GICv3 stub once Date: Fri, 15 May 2026 16:10:12 +0200 Message-ID: <20260515141032.3271-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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: 1778854607775158500 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:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778854291; cv=none; d=zohomail.com; s=zohoarc; b=BFIM6a8M/6pFNJzaFNyS57SpF4tAClorEA07n45D6Gw6/QW5WcEvjGUsBzRy1vegQ1O/Rtbph5NS0pdABOjqqq6eG66xWc8y3ZBIZNHaLKmsXaLfXV340Zu/JmQ/d5WEyd+M6VENrNwsQoju1GG8HYpqeSR05l1Mqhl8im+KeZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854291; 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=I4rD0JsU0v8sUryGuK5c/TpCd5rAdC8CkA0JDnYNcxc=; b=CVuu7XGKIpADwOV8yWIBa7z8W1EqGh1/g5sKGlALjXzb2O+CDwGdzsu2l6VZGEo28AOwYxm6QkCNz1EAW6Gj/ucW8hYezLdhNTwxBVG0K/6Wr9+t6ONQ+VHn2gzPatBY7CxYyPz6RJKxRvywNZkCZLbL1YRzTD1IYRtQXj7jJIs= 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 1778854291647388.30336161213177; Fri, 15 May 2026 07:11:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtFf-0005LV-SH; Fri, 15 May 2026 10:10:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtFd-0005LE-HM for qemu-devel@nongnu.org; Fri, 15 May 2026 10:10:53 -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 1wNtFb-0003hx-TN for qemu-devel@nongnu.org; Fri, 15 May 2026 10:10:53 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-488b3f8fa2bso8505425e9.1 for ; Fri, 15 May 2026 07:10:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48febf8305dsm19915945e9.9.2026.05.15.07.10.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854250; x=1779459050; 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=I4rD0JsU0v8sUryGuK5c/TpCd5rAdC8CkA0JDnYNcxc=; b=GySPiw56T4kE83p86/djrixAxURlrRWYr1sZcETyLPMDwMkBDhshdo5IzzNh8qXKoZ m8PCH0qWyzE3O2Eu4rvzitKiSx7/2If9meowFKeJSpcRWz3mmwOvHJwfuwleQoT3o8qX fGSBW6ySlUAvbfY05zvfsz6a2icbxXLmtbBwydp7OKl9tfPru9O3q6Vr/GsvKW5AE1Lc iIbBCaW6cBanHw7jZg8WazWY90ChkXr+rqxO+0avvDqFzHVWJ0bL7HNDHmK1Z0/9QtIc hFi/UAGfmwxqHVbxZQ5YfT0RAtxP7Stv/T+WlnVaD3sT0y5SbNtZSLCx6L5DDGRZ8n2v MNJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854250; x=1779459050; 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=I4rD0JsU0v8sUryGuK5c/TpCd5rAdC8CkA0JDnYNcxc=; b=KlWesVVM/QHPfnDLOu5kFi19GdjBd6I62MLP1A/CMF7GO7fL0kNFgwG82hWnvBBoha i10PY2WSFzrCGL1hxX3+t0Z0vcVjqHJLzjV7WB+LUQxLlY0bfDw9JrCl8uTzR1sBYDPH yTnhGZMg79UKbIaHzeT/3mv/PJNEs/jE5aAvB3A7f0vtgeXuz3yQcfgIruRBHEhjFfZP 7nNy3NAgytojRCP/WUVkV/Mx181OICIANviHoDzOeqXLx00T4l1IugXFBVUc5N/IzLxo 20UpUqyQzRX1e+zQKEwYa/3l0mCA7/vZCXO5gpTeY5kSI5odOmGKLGnc1pHHflPUIO21 QJ5g== X-Gm-Message-State: AOJu0YyvnPplEvZiLZn5LF/Zt02Tj5tZK2n4WaR2JueXsonTVU9FcYB2 ncgb5GgF5Un0YBt51sR7IuRjeSu7z026D9dbr9fpf28LMBQ5p6T2oKzOrG5AoYe3b8IPTIoAUR+ quNfqfg4= X-Gm-Gg: Acq92OFA/CkmVH9fijfVhWDXAl/ZjqtCOLOS8I1oIyAMNrA5RFWfmMXKe8A0guZNzx0 3ffUtUsjCzVIAWEv54TE94ZSU4m0IUWpw+Ys6cV6d4etGR1+IMIvIL+0JZlU/Hk76WQ1QLdwvgZ KA5XRbr0Buod3jAIA9RjeGavKNtp4aq3xHErPxE8v6dqfNTJ4eRkR9oxfAAyatj9gVfFHOX6AfQ 1NAA5s92IFMjmsvIWf2VrczaW+qNR46c45V/pd/6Uyhq+tQQTEzDqMSUtL/0+3QQMp8bY4C3yiu 2k7AHrj48gqO3BmHBjKRUKpk1qBcO70bBQOtoVo5VfKdxljwKvVIMaI7um145NFyUhGTVNLU2yj V2L3D/vDk8VWUNuP/RMlYN9lFzPZXS1wy3lVKYzfOw7dig29e/MiaZLSlMlt9Y5vFN6vJpydvXb sm6TCnw8Ls5qVrA+o9zAuzWwOm5s1dpFwf8DirT7VHpl3/DpAFx/yA6rXRP7f0xEYDNxmqvDqM X-Received: by 2002:a05:600c:5010:b0:486:faa8:9e4 with SMTP id 5b1f17b1804b1-48fe5388407mr53334305e9.12.1778854249776; Fri, 15 May 2026 07:10:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 02/20] hw/arm/raspi: Initialize 64-bit CPU types during DeviceRealize() Date: Fri, 15 May 2026 16:10:13 +0200 Message-ID: <20260515141032.3271-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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: 1778854293320158500 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:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778854424; cv=none; d=zohomail.com; s=zohoarc; b=XTty+HT7SksNSVdvH+6AkGTmQc5sgPJcgnwhEOgwXSlp8+cCe3hkDpa3HKSpnUKdKY6IAVnVSyvkI5CKInCbGYJ0i+tzJL1jjmsscHsEN3qZSms3pnDo9k8uY6DYSSPK+GYOTIjT7a5tN/Py43RMVJp3TY7pXV6oQyHmfPJyMh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854424; 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=g8wCrZqT7mA1bwCVLy6yZNGEq0cay3lDGUBZnl7t+cs=; b=mH1n691aHrESTK9BGUhU2t+cPf/Yc6508Q07F2+c4850XD+SFG+5y+FA1FwYv78wmPjlRpZ9sTq6EVk7xRtvKqAQghsFnUDyZuEaFHNw2Zb12urYft0+iK3sMyuqCvp/cb0t33gltYCrRt77Jq23dXfLSHdsM2lbJarUayN86Vk= 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 1778854424383418.1222125170191; Fri, 15 May 2026 07:13:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtFo-0005OW-U1; Fri, 15 May 2026 10:11:04 -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 1wNtFm-0005N6-6z for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:02 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wNtFi-0003qU-FE for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:00 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-45d96d21e82so1293498f8f.0 for ; Fri, 15 May 2026 07:10: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 ffacd0b85a97d-45d9e767cb9sm14687986f8f.2.2026.05.15.07.10.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854257; x=1779459057; 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=g8wCrZqT7mA1bwCVLy6yZNGEq0cay3lDGUBZnl7t+cs=; b=OrMawm7uad6g92xnv3SPzHdmdRaw79OZIE3/BqG9UjnxuGnx7sJ1ey0C+w4ZaqZRix X6pQCTFETB++O+pflHSpho6zjNSi3IRLpdPbrbj3FGoZoaBdi2ib+T8FDC0yDWT5ak3f N86QKgWbEPwIXK5qKcG/zyr1fNVX7rTcIfajaJE8zF55lZmYn/ATrZF5HPkKFeaF7eTF K8Vrg5zwjJslsI735ET+Ay7qkBqT7nwqmR1xHpSscLS49pgzOz8ZY+BGtEwRa5a9b3FN VVRgP4C/LPetP3VS7F5GWw7gTbHB3H3AOn3NmNq9RTrd9dL5O7VpEI2k31psd373aTw0 iOrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854257; x=1779459057; 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=g8wCrZqT7mA1bwCVLy6yZNGEq0cay3lDGUBZnl7t+cs=; b=d5WR9WzcYJAnbJUxv6g0XzQbeemzB/os7mSbGdvKSN2/AwZ0TZ8sB+/kYxK1fvTWlG r8ZsDXVa3AV5cinJpfOlTo41ERIxMV/qKbJafHW3wVheHODxgP5YJ7Kd022JUNBdxCoD nQYqcYYPqX6pdU5Ao7JYIENy52BCdt7wj5nfFdrawf4fmSIgENR9n5VdGuVZy0PlPssA LKydD3oXmetiotm/IsP4Q/uizE7h2LZfH52/k1b5PXf2DyMwtdU4Mp4k2UbGC8Y05UVx uKtTGln5GqucA5ziGjzbI1QzFT7Ro2nunnuy/k3kzkGGR1OcHOSOfJ/mk7bm8J58b5TN Pyhg== X-Gm-Message-State: AOJu0YxxS9fp0VTtmoRDl4XJ+nE2ko8t7mhjX71piN7TBV5+h3smXVNq 8lU8VPdzwYovGntXISZzjVKV2/f/yrVDMPJX9BbZ7NmBnZZVsy46N9pUeJThJBSn2j6BwyX1M6e gZBiKHZk= X-Gm-Gg: Acq92OFO1tHE1bxthRw2v+aEvT1sxKKn4+RdxNY3h+/ESATvU5IghzJQQvMvLIORRAW bmEvHK2RmUnWPATLSWNDpzt0NXyNto7tey4YpYS9JMuP34YZnSOdLGAd8J4BtfFtb4WiU/16CyK glFmRCN3lV6DJg1yMR/2unAQhIgjPAiJ3/YgD9jyvAmcS/1LWH/Mi+urvb/bQmDNmBkXnu0xUdi L5LS7SHzig+byR5cYT6dZx1XVLWrH3aIQrsalaTNkAP3GAeFUxT46yfzJl+UPZTcQaypyi3/4qe 41K3Pjp3r0k1tp4E0lDXWX0yTgAPvwkwVubeL1Kh9QCBdyzDAQ4m3J01ZTosJo+J5nWlsQpbYOy cVvLNLxlz64dHkHf1FcmZFFMB/KuSd2VwjuCQ2g7XvRnRdaKAWVGb/7NWsRsbiKB5ma3PBxP85A kgGZQMLIKmUrztosvyaow4yd/wE5CmbGljshpB+X61xHfAqW+j1nP1ZOQW1QnCjP1xL+5MPs/Bo nmeDKVWGsU= X-Received: by 2002:a05:6000:26c4:b0:43e:a69b:d810 with SMTP id ffacd0b85a97d-45e5c5e6096mr6234758f8f.38.1778854256953; Fri, 15 May 2026 07:10:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis , Pierrick Bouvier Subject: [PATCH v6 03/20] hw/arm/raspi: Build objects once Date: Fri, 15 May 2026 16:10:14 +0200 Message-ID: <20260515141032.3271-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1778854425007158500 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:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778854611; cv=none; d=zohomail.com; s=zohoarc; b=jVW2eTsIrbx7BBemCHcDQvv0KYZnSJ8le4sf2xGxP0dBD1r1jR6HAEsG3HiKAcBkQByb6aVEpmP/XUfkDwaZI5hJ8Pf3IxfQxaCJoqbAeQnaEMXRTMYtcElBUV+1qvCvE5DkcPM6w5N1OtI/jOwZQeQiypEtKjM1NDhAZl6jM8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854611; 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=7QWGPspy0sNOMbf5lpim3GaJwkmkvUIm+uwig0rAXqY=; b=h0BLt/Xbuv3ZqTEhYvJgUfOQ+NyHPrByTZCV9FC5PNI7wne9UMeyIxr8B3a6fmYB5Zhzw3RGR4JTN19CLVz5S35RnfmEGULwmGzDZY5AV6ZQJngwRLbcmS7r1YsilriLTKIxqQTjzfkXTKbNUlACgoBItqcpPNS9yskflFIHrOY= 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 1778854611434373.7544784569973; Fri, 15 May 2026 07:16:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtFt-0005Pg-N4; Fri, 15 May 2026 10:11:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtFs-0005PO-Ct for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:08 -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 1wNtFq-0003tx-7v for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:07 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-48d102471a4so90459715e9.2 for ; Fri, 15 May 2026 07:11: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-48fe4c88495sm68165475e9.4.2026.05.15.07.11.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:11:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854264; x=1779459064; 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=7QWGPspy0sNOMbf5lpim3GaJwkmkvUIm+uwig0rAXqY=; b=zlaJ75e2uJzwmhl4GgtSe65g02fdhjElb58ISWMm/2F8JKuIl7XzJ8KYMm85/68+sG fBpnIQ3gawzzOyS6cJ4gu8Y9w5LQOpq8StJ/7FUwCY8QENF6462KxeTGpqEnV5FQb9sD NIuBvime8be1/ft4BNm2vySQzzi8kl6wBx71gncqcyFPGPhF6tHrIyP8lOA3iQYcbMeq Q41rn5hS55KB07Cm5XUx2IEnNBaYQDHRH/SIxKGsjzvTYX6wNGAkcaMMezTMlbyRJm9e 2yduGWeHcjO76SK0Lk3CnWbkCa0ONZ1GXrCv5/8dLqwfnrXFbpsZPAr9mfHzJaIT1LZ4 7KAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854264; x=1779459064; 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=7QWGPspy0sNOMbf5lpim3GaJwkmkvUIm+uwig0rAXqY=; b=dGsBWwIN2EQEtqwcoiLIEZd/u25epOsGrmDHGGDGyMlTGhQfK414IYnr8Fy5S5hpsb MqRHY+vuautrcloAOnqsHqWLVKZSTXgBBhMKqW6RiB2ycNdxCMy7cCWAv14JOeDp2SKu rFPGx4vH+PbrIm3yKJKy5qsa/QREVj6tK0uS3LNFmEqAxab2wJlwIIJUp83rfWROMeb5 8YnNodUiRPTSstP8tFtQk0YzQ+UNy0tCfEhLmOUYtYuFwxzseOwcAbExza61zpEAa0zd L9dgu1mo8uXCr8DWJTMmZhnRd+ofD7MOTM4Fq3F/HzVjnDV6KEUcIu8f6VM3SyCIlLca niUQ== X-Gm-Message-State: AOJu0YwzeoOKJ15o2R/y/JY5ObbGOk9+zRudyQZECyBD2qwwRRgYbIZg UJgJXGFzFJv/5t5knfNQ8dXU7nIRBcnbVxOo6AtcvXlLd02XD/Mk5wNfF4bwpFNm0JmUx3r+nEl fJaWn6Ic= X-Gm-Gg: Acq92OEN6OsJkIWYOscf4gmkSYg2lq7d6U020MV88EzE7hpeK5MyxLwQRWtzIZMFCIx e3bg+1rBBL1bxRN4w3RLyJ5lF3Ly55osM6o83lOEDT5EUVbYnzN+DXe9D4C/UEiu2Mne4xeIzgM Gi5qXrCJJzv0uavc+8L4VzZN+SejaaMFrd+OFbQn667pkTSufsayHXMQbb7/w1msDFk1WOAvN0v GF3FrWM1CYGZfuQZZu622yTFiLH5ZWaLpmdkdpn14tIoYqFwhSmpdrOrjKER/E9ciBo7+bVSAxe suGok93cV73mrbQmOHOWmRLNpgqHTO2TuWjrJn0w/xwMJyOHFEgg8M0cr2hDazUPXNTD7+FUfj0 lk9muJb1o/XwX2AQEBWI8kBrQMT9bhan4KoOmQYPMQsQuhjindALVdiavqpe3j74XV5g76i8Guc jfQ418km27BKZXiNF/k1JBT05ibaBGetkDvL9M13L3jpVZcsY7BgLbtQ442LdU+HXjP/wpzKxO X-Received: by 2002:a05:600d:10:b0:489:e696:8362 with SMTP id 5b1f17b1804b1-48fe60d7882mr51294645e9.13.1778854264161; Fri, 15 May 2026 07:11:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 04/20] hw/arm/aspeed: Initialize 64-bit CPU types during DeviceRealize() Date: Fri, 15 May 2026 16:10:15 +0200 Message-ID: <20260515141032.3271-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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: 1778854613509158500 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. 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/aspeed_ast27x0.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index 87dcb82e1b0..e50125bfeec 100644 --- a/hw/arm/aspeed_ast27x0.c +++ b/hw/arm/aspeed_ast27x0.c @@ -418,11 +418,6 @@ static void aspeed_soc_ast2700_init(Object *obj) g_assert_not_reached(); } =20 - for (i =3D 0; i < sc->num_cpus; i++) { - object_initialize_child(obj, "cpu[*]", &a->cpu[i], - aspeed_soc_cpu_type(sc->valid_cpu_types)); - } - object_initialize_child(obj, "gic", &a->gic, gicv3_class_name()); =20 object_initialize_child(obj, "scu", &s->scu, TYPE_ASPEED_2700_SCU); @@ -701,6 +696,8 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev= , Error **errp) =20 /* CPU */ for (i =3D 0; i < sc->num_cpus; i++) { + object_initialize_child(OBJECT(dev), "cpu[*]", &a->cpu[i], + aspeed_soc_cpu_type(sc->valid_cpu_types)); object_property_set_int(OBJECT(&a->cpu[i]), "mp-affinity", aspeed_calc_affinity(i), &error_abort); =20 --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778854494; cv=none; d=zohomail.com; s=zohoarc; b=HDhOh5+y4D9eSbXxYGSi3fJxXuFfHFalGtwV97gyR8+kttazIvGfMMqyw1MnyNMOM7WHE9jypwc/qbeeRd5vH54n8aA7Mo3gtlPtmlCfTfkGAbWa/qM0ILS4AztQ5EgBbzIJQyeOIgBxvVqZDFhgdR7uiPb/g6Pi56oAwPWUiDQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854494; 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=R+U9wwPM1Xta3FX+ZaXH8IQr8ni1ssktAw0s7odT+ws=; b=LpWEu3aeBRN0hD7xWrjCNV4t00rN+OTedfy4hWfSaXs7XH5Snh9nJ6kpPPf0mdiA3q4p/LxrFxBgCGm+V/XU/H50+3cYdlB0Grql+KM9MQyVpq9RV9Xdbfjacb3fDcqmBUqlxcHnfYVk3UPR7BBKQV3iDsvr8Co73KX5bpZtAOg= 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 1778854494284100.17135830759946; Fri, 15 May 2026 07:14:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtG5-0005RH-8z; Fri, 15 May 2026 10:11:21 -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 1wNtFy-0005QP-Vf for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:15 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wNtFx-0003xT-6t for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:14 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-488d2079582so92952495e9.2 for ; Fri, 15 May 2026 07:11: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-48fead1c364sm16398215e9.8.2026.05.15.07.11.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:11:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854272; x=1779459072; 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=R+U9wwPM1Xta3FX+ZaXH8IQr8ni1ssktAw0s7odT+ws=; b=lukLWVzGVMJxVuS+YTssa4GNWEX+OJfyD/85GN65301HIJGLj6oGyGVMuDRyF9d01G 0Sp1031rZmu67EewpPKIQr0ZTgUH6S1OpEdcdeR209+O4M+C8EM0JScFwqwwsE6RPJpw IzBsHGmL/lnPGHkhFXWagWq+8UJW/i+OKXjJ4qqBodinf35x0hrS8bBbTVZc5+nvu5AT h2O/E2SxpQnzRu2bvUuxvSVf9/dL1kg7cmzO1HYp6cBkt4pRJ025bZntsGgWURX6WurF zek1cSCTZIykTLgvjn7Sc4C1cDz7Pg25Q6IJ3rHvDapmqU0Ov1/LaJH6rvtIQm36hb3s 1VJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854272; x=1779459072; 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=R+U9wwPM1Xta3FX+ZaXH8IQr8ni1ssktAw0s7odT+ws=; b=ctBffxpz6Ti5P2Zylnf6wR0eE1u4cBoc7C7gOg4FcTQq4Ymy7LX96MLzQDIC26DU3V Ouw32BsFPCsqTJWuZPgUNCXVd8wpWB8QSGcJpX3lDrq1w00WchScGfy658uHV0pSa4lh v4Cp/8YU/Xewn3uF1nTWFejRhlTWgktZ6gCBGsQX+UfGyHJ5mAfcawYIXRf68u5Ox6NO 1isvwCKMYMAqmvTOEvMlF0HYgouprm4iTZ1ksHxtaHqM064dWNnqGRFDGthsO5rfNHm9 prcSMzETYdoZsmw2Ahs+zWB86EVocK9evwvaPwwtH+y3yzZux+VHeo+5SahL9Ieyg0yL wcdg== X-Gm-Message-State: AOJu0Yw+GdrTlxPKarw6ukwmYIGPndXIVlIWoh0Ft3dBMjFyHQNvcsOT 1L+j7eoLAcHol+zNUcYhA4ubhyAkw926uU5i5wiYcWTqbUXEzf2a8Mv5GuzVl+OVcmrqBXkbdxU Vn8Vrw70= X-Gm-Gg: Acq92OF5cNJTqIq7UQrNo+a7n/OMryOrXbKFTeCc9fy/Ac7NyjEEMZ/cNf/Fn9icJpo ttMSbOtKSpPtGP0DFZjDUr0yrWIDthXW/GYI1AJgO8U6ZEcpLaKun9LollDTGZ4tbyHH08repsf IL5GQipQgim4b6EDzEsst3RCRHVdlkkdPKCx+ERga7uM7y5bA/hhKx8gtHcvjiiwymgc+y2J8R7 GUhqcpdpaIA0d+vc6ZZLI33wnx9UODnDDT630EvGrqzuT/4II8CuNWl9VtdYR9nohau2dYoqOXF UmhJrUb8iGgnXaL0ZpgHS3m5Bax+qwBy62XrWF7MOBuV1Dbi0X4ecWZlgmbVYeKGWHAdz/SPxMq eg62t/S34qE8SVkpkg1giel3I8WT/KszC3h9fmeaIYwKjCi3w2W4BF7h9Ff81GivjtF76HINGRd AdYVD/vuZmRUuqHAVK5QCTFFt9M250AGFFxsSQdqj082ThcH6ucDBp05L6FZMbcwm62jx0YNFuv 43h/4UpWBA= X-Received: by 2002:a05:600c:181c:b0:48f:d5b2:7c1a with SMTP id 5b1f17b1804b1-48fe60eca66mr37497555e9.13.1778854271541; Fri, 15 May 2026 07:11:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis , Pierrick Bouvier Subject: [PATCH v6 05/20] hw/arm/aspeed: Build objects once Date: Fri, 15 May 2026 16:10:16 +0200 Message-ID: <20260515141032.3271-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1778854495877158500 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 --- hw/arm/meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 144e4827660..7c3d66f4378 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -43,7 +43,7 @@ arm_common_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: fi= les('xlnx-versal.c', 'x arm_common_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', = 'imx25_pdk.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', = 'kzm.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) -arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( +arm_common_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed.c', 'aspeed_soc_common.c', 'aspeed_ast2400.c', @@ -66,8 +66,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_ast2600_gb200nvl.c', 'aspeed_ast2600_rainier.c', 'aspeed_ast10x0.c', - 'aspeed_ast10x0_evb.c')) -arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: = files( + 'aspeed_ast10x0_evb.c', 'aspeed_ast1700.c', 'aspeed_ast27x0.c', 'aspeed_ast27x0_evb.c', --=20 2.53.0 From nobody Thu May 28 00:44:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778854352; cv=none; d=zohomail.com; s=zohoarc; b=JQTpAt1tn4fVpLyTGGwt5y2MwMHlscnXXzR4W0KZiODtR9rb3nnfTnka/QluVvH9cOm/nNMG0F415sdXx56vzeMKt7fxCC15SszcatRoPT2wlKhv6zZi//gu8dnKe2Ph1sse3wr1AreJFssLFQoQE4+BbmRDvEiYrW4HVd27fSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854352; 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=iG6uKO/60gM7kCsznxNFjC08KhvuF24RLwnX0xcMg4g=; b=kqsSctq2xI20nYMxTjm09d+S/5PVHItOD7PWcVUHDx+JuHedIlV93XPaph9eAwVFWPYNEA0lVf6qkfxOlLDoX+Nh6a6p7KoC0ncvGdi6lJaXqByaI1njbV0m2FQvL+vbfXGmDauhW6SvrTFfJlESnt5r9Og9wG6p1jra3L0j484= 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 1778854352850279.9307781948297; Fri, 15 May 2026 07:12:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtGI-0005YM-44; Fri, 15 May 2026 10:11:34 -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 1wNtG6-0005Rj-6F for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:22 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wNtG4-00041J-Ki for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:21 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-44985f4ab0fso5414470f8f.0 for ; Fri, 15 May 2026 07:11:20 -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-48fe4c88495sm68177875e9.4.2026.05.15.07.11.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854279; x=1779459079; 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=iG6uKO/60gM7kCsznxNFjC08KhvuF24RLwnX0xcMg4g=; b=iOqvRqqHBrjyai1aUxN2Uu2uzoUm+BjHDJ3Qj8nSHa12SU9DRxBiQ7Wesg9YJ3aVlS eRgnTgXUmPIQGuq/6y8QSRSUzilLTwQeWBJNmwra8TRBRMhkpz6y9UZKkwRJqHP5q59i IF8bJon/fHhJH6WKJ8WkHn0FFfAwhmNJ8dAt5/UVnbccp+jMsLSdmwbLxz/MdyRW6p4H qmgxZ5+5TkjWCmdPaaYlEpBQL3iMUPBMkUo5nrruz73+UT6x5FgKaCs0XIROgCt16o+Z R1cjBMAco3z82RI0yO5p4cq4mZAQXviPBwwyUQ1K0KJfU6wFCraDcQFavDwViTZdlwNf M7Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854279; x=1779459079; 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=iG6uKO/60gM7kCsznxNFjC08KhvuF24RLwnX0xcMg4g=; b=aEiP5kF5+tLeSoNxQUM8OfojAsbtaGg7V58z8eu5sisEpNgc7jQpqee/tijIudivpC I4esYtgEqtHk0cjOud0qLeY83gxcOXCm4rF8gVYyrmlFbvTYtA6dxGR+krhZZagPPOWp eOwtO8h1eRRB4ZpWuwlkp2/MxFXogMsbnltzkacmIYiNKOJnE7z2sBq9Iu/qFEfEU2b7 JImEZtp4TD2LrGrlSCPViGWE6UrxQU3mgfnSgz+EZQH5hu0MZmeZP+cTevEA6AAUkjy7 3ennVtH1YQxEfr99BQ3UHOIG4tBVtysAxvmURnj3+P7Z5kERrPmXJx2PzFpvLossgChy pMjw== X-Gm-Message-State: AOJu0YzQxWrUPrZtcqQYqKGT6OWQRjcuO4bpsDe8dGMcoOlONPHWWqk0 kGVAHTzGhZZNXAvcGnAK7kAbb2bEhPs+k/wXvIz4LU9mdS1DVCZZttRnK87Xd3Ozlu64BufatxK +I6wc9hA= X-Gm-Gg: Acq92OG1xyUHG8VPXBgkJ49aVWElwEnWGKSnAxRwSKGi2Nsu6f5PqMMiFr0WPdSSbA9 qJRyvQ3kZhbp+ZpSGnsd+ln5/aXeqd7pEy2eokDG0jP2dbcfaifbhKVmqYDDXZ5D7oNqRBIfttX MKn10cBGphq8b0wshVucmEi5IBOsJE5mwXMHUDIFaF5SXGCU6enyEsuC3awzda/Jjv20OVeDv8l Q5OZXCAeWJELOMHe7emg3I3wVweioZv73gsNJLFvZp+diO+N5sO+A4s6qRcczbJ3Q11AkfsPKk3 crHfhSnOtYc0ygwks0Cmb4ymXs0v9Tx6qHvhqVNVtK2Nr8gBiPJKiQL/+7pOTV6bn+fqF7o8ORU o8mnO03S+KBKBK93DQeMazUGjYtE5bgJ/GLj1HGNJZsNw4Gnt5O1xx1Wnbce7l62HNhAJc5g8J2 DwY3s33by3CF6h40CNlNLzEEY7n9biG142NCqn1cPaTC2jIJCqQT7Ora5OfW8/sDuXa/eui9pi X-Received: by 2002:a05:600c:35c6:b0:48f:dfe3:dae4 with SMTP id 5b1f17b1804b1-48fe60e9f8cmr64577495e9.13.1778854279131; Fri, 15 May 2026 07:11:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis , Pierrick Bouvier Subject: [PATCH v6 06/20] hw/arm/meson: Remove now unused arm_ss[] source set Date: Fri, 15 May 2026 16:10:17 +0200 Message-ID: <20260515141032.3271-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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: 1778854354058158500 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:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778854370; cv=none; d=zohomail.com; s=zohoarc; b=XFjqCunvO02EpILh58YKv+S0fsvgEyQnMTc1uybWbCHDiEjvJw0Eyu9r1jVwpH3FquvUvCR4mAcqWGck6ttUsVjZAj1kz3rbKMwXhgJ99XoRg8BSz3howikUEU3p9Rngpkishuqnxr6sY9yCGPeAqYCZ77NljCE/w3nOCmIl9pA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854370; 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=Ij7Lv+xOkw+dnHmI7jo5IUG/QbNAyBo1SM38AVgoOSY=; b=VKf3xQr7QI+zT2WeijVjFWTtFBmgzNLacBpgcnfuNLLrc8oM7G5sp3iqmrLM4Tkg+UOyw8ZuSW6ghncWf0Sxg3qavfvg90BsSyfgSbqHyxe/klUjUlrxqcumuSDtyeHg0NQjQuejKBVwW3ODkQq+MuzcZROjGfs8S3Y5UbHOaCs= 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 1778854370436773.6477514113182; Fri, 15 May 2026 07:12:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtGL-0005dx-8x; Fri, 15 May 2026 10:11:37 -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 1wNtGH-0005Ye-KE for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:33 -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 1wNtGE-000442-4P for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:32 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-48a563e4ef7so83634165e9.0 for ; Fri, 15 May 2026 07:11:29 -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-48febe661e1sm15155425e9.22.2026.05.15.07.11.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854288; x=1779459088; 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=Ij7Lv+xOkw+dnHmI7jo5IUG/QbNAyBo1SM38AVgoOSY=; b=PhTNOffkbiIIcVArqfpfNu4cH812Dmbdl28ZzqpGwEMG/CB43LS4rE6KcQR8JaeKhK y9pGk9X2sIrp36aEIx22qpjHhIuAJj6lS0aij7bkM+TNdNS7Bnf3fge3W+tETdcQTgsq VlSM1/B76b3Imp2hpVpztKCkPInGuvwHHi/OQDvvP1kd43zq/an8qkqyFFMyg4VTsFct Ak5ghgXyAm9MVAXskCHpVuP4cafCuBZDCP1aDmaXqJgweJS0SloH0/oEIr2U2avuw3Gn 2AMkUrEwKhxFhDxJqQ5d5S35WDb9jqG+AL6OmwsWd3X/Osk06RgqSjgCSggSzWoAdVds Tsow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854288; x=1779459088; 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=Ij7Lv+xOkw+dnHmI7jo5IUG/QbNAyBo1SM38AVgoOSY=; b=m/SazkzW74zlz+7vZEs6yEbOiEPJ06P63Pryvzliwt0AuOmaCDBAFwpymKhz4zF9oh B07dTvyA7N4NN+UZA5eWAXNr9FbJHuhNdlLSnizoW0I8zaD0FLJ2DAtK7mSRLB0yjWSV erXXlQWfLGe9Pa3g5aGRdCnjFqMcLvyfjSPIBAwbQyi132lI5eyjkYWSqAMoEdWggVUS OatNH4YF6a+Bo0VV0XlX0BY8jMarBkNbqKmB2oks/g6GUkwOrkE55kb+4r4ok/RWBlJH Fauids89cXwA7g9Cjl3+5tzr3eEX7Tjsc16Fudl5rc2bPYVsXLZ94Hqt/wR9ZZreuPMQ i7QQ== X-Gm-Message-State: AOJu0YwuVk0r+/QpUrGUAIyANomtX4KmtLSMHHZCyY2zlhYG+OCxZO8q jpH2c1ongsYrBno5JePZLutLwm/qjIlrJaTz+KN1MG2x1rPUYsrPApos1cpPR3VZULaHD4VOEAd sjeCp1V0= X-Gm-Gg: Acq92OFk61d5fEtVYZj61JSJm+R8tDg9y1dRaMe9jgEgUrQAYBI3fcbH8xz0+EV5nmI jGalyqf+ZdsySIXeUJ+Au6FcOERv/fFfKvKnfAH5quBMmL2NChRxLbB9vKkCspbDLwV6AOW7gMd j8+a6MMFRWea2WvQWF2lIrTa+S2x+AVDWSM1/t7QRuK/5qgwjb3vFPbrObyNnMK5d+ZjrdjLQPC o9bf2Oqa+3vqq+3t6JRHnEwO21tT0JFV07cZZsB9yGdjnNOXxwZ3MLxG3/4ynRkkkediTnHlPNX 29itEdstNYfRuWJvrA1B+B/SCVEivrABxJ/hhB0a/eKCSEcSE+9hdb591//sMFps2T5+q2c0fwW q3NGJqWPiwPPBsbsSfdaJQue5MeVJv/XK9yjQvj5k6Jndvhdblv9LDz48nmKCPcCwc6s3/6P+zK oBcciQ5cCJWl5ONmpM2CaE15a52nj5yqPPVc+AuI+6MyuuIgt/A/dOCLhEzR2KnwbJ2cweRNF6 X-Received: by 2002:a05:600c:1389:b0:48f:d1b8:9a9a with SMTP id 5b1f17b1804b1-48fe60e515cmr56879045e9.5.1778854287715; Fri, 15 May 2026 07:11:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 07/20] target/arm: Introduce common system/user meson source set Date: Fri, 15 May 2026 16:10:18 +0200 Message-ID: <20260515141032.3271-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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=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: 1778854372326158500 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:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778854597; cv=none; d=zohomail.com; s=zohoarc; b=Ao4ONId7h54uMp2ADGyD4raMkJ4td0XOVFKhhstaHxMI6h+Oa4uokxzEL759EWLhLE8Zkr4m3a/v4GSp1lS0UKXA23V3Q0CpQkfVqsAInnok6bpVskxzMGapiOdyb6T6D7u1oAV2S5Q4W305e+hXm8tsQel0FBpoBE5wL9/bWuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854597; 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=xPeBcaZ5YD7e95Npghm6maaNh0uoOJNDDsoQJDSIkp0=; b=Gg1HVt9iKoQTxjb7owxKEWS8o0hdPDq3kEOyiLrAezJV2+JrbjU88SWILw7tZUU3MyAq0GniegKlXsBsdIEqry0CJkkVhVT0hHGtbprBpsyrXN9D5wlUuVTTHdWdBd3xtrWRyU7Ft01rhJ+UfafOmx7WGfxBPGLfOCBEiJvWnUo= 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 1778854597344660.2144568050027; Fri, 15 May 2026 07:16:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtGO-0005mi-AO; Fri, 15 May 2026 10:11: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 1wNtGM-0005lZ-Ns for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:38 -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 1wNtGL-00045J-0J for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:38 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-48a3e9862f0so6220725e9.1 for ; Fri, 15 May 2026 07:11: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 ffacd0b85a97d-45d9ec39806sm15166142f8f.9.2026.05.15.07.11.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:11:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854295; x=1779459095; 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=xPeBcaZ5YD7e95Npghm6maaNh0uoOJNDDsoQJDSIkp0=; b=YUhJBmSMwW3m6qpcrKK48lSrUzjEQm2kbYzZlE7FJYxMMemOba2TfIrDW03moWhs95 ed+kgfpP5MzkxBRo894KKwwZ/H0WkMbZGxHM6cJejv84dMUbqlyCfeUkCO3mUeI+GqZm 6BpeFbDfniC3Iomvv3G3eEoIHvEBn81mdhTkkYb7wuNvpgRrKXN9gAuVQe+6ZwE8ow6y cQ10IPf0kqnHPgO6VUwyHVGALf/YdstTg8efdmCacPJPg6Jot/a6V+5tpbafdLQV/b9s lWDIlDMPSXOh0t6rMUQMLX7ZiDhsqaTdEjKJt8erw8ZWz1B87yrQxbbkZDawGrtcQCLZ CqYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854295; x=1779459095; 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=xPeBcaZ5YD7e95Npghm6maaNh0uoOJNDDsoQJDSIkp0=; b=cgNPNMUdG5WGknU8AtlcKxTWZdK9Zvl3ooVyVyzrlmHE69F9uGDA+zNB1BM70ckVMV ynBGhuLUfRcjKmVWI2rg6SSr5brOCFinBTee8T90kfOJss00XwfwJ9VtT0xqJA84M673 OYnIkhCN5q8C/fb+qVEtNN7oG91cZsLk2gv7Ey68xLvv13wW/bG6yaqvz7AS8FEuudNU PG9zGcPK7/jmo4pK2JvT+Nta7Omaf2Trb+pjDJ22M89Ns2Ad3JQIJhXksmLyLSfIhaNJ B+ylnR6faY6p+FhVIpZny99bM4Wl3xDb0+ZXm03FWslnI5uBj3Zb4U8byxgJ4NfxgTaN oN+g== X-Gm-Message-State: AOJu0Yz7DNTEl/BkbH6TCGJi3qWqtm+tHrMRSWh4+dgQ6edUvT+uX07g pOCwiZUwJtIdfpeag9UrgeSSh2od2XXl4vo+XtNk8Nlc93yim/lzjEXLjH7xKGbD80Dd0hzcYdI 2EIAJC28= X-Gm-Gg: Acq92OFzVMZjduuB+ab2h3aXrUM37XcdOHag2i6IlGvoofe+4odbG/QfupxpSabnxRD 1frZ4BzGK4CVLJWoHYLb0e9k0EAEIfZX0bEF65eRcSXGONI/E5dHpkcddr3RzkWyQewVYDwBnZi LtyLBmvvwuEVqCtnAtXr0jiKU2c/2dEben3MOPP8k8zBS+m7n1Y5OjD/GCBhsS2d5jKf1evt6J4 KjudidYIP3t/yXVCO+z89NDbHTBdJeuUkPAPKPg1GyJjMHJzIlQ6HLSQN6DbWALtUFkFMibeeFN jGwQbB7JlZ/dW48T6jDnKCru0Y19jimgnY3ll16Q3gK7OTqiwRa6HdXs9MxdzbS98Y5Ikf66rZh 8vkJGQpGXSySTR5abz9FMynP53Y4oBIkkhjIlc/16AEM6xGjLi1kiI+KiI6I8HVkwylsG6XVpBW bLjNClOVJdghle9rvUFEml+hFvy3JURReosWG1QUbhge0lD95N/9A1fd20v7CO4Fngm2VwrhAd X-Received: by 2002:a05:600d:8:b0:48f:e044:927d with SMTP id 5b1f17b1804b1-48fe537fa84mr59363415e9.10.1778854294926; Fri, 15 May 2026 07:11:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 08/20] target/arm: Build gdbstub64.o as common object Date: Fri, 15 May 2026 16:10:19 +0200 Message-ID: <20260515141032.3271-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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: 1778854599815158500 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:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778854396; cv=none; d=zohomail.com; s=zohoarc; b=jvq1jqr+6MPZ3E6W+zXZ0yOlrT349wda1nIuoJQoXgqcNPPlpf9gZ3/3eYJEny+GffjLlC4f9pQ2VzlBh15AH3DmO6OEiCg0h980jFL3yHHP0cIWWVAjk05SesX01fMzirLTrmyfaT1Pxx0y9BYBfPrOhBPUGQ75hViy3LaUh2g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854396; 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=mPHHkuT68LQ8THDPOQM1jypUgrX1zdRt0XHWxhQhz5I=; b=ST4GN5MgpEzJL0EuswEkVn93i9ugqA+ASteTqMIivu2mJmF3+oq5Hl38WeSdFVxTKHqQgDcoG0Gc0wYVUrLB7t1cTyRLmItxXcyRlCJcSy+QlIrRc32Mn/E/LljgtiQpf4UC3rbspxQCogIaqkX+N+Raw1EouXyTxbSjQdLTgaI= 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 1778854396522975.0382413408125; Fri, 15 May 2026 07:13:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtGV-0005xy-4L; Fri, 15 May 2026 10:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtGT-0005tB-UO for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:45 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wNtGR-00048K-OX for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:45 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-452169ae568so7133257f8f.3 for ; Fri, 15 May 2026 07:11:42 -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-45da15a666fsm13484679f8f.36.2026.05.15.07.11.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:11:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854302; x=1779459102; 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=mPHHkuT68LQ8THDPOQM1jypUgrX1zdRt0XHWxhQhz5I=; b=T61bIlh26ZAWb4Ox/oMXW/yaFzl256ZJNd27NvY3iB1XcqNAE/yWXAvmB1l1UQD4k3 hQV/YTz1a5kQ7KOEccCfPuEjgFhHESDZDMBPRznAkxqvNq7IQTnOJgbJqxr86B2rHszR 1HjDjkg/ps+QsULzqFXACZUa77WT++VUUHGfDbrHV13Gn84rICl332KQDPAaT87fg2gb Gahpl6BTKNOGyx75dZaGfQuEk4EK2icmYQSSxE5Tkmy3D1F6GuW/if3z8LPrPgYnFrQ8 LZE7yT9ubgBqEp/1p4seAltk/NpfTNxzLmLwx/2orNrnFCqhMr++6BMh7X8ceJYahtsr k/KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854302; x=1779459102; 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=mPHHkuT68LQ8THDPOQM1jypUgrX1zdRt0XHWxhQhz5I=; b=p60TKtYpCeCt5+YMLPLtweMmXUF4Wf8ZBuIe+9uiR9USCuDolckN2VM6g2qMozJzxA Y5CSiwPVKeyZfPQMPRi294LzSBamXmyBAibJrXl2HSAh7d6s1n51HbKYWAkuLWZbyz0j dJHl2XSXEfkPKjorAQMa4C4VSEQVSn851r6SSfyO7IuDfuqXs0ZI0i4uqzSFWsli0Ss3 494KtTewVCGKFSgxX/RXK9q66UpQLrUGZXQFqtJlkYGd3O94Dx9xZ41/O+f1BFoR4fKp PkSgRqP6IFnieUZJraWnMXSL/5byWj0vjgZNEr3jb0yVSshG5lGY7MZQjVXpawvBzs3y fczg== X-Gm-Message-State: AOJu0Yy9HR5tZQMq0+FGac5KEI8NDu/8ZUer4vui5ESJYOKkvBZ+VJ9m lFI7cg+oxAo00tSFM/uOwyz4Prp0F+4uWdXicJ4CSZyfZsWqdN+BzojxfmKPIGKeGXoYQCTFWJL POTHaAJU= X-Gm-Gg: Acq92OErqxc+MOgZSwmaNhVAkCNXJVTrUoR+hclROZj1tu1rAZa9r8L4yM3rIlBWse4 yPbqQy7aElqTj2jgsUaGSrCWNmK/PzAFBfPNL5Lb5d+233R/JS4sdxXvScGUsecjCOhL8s3yRnK dq/5nwTlbmClq0fB61K6Ct1i40PdjICYSGaRfRja+NrNuZf752uqT9Cl/HQXuWSeEcVkztz2ufm yHXznFccKY+C1/JU6O4KYACy80lCLu9igfAM1op0on9eX2rznvd+rq5j4Y823M/Ed3Q6bqJsMqM SHk5j5O0T1dQczHAoZN7xl18yLFPOyz+UbreHgSlfSFeY/Q98IERbRBeiaZzcyB6uWCqT2FHUhf pmGi7603Mwrh/Glgfad0C8PuwQ2xiekQIcb1NQ//ilAd6aESh/MkTKDH1MLbs8a8IPuqzfLtouR 4LrqCxG5xkFfozsSNbJsv/l/48L+/Y0j90cofk28ck3tI/5uZQ3wZqNtl4Tm/5BbCfaviYdZEyG OB4TMc0u5k= X-Received: by 2002:a5d:5d01:0:b0:452:a293:4d91 with SMTP id ffacd0b85a97d-45e5c34b279mr6122960f8f.0.1778854301916; Fri, 15 May 2026 07:11:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 09/20] target/arm: Build cpu64.o as common object Date: Fri, 15 May 2026 16:10:20 +0200 Message-ID: <20260515141032.3271-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1778854398586158500 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 9eeccb2adca..f821331fbee 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -27,15 +27,13 @@ translate32_d =3D [ decodetree.process('t16.decode', extra_args: ['-w', '16', '--static-deco= de=3Ddisas_t16']), ] =20 -arm_ss.add(when: 'TARGET_AARCH64', if_true: gen_a64) arm_stubs_ss.add(files('stubs32.c')) =20 arm_ss.add(files( 'cpu32.c', )) =20 -arm_ss.add(when: 'TARGET_AARCH64', if_true: files( - 'cpu64.c', +arm_ss.add(when: 'TARGET_AARCH64', if_true: gen_a64 + files( 'gengvec64.c', 'translate-a64.c', 'translate-sve.c', @@ -79,6 +77,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:21 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=1778854356; cv=none; d=zohomail.com; s=zohoarc; b=Yb/hiSj1IAs8RUAw1VSzFwK405imkm2kynnzsNFkQhUSNubeDwdCtR1j5eM59MO7t3XhCo2eP5n6QcsVo12JcOvX7q42GPVN0+lwMt6GKwTmWfdcF6WM6qzW8zrE4s2JmaeD1Hzn2fAeDKbNVwFaE7AhwAr5VjqtaCHkbITrB4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854356; 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=GDq9BvT/lOkobiXtw67j1Qf1XHuz8YPQ+o7ed/CVvtA=; b=gZalUlEBIUKtx8heIKsQbM+qfuTkipVnMmjPArx6WceUfNtey0P1O3VJNIist+iDDoB1Qj+KYa3fKxQul8s+rKd9Mf6Io4qe4HGX/UrSjWRszoD3hIThqAp9zqpRDCYJbT4b6rNgW2DtgAZIQaz5IoYemHfnFE57GYgMViXmf8I= 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 1778854356557954.5372835053709; Fri, 15 May 2026 07:12:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtGc-0006HN-JF; Fri, 15 May 2026 10:11:54 -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 1wNtGb-0006AO-8T for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:53 -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 1wNtGY-0004AH-NN for qemu-devel@nongnu.org; Fri, 15 May 2026 10:11:52 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-48e6db3ff7eso40427375e9.0 for ; Fri, 15 May 2026 07:11: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 ffacd0b85a97d-45da0a19a0csm15051893f8f.20.2026.05.15.07.11.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:11:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854309; x=1779459109; 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=GDq9BvT/lOkobiXtw67j1Qf1XHuz8YPQ+o7ed/CVvtA=; b=VHqmwn08CuQHhvCcRCkrIsCxpdrZEIcri5m1yy2vBVBga6BIVETCsiyF5viV3SsgSg GRzxvEGhZvV0qqYe0remhXBft0D6NIQPA30E+V9Fvx62rb/eX+BnjWRXMhxPF9XApGm1 Jg2vMQIvA6p3R2KVvywSSq2SsnUFikKMnGdN9tTLiU8QqspvAQTJBKH0RZzIc24iptmM l5jkvJ2O4WkBebB+l/YtOAXFWGJhSsVlUNCR40csMidEFFVvHaJC3M9XWAIQATddo3KE XYhLtP8+Oaa5PlaBUJ9w22uvFgel9HRtPERrlRF6ZvlWHq5nmDeHy026+A4acRw+VaHz pqyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854309; x=1779459109; 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=GDq9BvT/lOkobiXtw67j1Qf1XHuz8YPQ+o7ed/CVvtA=; b=h9EE6L9ityFxgu6xYUXHAgxTcv0EsxQwlBgGBTXrtMG31qiigmY2CO3ETVTo+F7Azo 7U9JyqVuEopK4d/olhF08kTBoscHOqNdwmSRb51vzm5ThUpyYwzeCQD67P7r6QaN//Hp KRydlQ984XKCKHq3y33KHT0+FOtuDa24whPMKaTo99RqG7VLSIbQesno3baOO2XwUMiZ 4Xohy6/tt34bEwRGPS4uq6FPN8fnqwI9ET8rL9lmhh9l2eXPvNh9pMVrLfeUJC2L83ux /jh37UZNrl4PU+4z/ATXWJqbLFega8ZqhgJ74QbTQ8ZXsGsYYPu/AUPFdVWBvnExRP/L 1CwQ== X-Gm-Message-State: AOJu0YyL37l2bq66DGI9Ee8HWVIlDoSLREn2Gva/dd32/3ygGCZ6AzPg 4MATmkU6/PMT2Ll1k17olihcOn6V9NlYdOcyLZGGakiqR4h9pOvvEcfHWBeLZm5RsNiAIbgA2kI C2a76+1U= X-Gm-Gg: Acq92OEaK+5cwT45RZoDXkJpp4cMzW3tWKXmBEILiP06hp+UlHRj0Ut1RiT/nggrbV0 I1nIBV1m+h3Bq+qAv7VqFGi55w1Qm2MfJl6zEFXoC5ii2R2XkzyG5FxB3LIVh8FkmXEDDcNq3n7 1Q9vNlQE8QY77f6XDiu+tNeDh0Yx7bJj74hQc8//kJyLU5WvG+Mbhc4buQJETEs5cRlUm3DiyvC wgNkQzEq3y3U3ENYVezGViytX36EfLBjN4qDeO3W1/e3oLMj4tjqDIaitqOsYaz6GQpMxsjQL2N EGplDioWHA+F2Pg052pFZ7MSbmBj2bRA/MsPN9MDNl9jb05QKUpg7yCqupWL0JZ5kLk6D7FhuvI /vS7h8UvQqqBXeduByHzWi/NfL2Tna7nu/9A4tQyb5KH8KdPn2CKMzY3va3nWPmRxgZHKZ/0FC9 CWHe74Jo3N+ap/Xj56XMS4sc4p7re5snC1l4ohXp+7pTXy9eyVbmKf/rdZbN6WVyBt0ki9n/Uh X-Received: by 2002:a05:600c:354d:b0:48f:e230:72fa with SMTP id 5b1f17b1804b1-48fe662ffbfmr52036585e9.31.1778854309211; Fri, 15 May 2026 07:11:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 10/20] target/arm: Restrict IDAU interface to TCG namespace Date: Fri, 15 May 2026 16:10:21 +0200 Message-ID: <20260515141032.3271-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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=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: 1778854358485158500 Emphasis 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis --- 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..76f5909e902 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -24,7 +24,6 @@ #include "qemu/log.h" #include "exec/page-vary.h" #include "system/whpx.h" -#include "target/arm/idau.h" #include "qemu/module.h" #include "qapi/error.h" #include "cpu.h" @@ -42,6 +41,7 @@ #include "hw/intc/arm_gicv5_stream.h" #ifdef CONFIG_TCG #include "hw/intc/armv7m_nvic.h" +#include "target/arm/tcg/idau.h" #endif /* CONFIG_TCG */ #endif /* !CONFIG_USER_ONLY */ #include "system/tcg.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:21 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=1778854721; cv=none; d=zohomail.com; s=zohoarc; b=PJcBAl5sIAhRsumAA3Iv6YMPLVLVw3LVPaUi49Ru/H5gxEq7++4EYBBWERwLUJz3LDNSGcVXosx9YgDbiO8XLr9ClkHKcHQ21/2zJVjWY9UNcntHXUlcDsfEOYAIFARiPe83+516uRcn5vNDWKA5Hyq5CXtLI/Rk9sMbD7gu1xY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854721; 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=X4z7sxEcq8cgRQJzCS3+RxU14e+GbTMxdJeSkxmfOJw=; b=DLe+UT6x4z2IClYJCR7JGA+wEXog21+a2c1qI5IceDGxBZ6u6CISMDv5FMqWzaPE9z6YDazti4LkPt4s9nsQNWtEb5GuJ4F+3EG73Cp+MTlVU72yOOhZ6neOqnAuqVjzapS84N1ymyHLH8hmxlVummgDCepbgLsN/yVX9M4UMio= 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 1778854721027849.7791182919096; Fri, 15 May 2026 07:18:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtGu-0006s5-TM; Fri, 15 May 2026 10:12: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 1wNtGj-0006c8-C5 for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:02 -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 1wNtGg-0004BU-RE for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:01 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48374014a77so80104595e9.3 for ; Fri, 15 May 2026 07:11: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-48fead1c364sm16411955e9.8.2026.05.15.07.11.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854316; x=1779459116; 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=X4z7sxEcq8cgRQJzCS3+RxU14e+GbTMxdJeSkxmfOJw=; b=hpGeArNBD4Mwkogag54w4+B9D2R2u+jp3G9RyoFVRwNFtFg+I6bbZNEF/+P7NU4bqh wqm+1nozmpimelPF4DkKbaMbw71oSw/Dcl4XFEYOSKFTJ5PPYGj8CBMBcQvNNYPug1eR lp54ko0AOQY0V9TJi5f2IifM+XVfVRhnYOVmStDPGta73cpt7QR/8Sk/v3rEugsfltYS FL3iLD9+LL+maw9TyCFiAYwRj3eH6V1nbAnFpknDG+zxqhXK9QKkN08LrfG1mrFJHSd6 dL2VwRXrYETpCQ2pZif1Unz3qS+BxJXqHz5aL5F/5hWQ1FLhtyCAuESx+q5e+NmagCX4 XJCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854316; x=1779459116; 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=X4z7sxEcq8cgRQJzCS3+RxU14e+GbTMxdJeSkxmfOJw=; b=Q3o2dNy2YnL62Xeum/cmoEGYLw2YvnCtujIZLZaZbuvknqUmxhvGkVUnmiS+kaui6i k1Swbg7lo6xazci0YvX3aKvIBS7QBnLJaIhMGO9P6Zmgqi2vRDwOcEFfABaXkxuMgb2s O0XgYOWmfQqm/MRvycA5SBBH654fZb7l5a9HRFW1b7qKoP5QVQNFUujckHlYjwSZiieI Va+fH/pzkfB8ZWqpOiAIcQ6ImoP/U/Arh+zSQ6+9I4UPHucgdRsHbqvx35UfyxMXgD5T NljjvTokfRwRiZrAfbxECJQPn6LIH+nGjEunYTmgOjtApGt9A15WuuoQhGpl/3V87mqV drHA== X-Gm-Message-State: AOJu0YzED11APRAw59uq7fP2nc/Ei5fbX2yoBHgBqou4ubSXQq13qGnm d7UappMLoXFR9S0I581/K42ZF0SrnuySHA5g7TNEMSq3ckYST0FTmSR4BVrAwLonIfHTlemPXgU kEzowAPo= X-Gm-Gg: Acq92OHUlzN9jH0Hg1j9XUSTa1pqXVPrSUrcu2+Mu/1kQ13i07e3HOwfXAq1t9iOpt6 +jocffxdd4bgbrDsbCO76l7yytDgR/Y1b6BXA4QOTrpiHgebcn8kgGJTCSuK/rZb4CsDz96sBr9 DPQ6sTJRlJO+DFv+o+/15BbTGz9UnWN/Rh6pZqmicqmpyjYlSNFub7eEyozfRfq3BPPWRHzdSk1 /jspR1U0JtCtN8gypb/z+WV40Q6TxAnCNXUikpzmzQ7UFl1sC2cz6wKSokRr7BPqWFaQzFhxKnt qsmmQM15RqsgXKFHJwGcGjIJDeLi1Fo+5hgTGjDYkudysMzP/iB9cGKXnYFrRnc0A+RrpdZKMaK D3Me56296ZIDZAkJ6k7bb2wRLC8wuNGDmsALAC5CRnd9q/FjRnC2d/QSna/PoMPV36iREV5msPC ZHC8wXPx1BjoXBZDkW8+Zp/qVnC9sUCyDFbA+Q24mWPdsNQj2yy1Kn5C5nrmjCfr9dr5uDb3ZFZ DyQhKLHomM= X-Received: by 2002:a05:600c:c087:b0:48a:7b55:12a6 with SMTP id 5b1f17b1804b1-48fe5cb36aamr50828545e9.0.1778854316524; Fri, 15 May 2026 07:11:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 11/20] target/arm: Rename Aarch64-specific methods Date: Fri, 15 May 2026 16:10:22 +0200 Message-ID: <20260515141032.3271-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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: 1778854723167158500 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 76f5909e902..31e1fd6cd51 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:21 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=1778854562; cv=none; d=zohomail.com; s=zohoarc; b=NlypNrc+1McBQhY4TG8FdHR3xhUyvcbcUve4Ev47h09FoREUZ63a0yGXb9OYOQvnusG+pjKfCFr9Q/IBeoFH+KEAE1rcQp//hxIbEI2ADlxR8T+HoqmYK5btmSUzwS3wfEHVDXXkrf6JnF6FCwl3n4sGcm1kl8tHRWd3tX+1sqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854562; 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=cud1EvGK9OKgm2wbbXO0Tg7zjgqWh8fpMgEbSaEWLIc=; b=YN4M1C69OZPSTGPxD3xXTjfViAKFkluaWzkkQFVk67b/TynjF/IHPx7J60aK41HdXd4pfldX8bfxcixDPhnkbZGOXftG3M6xWrO3a6wPYU/DrGtplUc/F7CCv5O514GShIPJ7NktUlQqe77ef8iULbxbwjW0L3ETnnqpinARFH4= 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 1778854562414214.9872916890548; Fri, 15 May 2026 07:16:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtGv-0006xL-Qs; Fri, 15 May 2026 10:12: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 1wNtGp-0006mZ-Rs for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:09 -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 1wNtGn-0004DA-LO for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:07 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so152709085e9.2 for ; Fri, 15 May 2026 07:12:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48febe81b2dsm14433155e9.34.2026.05.15.07.12.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:12:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854324; x=1779459124; 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=cud1EvGK9OKgm2wbbXO0Tg7zjgqWh8fpMgEbSaEWLIc=; b=ZkTiTdYX1J6Xl82lBrsIvOHkiZ1IOFdGcpQX4lRQHE/WB38zkrSlx4QFCqu5u+oghD g3aL7fqPhdBYCD6VvtykVYYb927rBdzvDnHEnb+xb0dn6jlgalA6W0RjEdjk70XI6sQ+ BjpGuKKVEBTQ+GIxibpE5a/kLpSbZsBi3E83L1zMFF4NraTm5+kFtyXnLOH0EHN/8gHz 42rtajyV6SfEJ4dvFxFtPqSQ8jE7nwZcqvIS1AcpotL1efd6TMVQzqGvRuY5td8IOBv/ wVuT0syeTwwCCcyTMNMqXZDSjGhJiX90LyfZbp1T5rfcfl8B/DWajCyaFly/Qt8K85n8 XeOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854324; x=1779459124; 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=cud1EvGK9OKgm2wbbXO0Tg7zjgqWh8fpMgEbSaEWLIc=; b=IYVIK1gkGZRSmn3bweMXHeHSDhP2KzEEIEFYIeVOMbiQfRfLV8n8GOhlrQnh9ZL8hV E8p3OBRLv5O73U9VPmFPj4qw+XrUbvETqkAcmVK+3jQnchUrEiqlGAnKRjc1iOzpgPiR OiSJPeFAM+QtNtgPQcrTZnaCXG7CTyi1erK0/GH3ysI/OspXCpxmCID6xwKUIDPLf93s iHuaIaTutd7BjRSlQlHTMFsmr5Tw1sGogrJQ7F4D4RQHChYhghyEJg9XzhACwfLi4fg9 tk1w8Ov5qHFxsa1zu/QtO+7rXAEgvZbGfzMS1slCqMVsYMcWOS6nr6lRuwCujizFKRlY NbLQ== X-Gm-Message-State: AOJu0Yx/EZ94ky6ZPg6C9mhMVmfEPn+5Hta+nd9Eu+FEE7lYpjd1hJFi oeFFt1xUKCNab3jj706ECc5zSS6l5z0sU3VAAQhKisTNayqBfafIgPi55leNmDbUzQA4BiMwilc D4Tzxu1g= X-Gm-Gg: Acq92OHAL7/C3KXObqRrYVpO+HSd5H6Iu0ST2XIBrlPl4XjkrPIMHnzXKk/5TKXYK8y v78bO0qXaKn8xmnkvGYd7pYUf6TLDDJwYh7B+NJFICA4/pYbztrIYN13XHzSgZ0qenWOBdnSdHT o6YRzB4QNlCNDg1Q/OeVWuQEvZKr+V0Xb8x8hrLpbWK00vVKtAz/Gy1lz9w/PWke8aI+UBJi9VT HktlAEINJQ0CHp/lPnVTgXBpSjUDMXpqN7J6l6GqkaZ2kVxNjK+sWIGC7hBJ6CQaqT96hp4VsGd Ws+C+KFb69kBlFH42CII/+j7dyWsLZ9NL8F9xLI09Avzt3IJULcab/q6MK0N0MZtImNXOPQiYhM QEav+oSCHXjTSzgUu5HYFV1UTwQwfRz2CWGzrWCuodLZSBNRKYVET8h8CA3h8te51SkFopbybXo Fsm+QssvC+4tOb1DVOL58Y8sGG1lu0WuwQ3aOZMz3YNT2QaASwaLk1nLsO62/57f3EoYGMesw2 X-Received: by 2002:a05:600c:a417:b0:488:a882:c7 with SMTP id 5b1f17b1804b1-48fe65168a7mr49249255e9.25.1778854323912; Fri, 15 May 2026 07:12:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 12/20] target/arm: Extract common code related to 'max' CPU Date: Fri, 15 May 2026 16:10:23 +0200 Message-ID: <20260515141032.3271-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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, 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: 1778854562803158500 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:21 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=1778854494; cv=none; d=zohomail.com; s=zohoarc; b=Bv2tH1ofLb/DV4exyhuv02y+3uCnT/tkQsuZNB9TR8cQkWfLkNCVbYoGPVZdAOZ65bPswrqBhnIOMNJblb4FDl2PVZ5Id5f09V+EUhidFJTbRRkLKu/FztGWiVvcGe6Ie1uNL8hSfTk7ZVm/grbMPosHNw6bWUKdiL0GDGM9O1M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854494; 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=hZ8fiEyIcsczQEDgRlwFz4p9FVMl4Ln4nKLkoMyRd58=; b=hpm0mgGSGuvRWXZUhxbXUaYOOEBTms7TgfaJRxjg3N4pOEQcqnVodS59LrAEy/ipQF1OK0yYNpyvNJGtZlPy2ugBr85A6OEKJlkjYDBF4YcxhpeiZsaeA+ETQ18BJgkJwHqaPTa88PpkStCm74e2K+oz9tbxLYbClaIBvepT81M= 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 1778854494805574.2395018321737; Fri, 15 May 2026 07:14:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtGz-0007IB-I2; Fri, 15 May 2026 10:12:17 -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 1wNtGw-00072I-Dh for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12: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 1wNtGu-0004Em-Ij for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:14 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-488ab2db91aso98641895e9.3 for ; Fri, 15 May 2026 07:12: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-48fe5376812sm67877445e9.11.2026.05.15.07.12.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854331; x=1779459131; 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=hZ8fiEyIcsczQEDgRlwFz4p9FVMl4Ln4nKLkoMyRd58=; b=hRjz0wlF7AaLk8Eu42GKYOysnjTFWqg3yYf/SB3AoP/CkMjr87BMM80jeIqM9JmAuY ed5v9pDEv3jAMJMXG/JKN2WhHvao4JXH1boUN/v8p2t802ACFI+ksldZcEBcq0ZWKwIc rcN7gV8Rmlwue5gzHALSrsGigtTRQ/0gW4Ql7lV34TBnLU/O2V7css9Y5Cd1Ku6AdME/ Xh6aEaRaXB5IPGsE/5xfi+9JczECmc/2Q2ITMTVvat5r3d+jM2XM+4ihKvXjS8CB1qJF oHIJJsmjGEx287HFJfl5ZaSavHEZXKi2D/eLzbsCRDE7NQt+YXLMX5qtZqVWTbjUWacz b5VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854331; x=1779459131; 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=hZ8fiEyIcsczQEDgRlwFz4p9FVMl4Ln4nKLkoMyRd58=; b=p0/10PlC6JjKVc9uDxlt/Q/eZI+HMJXsNpRgbioplCIImVMtYk/PZig7tlDxKyWdK/ J1w+TYCid5fMro4kFOGa2OO5cwBmCPemMk9UhbQxQ6OsnV0LaAgv8ogFunMZQwN6x4lJ xFKjbvypW2qCCapAD3aQdbE6m+T/YfsJmpK/8oe3tzCg9c5LG1EjYGJWXbUeZnlf/gYD AwIQgKBUjFlOTAwgC35U7kyKWrIJDFvuwVXfUSQCsYXgnUEnrNYa1h3r1OL82JChOczd ETTVAsPX2BE8LqdKnFqYMmYYqu5RydaXv12RrH8/PXUxwW6CZtGOkuZETbFrNYTZ+XR8 7ENQ== X-Gm-Message-State: AOJu0YwvJ1Rvv/o/c+5JbCxVEvYgTOofRtkYXsS8S92v8pw/tQoc5hsI pwmQYhjDGy4Zgx3i+bILP4zEbRmJVAtGBbyWlaM9R1HhxOrb+I7QhInzxJohtxgOU4eKD8UIOB9 SQTddYtc= X-Gm-Gg: Acq92OFJneKGFP0eejn6f4Q6/QOFlK91y/IKFSPJ6pG3iSuPtEFtCV9lwvP8bZwyBn1 xzzrcg2RUDA2NJk7hLjW0TrNjVRB7gQI7PY6vEHLcXEqqNxlXHBbXq/0kcOS13onz3Fw7k0O5Sk 6lfzdSy/eE9/LwSkWTz99GM3KuvuKs6etno5Lz6OWYiSyO8SDd2zEsuv+EfDnL3kHLKvhsXDuhq yp7DUsxK6bC2T9D/n9ga8R7qINMpgelkYTOcjjC1+zrHN3jWdSH7HpFPoTWwLkB0M3OeVjcwdbC 24XfNWEibEKxpr2MLUuYoFbQ1SfUQ/Jj8lzBc7JDbxIuuYR++ci4Ayl04QNRRR9wtecft7jKbdb ReyZrrEYqggQNI7p74UI6wam5D5kb+krl2+hFysxjzfONIx0R/qCsOEg0DVGLP/4O+kUdbm3TR+ eAhY2N0yIkrH6AwWDq5dD/2Y2bXkQHHuosHcFcVqB5lbKSFG+tYb0IyXy9y1X4N8oDX1Xc+P1CA /abEXN3yl8= X-Received: by 2002:a05:600c:48a8:b0:48f:e230:d5ab with SMTP id 5b1f17b1804b1-48fe651e11cmr35164875e9.31.1778854330979; Fri, 15 May 2026 07:12:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 13/20] target/arm: Use make_ccsidr(LEGACY) in 32 bit 'max' CPU type Date: Fri, 15 May 2026 16:10:24 +0200 Message-ID: <20260515141032.3271-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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: 1778854495867158500 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:21 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=1778854597; cv=none; d=zohomail.com; s=zohoarc; b=SSkbbTlNJuwsCB+1xkPPitwg0NYO+ELyPfgufTBnIGQXeLTfM8CoujP2nkj7yEy45egZUyN7uW+CgynGVWh5FGUP5GK/l67GHcJyuHN7xSVZvwPGSHpe5lxTIKLZSLXQkTsA1L+W4q93B3mlMrBgkgfQdUJ9mBkNhRuWM9Xwxj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854597; 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=o4U8ZCCS2W/eS7opYuY30TphoIHkpy54aFpBL/IoRZY=; b=Kx1ILpCZMdUb3MoRYq/AHIjNLJsPGUCJgM4Xq8tqtbK3RcXZWUXT0OHxm1YctAwxRKqOsp0JPGXWuZ15VqdjGhH2Kn9HUmfqJDN562FzMdUBrKbQdaDB4tPOaKdLWf5oRwzF3eaZ8dNNUIT5xqwAJrsYM+a+6QIo58vlCM48zTY= 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 17788545972601.9418102141515874; Fri, 15 May 2026 07:16:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtH7-0007mK-DA; Fri, 15 May 2026 10:12:25 -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 1wNtH4-0007ZN-MY for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:22 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wNtH2-0004GZ-RD for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:22 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-45562c41ec7so4767432f8f.1 for ; Fri, 15 May 2026 07:12:20 -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-45d9ed30110sm16004845f8f.13.2026.05.15.07.12.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:12:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854338; x=1779459138; 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=o4U8ZCCS2W/eS7opYuY30TphoIHkpy54aFpBL/IoRZY=; b=UrpgxejORcUs/HmEPuamvghNO+9Fp0342gzrkr5FbmVhKW8MKPQ+sJB+MKdOZo9Ksk lVwRGC6r8ztu7HBeVn/fTMqfs7ySPrRk5TdqyKPAEP7M6scguT85n/8IyKWgfIJIwHbe qqq+rVbU7fKHZFIaQBQdnDqOh6Ls7YYZZ0IbnOzQA1PBxwBTe0Kw15ufhxN/ZX0WG5Az YQOk5k/c3pinaBIw+gEo0p/erok6slqAgyfXHlXBCdWXiw2esNNS8s1EODfMq5AhjPyI XEDYGJA4YkPGHdJC8E4Qqwd+wUBTf+B92zbwJsIVFEczAWwu6ohHDtj7DSp3f+wEf4DX n4cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854338; x=1779459138; 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=o4U8ZCCS2W/eS7opYuY30TphoIHkpy54aFpBL/IoRZY=; b=OyaU9LmP082I6bwePfg9C04VI8UDqOA+9qXNgjENsgfOtwhygYLAWpiCR7PXqRm6y3 OAyrUgajGUKJxAPd5/17ZQHmfYHffemAdLMqfaN43As01l0MeUY7NUErw6gBTDfkpl/r q8BQEvCCi0aXbHr+sIrKqmIZq9gfYPv/QqO3tpZzteoYjk+Oi3hJPUJrCh3t6Kgrs4kc 7C8wwEl+ZH4QN/SneNFH0FbhGR3A5kp+j4fotCfVkNr4bQuKb4cqVFSSIf44mKBbrMcG dyxwVxZ1kry6yU0BIEIDds4ZEH8HhGHIONyLIwsnz5B7bzyXQ2753GdYFgPPbxLt2Msv Z6Mg== X-Gm-Message-State: AOJu0YyHFY1/Lik+1faSjJxABLR23wufHLhbqo7ONwPm3k/zxEeqiDwu HqaRHucDgT8EOMtNxmuotBen/tRUzQ/1tB2H0t871kp4vv0Zbxa5mLs8txVNk7jXE8YtmwUs5iQ HKLoegw8= X-Gm-Gg: Acq92OHgwcXpuT1HxLFNpN/7uIeFHacsUOOFVBD8MBr87PrRG6xXnCS0P9t3mQUCzST NCFsBnN8vvd13PHH8WsXa9JUFIAZJKTJjgKYtsp9PBXT50eLYu0gnQ25jxaBWvSo3dseBTCW2C+ JZzkWTQnRWv/7sTgmg/rQOIUTM/vHaerqHzK/cDHGjrgYKGHi0fDomtjIQayYbl7cuyQ/TrJ0fc I5qzdIopIfSIf1zpfwcpSOIGSObHFmLFxUPbBj6S90b4kFqhc3bWvLliMJ3F82SXUqjrzYST/Dr xVQURI0aGgj8Aa5Kl8DxsJGnz+HJcNpzNvHyjyYL9BNs/LqvF5FP042GvJPtvrmPzkVzXMQD8AU mjFe7zKnBGHiX+Fh25q45yhEzUBRExc4Pi8IjrP7XoSysd1nb3ohO9EqXFTg8dqtSkVkErfnXiA TW2GypfTVr1wbNzvrzuOTnD4SuUWTZ2VFfzIk1KnTX3GSmh2AB609soXsBaBoHY9pYieUDgSaz X-Received: by 2002:a5d:5f90:0:b0:45d:3cb0:5ab1 with SMTP id ffacd0b85a97d-45e5c5f8424mr5697301f8f.38.1778854338158; Fri, 15 May 2026 07:12:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 14/20] target/arm: Implement DBGDEVID* registers in max AArch32 CPU Date: Fri, 15 May 2026 16:10:25 +0200 Message-ID: <20260515141032.3271-15-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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: 1778854599815158501 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:21 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=1778854474; cv=none; d=zohomail.com; s=zohoarc; b=FN7TPmX4uPCkTz565NiPO4OLNGVNGjGuZeFQkz0NwJOX376zrc0Hb5R+MeWI/O4JiQr6CJmHaPK+NRTWvFiimSDyYdpBNDftWD17rG5nzIgt3I+QuhB3J7kzH8+MdAoyIgk8pNdlv7H3mSHlWRC3Oi+j789JIe3MaTJIw5IK3tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854474; 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=ElGFD+og27a+qig6P/7TdWyM3lA7CN7DxfP82EoGOvw=; b=RW/CS5MaODeCdwsNbj5mLJNdBdW4fP4A/8Lsvgr3fH0A1IPugdr7rTTq1LEZeqQr/DkSJkQRBe8MnQh4AnP8kH216kjE0gb6EawtLKPo8nqKHxw0rVwbHu7NaDvOhUsjfvQuPmu2DeiOXtfpA9a6hYPWHdVIdvMUqGjUdALuMiI= 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 1778854474347659.9614587488377; Fri, 15 May 2026 07:14:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtHD-00086Y-R9; Fri, 15 May 2026 10:12:31 -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 1wNtHB-00080S-7K for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:29 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wNtH9-0004JH-C1 for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:28 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-48a563e4ef7so83647355e9.0 for ; Fri, 15 May 2026 07:12: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-48fe4c833fcsm61741655e9.2.2026.05.15.07.12.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:12:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854345; x=1779459145; 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=ElGFD+og27a+qig6P/7TdWyM3lA7CN7DxfP82EoGOvw=; b=SuPVXQxbBiodBKjsUCJWeQTydIKH4CjnIcGj7Xn1XAg3E8n1CWLRtOfHaZ62jtf/YP XWXAivU5rKkTi9lSj+PANLXi7JJPovIFKlStbqaMMjWF55bQz6Kqe2JyTzhGTGzLYEN9 9qqCUfQr7CfrasjW/FjH9Xp8ZJM9q7NfrFw69hCLw7ozn9efp+gCA5Sx7/Lg9CowexW4 x8RAITiNADIgiO//VpwhSeZQfAfOp5R4LwPYkE25d9ZWz2BzwjMEdY54Ko9ZvyY+15Wc EOxHuGDHKC05dx8BKENy4pwdO50P9NEXfh9okYrSkJvrcFOFJGTDA4HCikzjyHM8vAnU 7pEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854345; x=1779459145; 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=ElGFD+og27a+qig6P/7TdWyM3lA7CN7DxfP82EoGOvw=; b=eB41Mv1Q4J47UFmNqtK8KSP6myMtlsy1kGA7hzXOevXMN2YKUVJ3DGqH9loXkyE/ha S+cjtMRfreZVJnat0I5OtAsMvVZNWE+SOEjL4IX/8qqIt2SZvaDmj2+vtjf/tQhvpN3Q STbmnb0vamjEXjOKwz/D1mFSEusHBqPk47w2HV26GkvHtE/4PaA4QomisUrqSt6RK819 mCST/ZINnT3gm7gfcTu5iq8ZlGj2/LdUBTWdAB7Wkkn5oKTImui0uymGCm54vTiChReg PfbK7K2Yx6bVjIbhrirn1yiicI/iRUc//bYLcRC/NomFaShuH/1qsp8DdIkKZNmX7znY PBaQ== X-Gm-Message-State: AOJu0YwDcB0biQeIkpht+VJjFllFeq7m0aH0bfRKAoCFGwjIqhjipqM8 Py7pJypB4AhyJ1uivSIo7BUlGmi0TLcwdRW4fm+skRhFgH87bCRUJJe5CW+2jsmnnI7cbxzB+zd QGAV0gMs= X-Gm-Gg: Acq92OHeo8ATQJxSIrcO+zLIeR1ryFa/E4whsgCt5RrakcEiVDB+55z5MwVmReGwgy3 7v/dOAH/qOxkFgxL7yZz/N1bFf84VdIniQVmrDzlobmNZG7AT8VYWM2iiNXBL9UM7F6LHXkIema di5GoTPOpTn39ym/YYVoY34OTGV87gtDBpM5jdD3aRdxh5F4zW14Tlkx2c2DY3jpGX5C8v40R5g qlN4pMCVsD6WES1UmCuy6hvDgieJyaMAQhZ75PwEeBFz5kC0xMXIwr3WQItpWfnpoJCbhCbFSrp zCxYPVcd5WHhH6YbZAs2kO5zKY6mDN/LwGoU+6k5Ib4SKBN3TS5NVZiEJOrh5orEpO/0iG/eS1W 7gfT9xyrV26KvQsICD0q8VqUuO08kY7zwa/2kdxVK3KwRpOh556UTFup0lshN+V33pFhd6AsA1O bJlht74/mwiN3vEQfu7nrHLeeRFG52+XBpHYniJRLOiNFkirhvVfsmVKcCQRLxPkhp3lh2tAlP X-Received: by 2002:a05:600c:1389:b0:48f:d1b8:9a9a with SMTP id 5b1f17b1804b1-48fe60e515cmr56940105e9.5.1778854345206; Fri, 15 May 2026 07:12:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 15/20] target/arm: Only set %kvm_target when KVM is enabled Date: Fri, 15 May 2026 16:10:26 +0200 Message-ID: <20260515141032.3271-16-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1778854475598158500 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:21 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=1778854373; cv=none; d=zohomail.com; s=zohoarc; b=U1ODtUR3GrCGjqHgzvYOu2y1NWio5AZdK3QAcEOkcds7q8PboRps0TIVfnO+gyVAos1wncvhPSZDZ9FepWawpgXijtveMnO3IdJNUT84R5/rF20SgqiNqNI6tDAcWHBwOfj/8fHgAAVD+ddQNVe0VDxwW2XXQZYU3kHUV7i/Qu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854373; 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=apMFV5d0tB1kr05BjYFhBcn37xH7cGfXBd2nTWR64H8=; b=Dfr9t+8nnWPjjHvvNZhQzJdf905ebtkSQtN6kziQl22F3Xlh9qcWpUp4fMaY2d3dT95gRRYd8KHOFsutsw/1hrTOme8MoolP+9mTV1njCDkNkV5NgXyQoI9TahFk9dsnLrfXjEUGoVlywkiFLDDx+8daPM7J7OVPe6uqLSVZwT8= 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 1778854373504883.6349633341613; Fri, 15 May 2026 07:12:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtHJ-0008Mu-9F; Fri, 15 May 2026 10:12:37 -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 1wNtHH-0008Ky-Jg for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:35 -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 1wNtHF-0004KH-RU for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:35 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-488ab2db91aso98647015e9.3 for ; Fri, 15 May 2026 07:12:33 -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-45da15a6449sm14577385f8f.37.2026.05.15.07.12.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854352; x=1779459152; 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=apMFV5d0tB1kr05BjYFhBcn37xH7cGfXBd2nTWR64H8=; b=NZYrDai5MDWpXL7aA7DSfFS1yF8IkbyhH23E0OVb/696nrv/kGqmVhp36GCSFEr8S4 4LISjHy0ITWf3XWrRGg1kFAeaLqDmxGlkN85JL7eqfKQShHctKdPtEyDRU5M1OD7ecrr neCl4C+O5bn4sacIuqb9f4DG4DJD4sF+d5VtTujUjUTPToSlRWdYRRuWAmsmtedrG8qH g24WRQI+kyEmR6RmuYCoPw4r2SAl1oyGbVjuC0Bkxa0dMfC5ZNGW7G2BV0yEKNKO810a 0/+ryTudNgjMBjR1ajm9YcbC13ME2RbjB2h7qQJS/ENFUwJFHAp7Sazpn2U6dMQdsNLv XydA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854352; x=1779459152; 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=apMFV5d0tB1kr05BjYFhBcn37xH7cGfXBd2nTWR64H8=; b=Vgg+PJs16LChtgtLQ1QE5WxRpwvtRIKi0iPxZSRXlORaVSkoNXArUgHGvyfxMSsON5 McllHtWgMJynY9Q1Kn+Cl23XEFT2BOpdSINvHr38UuomJjytmFbN0krItwqEMYlHtfG2 YZ0vPlqUlja7dCmdjlMflk5+tYdqBFd+SGs60tkCQsSWJ71DDKQ33v3ynWF769nzp7Ii fsQPgRRYayCNBRtPlYRxcVG66HJAx7CjJRt9hLAngJE6kKaD5jYTGn5gKjMu3uzAW12D 1gLgKbLskTSWTQ7zEgHakyQskHAVgdcW6BZ77goDolht3cQHvqoXKNhwtPq/b55k2yIc 9mcw== X-Gm-Message-State: AOJu0YyONGNbHZ0xp0OOd1KOrIMseUHjDvwkWOEToBBKq/gLOp89Gx6+ CP+qZ2so4ZMoFB094yJ+KDK0FK24opKLPjj9KB2S8S6XUP3ZLget3fgHQ7RIe+h7nNoa2a26Ino Hcw40I4U= X-Gm-Gg: Acq92OG+iQtUQjZCoFUgYmqc9C3wd2kJrtwvnep8Q2sFGe57LigVb2y1PGz0u3zMMdM IgM0K4MtXACXqUHE5aoRPpuKDuq1PqkUkSzduzw5lfVBmBK1N3sBjEoss56TWGx/bvebu/ceG+0 U+1SeFDNAAAckvv9GwZ6iviEEsRULp+fmcZDlXLKvKOOuYBkiOHjOD4mHA18GyISokXiqlRwsGc ztXxWn+HECAPeRppNFGVwnnhtDxy8tWSjnwngLo3e1ijFPOEiTtRt7p1+KkDBmdcrBsYbks/RwS 2b4v1j46Vjgp7jENulpWRAyiJ2CfgZgvIHspXIPAGbQf2znZ2M/LNTbxtr3UKINiS7eewkiajfX cr2FkA86fVPGIdWnyAizObfsbswiqraryYqdxhqj7wU+VdlsyNzO8mliw0xZWo/je6er8SWKgsz JruJSZqxP3jAhs5LnCC0wvGkveh5lfqLBYhp4shKhkPPrEwMT07KHq6dohZv+/a6nkRNhab03y X-Received: by 2002:a05:600c:3b21:b0:488:78f2:6b0 with SMTP id 5b1f17b1804b1-48fe651b39dmr54784975e9.29.1778854352410; Fri, 15 May 2026 07:12:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 16/20] target/arm: Factor aarch64_aa32_a57_init() out Date: Fri, 15 May 2026 16:10:27 +0200 Message-ID: <20260515141032.3271-17-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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=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: 1778854374378158500 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:21 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=1778854500; cv=none; d=zohomail.com; s=zohoarc; b=LESqMn2mDsCaNPsfohlBp8/PIxw5ZOFKDX1wCLylbY84mcl5U6fapMKpY/dcWxh5+FbxndSy/SvHNk3YuzqPUWfbV0GND49sFlbDwoaATzacjfs0zFqJwY7PH05C6U1ouJ4eNr6tSY+5t7ifnkoT6dwkvnu/zdwwieLhpccUkRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854500; 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=pJU/tawq5MhlfIuua7L/PMVdYR5OjanFKkQ3nbDCxFI=; b=HmVGFN3p7FpP2JOteVKBsbJ+81aG60gogOepGIl2IjxxQ9LgSV2XegyO//t+w85xg9P9fqI2e+JzUxdLst9/B6JWQoAe9eZttzZDpDM9lZtP4o4Bt3eW5rkjYuP4una3RABp6rXdKamCiIE2iBqRZpBYD66uHnBLVUIPedm0dak= 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 1778854500435387.0557466510927; Fri, 15 May 2026 07:15:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtHT-0000fF-TH; Fri, 15 May 2026 10:12:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtHQ-0000YX-2s for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:44 -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 1wNtHN-0004Kw-Oq for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:43 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so152722545e9.2 for ; Fri, 15 May 2026 07:12: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-45da0fe1a41sm16017840f8f.31.2026.05.15.07.12.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854360; x=1779459160; 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=pJU/tawq5MhlfIuua7L/PMVdYR5OjanFKkQ3nbDCxFI=; b=Lb9Iwyu7KVs9SqoTaPvwbUhHFVmIrE638YmI7FiTrB5EK19wPTRy6XtLQJCsohqv3U 5B5SUhZti+7LhAkWwoAqQ9aI6FpUEZOXxMB3xMY6L9Y9/ZRltzEHynd4ZptLuKjq2RVL tRRa8oAm3AF8N2VHWaY/TH6NQsCITBeZ/XmaX+KUlWVoTgstDpAVQGserVYy+lbonkOy NNGjTlTb/6bh1DngXxJhPzIIxUucTd+/Ebr6V3bOAlNF4bZ+ieFqIW1KeQNfRsdYxmRP KOof08EKu5jlOkUFY8RvqS6hpGhudUGcxiHodPzIBARXbTpOigZIBpMSyHsH6/9I71lZ Hl8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854360; x=1779459160; 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=pJU/tawq5MhlfIuua7L/PMVdYR5OjanFKkQ3nbDCxFI=; b=ChBvoeU5eip6MyI43NCfkEjZWvpzQUSKwy15P2IkljYUqfvxq9LGl4P2BcvXidURDF 5MWlgvPi24c0h0bAOu9C5iuQ7rZ5pHBZ5qAD2SzhbtPHJ5O0+WZtorcoDxR/jRJ4GP2S Q6HH23xz6jdUiT8TykKfrP2URRl8xyd9h4GfODy2w0PeYgTNE6rZjWx8znuQ7Y3I5tvH OcfIR4XvmZEcaAX5d2TJqTDmZHtzpAQDDhLgkE/8CV5EvGRJfqoMflRXXbINkPoJBA6v pjNIqzQ0ZMRMkqPAdsarDthUNp6fVWTSu11z4/XSoWQcdUw1QwEmfcKot9pAgzWtGCeW W7mQ== X-Gm-Message-State: AOJu0YwhLRb52h+rr1UVotqSJKZCFRmBfhezTI1pAy6CCoX/1O9LrSdU oxG5KuN4Xac0QPwFSBv5el+QhcP5Z8wICZqVvBzJ2J5zi7pQ4o3WLIGR5Wb9w+Y1QxM9bjLyBmU IIDX+jBc= X-Gm-Gg: Acq92OF3z81NKNh3arW2pNKDmCCYi/TeXmea7GuX55O7CcCGluVd+plo2qt5zT8lgFI LccG6KBEG1yM1McKuulhyKPjNLXqR4qcgARs+oWVao6ANyRSzZY6ZDMkkHKL4B17ErNGPRvCqav OYbYNZ39awYCTEad65DK+biOZdO7QE0Hu0R2nbM+itKyQFel/N/qxxn7/3EdaCKj8IIofjiFI4t n4CSio41fdyYIgTLyvr8c6eiWeqW5eGSHCCn1zgaUvbDiqiCYdKLLSCu4nhRIXbAqclANbWmFW2 yK73QldBookaUOIHBmD/gZhvVdpzfq9gog5jKbLeS9EWnOb4gabsID7ABqvLAYCG7voVlJw9ELz 4WgSj2LmbHMsFaflP4PfKqBL4QaV1UxqOUY7RFXkIgI3rt1qxrbOgV3KIji+e1Gj6P2TRHBJcq5 WDdfUcHbJjtYeXgAlzgOvPf8f04WzfJs//7EbRUJVPw0MBYtMfFb9+LuxsEKi3Xtlm/Ld0vWM0 X-Received: by 2002:a05:600c:3b12:b0:488:b14f:b8ed with SMTP id 5b1f17b1804b1-48fe59ab80emr62410105e9.0.1778854360119; Fri, 15 May 2026 07:12:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 17/20] target/arm: Re-use common aarch64_aa32_a57_init() helper Date: Fri, 15 May 2026 16:10:28 +0200 Message-ID: <20260515141032.3271-18-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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=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: 1778854501911158500 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:21 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=1778854475; cv=none; d=zohomail.com; s=zohoarc; b=WyzE7RfYw+QcbLpvqb4DLZonZzMFpwWFb0F4M2haj/cgX8ry5JJzvpzMdjR90uTXuYULnt1Woycextgur+UuUwXRmh7+FzFMC+lLDQa8M13z2SqGAAPchporY/lCP7zoV9V49ToW+05MYhR4uLmLqM64gNZ/BI99tEVNbpLM4qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854475; 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=Df3twy7C9N1bQlYaq17s4JDcVs/EtSqEVWmNO91fty0=; b=KeB9uZTGhSyQ4rH6NqAuOfkLBZkBlLhema8GLxgmN2oe33gm+SUpMZLc+k6HKa6XTdVfthWTgS5Qoee6Dz92ByCLDXDuPPylTUWbkeHtUyk7zBSwERq2cC9WkVlmaPsffEb41sYeZenhERxW+SBkretygOfZ05XJNxeKr0b3CHY= 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 177885447517745.15081520709771; Fri, 15 May 2026 07:14:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtHl-000144-OF; Fri, 15 May 2026 10:13:05 -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 1wNtHY-0000pz-0H for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:52 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wNtHV-0004NW-Fc for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:51 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-43fe62837baso4810166f8f.3 for ; Fri, 15 May 2026 07:12:49 -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-45da0a19c2dsm14888311f8f.21.2026.05.15.07.12.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:12:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854367; x=1779459167; 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=Df3twy7C9N1bQlYaq17s4JDcVs/EtSqEVWmNO91fty0=; b=t8/qzv8+eNSCcnt/9q+WfXWZN3rxbDWIyMuLmV+BldLiJxY03a8UKWoOrtjF4m04RK hG8Sqcta8CfefiobHu15psMLzu4gzwmpbrtuaac6B5O9mDdbLk3GJLfZypOv+XGGxfry cup2x2YdJvaOQJAuen/Sc76PhY1lyTLDgPjpj/GLahTvEV3PE9ngj07nnego8PAWXLY6 KLGS2n5vLiLXDGdIZ3n+w2AXaoSTl0zDvJTsl4xU1536uwP6Yw17RVMUpS5gK0YGJ6oa s4mzkIreNjujE28A1LzbqtYSDzVwoa8GERQ7/NQr/LYrHjSP4Dpay5565CYRhfIBbFLm ahrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854367; x=1779459167; 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=Df3twy7C9N1bQlYaq17s4JDcVs/EtSqEVWmNO91fty0=; b=svTMQe5DSVo0TIuHEhWe251MTZznpR9zFv1PaXWfwNsIT+L1damaqPJvRLQsfh2zrr Hkr++HBlyHg+vNW34gq7X5nYArwzCfK6hkQAkZRJ85XMvTs1yKkvFtugm/yadUc8w/8x 4Zux0U+8SBHaNqBvV7lqviYVK7R6ioCRL+dn4SVlz+hyGnbJR+149rc9cQFMovAz7kHf 8jp7tPdYAivWq1kLdPcY5g2a6naA56KG/rY+7o0keMDmoCC7Nhg5GAiWBunU6JcnlyRE GkCdVAvlEDVjqvNY90Y4Nj76370ood7WLTFGPZkFBb4vk1ZtH52zRkRbl+I4zS1QtIyy GC0Q== X-Gm-Message-State: AOJu0YxbPKneT265IFR2UFJ1FUG6jwL/oL1isSPhFncLTTD9gT8c29V/ wO5QXN1HtLDXu3llE0bK+wOFPI5OC0tg9VkpCLSL8yijaNF2u7ki0rpzgP5Vu1vglLiO+VszKNx lT15nISE= X-Gm-Gg: Acq92OEPn7vcN37jtvG5gQdNRfpLFZr361qdvwxEgU7Ygy4r8kkEUn5NW/tc0gFv03S 3Vm4axJHycK07Uz3JE7LdyRcrmwVjmo+XHm+dWoH/f8S1tEfYEbrLFT37VMQtp0R4zVTqfC1wVd X1pSJVQMddjmReEc2HRVy+MF4XVb52olO6kEE92kzzJ2xUeK14RMlr+FMYkrLfYdnUtTpENTVvy wu+EhGOe4sbPv1e4YS72Eg+GnIwyV0cE9nH5oLJF5+cRpEpJ2rT+WzilNEPDWThTFa1xERloGCX uQcLohRLDhhlFlTnn0Souq0jxyc6qdk1+dpET3DHZKhrIfkxLKJwpCRgJPCebPoZ2dok/d1kMUe bxNzEegG0wynCl/X6OxnE9RVOF0GppMr/oTYf5qkGhzcsqVBeWQfLUyYxtNbnpGjNuYLyMeEF55 JlaVQGyG41MsxT36v8BEEVTX/8ryGrolIDbmjikvaTdx4rP++3UkFwndueEzGvEMMZtmO7XDeJ X-Received: by 2002:a05:6000:240b:b0:451:2157:6291 with SMTP id ffacd0b85a97d-45e5c5a5eb0mr5771437f8f.41.1778854367254; Fri, 15 May 2026 07:12:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 18/20] target/arm: Define 'max' CPU type in cpu-max.c Date: Fri, 15 May 2026 16:10:29 +0200 Message-ID: <20260515141032.3271-19-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1778854475691158500 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:21 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=1778854447; cv=none; d=zohomail.com; s=zohoarc; b=ZHechmSbSsl6OfHc9Oea1Ca16jbC1RF7J+wZUqvKqc/OkDatoyMtVXbLJjvjmQR+1r4JMmwBnic/S7VSmPx17uioGNHCQTZURwMyOA8wPgbA3Re2ZjEnJrS0pQPECGzwIrZO4BnxDd/xmGRPdbpn9Ebq33sy8BSYyP4wJtCKTm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854447; 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=xTJ12u23QhbWwNIBCNdFgEzxGR2+OzqbFo7UXsWqIjM=; b=IJbdwyz/FnJW19284WJciBRyerNfvVOWX7UCTScfOBJy0aaV9i7ocV1lhlrNwZt/i5Zj/5jVnlZDM+xc9TnNcJL+3dvSrQuS9nH/ldCmHCWPwhbcDcX/0LJ6buSNR8IVOgxPo6+HUgB6loPDwZQYoRNIERtatss8Gy9JvCBBo1o= 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 1778854447733510.509990370305; Fri, 15 May 2026 07:14:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtHs-0001En-K4; Fri, 15 May 2026 10:13:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtHg-00013R-Jb for qemu-devel@nongnu.org; Fri, 15 May 2026 10:13:04 -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 1wNtHc-0004Py-H9 for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:59 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-44e1ebb3122so4958669f8f.2 for ; Fri, 15 May 2026 07:12: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-45d9e767cb9sm14697629f8f.2.2026.05.15.07.12.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:12:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854374; x=1779459174; 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=xTJ12u23QhbWwNIBCNdFgEzxGR2+OzqbFo7UXsWqIjM=; b=QMFs0qRqop+MithR3eQKIIJafkehs/KpUZxBI10SUxvyuB4v2JOUPEIyhAgjgx3WIE hoyLb5DbiHaFM0pEOOEHjsuEAa3neHVnMtqqsEoBAmSlNOxKuQVR06wK5qFp9J77wntW VDHplsm7AIZV6ctRMLLYIbRCqpLEoZRMg9qONPCQMqtdD/GxkLYeHcqOITLX1F77UxbP KoDtG2sR2TP+orvfqt9k1R4ANJm2xwKMUeyXfgBX6nKBphBb4MsXkdXSIyTUymjhcqwn eiby7x0JsDDIwrQ5ZcHWfGGQRard808JXXbtJhtJ4ZJEOL0r+DQVL3WlI6JDHw1nZX3B mZfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854374; x=1779459174; 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=xTJ12u23QhbWwNIBCNdFgEzxGR2+OzqbFo7UXsWqIjM=; b=JF7LDeogZsf4067jlikQ+y9TB9oJnv6xU0rawSA3sJYn0P5guL/Z4IkgvBK1ILvnHv U/MH7WTAG/GgGXbPvUY5vdNVXs5oVyddHcwqPrDbmbNlGc2iBlSQR224W48yD5mViaPD uk3yFnBdYYGR4nCWNap681YcwEI6Iw9e6uRSgFaAjA6OOgpfpgKXzdv00iH2/3H4xaqJ DI8T1PTboPIKN1zNLlrwvBLVlK+vdSbM198zVHp2D1IdKS8p4Asp0M5TOvJEkBCP1RTv IH9iOMFTKYXzXCF1kSkxw1XXT5YlH8ybWonjGO+jj7Ekb+GSyhhP3n4B9z2XpW/+Lm4j rODw== X-Gm-Message-State: AOJu0YwyjQMNX3Otg9DHdvIA3RFMulRZUw7rljPVJ0mocN5OgS+ydQ+m 81I29lBCpVXvllAAdXAUB7vcQ/h+zzYTZQCt4sl9/766EgVLQgq9rzH3fu8gY6OhSo2fk3DEqPu G6CjC2CU= X-Gm-Gg: Acq92OHJmFCRuGTtsx/xOTbN7dR+zcxV17YPTiwL2ogZkfHSVUq/87zNAb7BZntHIV1 X7vQ0VpFoYyC01WChzYBXB6oD5WVvtltnfWOpNLKTiy/ZmME0pTniXePuJ8b/P2Qwxd7jlVR0ne NHWUG64HjAestyLvHQiy1wfpZu2dhm89zDXrk1C+vQ8yuz0UG3SAP8q9VzlsVO4A/Mi3+mGVSxw Ati3blxTVFi/5hWS8LgHI/QqECWOiGtw3qm2Lx31+e7Fp7T0f3f24V3yJR8swwFxnCevKOY1NGm u7HiFcMswnAApI3nXrxpiVdNeBIE1hrzqMwJ1YuZm7TYfupb9wn+B9ddRsu4JrSiPrnrfLZSPY6 834VPuB/PJJEA+3nRAtZw9eYSuFz3IRmWmVhkl+JnNl0g8yooZes+ceEYLZo8B9oHuYzJvfHWbN TP4yDiaO5ckxE9E4j6e9fW044hio3XkKumKIv9X02SAZdg/2XZzgxfXaIVR3fUJ2kSrUNjkFem X-Received: by 2002:a05:6000:2f83:b0:45a:e3dd:5869 with SMTP id ffacd0b85a97d-45e5c595745mr5918727f8f.30.1778854374234; Fri, 15 May 2026 07:12:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 19/20] target/arm: Build cpu32-system.o as common object Date: Fri, 15 May 2026 16:10:30 +0200 Message-ID: <20260515141032.3271-20-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1778854449302158500 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} | 19 ++++++------------- target/arm/tcg/meson.build | 5 +---- 2 files changed, 7 insertions(+), 17 deletions(-) rename target/arm/tcg/{cpu32.c =3D> cpu32-system.c} (98%) diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32-system.c similarity index 98% rename from target/arm/tcg/cpu32.c rename to target/arm/tcg/cpu32-system.c index 8220d785f5b..51ed1f8f269 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 * @@ -10,18 +10,13 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/target-info.h" #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); @@ -738,13 +733,11 @@ static const ARMCPUInfo arm_tcg_cpus[] =3D { =20 static void arm_tcg_cpu_register_types(void) { - size_t i; - - for (i =3D 0; i < ARRAY_SIZE(arm_tcg_cpus); ++i) { - arm_cpu_register(&arm_tcg_cpus[i]); + if (target_arm()) { + for (size_t i =3D 0; i < ARRAY_SIZE(arm_tcg_cpus); ++i) { + arm_cpu_register(&arm_tcg_cpus[i]); + } } } =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 f821331fbee..a6aac6deef0 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -29,10 +29,6 @@ translate32_d =3D [ =20 arm_stubs_ss.add(files('stubs32.c')) =20 -arm_ss.add(files( - 'cpu32.c', -)) - arm_ss.add(when: 'TARGET_AARCH64', if_true: gen_a64 + files( 'gengvec64.c', 'translate-a64.c', @@ -83,6 +79,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:21 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=1778854669; cv=none; d=zohomail.com; s=zohoarc; b=RF28I4yWF/slAbg311t1lWS8dSj5ZStb4Ypq+vfubR7Hne9FEv/uuwKY4mZTt/kiDJMD8CE6M3mPUorT3rZocBzPYZbWsMZYqF0QC98wVn5nCkQs/ajAeXI4RuxPDRQzb9h8MYN5QTUufB6jIqlF4JlQDrYfnaBT1kUPSyWKEvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778854669; 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=A8aF1a7gJjQ7n0nAdGadLdH6XNXhhZ7j9w8BXeSbNoo=; b=Cvm3vf5bDVUwAvshkBXXgiZPZORz+FRvUMMgREgD8TzeCYBJRa4hQVFGCmWErSflGSW+MMG6kILJV8IAFMEX3hixfkzJ6RB7xMc/YVYuYXhGbC4bQiZyX7u1wq0jEIBvA9b216hZP38M1bCn1z+gBpyyw00mR/lTYOznqVIyl1o= 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 1778854669115396.1296306051021; Fri, 15 May 2026 07:17:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtHy-0001P7-5j; Fri, 15 May 2026 10:13:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtHn-00017f-8j for qemu-devel@nongnu.org; Fri, 15 May 2026 10:13:10 -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 1wNtHk-0004S6-HZ for qemu-devel@nongnu.org; Fri, 15 May 2026 10:13:07 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso83104445e9.2 for ; Fri, 15 May 2026 07:13: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 5b1f17b1804b1-48fe537c516sm67055005e9.13.2026.05.15.07.13.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854381; x=1779459181; 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=A8aF1a7gJjQ7n0nAdGadLdH6XNXhhZ7j9w8BXeSbNoo=; b=Jx2BSCRXQ5KZHhhjZIEbHqLIM9FwF0DyVw4Pk3MjVgOEvlF3yiyB87NNHyh2KkYXSC hQsWmwvZPggfAAKho77wP9HSPjYqhbCZxIsMOErD4a9LDgREGG2TeFn3bcjXZbUTUqMC 5V7FCy3ZdNEke27CbVBRuIMjg5+CBCiULBYg+x1q4hbYbxXyhkTV8RAWOG96rL502oel 0Ww4NE+tPOjIx8pSfk0nGjk5zvKLkmX6U4EvGgzL6RMQ0p6B2q+hQeZgtFh+koppeXjV g0/qpQsRKDsMnwlXyWTHZQX1yX0rH2aBJc96/bIamTXe7K+kzJ6I22kOvKJc99Twmof+ KU3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854381; x=1779459181; 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=A8aF1a7gJjQ7n0nAdGadLdH6XNXhhZ7j9w8BXeSbNoo=; b=r60JX5kdo5FZ8DWR4U/DwKAr9jdWjpih5gWNiRl6orU8d1V3uuzhqKkPVxMCSO5MJf fXB3O4R5TJvPN3c7Xut8Kk9lEFSAIWjDJU7Um9o7rjo+ffotRXyVqwMlp8+mLqpIp2Sm rYV43R5LcOenGz7fMcPsnDvEpBzzgNULnTXmjShb+a4mLJ5UHeyyCZEMVFm+zPDiIt7m FydLqT08hDffNm/1Bn0p1Q4sLbESj6YpGghywgGSwhWcuOrF+LH2gaxh8F9fE5rYXRaO JDj95qCJ5m17aVeolMNOvIl7FVueMLjGdxIDOHigYYq44dz5EAhYRZxXRXmpI73pMQYY Ph7w== X-Gm-Message-State: AOJu0YxLzAmfunyQdP0HIAkLYOUtMcSzc46drSHEpotdMvUC1Xzc3yUk aErpYVDuJlGEVbprYdZOBuubv4RSh8FXXU5Vt/OZU8/JDoTiLSv+lY8df8Fag+QXvg9+OfeG4sV 2B4qIY+c= X-Gm-Gg: Acq92OGH9T6zspMeCZIiMkqByvtEp/sGLkvr7QQYqW+I3JNlfNtN3R+0pN/jdYe8qgK GNIUUAqZYjVXBOXU55I+vPur+ibtqR3YaZeHp3cOhUM7a8RLaVCMr9XzPztf3rtWXBeKn7PB3My 3mHdjhpM7DCa0tLXxYawiR/P6pwvI+q2tD1mpW/SKPGQdqpAME+eC9pISYgnQnyxktn6Q/J+hOH aFamwj8Lu9dENhE/NhcIrUKvsZEnX2V58kQvPqEvG5MS+xxPEPBGU01FVnhuxetv6iFf5+wRdJn vB+BFzlivCYAcXzN5KQszD6Hd7omiwgkyv6YeRwQ+l177XqpjWNZ9QI5+heBrVz+wwtT19EtIsD l/tjyMx76vVkgKfRT0CerI1DplPdWSgb4a80ce/7eaSnojY+XGELvAG5jhRW/PbTKb54ICOUTAP ijjWawcTvJHBnxHTwT/by6YlTPHgu/FRPPoSSoA4cXlMmSamgeo22r1Dk74gHBS2dBOM41nic0 X-Received: by 2002:a05:600c:4fd4:b0:48a:581c:ead with SMTP id 5b1f17b1804b1-48fe60ed7b7mr53243485e9.10.1778854381458; Fri, 15 May 2026 07:13:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 20/20] target/arm: Build cpu-max.c once Date: Fri, 15 May 2026 16:10:31 +0200 Message-ID: <20260515141032.3271-21-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-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: 1778854670550158500 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