Received: by 2002:a17:504:17d6:b0:1be9:327d:8ee3 with SMTP id o22csp3752134njd; Wed, 2 Apr 2025 15:25:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJzZmd9pRmooME6gCTYHVYyAMo8snGTVdVWNV8a/G6CLaeg8meHCBStvPc21E3qimKN/bjF2Wwh4P5+Q==@linaro.org X-Google-Smtp-Source: AGHT+IEGBeRco7g31bLIknHFFgga1ATrF+jjGPfdTaNPK7KyTYVHl8fJ3ml0xv23ohQYy/T9bOFK X-Received: by 2002:a05:6214:27e9:b0:6e4:4331:aae0 with SMTP id 6a1803df08f44-6ef02b7d358mr60455356d6.1.1743632703423; Wed, 02 Apr 2025 15:25:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743632703; cv=none; d=google.com; s=arc-20240605; b=dgcRGbJCRscIJLvrX0ds0PrBEZ0MiZabZsb1lzuCGJJA32us8p8SBH+Ig/zOdajDaf B8d/x8/yqJ8tZCr8gGIpRp5hcpF06+hRFaFRQwJQF+rbNkaesC6dw9uYvS9aIjLymjxS t1pyU+o/LEzdzMTJFFlrx/FETXUsxqElAQeUG4SFA2lUhn7cHSN+ydJLpd5v0sm5e5ZN 72bV5LVh61+vPeB9osQYxl3euvhRy/SLoGIOXRRXrprP1wmeDi0R0rsKV4yMG3RrUHrJ CInNJ8WqczjtVZsHu2diYPnOKjIFREg5wqzzPrODYWZ6IRNAkiYJX7uqvzyXhgxF2jLJ Pjng== 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=J3tibzouVprzftlyy0nQmuXd714bGB2mGhjHzSWC2OY=; fh=ILu9n9UJYyGKJ+F9rVBU1LrxK5aJ3ihMVgUEh7OR7WA=; b=F8u6zqcwFGvqLbpryGz4sY/jziU1cIQvRas6iH6Z7cMUJZJkhujDHK0HFze20eLmZ9 J32aIWNgVKT0DA2TUQ92xN21VgX6Uu3nL5wW2kFEW9NRCqXZDblSygtwmkAtBrb+8fNq 3sinpFvGfxV8bid9sfpd72+9YOp1ya3SNPGQXZxTu5mCULRY34KoxWDBDk6CBBLoZHb4 a6dnpPbJm5JmxhwKegLnbkVvYzIVzdtDpPu1Vr0mD4C2oHWNAArdvaR2eYvqnYczKwU0 +FTNBCFi53gm92NSIwgAzheStCBExvQ5++ipXgwKJnAbk09GSGzn1jg8kkDMwHAFsm4e 12UQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="hDY/sIkf"; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=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 6a1803df08f44-6ef0efc57bcsi472006d6.94.2025.04.02.15.25.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Apr 2025 15:25:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=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="hDY/sIkf"; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=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 1u06Vr-0004rE-1K; Wed, 02 Apr 2025 18:24:47 -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 1u06Vc-0004pG-EG for qemu-arm@nongnu.org; Wed, 02 Apr 2025 18:24:32 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u06VX-0002Vs-9E for qemu-arm@nongnu.org; Wed, 02 Apr 2025 18:24:32 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43ea40a6e98so1942865e9.1 for ; Wed, 02 Apr 2025 15:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743632664; x=1744237464; 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=J3tibzouVprzftlyy0nQmuXd714bGB2mGhjHzSWC2OY=; b=hDY/sIkf3Vqfg03IRmnFpGQ/dA3ccU2o/xfmOCfsW7DJ4YPkTSWooUAxn/c9Hdxxtk r8BL6um+HYmySAb3WlEXVIKD63d+Uw1JrcOHcVEiRnN7FkkUstQbdebslXVeZNjSr5da m1tdBxP2em75nKcWgsGWtKXP6wjWaqHnVhjZ4kjqr+dnzSD6FK5DsJhAD4ccd9h/oCC0 NRP6OTb2V9222aM6A9+KzwzqecoAqwBkwV7tEgxONTX2YiOi/iMMd9bcJbvWTwBnV+VP P5NGkoFwvhXE1PWIqHco/weVKbCjUIS2OqYfMW1zGrtfLRu10bRd5ASWwzxcsOHlBYlx tGxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743632664; x=1744237464; 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=J3tibzouVprzftlyy0nQmuXd714bGB2mGhjHzSWC2OY=; b=h1Zr8gon1qDkdR1dyyW3WUBfZRagJr45D7XZAjQmBimft6JJXZ8/Atz9ss2uuL92dy jXVRpRS1MgrkbjEP/HAAfc6Ekm7hjRGoXZYIc8TWQ4F6q3MxJUfGRxC2hwyj5ja9exVv 4VCAwVckpgUOWOecQqunLiChqIquW+35TJeOXumkifMZUXXM4DP/wqwtuTR9ArXl6io4 RpIASJ/cuFwF1OEM+1Cq6dDP5oIQTkaCTdCxptlASHFmVesgTIm5G/CK+thOaSwdQbZM fNIN+To33qItY6OQ4W7Qp5iEnfMGjVvSVjUBVg3T87mS7utHEYC4GQ6xYEl4dXAS4iCT ExGA== X-Gm-Message-State: AOJu0YwIrPsGlXKXB+Ix497BxNW7/kByY+xmxN+7b+0/IAReVcdcmjPc wAFwVbi5vLpR/RgMuqI4IRqW5h+FdxdNq8zIodAwWTHQ5lTvzSUc7z+r6BTxi6I= X-Gm-Gg: ASbGncu59ht98U+g4fUpUVxZUG/1RNDulo8rL8p8EvVFEPf/fbcFdcWthiYNqZzPTVT Riud3EezrTvh/TYQmwgTecNG1r7oO/1EAxEVVByA/gVfPm4HyRAjfxpuL8rhdLOIc4T+1VR3Ihq 3BOspQVENTAbX06y0gjXPAFZTfBeG5INA2KQrsedA6gzVhUltD/LOqOxwLqQmpcfRMA85N27Z48 d5NgbdTLohRI5h7hXR0jjgY0FStuxGrgf31E+SioZU9dvvGT3IzplppP+XlKQsX5cS3qVvsFNBP GvvpGUc7WlvEzS2XyLT+FouA4kkd+Qb5q5b2JJ9cyUQOSzLofmXkD01rX60VXEy+YUvOff09Cic 33XC7tuDmSZVhy33ji4U= X-Received: by 2002:a05:600c:190d:b0:43d:40b0:5b with SMTP id 5b1f17b1804b1-43eb5c95bbbmr25892055e9.25.1743632663737; Wed, 02 Apr 2025 15:24:23 -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-43ec36699e0sm162755e9.35.2025.04.02.15.24.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 02 Apr 2025 15:24:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 10/13] target/arm: Extract feature definitions to 'cpu_has_feature.h' header Date: Thu, 3 Apr 2025 00:23:30 +0200 Message-ID: <20250402222334.66511-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250402222334.66511-1-philmd@linaro.org> References: <20250402222334.66511-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: 1s/ku0TmbLwQ Signed-off-by: Philippe Mathieu-Daudé --- target/arm/cpu.h | 54 +----------------------------- target/arm/cpu_has_feature.h | 65 ++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 53 deletions(-) create mode 100644 target/arm/cpu_has_feature.h diff --git a/target/arm/cpu.h b/target/arm/cpu.h index e78a1668bba..a76874badc3 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -30,6 +30,7 @@ #include "exec/gdbstub.h" #include "exec/page-protection.h" #include "qapi/qapi-types-common.h" +#include "target/arm/cpu_has_feature.h" #include "target/arm/gtimer.h" #define EXCP_UDEF 1 /* undefined instruction */ @@ -2379,59 +2380,6 @@ FIELD(MFAR, NS, 63, 1) QEMU_BUILD_BUG_ON(ARRAY_SIZE(((ARMCPU *)0)->ccsidr) <= R_V7M_CSSELR_INDEX_MASK); -/* If adding a feature bit which corresponds to a Linux ELF - * HWCAP bit, remember to update the feature-bit-to-hwcap - * mapping in linux-user/elfload.c:get_elf_hwcap(). - */ -enum arm_features { - ARM_FEATURE_AUXCR, /* ARM1026 Auxiliary control register. */ - ARM_FEATURE_XSCALE, /* Intel XScale extensions. */ - ARM_FEATURE_IWMMXT, /* Intel iwMMXt extension. */ - ARM_FEATURE_V6, - ARM_FEATURE_V6K, - ARM_FEATURE_V7, - ARM_FEATURE_THUMB2, - ARM_FEATURE_PMSA, /* no MMU; may have Memory Protection Unit */ - ARM_FEATURE_NEON, - ARM_FEATURE_M, /* Microcontroller profile. */ - ARM_FEATURE_OMAPCP, /* OMAP specific CP15 ops handling. */ - ARM_FEATURE_THUMB2EE, - ARM_FEATURE_V7MP, /* v7 Multiprocessing Extensions */ - ARM_FEATURE_V7VE, /* v7 Virtualization Extensions (non-EL2 parts) */ - ARM_FEATURE_V4T, - ARM_FEATURE_V5, - ARM_FEATURE_STRONGARM, - ARM_FEATURE_VAPA, /* cp15 VA to PA lookups */ - ARM_FEATURE_GENERIC_TIMER, - ARM_FEATURE_MVFR, /* Media and VFP Feature Registers 0 and 1 */ - ARM_FEATURE_DUMMY_C15_REGS, /* RAZ/WI all of cp15 crn=15 */ - ARM_FEATURE_CACHE_TEST_CLEAN, /* 926/1026 style test-and-clean ops */ - ARM_FEATURE_CACHE_DIRTY_REG, /* 1136/1176 cache dirty status register */ - ARM_FEATURE_CACHE_BLOCK_OPS, /* v6 optional cache block operations */ - ARM_FEATURE_MPIDR, /* has cp15 MPIDR */ - ARM_FEATURE_LPAE, /* has Large Physical Address Extension */ - ARM_FEATURE_V8, - ARM_FEATURE_AARCH64, /* supports 64 bit mode */ - ARM_FEATURE_CBAR, /* has cp15 CBAR */ - ARM_FEATURE_CBAR_RO, /* has cp15 CBAR and it is read-only */ - ARM_FEATURE_EL2, /* has EL2 Virtualization support */ - ARM_FEATURE_EL3, /* has EL3 Secure monitor support */ - ARM_FEATURE_THUMB_DSP, /* DSP insns supported in the Thumb encodings */ - ARM_FEATURE_PMU, /* has PMU support */ - ARM_FEATURE_VBAR, /* has cp15 VBAR */ - ARM_FEATURE_M_SECURITY, /* M profile Security Extension */ - ARM_FEATURE_M_MAIN, /* M profile Main Extension */ - ARM_FEATURE_V8_1M, /* M profile extras only in v8.1M and later */ - /* - * ARM_FEATURE_BACKCOMPAT_CNTFRQ makes the CPU default cntfrq be 62.5MHz - * if the board doesn't set a value, instead of 1GHz. It is for backwards - * compatibility and used only with CPU definitions that were already - * in QEMU before we changed the default. It should not be set on any - * CPU types added in future. - */ - ARM_FEATURE_BACKCOMPAT_CNTFRQ, /* 62.5MHz timer default */ -}; - static inline int arm_feature(CPUARMState *env, int feature) { return (env->features & (1ULL << feature)) != 0; diff --git a/target/arm/cpu_has_feature.h b/target/arm/cpu_has_feature.h new file mode 100644 index 00000000000..2adfccd9208 --- /dev/null +++ b/target/arm/cpu_has_feature.h @@ -0,0 +1,65 @@ +/* + * Helper to check ARM CPU has features + * + * Copyright (c) 2003 Fabrice Bellard + * + * SPDX-License-Identifier: LGPL-2.1-or-later + */ +#ifndef TARGET_ARM_CPU_HAS_FEATURE_H +#define TARGET_ARM_CPU_HAS_FEATURE_H + +/* + * If adding a feature bit which corresponds to a Linux ELF + * HWCAP bit, remember to update the feature-bit-to-hwcap + * mapping in linux-user/elfload.c:get_elf_hwcap(). + */ +typedef enum arm_features { + ARM_FEATURE_AUXCR, /* ARM1026 Auxiliary control register. */ + ARM_FEATURE_XSCALE, /* Intel XScale extensions. */ + ARM_FEATURE_IWMMXT, /* Intel iwMMXt extension. */ + ARM_FEATURE_V6, + ARM_FEATURE_V6K, + ARM_FEATURE_V7, + ARM_FEATURE_THUMB2, + ARM_FEATURE_PMSA, /* no MMU; may have Memory Protection Unit */ + ARM_FEATURE_NEON, + ARM_FEATURE_M, /* Microcontroller profile. */ + ARM_FEATURE_OMAPCP, /* OMAP specific CP15 ops handling. */ + ARM_FEATURE_THUMB2EE, + ARM_FEATURE_V7MP, /* v7 Multiprocessing Extensions */ + ARM_FEATURE_V7VE, /* v7 Virtualization Extensions (non-EL2 parts) */ + ARM_FEATURE_V4T, + ARM_FEATURE_V5, + ARM_FEATURE_STRONGARM, + ARM_FEATURE_VAPA, /* cp15 VA to PA lookups */ + ARM_FEATURE_GENERIC_TIMER, + ARM_FEATURE_MVFR, /* Media and VFP Feature Registers 0 and 1 */ + ARM_FEATURE_DUMMY_C15_REGS, /* RAZ/WI all of cp15 crn=15 */ + ARM_FEATURE_CACHE_TEST_CLEAN, /* 926/1026 style test-and-clean ops */ + ARM_FEATURE_CACHE_DIRTY_REG, /* 1136/1176 cache dirty status register */ + ARM_FEATURE_CACHE_BLOCK_OPS, /* v6 optional cache block operations */ + ARM_FEATURE_MPIDR, /* has cp15 MPIDR */ + ARM_FEATURE_LPAE, /* has Large Physical Address Extension */ + ARM_FEATURE_V8, + ARM_FEATURE_AARCH64, /* supports 64 bit mode */ + ARM_FEATURE_CBAR, /* has cp15 CBAR */ + ARM_FEATURE_CBAR_RO, /* has cp15 CBAR and it is read-only */ + ARM_FEATURE_EL2, /* has EL2 Virtualization support */ + ARM_FEATURE_EL3, /* has EL3 Secure monitor support */ + ARM_FEATURE_THUMB_DSP, /* DSP insns supported in the Thumb encodings */ + ARM_FEATURE_PMU, /* has PMU support */ + ARM_FEATURE_VBAR, /* has cp15 VBAR */ + ARM_FEATURE_M_SECURITY, /* M profile Security Extension */ + ARM_FEATURE_M_MAIN, /* M profile Main Extension */ + ARM_FEATURE_V8_1M, /* M profile extras only in v8.1M and later */ + /* + * ARM_FEATURE_BACKCOMPAT_CNTFRQ makes the CPU default cntfrq be 62.5MHz + * if the board doesn't set a value, instead of 1GHz. It is for backwards + * compatibility and used only with CPU definitions that were already + * in QEMU before we changed the default. It should not be set on any + * CPU types added in future. + */ + ARM_FEATURE_BACKCOMPAT_CNTFRQ, /* 62.5MHz timer default */ +} ArmCpuFeature; + +#endif -- 2.47.1