From nobody Sun Sep 28 17:07:20 2025 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=1758567382; cv=none; d=zohomail.com; s=zohoarc; b=UMpUN9RUbDscWggS/0Iiy52AqRcx0I2xErQQzyhS3+748yqiyv8Lto7jBeV7VU1G8O4APgmp+sWDK5mrvix0+2xu0HRxutDudP+1Ju3P19RrHM34zXMIJMR9Z4AyQshsPX6ZCMRMXnJTI0Pou/O4fGpVXMQqzROKyIfs/tM1OSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758567382; 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=BGgbkOYgstOm3FLiDI4TAuGXBCVfOMBg0ypvUcABhs8=; b=nVrRDFgTrTdzyniliyuXtqkDIxFFDhm6Zwr1nmfMLkTgdrvnzPI3+pM76ZS89rNOuXhitgRDK06XAmdAnOhBcmPvNlZ3P1yHfdRi/t7R8HH48La4nMt8Jue0BZ+NdBsx/F3YJt5i+0TV0aBvF70PzL4r2Dzb+Brzx/F3cAFDUh0= 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 1758567382673787.6984455905282; Mon, 22 Sep 2025 11:56:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v0lcA-00056V-Na; Mon, 22 Sep 2025 14:50:18 -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 1v0lbx-0004xU-HJ for qemu-devel@nongnu.org; Mon, 22 Sep 2025 14:50:08 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v0lbo-0004Au-E2 for qemu-devel@nongnu.org; Mon, 22 Sep 2025 14:50:05 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-77da29413acso5014123b3a.1 for ; Mon, 22 Sep 2025 11:49:55 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77e5fe6de75sm10583861b3a.19.2025.09.22.11.49.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Sep 2025 11:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758566994; x=1759171794; 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=BGgbkOYgstOm3FLiDI4TAuGXBCVfOMBg0ypvUcABhs8=; b=ZMpk7uo5CnwrCxE2xvV9kd3Z+Lj35CWm7V57kHOjafNpMNEW5CXwHNVLuXtMNMd1ly 7FIKvQBzDiH6lauAjN0BvNKQG06a1UbBL6mxz7n+LfASFLyH4Mo8Y3i4EaTGTDH+HUwg tRk3lE+UoGIQ0SpUNZsTImyIP2bqW8+pP28bwvnYcBY8CwjGiPSCyUQh0SGjao5TmfN3 s1MK8j/5A2Q21xmLRKGdt/c1ChkpFWzdR+6S4k81VxGtcuD5tW2QsOpoEUu/WDUKiqky q4NXnKR2VmJShVUGuLhE4QgO3ZimBXlnLGx/kqMcKMsEGlCENdlxYqB5ODiBUORDeqTX b7Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758566994; x=1759171794; 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=BGgbkOYgstOm3FLiDI4TAuGXBCVfOMBg0ypvUcABhs8=; b=kKTNPIqzWlugsded0HWmRhnPUnlTDgOp7cDbpXoU/cvurct8DD1tcoZYt1o8nXr6MV IYMnvb5dmbNBNsuO3uUerl0IzfApPQTS98qh/s4ZY3ePfGPSMAk+2VHy4Mpab7rhSMsJ WhrettYb1OO2BBykaZ01V9kTXOcJoTaVLThNV4v6vad1yemTngYpA70G5zVWq18/Gvuh xDU2bmzOke9StwkCBcX0IuC20vqYvPgSjE+gt8PErkYaj93dWutqNOcOZWoLQxdD2fcJ m6RiW0asW5gZjIFTooJ34pSgwuwC7SopSXlTaa2E2j8nUT6cBoOGrkrd0ci4ao3oK8CA AiIg== X-Gm-Message-State: AOJu0Yx7LvQJuf6qcEor2Bq36GHZMejoHDxQXYNrr/kAf1VftnCMv8Yb n0L7IJlsXPwhBpYYrKh5dMemWfPkrS7+cwpfsb+hYfBQHlVwg1KmKP0NJ0PKFFfTGtHKJVFtwc3 3rr+7 X-Gm-Gg: ASbGncs2NetlioM/VAP3wBuuSLt4heUtZrynTmrbsMRG4xU7j79vOlryzsOVkpnpoXW 8YaRRKhHfmqBEynTt3X48+w7FxGYewMyaHVqgK/BuGRtqBrnLY2sfwW+lc3ieeIRJKFCHImvoOm 9mgLDoxsE9Esndk99dpboiV/bkF/J2Kr8RWbu/GUuVyIieBdAS4595MB+91HQXh6aqouS3mHTXc EHBFSaPAJ5KQ6lXE5q0/LKrI8JVeHO4ADCuaiJ9f2jNDm7GkzhRTCZh3iMShQ+uGbZwzLVK4XGO s0MZdfgv5OYnZYoySYRFpSYV7aE1sGWZ/38EndC08SjUpvGnZ2qbA/7HfYlBD7yp1Faw/p9fSou UEwI10EyyOgb+BGkQmd+SF2PLWVb+ X-Google-Smtp-Source: AGHT+IEXhlhum1r7tAymTwLclKht9P9QQvFDoXQWtYxlYmcPX4xpfx1wgWnz0frEgA9HV/+gX+HRSA== X-Received: by 2002:a05:6a21:6da0:b0:2c8:85a5:c421 with SMTP id adf61e73a8af0-2cfda85d44amr144819637.18.1758566993781; Mon, 22 Sep 2025 11:49:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v5 20/76] target/arm: Convert arm_mmu_idx_to_el from switch to table Date: Mon, 22 Sep 2025 11:48:28 -0700 Message-ID: <20250922184924.2754205-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250922184924.2754205-1-richard.henderson@linaro.org> References: <20250922184924.2754205-1-richard.henderson@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::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 1758567383523116600 In an effort to keep all ARMMMUIdx data in one place, begin construction of an info table describing all of the properties of the mmu_idx. Begin with the access EL. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/internals.h | 3 +-- target/arm/mmuidx-internal.h | 29 +++++++++++++++++++++++++ target/arm/helper.c | 27 ------------------------ target/arm/mmuidx.c | 41 ++++++++++++++++++++++++++++++++++++ target/arm/meson.build | 7 +++++- 5 files changed, 77 insertions(+), 30 deletions(-) create mode 100644 target/arm/mmuidx-internal.h create mode 100644 target/arm/mmuidx.c diff --git a/target/arm/internals.h b/target/arm/internals.h index a2ee5f8739..c29682da7d 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -34,6 +34,7 @@ #include "system/memory.h" #include "syndrome.h" #include "cpu-features.h" +#include "mmuidx-internal.h" =20 /* register banks for CPU modes */ #define BANK_USRSYS 0 @@ -984,8 +985,6 @@ static inline ARMMMUIdx core_to_aa64_mmu_idx(int mmu_id= x) return mmu_idx | ARM_MMU_IDX_A; } =20 -int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx); - /* Return the MMU index for a v7M CPU in the specified security state */ ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate); =20 diff --git a/target/arm/mmuidx-internal.h b/target/arm/mmuidx-internal.h new file mode 100644 index 0000000000..29bba4ecb5 --- /dev/null +++ b/target/arm/mmuidx-internal.h @@ -0,0 +1,29 @@ +/* + * QEMU Arm software mmu index internal definitions + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef TARGET_ARM_MMUIDX_INTERNAL_H +#define TARGET_ARM_MMUIDX_INTERNAL_H + +#include "mmuidx.h" +#include "tcg/debug-assert.h" +#include "hw/registerfields.h" + + +FIELD(MMUIDXINFO, EL, 0, 2) +FIELD(MMUIDXINFO, ELVALID, 2, 1) + +extern const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8]; + +#define arm_mmuidx_is_valid(x) ((unsigned)(x) < ARRAY_SIZE(arm_mmuidx_tab= le)) + +/* Return the exception level associated with this mmu index. */ +static inline int arm_mmu_idx_to_el(ARMMMUIdx idx) +{ + tcg_debug_assert(arm_mmuidx_is_valid(idx)); + tcg_debug_assert(FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, ELVALID= )); + return FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, EL); +} + +#endif /* TARGET_ARM_MMUIDX_INTERNAL_H */ diff --git a/target/arm/helper.c b/target/arm/helper.c index f66868f9ef..ea343e9d48 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9639,33 +9639,6 @@ int fp_exception_el(CPUARMState *env, int cur_el) return 0; } =20 -/* Return the exception level we're running at if this is our mmu_idx */ -int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx) -{ - if (mmu_idx & ARM_MMU_IDX_M) { - return mmu_idx & ARM_MMU_IDX_M_PRIV; - } - - switch (mmu_idx) { - case ARMMMUIdx_E10_0: - case ARMMMUIdx_E20_0: - case ARMMMUIdx_E30_0: - return 0; - case ARMMMUIdx_E10_1: - case ARMMMUIdx_E10_1_PAN: - return 1; - case ARMMMUIdx_E2: - case ARMMMUIdx_E20_2: - case ARMMMUIdx_E20_2_PAN: - return 2; - case ARMMMUIdx_E3: - case ARMMMUIdx_E30_3_PAN: - return 3; - default: - g_assert_not_reached(); - } -} - #ifndef CONFIG_TCG ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) { diff --git a/target/arm/mmuidx.c b/target/arm/mmuidx.c new file mode 100644 index 0000000000..309b1d68df --- /dev/null +++ b/target/arm/mmuidx.c @@ -0,0 +1,41 @@ +/* + * QEMU Arm software mmu index definitions + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "mmuidx-internal.h" + + +#define EL(X) ((X << R_MMUIDXINFO_EL_SHIFT) | R_MMUIDXINFO_ELVALID_MASK) + +const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8] =3D { + /* + * A-profile. + */ + [ARMMMUIdx_E10_0] =3D EL(0), + [ARMMMUIdx_E10_1] =3D EL(1), + [ARMMMUIdx_E10_1_PAN] =3D EL(1), + + [ARMMMUIdx_E20_0] =3D EL(0), + [ARMMMUIdx_E20_2] =3D EL(2), + [ARMMMUIdx_E20_2_PAN] =3D EL(2), + + [ARMMMUIdx_E2] =3D EL(2), + + [ARMMMUIdx_E3] =3D EL(3), + [ARMMMUIdx_E30_0] =3D EL(0), + [ARMMMUIdx_E30_3_PAN] =3D EL(3), + + /* + * M-profile. + */ + [ARMMMUIdx_MUser] =3D EL(0), + [ARMMMUIdx_MPriv] =3D EL(1), + [ARMMMUIdx_MUserNegPri] =3D EL(0), + [ARMMMUIdx_MPrivNegPri] =3D EL(1), + [ARMMMUIdx_MSUser] =3D EL(0), + [ARMMMUIdx_MSPriv] =3D EL(1), + [ARMMMUIdx_MSUserNegPri] =3D EL(0), + [ARMMMUIdx_MSPrivNegPri] =3D EL(1), +}; diff --git a/target/arm/meson.build b/target/arm/meson.build index 07d9271aa4..91630a1f72 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -6,7 +6,12 @@ arm_ss.add(files( =20 arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', - 'gdbstub64.c')) + 'gdbstub64.c' +)) + +arm_common_ss.add(files( + 'mmuidx.c', +)) =20 arm_system_ss =3D ss.source_set() arm_common_system_ss =3D ss.source_set() --=20 2.43.0