From nobody Mon Sep 8 12:32:22 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=1756570552; cv=none; d=zohomail.com; s=zohoarc; b=Y140ejhjdlLIrbgNvq+eRHbNsO2YFclcc8aeW9XsHduAeN1rlpsrt0m+uN59Co4jnvNPlr2ZZxXRMR+o5NzDzat4GnB8j0YprxBvstSgfkrRd76GDujqbsWYFnI4YUky53qv2AZxvNrFO2FR+jYzOekpE6diie/gqITEU0rUS8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756570552; 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=4EUcs9AxpyMgXNnrYM+Z+Mp8un4Ur/NPZfUNCkMhAek=; b=eATO+YNDlkhOQFnje4NJm9x9w3qJ6FN/G/qXr3bs6Zx7xhRYJ84KrEmM5UE3JfdYNL8gLRJkSVRUU+AtZfhrqskn31F/8zuNcvMgSiOCY3PAgwbqZYjauUNAxepHloyxZc/fa5efMBDITOdMJAHrT3VXcowZOWRwZ1yhAkqGcAA= 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 1756570552581931.7800811397796; Sat, 30 Aug 2025 09:15:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usOBs-0008SI-SB; Sat, 30 Aug 2025 12:12: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 1usEN1-0006KG-Go for qemu-devel@nongnu.org; Sat, 30 Aug 2025 01:43:23 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1usEMz-0004N3-HO for qemu-devel@nongnu.org; Sat, 30 Aug 2025 01:43:22 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-7722c8d2694so1149582b3a.3 for ; Fri, 29 Aug 2025 22:43:20 -0700 (PDT) Received: from stoup.. (122-150-204-48.dyn.ip.vocus.au. [122.150.204.48]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b4d96829a66sm2435905a12.6.2025.08.29.22.43.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 22:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756532600; x=1757137400; 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=4EUcs9AxpyMgXNnrYM+Z+Mp8un4Ur/NPZfUNCkMhAek=; b=ijlLBTyTp95a3bSUrnSkhuy2IqkQekr68k4MUlSh25WER9gMipBqJE7Q4aA17MoNJE Kj4DYoWKNVqF0LS/UlRDCHArAOEMIX24qDCwJLTw70oOIKdlgGlBhFSanzuLKyXimFJv NEbr6HjGVT/xtSM151AZCOG9XqWtUjBLxiqULDoeMPwijA260wRymWFrmD6nhTpCyeii v23Aq10wH6QzKC6t2BGRkfgxBCPNkmcE/dqrym27ylSdhbDb1VayiuSmNUa9gGxfsu4n TB+/Kz6XAufJt7qzuRvt0uNzo9d0pA5YbnoV6NmR9nb/WMrM5y5/kwXcfYzCp6H4U0Pv ttmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756532600; x=1757137400; 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=4EUcs9AxpyMgXNnrYM+Z+Mp8un4Ur/NPZfUNCkMhAek=; b=lsdPKqrDj4gzAPhtyjmboiB1PNkMXsA94pgdBYUpvdUWNQfXzK8Kal5mSzr/YkK9qc GDp/mmhVpG05khhPveHZbY04gSn187pnwo0Bh51Qh0HfT3ViA7kQePul4olLywbNypDh J+yYeun2tjWlqspE0OX5ZUOuZnbPhJVP3+pDkTu6PFCXtwrjaL8skkOpeNz9WwaNQGmW jUo0oyBg10s3CAW6SKf3QogHRKn+R5aVk0Wy/v3TPtZmoZupS8RrGK7Y6ZErKOuEfTon otp7nbG5hyXq8Na5DD1coUnru2ciisoKrwEDugxIiqtrrVf9iGgnHh1DDpEPbJaGQKBt 6Ueg== X-Gm-Message-State: AOJu0Yze0scN01TgWHUs9EPWRCwil8YMyn2MOdaVRRTxmkTdicq3kCG2 yP3atiID8flFEBimDisi3LM7wu5o9PaLGBEB64Ocx4zJz3uf09mE0WTPHuEYUJpf+DVGusEfLAN VUeiI6Ag= X-Gm-Gg: ASbGncu4Co2eiKdUkkKW5ekwqn9rOGU219+dPXo71NTYr9eCBIKZ3VZ0uETtL7IMxMy rmIGwkFTPVZELjowaKb0+zEfKYlZ5TAIAx6zJ2pNvF5tSKDwouc6UGbc//KucXQZwcve75mi+jE XPe3bYgQd4of7S39ZR0pZRUNsudIi9xExVYqrS8dRCF6SfgIMVMWRFisO0CNFgVbwS1GFRfaX00 kVJphTb4guAo6cAU1W7+bmeBY4yJ1kMRUkqatoThIJAIQpgdtImNRsZs4mDIF72d7D1JoSTP9QW vgO2RfeFv7Z98cUq2Jxg4JOZfybwQJEap9POiPlrKJBtc8zXdrLaNFJ558Xnv1OxkhQbRoLRwpn uZAq46rF9lThZdKk2SSXeaeUhpIJiXeO5x4E124T57YY2bT4MvjYk8jhxVnC5 X-Google-Smtp-Source: AGHT+IFnsWuEdXg7LhQjymWvku6ivuMClMe6rdmhTtCXLLhQDoIZ8QyeATCWPV8AuJ6Aw8PEXiJtQQ== X-Received: by 2002:a05:6a20:7f8e:b0:243:78a:82c2 with SMTP id adf61e73a8af0-243d6f92da2mr1396228637.60.1756532599710; Fri, 29 Aug 2025 22:43:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v4 38/84] target/arm: Convert regime_is_pan from switch to table Date: Sat, 30 Aug 2025 15:40:42 +1000 Message-ID: <20250830054128.448363-39-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::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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: 1756570554339124100 Content-Type: text/plain; charset="utf-8" Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/internals.h | 13 ------------- target/arm/mmuidx-internal.h | 8 ++++++++ target/arm/mmuidx.c | 9 +++++---- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 2ef81a00ab..2148814835 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1027,19 +1027,6 @@ static inline void arm_call_el_change_hook(ARMCPU *c= pu) } } =20 -static inline bool regime_is_pan(ARMMMUIdx mmu_idx) -{ - switch (mmu_idx) { - case ARMMMUIdx_Stage1_E1_PAN: - case ARMMMUIdx_E10_1_PAN: - case ARMMMUIdx_E20_2_PAN: - case ARMMMUIdx_E30_3_PAN: - return true; - default: - return false; - } -} - static inline bool regime_is_stage2(ARMMMUIdx mmu_idx) { return mmu_idx =3D=3D ARMMMUIdx_Stage2 || mmu_idx =3D=3D ARMMMUIdx_Sta= ge2_S; diff --git a/target/arm/mmuidx-internal.h b/target/arm/mmuidx-internal.h index f03a2ab94c..41baf1a003 100644 --- a/target/arm/mmuidx-internal.h +++ b/target/arm/mmuidx-internal.h @@ -16,6 +16,7 @@ FIELD(MMUIDXINFO, ELVALID, 2, 1) FIELD(MMUIDXINFO, REL, 3, 2) FIELD(MMUIDXINFO, RELVALID, 5, 1) FIELD(MMUIDXINFO, 2RANGES, 6, 1) +FIELD(MMUIDXINFO, PAN, 7, 1) =20 extern const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8]; =20 @@ -56,4 +57,11 @@ static inline bool regime_has_2_ranges(ARMMMUIdx idx) return FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, 2RANGES); } =20 +/* Return true if Privileged Access Never is enabled for this mmu index. */ +static inline bool regime_is_pan(ARMMMUIdx idx) +{ + tcg_debug_assert(arm_mmuidx_is_valid(idx)); + return FIELD_EX32(arm_mmuidx_table[idx], MMUIDXINFO, PAN); +} + #endif /* TARGET_ARM_MMUIDX_INTERNAL_H */ diff --git a/target/arm/mmuidx.c b/target/arm/mmuidx.c index f880d21606..98db02b8e5 100644 --- a/target/arm/mmuidx.c +++ b/target/arm/mmuidx.c @@ -10,6 +10,7 @@ #define EL(X) ((X << R_MMUIDXINFO_EL_SHIFT) | R_MMUIDXINFO_ELVALID_MASK) #define REL(X) ((X << R_MMUIDXINFO_REL_SHIFT) | R_MMUIDXINFO_RELVALID_MASK) #define R2 R_MMUIDXINFO_2RANGES_MASK +#define PAN R_MMUIDXINFO_PAN_MASK =20 const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8] =3D { /* @@ -17,24 +18,24 @@ const uint32_t arm_mmuidx_table[ARM_MMU_IDX_M + 8] =3D { */ [ARMMMUIdx_E10_0] =3D EL(0) | REL(1) | R2, [ARMMMUIdx_E10_1] =3D EL(1) | REL(1) | R2, - [ARMMMUIdx_E10_1_PAN] =3D EL(1) | REL(1) | R2, + [ARMMMUIdx_E10_1_PAN] =3D EL(1) | REL(1) | R2 | PAN, =20 [ARMMMUIdx_E20_0] =3D EL(0) | REL(2) | R2, [ARMMMUIdx_E20_2] =3D EL(2) | REL(2) | R2, - [ARMMMUIdx_E20_2_PAN] =3D EL(2) | REL(2) | R2, + [ARMMMUIdx_E20_2_PAN] =3D EL(2) | REL(2) | R2 | PAN, =20 [ARMMMUIdx_E2] =3D EL(2) | REL(2), =20 [ARMMMUIdx_E3] =3D EL(3) | REL(3), [ARMMMUIdx_E30_0] =3D EL(0) | REL(3), - [ARMMMUIdx_E30_3_PAN] =3D EL(3) | REL(3), + [ARMMMUIdx_E30_3_PAN] =3D EL(3) | REL(3) | PAN, =20 [ARMMMUIdx_Stage2_S] =3D REL(2), [ARMMMUIdx_Stage2] =3D REL(2), =20 [ARMMMUIdx_Stage1_E0] =3D REL(1) | R2, [ARMMMUIdx_Stage1_E1] =3D REL(1) | R2, - [ARMMMUIdx_Stage1_E1_PAN] =3D REL(1) | R2, + [ARMMMUIdx_Stage1_E1_PAN] =3D REL(1) | R2 | PAN, =20 /* * M-profile. --=20 2.43.0