From patchwork Mon May 5 01:51:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 887415 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp1824626wrq; Sun, 4 May 2025 18:55:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWWnm8fQGP6yNImEcnoWBVHSusAezBp4nWm4coFc5ZBgO7OfjGhuaZdw88/FjN02U/1gss8JQ==@linaro.org X-Google-Smtp-Source: AGHT+IHnPT2mxpACLFHY25mj52qShhb6OCSzhTFJ30sVgc8/iVmvBMyx6Zka3wMT+sg0dRh+CC0g X-Received: by 2002:a05:620a:25c6:b0:7ca:c5a4:f7b with SMTP id af79cd13be357-7cad575ebfamr1667055485a.15.1746410146053; Sun, 04 May 2025 18:55:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746410146; cv=none; d=google.com; s=arc-20240605; b=lX1D3bTdrdp56HXkwBUgK6e9eGqgNyCFsWW1lwmFfxxDiKdsNpXY4OdemyPbV29V/I D3oJDhfUDXEGiLp+DtEvOsVpvQjuywTGtKycH9Kbt5G7/u76PH6muJDb+EU6YFyZARWN mukihNNU459x3frZUphiVaYRJbHJDzGLGveq0jNQ4etOmx9i+Pggs2pLD2udlH+EA8WV GchB/ZbLJ9DjCiLkE9E5aWo3xDOo2ilsogaF4KRTfrFUu2Y2N/N4qjXqgyiYfHXnWAKh bVE7jlgNtC9yBlnIIU+BLo3IIprH4kO9DWrWNsZr/jhtPGqB97quaOWaxqG2KKm1OTNv N4pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xML4J0OK01b5ZM+8qKTIYRySQNd3gi0WVCRNgOjS4SA=; fh=NjGqp/B1Bwp2wtTnyHxTvlXYBfwRSGY9cE7hmKIZquY=; b=lXQ4H53h3rjz57+pRS8CUI1CUOPlrm5xJk4MBrUKFNcuELD+hoRFc6PDGcyPI51hRG RxXj/VinZcdP6cN+5Cd1eTZuLUofBM/wTceUM24TrxnsJQdvPeRM/DrnE1xRtzN2gF68 ydEW/XDSsIN1vLxVZocf8yTci2XicGZpuXkGntqZG2KNIO1owhhvyTNgduMOG6AGh0mW HoflEvlmiipvByCxuefTtJBTmiF29JN4fuQJpPDd5+4F6p55m49OFct8EjV4JYEu6uhM VD0WzPpfo0wnuXs450QtH0c5nv3hhAKVF0pLln4jXdvx4+pWEJ4KxESg8ifu2QyzURfT 7hQg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gyxGooic; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23ba884si777386285a.45.2025.05.04.18.55.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 May 2025 18:55:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gyxGooic; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org 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) 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-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) 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) 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_M?= =?utf-8?q?athieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Need to stub cpu64 finalize functions. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé 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 **errp) { Error *local_err = NULL; -#ifdef TARGET_AARCH64 if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { arm_cpu_sve_finalize(cpu, &local_err); if (local_err != NULL) { @@ -1914,7 +1913,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp) return; } } -#endif 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'), if_false: files('kvm-stub.c')) arm_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) -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'), +) arm_system_ss = ss.source_set() arm_system_ss.add(files(