From nobody Mon Dec 15 21:29:24 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=1755177886; cv=none; d=zohomail.com; s=zohoarc; b=lUMPwbGo8craUJKznkH0/90ichD1w87oEjUJMk1WedwuoeDryftz6vZ8m3NzX/fiMvcCIAprjfC2lvCqNIBJPf4l/pIe7nmZgKemrhhQKoN47t/2OY1pH8tgX/x0DgY70OgEm/zGq4gtC/4tspCbYBPUGUk+C+lNhOeepp178Ns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755177886; 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=vIH4ns6evSuoDle8SRNEFdzHb/qidDpm/3DmttrGIbU=; b=bGEELzRHnPyOLuW6Sgs/VqkMYQGjh+EE3czjoFlrrnGXT0+0hal6BIS326Fmll9L1P6zPWSBMy5QqfkQY13H79rzowK3yDSe38rf4jzxjDMSVBwrtsNUMJrrgRkqkG/R+5szAgAA6ITxnBPIBBtfFqOuP6wXmWRo8NWsMRBPgTg= 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 1755177885970801.2694743839676; Thu, 14 Aug 2025 06:24:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1umXci-00025X-5S; Thu, 14 Aug 2025 09:04:06 -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 1umXcK-0001gQ-1G for qemu-devel@nongnu.org; Thu, 14 Aug 2025 09:03:41 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1umXcB-00053B-6M for qemu-devel@nongnu.org; Thu, 14 Aug 2025 09:03:38 -0400 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-32326df0e75so776991a91.2 for ; Thu, 14 Aug 2025 06:03:26 -0700 (PDT) Received: from localhost.localdomain ([206.83.105.236]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bcce6f6fesm34480631b3a.26.2025.08.14.06.03.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 06:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755176604; x=1755781404; 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=vIH4ns6evSuoDle8SRNEFdzHb/qidDpm/3DmttrGIbU=; b=nzYltbE/Y08OOrRCNWNG14YaM4sCmMzwKLiksn9Rj4opSBgUF/bsuaxs6ntUH3wH8b qV7htzlECKVP//tmOmsmmrbtyUtw9Azj9uPqtz7CLVnxPG4oYMt0er/b/KL9kzoyREF3 iXpxH0OSgNl3lKjZV00ayse4bqsWJLLxUHeCxbzWe+rwkoHzsbOwZbqQ2KaFBlic/Vka 0K6nvL23Hap1GeqPMUAJoPhFzUu0G64zlt0+L6HdJnntlB7nyOyaGgUxFrdnrIXKBCWW cc7gqm4ITZL4C10DNILbKmIw/EaoiphRcimGYDa7ksdjDaeiReTUB4tm5e/yKiZsdpyq zkFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755176604; x=1755781404; 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=vIH4ns6evSuoDle8SRNEFdzHb/qidDpm/3DmttrGIbU=; b=dGY3Qx0vBDH/PU2y3AA4xGtPnJcq0FDyTsj8lEw/x5ehbKtTkntK4SYN6WwU06UD34 j2RLhe+oQxuze8LsuZkaZ/KmS+FczYMNEAdQiZZQF+bhIurgKV+hopmCr6Yob4+mO/2O x1UpJ5BnOFWKKySQnHXRJblxy723H8VeKXTmu6KFIGz1KYR2BoOgOG0bgfjwYzt0hcC9 jsHlxauG30mDpQZuHCMXYphmrOCCyPAxstp53tok6YHxe+1anlu676dPnOXWb/wx3mR4 e4liBuN6jBUrvr9CundZv5AMmppUVe78P9gOMhszcgVmLv8bedj9tbC1Ad1hwXFTp+Ns +5zg== X-Gm-Message-State: AOJu0YyRe89DdbkfgeInkJZWmFY43wvHKgd7g45qdvyhBm1xNMVM86kU I67MpvUlXcHXs+5WlCuU6IEzyM5aYu8Jrj0btRs5i86ugRKG5SIVgdD3aSvRwj7WnwH+e1oi0L3 pem3Q8pY= X-Gm-Gg: ASbGnctaXq9PKqwRQJLUBwB4bmySGVqdpWjzpOC8W0LC53vpmcpfsBaFqJRUstMjiC3 z15fzUEUOb/+1AWPCQ9uGFrqvLyRVCO12sh4pDje3meJU5Cg3SgxjBuFtKE17JbUiZSRj6ERLmE NGRYIKhf4LrcZ1MMXIRv1GyGMrBtsDMJTWghBx8o0n6WfF088AkUPHouSv6H3oTPuLut+dQY30J 7OIrLKyD/2cDdTLI20aO8nv0n4DGVRT9oLjql8SQgEVHtafYozYeZv5yCWqBQXaU3JJHDgRjqAX V8q6NdijxryKFHxG0jilzm0ynxtWL0+23gprMFdOy7f2JpD0Nlr9Zfk+XG1wV594qrSwZF4aaip evLvOYKbp8EPyKCUBHCmeGwh+SviHXN98paONmBkJtdbUN+A= X-Google-Smtp-Source: AGHT+IGu+Lg15H0v+ZfanwZeO5dTaRzYe+6X7f8+0yF9/RL7ArxQcTNL293XNGrYqJBqKGqE0nFrIw== X-Received: by 2002:a17:90b:6cd:b0:315:c77b:37d6 with SMTP id 98e67ed59e1d1-32327b48f6cmr4659662a91.23.1755176604246; Thu, 14 Aug 2025 06:03:24 -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 v3 42/85] target/arm: Convert regime_is_stage2 to table Date: Thu, 14 Aug 2025 22:57:09 +1000 Message-ID: <20250814125752.164107-43-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250814125752.164107-1-richard.henderson@linaro.org> References: <20250814125752.164107-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::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.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=unavailable 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: 1755177888403116600 This wasn't using a switch, but two comparisons. Convert it to arm_mmuidx_table for consistency. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/internals.h | 5 ----- target/arm/mmuidx-internal.h | 8 ++++++++ target/arm/mmuidx.c | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 4f99ec69f8..805f4a1876 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1029,11 +1029,6 @@ static inline void arm_call_el_change_hook(ARMCPU *c= pu) } } =20 -static inline bool regime_is_stage2(ARMMMUIdx mmu_idx) -{ - return mmu_idx =3D=3D ARMMMUIdx_Stage2 || mmu_idx =3D=3D ARMMMUIdx_Sta= ge2_S; -} - /* Return the SCTLR value which controls this address translation regime */ static inline uint64_t regime_sctlr(CPUARMState *env, ARMMMUIdx mmu_idx) { diff --git a/target/arm/mmuidx-internal.h b/target/arm/mmuidx-internal.h index 55fba4aae2..1d948aa6f4 100644 --- a/target/arm/mmuidx-internal.h +++ b/target/arm/mmuidx-internal.h @@ -19,6 +19,7 @@ FIELD(MMUIDXINFO, 2RANGES, 6, 1) FIELD(MMUIDXINFO, PAN, 7, 1) FIELD(MMUIDXINFO, USER, 8, 1) FIELD(MMUIDXINFO, STAGE1, 9, 1) +FIELD(MMUIDXINFO, STAGE2, 10, 1) =20 extern const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8]; =20 @@ -84,4 +85,11 @@ static inline bool arm_mmu_idx_is_stage1_of_2(ARMMMUIdx = idx) return FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, STAGE1); } =20 +/* Return true if this mmu index is stage 2 of a 2-stage translation. */ +static inline bool regime_is_stage2(ARMMMUIdx idx) +{ + tcg_debug_assert(arm_mmuidx_is_valid(idx)); + return FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, STAGE2); +} + #endif /* TARGET_ARM_MMUIDX_INTERNAL_H */ diff --git a/target/arm/mmuidx.c b/target/arm/mmuidx.c index c5b43a5932..61a682e655 100644 --- a/target/arm/mmuidx.c +++ b/target/arm/mmuidx.c @@ -14,6 +14,7 @@ #define PAN R_MMUIDXINFO_PAN_MASK #define USER R_MMUIDXINFO_USER_MASK #define S1 R_MMUIDXINFO_STAGE1_MASK +#define S2 R_MMUIDXINFO_STAGE2_MASK =20 const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8] =3D { /* @@ -33,8 +34,8 @@ const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8] =3D { [ARMMMUIdx_E30_0] =3D EL(0) | REL(3), [ARMMMUIdx_E30_3_PAN] =3D EL(3) | REL(3) | PAN, =20 - [ARMMMUIdx_Stage2_S] =3D REL(2), - [ARMMMUIdx_Stage2] =3D REL(2), + [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_E1] =3D REL(1) | R2 | S1, --=20 2.43.0