From nobody Sat Nov 15 10:37:14 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=1754178477; cv=none; d=zohomail.com; s=zohoarc; b=Qfa67SI7YnSona7k3KmeRHMK9/VBaEZTOhWmLjb0nsV3IVsbdf7heXSuM1mKyka5TPOEffOVWDylmfAyBFayEqbKCXv4w9vWptlS9cO9gjsCPlrZAHxRB+bFKU4bnRNH8JUzDF0LI95QPfjXYi3JZsnaaDWwxOyJiaOFm4XUSSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754178477; 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=V2FGn80IIxq+5YvbekmGjhqWReeDmIfnP5ZkZoBosUuJ1BFGq3L61gNzW3p7rqcfsEKCwt+F8vGN6lnUQkj/7hScGJbg7aI3RiAokPEGKM5TGA8avUh/ded3riiwApVaGIarwBZyhNn6+lWagayOI5gVAKPantMqaY+SK87uidM= 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 1754178477664560.036714646657; Sat, 2 Aug 2025 16:47:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uiLo9-0005hj-FV; Sat, 02 Aug 2025 19:38:33 -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 1uiLmI-0002wX-Nx for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:36:41 -0400 Received: from mail-ot1-x32d.google.com ([2607:f8b0:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiLmH-0005jc-83 for qemu-devel@nongnu.org; Sat, 02 Aug 2025 19:36:38 -0400 Received: by mail-ot1-x32d.google.com with SMTP id 46e09a7af769-741ab3e03aeso295443a34.2 for ; Sat, 02 Aug 2025 16:36:36 -0700 (PDT) Received: from stoup.. ([172.58.111.133]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-741a71dc78asm380409a34.30.2025.08.02.16.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Aug 2025 16:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754177796; x=1754782596; 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=MUeOcpDuQxYyOPe3Obva67eDahrbz11tUXGeoj0TRBDoKCM4A4gHEfPgNNp7nUmssT i06XbqqbM4xJ1RgaIV1l+yWv5oqIKjiG81T+2xRa4BvtZ+XYFRGC0YuGzojdQdu7ijoV KpZoT0FxcK7X8G/m9NvO5pFfkFb7DcFD4ce4ATsX0fUHyg3RsCNURwOO9ISEZbZIUa5A dJEntHLre/ueRANLWIWYwsFnvod/7fXiljsgptxL/TDVqXcWU5Prollkj0B8+emQeAE0 gBp7yox9VDgqpwvtaeK2UCvkJpXqT4X1UbPv3Z9xTu0mpXeaUa3MUo4Zk391+y2r87MG 2i1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754177796; x=1754782596; 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=SiA2LKcTRzd9uiaj/npcLeIruwDFpXzV4CYo8pRU4QTrR1H5FZ/dfVcA/ka5PU8aGq VohbkIb8MGiwIEL7xByieR+6KQgSCtqkApONOWOk/POlfNy0GQyBSFhl0jUFWYVpB+cV 0VwLANyZMg2ogXtmy5X1+JHC5QP6Qhy58qn90m3vzSoVFCnkAQk67Cbln78ICPaKnzl9 IK85FNU53+MP2HWWWcX/+cgWzrGSMcSvgXIZweYwosLwfXyu8tqKk0K5NvUTuooKAg0h M+0oJyUxMxhxrbKYfmEdDkAJOixSNbTpKVxg6sf5mhgdAuCM0eU0PyK2eWbpll1Yiio7 IGDw== X-Gm-Message-State: AOJu0YxjG/IR3CwTk6rnxumvxsKtp5injnNspWTyRETVFS+AEL1vpquK knVXFR/8EsVWwUYOAgRwRhWWfrZTX5l0ptrCP4v+tzHyEjluf8soGu3rBH7xwgZJs7CGGy1f6N6 Dl4gMFDw= X-Gm-Gg: ASbGncvAXqwrZ1uKkiy3SqlTHhYFPKk7jCQY3dFw8KsdC1PZ6v8rHFNV83gEZhW7ksI sFMvKbanc0XDgvzoKhad7+FAX0tE0OMQjZw8rMoPzJJcECHLU1RNZ+u06AfgJ7+SlwrEeAa6TpS K+U9S0t2TE7DY8BkaVLVqzaW6kyThr0HlIi42t5eXWBjrM97SpWENQWVjtCho2Pv8BfB4yWFYwu /RHVgF3zXk2cDTgx3vkCa82GbHrRw/++pmXqW03frvmARZby3zrt9ct4TGZxIY5BEo5Y2Gf6tVL rpIW/SzP1az3G1zzHd2riaEsAiqT/BRQZIn+tYeLcRpA3K9BnvYhzp7mu/3Rf0e48dkMFGYEp6b ytGtgZNqu11wUMKFe7CZmlL70GcvHHNzgmR/RjscEziS8Oz4bZWf6 X-Google-Smtp-Source: AGHT+IHXM+tDmp9KRG4oQchqwWwx5+59/wRU8Y+FF1E+d0V9ILPbYx4EKLHYLheDA96CT5puzYOrig== X-Received: by 2002:a05:6830:7192:b0:741:a36f:7a1f with SMTP id 46e09a7af769-741a36f7cc5mr1772068a34.16.1754177796170; Sat, 02 Aug 2025 16:36:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v2 44/85] target/arm: Introduce regime_to_gcs Date: Sun, 3 Aug 2025 09:29:12 +1000 Message-ID: <20250802232953.413294-45-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250802232953.413294-1-richard.henderson@linaro.org> References: <20250802232953.413294-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::32d; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x32d.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: 1754178479078116600 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