From nobody Mon Sep 8 12:45:45 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=1756569633; cv=none; d=zohomail.com; s=zohoarc; b=UpddoXW1dXwRRX69G3wQu0aY28nojpSg79Nyj+sp37W8VcmQcbVA2ZscnIYgeYIUY1pSApkGeSSsP5gq5wi4jgn9VJIqhIFkBy+Jj5GVu4DSMv/XewMnxtsGcJTc9CJDQLj+BD26sBghNwFFcnAgmlz59s1K+Nsg0OvtzS6A0Ps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756569633; h=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=cr6Y93u/SVkcU+goxAfQSNSlnm3F8dUSxwzHBpcNsX8=; b=SHIiBPhPZfs/OlvbrjgOS8k1Jkcpbrrrx4X08PUWR7rIy6aRgGabZ3xvRVN/EzB2ai/oD9NX/OnpN/+c3AtBVH0dXA3WzVIpg7re7qOdmefXPs+E4CKL+mrjZV6CFKXBi0TSlsmTLrcQVOILIQTB1VwJ8jNjOpIyU+L77zWo1Zw= 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 1756569633211971.9176367222801; Sat, 30 Aug 2025 09:00:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usNxP-00036n-VJ; Sat, 30 Aug 2025 11:57:36 -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 1usEQG-00079g-A9 for qemu-devel@nongnu.org; Sat, 30 Aug 2025 01:46:45 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1usEQE-0004oC-Bx for qemu-devel@nongnu.org; Sat, 30 Aug 2025 01:46:44 -0400 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-b4d118e13a1so892646a12.3 for ; Fri, 29 Aug 2025 22:46:41 -0700 (PDT) Received: from stoup.. (122-150-204-179.dyn.ip.vocus.au. [122.150.204.179]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2490658999fsm40852715ad.112.2025.08.29.22.46.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 22:46:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756532801; x=1757137601; 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=cr6Y93u/SVkcU+goxAfQSNSlnm3F8dUSxwzHBpcNsX8=; b=iiFQgaB20WzBU1OnQ5cv8UaKPGu1/x4K3T090cYwXi21qO4YLvhG0s1okFgMlyEDcu 5t2aS2PwuoTwY3W1aDKNSQslzgXGj0zJLnv2xvRSNib5t3ntjZNi9OaZqUlmpXJ3nmRo EWr2d1efHjlgA5j6IdOaNYcn04vzduWsyi9ocTVgzkoh5wglQnQHnyKAPswpqfEZJTCM NDqjpArkNH4LnLRymiBIivMeZ/IMqqx3kaCMDAAy11NMSh7hbQJqDle8mtakCJPycjDP hvK5EboWpJbc3gnr9VB4RweNhpLYnPBy7AlAg30wc1vFMsKqlRZgfMuERS+8GyToIfNY fK3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756532801; x=1757137601; 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=cr6Y93u/SVkcU+goxAfQSNSlnm3F8dUSxwzHBpcNsX8=; b=gjiey7qlp4OJWaKe0uWVnMRkaugqehY38ABLgcfGJFJxC7Z7NplB7d7OPTICCVIGw0 AyUJxrg5ywPh1865aHi7kAB3ifoQugyJ1gaKEj/efPYwjVloFePfE/o2qV1ReoT8v5xY hnpba1i+gg0c+JZtRtip2BEv8Z2S6dIy0jwgF1t+OLtJE7hREU6PWc3WR2EtYQxI2HrY 9M5ynvAWTuhK24fVIHIV510hFeDAtqtmZsWUNGvRRkMVzznFs6w7Qvz0+ZjFVN51soKp DTfUUc4a5on29zqVbzq7hGD8AxFASLwBdINct7ng4WQZqbSNpbjyCIokYcU3ZM4dFr8S q7tQ== X-Gm-Message-State: AOJu0Yz5FRqyuJ4XgsGEzHHoT50QrEmDmQGZx3DFJmIHSA2dZoi0RDHM 68RXjP5MHqqIGONdUO/jCi6KNFOKvF65DPkv0Fbnwk41SzqDTr+f62Q4TU99vCZQy6VcZlCfj+o mT0AUtwE= X-Gm-Gg: ASbGncumFl54KaMm1ioLypeBs0x9qXgPtwiAOm36UJDbnwVe2wr7SEmYcrwSWZ2c89g ZNCiNSwS0lizqkNssfPfzxltZM55Gx+jwBaO4a4xNWDjBOxhdZ7vUiB0bTEfw12zAcF3BM2YZcr d3vzoAiBWsNtrvZ+lEV3/1wjMhse8hg72mhcvoUO5r7pQL92IAMSgqAiA4um2VMBQ1R3OFrWLhY aTRR/CKa/RWoHG8wqdjg5ubxcU9PN9t6U03Vy9jg8L6R8zNXLPZCzVWpqTnt/JxXYft1DGpSNYK Op+gK+00GzYo3GhqZGRE/Z9L0Z05Hs8/5yq4LbuprUIsQkhOZlICGuf0CqLWwVcCpZPPzRTNwTC dLR/YyKqwV35g/U4K3wxMBeq0h2NG4mGf2Ltsu5N6dxumGAVc6Ij5ncL3k8/YdS/NP3dHdTQdkg == X-Google-Smtp-Source: AGHT+IFJvFtfETB+j1XCl5eXqLQ4ID0FxM5eY1a5aYC7Dr0out/3hK5X7/C71zSA16Hzn+9sKhjtgQ== X-Received: by 2002:a17:903:1aa8:b0:246:441f:f144 with SMTP id d9443c01a7336-24944b75caamr14239475ad.56.1756532800969; Fri, 29 Aug 2025 22:46:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v4 44/84] target/arm: Introduce regime_to_gcs Date: Sat, 30 Aug 2025 15:40:48 +1000 Message-ID: <20250830054128.448363-45-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250830054128.448363-1-richard.henderson@linaro.org> References: <20250830054128.448363-1-richard.henderson@linaro.org> MIME-Version: 1.0 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::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.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: 1756569635966124100 Content-Type: text/plain; charset="utf-8" Add a lookup from any a64 mmu index to the gcs mmu index within the same translation regime. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/mmuidx-internal.h | 10 ++++++++++ target/arm/mmuidx.c | 24 +++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/target/arm/mmuidx-internal.h b/target/arm/mmuidx-internal.h index f494ec348d..962b053852 100644 --- a/target/arm/mmuidx-internal.h +++ b/target/arm/mmuidx-internal.h @@ -21,6 +21,7 @@ FIELD(MMUIDXINFO, USER, 8, 1) FIELD(MMUIDXINFO, STAGE1, 9, 1) FIELD(MMUIDXINFO, STAGE2, 10, 1) FIELD(MMUIDXINFO, GCS, 11, 1) +FIELD(MMUIDXINFO, TG, 12, 5) =20 extern const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8]; =20 @@ -100,4 +101,13 @@ static inline bool regime_is_gcs(ARMMMUIdx idx) return FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, GCS); } =20 +/* Return the GCS MMUIdx for a given regime. */ +static inline ARMMMUIdx regime_to_gcs(ARMMMUIdx idx) +{ + tcg_debug_assert(arm_mmuidx_is_valid(idx)); + uint32_t core =3D FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, TG); + tcg_debug_assert(core !=3D 0); /* core 0 is E10_0, not a GCS index */ + return core | ARM_MMU_IDX_A; +} + #endif /* TARGET_ARM_MMUIDX_INTERNAL_H */ diff --git a/target/arm/mmuidx.c b/target/arm/mmuidx.c index 42b003db9c..a4663c8d87 100644 --- a/target/arm/mmuidx.c +++ b/target/arm/mmuidx.c @@ -16,27 +16,29 @@ #define S1 R_MMUIDXINFO_STAGE1_MASK #define S2 R_MMUIDXINFO_STAGE2_MASK #define GCS R_MMUIDXINFO_GCS_MASK +#define TG(X) \ + ((ARMMMUIdx_##X##_GCS & ARM_MMU_IDX_COREIDX_MASK) << R_MMUIDXINFO_TG_S= HIFT) =20 const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8] =3D { /* * A-profile. */ - [ARMMMUIdx_E10_0] =3D EL(0) | REL(1) | R2, + [ARMMMUIdx_E10_0] =3D EL(0) | REL(1) | R2 | TG(E10_0), [ARMMMUIdx_E10_0_GCS] =3D EL(0) | REL(1) | R2 | GCS, - [ARMMMUIdx_E10_1] =3D EL(1) | REL(1) | R2, - [ARMMMUIdx_E10_1_PAN] =3D EL(1) | REL(1) | R2 | PAN, + [ARMMMUIdx_E10_1] =3D EL(1) | REL(1) | R2 | TG(E10_1), + [ARMMMUIdx_E10_1_PAN] =3D EL(1) | REL(1) | R2 | TG(E10_1) | PAN, [ARMMMUIdx_E10_1_GCS] =3D EL(1) | REL(1) | R2 | GCS, =20 - [ARMMMUIdx_E20_0] =3D EL(0) | REL(2) | R2, + [ARMMMUIdx_E20_0] =3D EL(0) | REL(2) | R2 | TG(E20_0), [ARMMMUIdx_E20_0_GCS] =3D EL(0) | REL(2) | R2 | GCS, - [ARMMMUIdx_E20_2] =3D EL(2) | REL(2) | R2, - [ARMMMUIdx_E20_2_PAN] =3D EL(2) | REL(2) | R2 | PAN, + [ARMMMUIdx_E20_2] =3D EL(2) | REL(2) | R2 | TG(E20_2), + [ARMMMUIdx_E20_2_PAN] =3D EL(2) | REL(2) | R2 | TG(E20_2) | PAN, [ARMMMUIdx_E20_2_GCS] =3D EL(2) | REL(2) | R2 | GCS, =20 - [ARMMMUIdx_E2] =3D EL(2) | REL(2), + [ARMMMUIdx_E2] =3D EL(2) | REL(2) | TG(E2), [ARMMMUIdx_E2_GCS] =3D EL(2) | REL(2) | GCS, =20 - [ARMMMUIdx_E3] =3D EL(3) | REL(3), + [ARMMMUIdx_E3] =3D EL(3) | REL(3) | TG(E3), [ARMMMUIdx_E3_GCS] =3D EL(3) | REL(3) | GCS, [ARMMMUIdx_E30_0] =3D EL(0) | REL(3), [ARMMMUIdx_E30_3_PAN] =3D EL(3) | REL(3) | PAN, @@ -44,10 +46,10 @@ const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8] =3D { [ARMMMUIdx_Stage2_S] =3D REL(2) | S2, [ARMMMUIdx_Stage2] =3D REL(2) | S2, =20 - [ARMMMUIdx_Stage1_E0] =3D REL(1) | R2 | S1 | USER, + [ARMMMUIdx_Stage1_E0] =3D REL(1) | R2 | S1 | USER | TG(Stage1_E0= ), [ARMMMUIdx_Stage1_E0_GCS] =3D REL(1) | R2 | S1 | USER | GCS, - [ARMMMUIdx_Stage1_E1] =3D REL(1) | R2 | S1, - [ARMMMUIdx_Stage1_E1_PAN] =3D REL(1) | R2 | S1 | PAN, + [ARMMMUIdx_Stage1_E1] =3D REL(1) | R2 | S1 | TG(Stage1_E1), + [ARMMMUIdx_Stage1_E1_PAN] =3D REL(1) | R2 | S1 | TG(Stage1_E1) | PAN, [ARMMMUIdx_Stage1_E1_GCS] =3D REL(1) | R2 | S1 | GCS, =20 /* --=20 2.43.0