From nobody Sun Sep 28 17:00:04 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=1758896273; cv=none; d=zohomail.com; s=zohoarc; b=YeSZO2qRwt2QZI06Omh5UnXNC2Zjbm4MO/GAROiAP2mLVsEnNNrUu4DMzME3gnjhnsqxXgSwLNOZO+sstqAD2h/ssq5FN8fovlY1YCX3u3AteDHJrKhaHQ6/sSzoObTvQJNHcIfKfvVVvI/DcvEnEak0Zy62rN1cY8cf5fTtHh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758896273; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=54i7q0TRCUXKYY+qLOk6M0n5wBbAsiSPn2GQEuQkelk=; b=MUQM4jeMBCpCt/JRvLAbjPyeUaunXAAaBl4JM4ek3/m8OvPHcxNTGmsuQennZoIQ8dUQTvMyn7pc7tzNePz9bbn76rgArSfg70SLzEl8Ngyy/A7M5nW3ytmEgS2ef7o7K6HGum8KjfQ8bAMQchpWg3/OO2fh0cEytI3QFDyAn8o= 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 1758896273545942.6476026442883; Fri, 26 Sep 2025 07:17:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v299Q-0000Cg-2I; Fri, 26 Sep 2025 10:10:20 -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 1v2994-0008IM-45 for qemu-devel@nongnu.org; Fri, 26 Sep 2025 10:09:58 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v298X-0005l0-Bv for qemu-devel@nongnu.org; Fri, 26 Sep 2025 10:09:55 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3f2ae6fae12so1212136f8f.1 for ; Fri, 26 Sep 2025 07:09:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-410f2007372sm6338315f8f.16.2025.09.26.07.09.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Sep 2025 07:09:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758895760; x=1759500560; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=54i7q0TRCUXKYY+qLOk6M0n5wBbAsiSPn2GQEuQkelk=; b=WHtff3c2SJRMVtyeCQTiDMNnUbjYLRhd4V2WXDVP9tpX/OGbmFXukQM6pFLkZd+QvH OlDFmquhYjr19YFKlyXg/Xon1xSQ3rvsqA4yP1VXoh06Wglaj39B09hGE5u0vGyrJ6f2 qCK/rg+SgctptB6hpEw4PidhCoFlG7gbmN7SmkxZ+DIBZVl3/bOsjtRtnqDe1jPQ+hPM D8ilzXx/W46RxjAMnUuo9s0YvoH6cfRx9ngI9JpNEaQy6w9c7BKpQxZV4/c4VYVuYOTU xmyk7nTYrNXSlz36XW4NdIg4Hj9NpypDidMboDcOkZxEL/7Za8Q7fJ/doXEpOZdQ1pDN YyAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758895760; x=1759500560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=54i7q0TRCUXKYY+qLOk6M0n5wBbAsiSPn2GQEuQkelk=; b=MSog9xEb+EA1TE3Q1oF5VvD1OBAOj8W/GQqvRqlDw2nfsV/20WJ5roOOEmqRT45SZm TnURhsVqdhszZkQlTgqiiOnP54CphrMY8ygP5rXZqRYUj0q/lTWy9PhaFTz2W/vmx5XU j+UMN1BQm/QmWTe4nwBbHXv4ognDQviSQmG1BPlEWmpdeE+IK9IYWf9ubKKMhFGMfBzV kZuXUZK01/Mgy/JKzJ36522J87LsfYKWgN9EDUVWl21S58WTpa+j89mNfzdxwqg8xPZd MRqfLnIay5PlbgIZKKfkqCRoByf0EcLJV8dwhZxWs0FRwCLBpiGl70KHyIPOetvBTlqD 5m+Q== X-Gm-Message-State: AOJu0Yyb7YjTobW/AFrDEy2Fy9z2h1nb8gaFw9cUw9CiLDD3nIhcMaDA GPKY/xYTAzwu2wOoh/nwFCdhcvqUxmbgyFGnjibAsuqLXaSMQ/Q0vewkCMx5O/B4t/ji97AoEuc 7LYDD X-Gm-Gg: ASbGnctcOCh34dE9xXcmdBmtdBjVORi9FQOmkq0Pjs4m/wX1dxNSdbaDdZo6yNv80K3 xgOUAEFQ80779T6o9qp+u0+FOgX3eweJgMKClR2OjvV88y5sCrOi8P0GpAEgCqJcjHPZdYEA96A WKOi0/MnTLVkePKq2yv9Yh1vxtDrRg7k5xRMBLqLXGo9Q6MjDxN9lPwQEuvSxBYx+VduFE33FLQ 8UOaixXYTRWQfMYZ39i9AfOf5JgI7J9HkNoV+VyB/5YH00hnSca9qmSC7GjJGgg0k2c4Q20ws0l YBHzInHZLxHq5KX9i1+kMsAEcVO/zVDbzHJJhFSuivMKXIXDV4e7wd2cxOoTkVUsuY+aM26GoH/ XNyzOLgtlYOSCPvX2zObj4b9k5kez X-Google-Smtp-Source: AGHT+IFXxgCTK9nl6ZczIjMt1k3oDsAvJOxzSiawIk0ukf5LiKUtQ5XD+MIF8MgsB1OyeuurvKthMA== X-Received: by 2002:a5d:5d0b:0:b0:3ec:db87:fff7 with SMTP id ffacd0b85a97d-40e4a9ee4aemr6563793f8f.26.1758895760020; Fri, 26 Sep 2025 07:09:20 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/44] target/arm: Rename TBFLAG_A64_NV2_MEM_E20 with *_E2H Date: Fri, 26 Sep 2025 15:08:33 +0100 Message-ID: <20250926140844.1493020-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250926140844.1493020-1-peter.maydell@linaro.org> References: <20250926140844.1493020-1-peter.maydell@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=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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: 1758896274985116600 From: Richard Henderson Install e2h in tbflags and compute nv2_mem_e20 from that in aarch64_tr_init_disas_context. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peter Maydell --- target/arm/cpu.h | 3 +-- target/arm/tcg/translate.h | 2 ++ target/arm/tcg/hflags.c | 8 +++++--- target/arm/tcg/translate-a64.c | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 1c0deb723d7..d5534e35804 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3065,8 +3065,7 @@ FIELD(TBFLAG_A64, ATA0, 31, 1) FIELD(TBFLAG_A64, NV, 32, 1) FIELD(TBFLAG_A64, NV1, 33, 1) FIELD(TBFLAG_A64, NV2, 34, 1) -/* Set if FEAT_NV2 RAM accesses use the EL2&0 translation regime */ -FIELD(TBFLAG_A64, NV2_MEM_E20, 35, 1) +FIELD(TBFLAG_A64, E2H, 35, 1) /* Set if FEAT_NV2 RAM accesses are big-endian */ FIELD(TBFLAG_A64, NV2_MEM_BE, 36, 1) FIELD(TBFLAG_A64, AH, 37, 1) /* FPCR.AH */ diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index ec4755ae3fd..f1a6e5e2b61 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -150,6 +150,8 @@ typedef struct DisasContext { bool trap_eret; /* True if FEAT_LSE2 SCTLR_ELx.nAA is set */ bool naa; + /* True if HCR_EL2.E2H is set */ + bool e2h; /* True if FEAT_NV HCR_EL2.NV is enabled */ bool nv; /* True if NV enabled and HCR_EL2.NV1 is set */ diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 01894226cc9..17f83f13a40 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -258,6 +258,11 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *e= nv, int el, int fp_el, DP_TBFLAG_A64(flags, TBII, tbii); DP_TBFLAG_A64(flags, TBID, tbid); =20 + /* E2H is used by both VHE and NV2. */ + if (hcr & HCR_E2H) { + DP_TBFLAG_A64(flags, E2H, 1); + } + if (cpu_isar_feature(aa64_sve, env_archcpu(env))) { int sve_el =3D sve_exception_el(env, el); =20 @@ -390,9 +395,6 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *en= v, int el, int fp_el, } if (hcr & HCR_NV2) { DP_TBFLAG_A64(flags, NV2, 1); - if (hcr & HCR_E2H) { - DP_TBFLAG_A64(flags, NV2_MEM_E20, 1); - } if (env->cp15.sctlr_el[2] & SCTLR_EE) { DP_TBFLAG_A64(flags, NV2_MEM_BE, 1); } diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 0ec309f1ea9..599e7a36ee3 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -10304,10 +10304,11 @@ static void aarch64_tr_init_disas_context(DisasCo= ntextBase *dcbase, dc->pstate_za =3D EX_TBFLAG_A64(tb_flags, PSTATE_ZA); dc->sme_trap_nonstreaming =3D EX_TBFLAG_A64(tb_flags, SME_TRAP_NONSTRE= AMING); dc->naa =3D EX_TBFLAG_A64(tb_flags, NAA); + dc->e2h =3D EX_TBFLAG_A64(tb_flags, E2H); dc->nv =3D EX_TBFLAG_A64(tb_flags, NV); dc->nv1 =3D EX_TBFLAG_A64(tb_flags, NV1); dc->nv2 =3D EX_TBFLAG_A64(tb_flags, NV2); - dc->nv2_mem_e20 =3D EX_TBFLAG_A64(tb_flags, NV2_MEM_E20); + dc->nv2_mem_e20 =3D dc->nv2 && dc->e2h; dc->nv2_mem_be =3D EX_TBFLAG_A64(tb_flags, NV2_MEM_BE); dc->fpcr_ah =3D EX_TBFLAG_A64(tb_flags, AH); dc->fpcr_nep =3D EX_TBFLAG_A64(tb_flags, NEP); --=20 2.43.0