From nobody Sun Sep 28 17:07:44 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=1758032708; cv=none; d=zohomail.com; s=zohoarc; b=b7Xtl1f5zkKJwY0boSysAurZAe0Rh0pJuEBTcD9AfGYih1C9wzCnKiRzRfqY01W3qlMIH5/TQoNBzhdgBbgTpzGUAoj2uTKJX8nLMGgpid5ljWKb8RkNZZf6TxRTqiyM38L8roO9LMxKjAoDXoRi5cHKIEj2njTGE/drIRcrWq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758032708; 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=RcKPQdIEUX2PNEvjBDHi7h42HjJJAKk2WkX9D2rphHM=; b=ao0YNjk9ivE2mSLkTmRL8qbnwFiMkLQVTedOvGoICgiKay631zordtQhJWLdLDnY+fzIq7mm2ua7kX/Bpe/yQ5m/b+y2k+p7qhl/T1HzJsmPeDwHLqJf5LCnVeIYUnm+eMjCbEre71uJfYkiKBVJrTe35bEM9L2c0oqXWEgjQJg= 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 1758032708727185.17731053886382; Tue, 16 Sep 2025 07:25:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyWat-0006O4-EY; Tue, 16 Sep 2025 10:23:43 -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 1uyWaW-0005uF-MO for qemu-devel@nongnu.org; Tue, 16 Sep 2025 10:23:20 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uyWaP-0008Nw-Gf for qemu-devel@nongnu.org; Tue, 16 Sep 2025 10:23:18 -0400 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-b523af71683so4503486a12.3 for ; Tue, 16 Sep 2025 07:23:05 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2651d2df15esm73459905ad.45.2025.09.16.07.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 07:23:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758032584; x=1758637384; 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=RcKPQdIEUX2PNEvjBDHi7h42HjJJAKk2WkX9D2rphHM=; b=E5E8W5/c3j7UslqPrnDMYfZmy16egOP+0qJv1wYTfgPoQGXzIfHIELp0XmGC2yPfcn 0JkOuoJsqclFHcO6+OuSmfcwgzTW5Jps09HOSZVh1oGrCqq11jqbC+YtDJQa+4jrWiik 4um3iR1yYYyO/UtJ380FF1yNCLJxtid1YM0meSTB9H8wySuG/Reen4PZmn8TcZ2p6pqL 5ylbl7KWojrXIE938s/xb6bcghrycrPXvvGgFrGbUjUMdgdvybh7UUB+TYGgapqomuqB uqVctEN+mSkUbHYlKg91gfuxSinM2akcuPSMgFv9qLpLyUx3i1Zzudkn7OonRRNB/YDK NNpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758032584; x=1758637384; 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=RcKPQdIEUX2PNEvjBDHi7h42HjJJAKk2WkX9D2rphHM=; b=kM8m6zLFwBIRTc/VpH1fzctsorBGEzSAf47BRcgF0COlnCpz96zb/vivdNIvTusuDV Z7ztxjsY5NzZ8OYGY54ZSLTf7XuhSM2YrdRREELhjijr8ly2hM4Kbd4fjPi/kwx3bBeo RLGE467Awv1iKWQUSKNDbC+Q2hqJVgr4QHnrH3WB0Ek+3CdSdXOsqyqwIcekOjkZIuNm 5o1Fod7AR/ubesCvl4Sw7LCqfthTn2ks/mQcFQGb5f92xdQ/RbiqKb0x+Z1GuWlis0r0 UXz8ylIpBYiEKG08F1KbqkO/MICZ7OUj7LVn9dckdcstkq9O88WcUPLEdUWwjnzMusys JFwQ== X-Gm-Message-State: AOJu0YyirI9WrZ3at9ClDgUdSqEQKX+rZnK+NQsSkTMOf3iQA/z9boLO c584GVRW27iUCBPcS3c/VbC92fbTePNnkvlh3kn8N9CzTIQK+hVaesDTPlwNMzp6ISYkvi94w06 UGztx X-Gm-Gg: ASbGncs2EiLrVM08hBoBVG2N5aiMjb4Rn2UAMDpWchUOAVlX+vhTA57813Q+8IrokGQ NEEAvyS2QIYDS3v4jXd5IbKbGov8ZjFf9K2tL6/Zsv19gUgLaGFOqKKMOtBEtA/tjJVQn6DyPvV lnEgudWerSDpMyJOj7AAMcnPz6MJ1/4p4YJjJIhRGubGcyCIS5kKqY4ikDxV6yB7CLYFBNh4BQ6 LWyBxCE/BwS/I1/Em3hSWze3DsiTgYVT+mUhZ201itgy9JoeBdukiBu7MAnsFoyvMM2u2IUDARC JZ5N6bs6Wc7OUXEJT2xgZnQGq8I44WibfTraSroRtlKYIzmuw+WG8I0zEgebvwJecZ6GmRFNUlC TT0R4Z5Z8FYz44ABQklbgvDQUkUHP X-Google-Smtp-Source: AGHT+IHPi07hSEXRpiQX7L/EwHSH6nE2jPErGxU+iCmuzG2fhrGJMUWHHW4loXXBPZbIHisIvgOeLg== X-Received: by 2002:a17:903:944:b0:267:16ec:390 with SMTP id d9443c01a7336-26716ec061emr102254585ad.17.1758032584447; Tue, 16 Sep 2025 07:23:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, peter.maydell@linaro.org Subject: [PATCH v2 31/36] target/arm: Rename TBFLAG_A64_NV2_MEM_E20 with *_E2H Date: Tue, 16 Sep 2025 07:22:32 -0700 Message-ID: <20250916142238.664316-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250916142238.664316-1-richard.henderson@linaro.org> References: <20250916142238.664316-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::530; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x530.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: 1758032710869116600 Content-Type: text/plain; charset="utf-8" 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 --- 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 c15d79a106..4a22b216b3 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3093,8 +3093,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 f974996f3f..cd67c0ed07 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 59ab526375..6969d41ea0 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 0ec309f1ea..599e7a36ee 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