From nobody Mon Feb 9 21:35:53 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=1746410146; cv=none; d=zohomail.com; s=zohoarc; b=fnSJlEdWm8UUVT78TNnwpr4+6vHrPwDS4uvaKLxIVPhwTvZfnHcNAhwMVU2c3enbv+WdYXTa7TrbhlKBbDrXihzeGc09esKJ6W7Eh2r3/RKtiva2+H0fKI2lTqJibg902tEjkgB2g0df0PVppQm19SI5QJkM7AcqohyTyGnIckE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746410146; 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=xML4J0OK01b5ZM+8qKTIYRySQNd3gi0WVCRNgOjS4SA=; b=aTM2OTyHaW8BKDWCUUJjzc6+Tn/kEK/u00iYj3HTO1pdTc1ck7+ERGE+ZUrBqoWJBurASlPCMvdhwWmDZrq3+wogkZppSuXV6A9EBbKS3VBQ5LN9PT7WKYdlPopBKliEUEpCVllMPpffybbt7ZOPykuH7FRiFUFsbcX9IOuQhhw= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746410146096873.4937779158306; Sun, 4 May 2025 18:55:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBl16-0004FO-SZ; Sun, 04 May 2025 21:53:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uBl0i-0003ut-LH for qemu-devel@nongnu.org; Sun, 04 May 2025 21:52:50 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBl0Z-0002Vb-Q9 for qemu-devel@nongnu.org; Sun, 04 May 2025 21:52:48 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-22e16234307so17451065ad.0 for ; Sun, 04 May 2025 18:52:39 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b1fb3920074sm4462101a12.11.2025.05.04.18.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 18:52:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746409958; x=1747014758; 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=xML4J0OK01b5ZM+8qKTIYRySQNd3gi0WVCRNgOjS4SA=; b=gyxGooicRajWLobYPeCsOYnDu/1pnA5q96DbVSye1orCzn/hAyTayR6vmJVXo4mlKj 8BKtnbXI+QqZERZ87v33NyMJZQKD+Mn1Ttc/aOIiSp/QHej/86ijo/8mJXH4PqNjzAN4 jf/rGhPb5+QEsc5sKFUF6LZafhxa4WHkZWfDBd0T42h8HukoVsAlIlzDElposK2Gsqxx tDE+dgfNZNpFiwku/i5Rie41HwLWoZBgUMW9Pyt2mE5Ih7h0KoctMooIOLYp2amTCxd+ RY2+9pGKqRExholDaFZJOUm+n1wcdBjTMt/Apy7J4aJMK4nRt5JpR+VPuqVI8bVK6EO7 dnfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746409958; x=1747014758; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xML4J0OK01b5ZM+8qKTIYRySQNd3gi0WVCRNgOjS4SA=; b=e8xotB+0jc02D7ijGorIVh4k6McwQXznsjWPV+yv9pe9tO9kCHedEeLFTHbfO8/pLX 91+Q11oZgeIpq6bDOgruz7Spnd8qDbSSru63kSbwbC/1mldGeKQmJOUNQKpj9v4Q+A/I vmT3sl3sgpCzkOZWdNtRNQhFsHf4t/3LM0NAfVrFlclxvwX8v4flg8UA4i4AgM9AAxev PKRwv3ZfcMygkP2NKaNhBEOaJRNXoILVnsR8JhGRJIMhiGyxDeF/0cibZ9y6TpJq//C+ GdoCGMHv/ZwNL6ytuJhzYleqQMj0BvCXkVEaykcJGiZBnTLbKJ/4yPwYqhfjUNbLaD2Z 9IbQ== X-Gm-Message-State: AOJu0YxW7GtCRAqA1Zs3d4FrSc5mYaGU6v1GouwJD0yKeb/r0qwRzWkM uWGUnHVICIMpoe4OpLAVUtf6QiYnZrZYvwTAF6g3N6jl7U226mW/KTegncVHLPnX7u6UezGdiKi UeQg= X-Gm-Gg: ASbGncuNj0onwod6ZcoMCg9xwTO6qsB8WA33/V8UZC3ALuHgT8Ii0WSfwFsnnLCTYXb PVH/yPoW9MLUBBTPzWtDG88Dt/dqdBBVXEkDJFSi8S5xc6K/G5rvCJ95svBLSTf474AZYPNBzzp Km13raLEWqyIyPSb7FbeN83Rd9DjDwXXEypG6vg4mn8fnYqYZjYnbyC4ivtnr9l9t2JSy16SPG4 3z4u/oZinPeFaoSAqDM00DA5pzoKYJCH8nPESRyXov0Vz/5hjALqHwMJoXsnB2lZ5IfNE73YzJB Hxb7/AxX/tIi5MUbF1qdvF40d/JO0eRTaeGBZhrL X-Google-Smtp-Source: AGHT+IEtIVHuMX4JePWDBmODChoDsS023u64Klr4UMTovaWNd58dYG/vCBHgFErrNE7uDGnIEc9MDA== X-Received: by 2002:a17:902:e541:b0:21f:5063:d3ca with SMTP id d9443c01a7336-22e0863a1cbmr212774085ad.16.1746409958142; Sun, 04 May 2025 18:52:38 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, kvm@vger.kernel.org, Peter Maydell , anjo@rev.ng, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v5 11/48] target/arm/cpu: remove TARGET_AARCH64 in arm_cpu_finalize_features Date: Sun, 4 May 2025 18:51:46 -0700 Message-ID: <20250505015223.3895275-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505015223.3895275-1-pierrick.bouvier@linaro.org> References: <20250505015223.3895275-1-pierrick.bouvier@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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62d.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: 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: 1746410146440019000 Need to stub cpu64 finalize functions. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Pierrick Bouvier --- target/arm/cpu.c | 2 -- target/arm/cpu32-stubs.c | 26 ++++++++++++++++++++++++++ target/arm/meson.build | 11 +++++++---- 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 target/arm/cpu32-stubs.c diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 00ae2778058..c3a1e8e284d 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1878,7 +1878,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **e= rrp) { Error *local_err =3D NULL; =20 -#ifdef TARGET_AARCH64 if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { arm_cpu_sve_finalize(cpu, &local_err); if (local_err !=3D NULL) { @@ -1914,7 +1913,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **e= rrp) return; } } -#endif =20 if (kvm_enabled()) { kvm_arm_steal_time_finalize(cpu, &local_err); diff --git a/target/arm/cpu32-stubs.c b/target/arm/cpu32-stubs.c new file mode 100644 index 00000000000..81be44d8462 --- /dev/null +++ b/target/arm/cpu32-stubs.c @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "target/arm/cpu.h" +#include "target/arm/internals.h" +#include + +void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} diff --git a/target/arm/meson.build b/target/arm/meson.build index 3065081d241..c39ddc4427b 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -11,10 +11,13 @@ arm_ss.add(zlib) arm_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), i= f_false: files('kvm-stub.c')) arm_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) =20 -arm_ss.add(when: 'TARGET_AARCH64', if_true: files( - 'cpu64.c', - 'gdbstub64.c', -)) +arm_ss.add(when: 'TARGET_AARCH64', + if_true: files( + 'cpu64.c', + 'gdbstub64.c'), + if_false: files( + 'cpu32-stubs.c'), +) =20 arm_system_ss =3D ss.source_set() arm_system_ss.add(files( --=20 2.47.2