[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 40/55] target/arm: Add el_is_in_host
From: |
Peter Maydell |
Subject: |
[PULL 40/55] target/arm: Add el_is_in_host |
Date: |
Thu, 9 Jun 2022 10:05:22 +0100 |
From: Richard Henderson <richard.henderson@linaro.org>
This (newish) ARM pseudocode function is easier to work with
than open-coded tests for HCR_E2H etc. Use of the function
will be staged into the code base in parts.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220607203306.657998-6-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/internals.h | 2 ++
target/arm/helper.c | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 1d83146d565..ceaddcbfd6e 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -1347,6 +1347,8 @@ static inline void
define_cortex_a72_a57_a53_cp_reginfo(ARMCPU *cpu) { }
void define_cortex_a72_a57_a53_cp_reginfo(ARMCPU *cpu);
#endif
+bool el_is_in_host(CPUARMState *env, int el);
+
void aa32_max_features(ARMCPU *cpu);
#endif
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 4f4044c688d..322508170e3 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -5282,6 +5282,34 @@ uint64_t arm_hcr_el2_eff(CPUARMState *env)
return ret;
}
+/*
+ * Corresponds to ARM pseudocode function ELIsInHost().
+ */
+bool el_is_in_host(CPUARMState *env, int el)
+{
+ uint64_t mask;
+
+ /*
+ * Since we only care about E2H and TGE, we can skip arm_hcr_el2_eff().
+ * Perform the simplest bit tests first, and validate EL2 afterward.
+ */
+ if (el & 1) {
+ return false; /* EL1 or EL3 */
+ }
+
+ /*
+ * Note that hcr_write() checks isar_feature_aa64_vh(),
+ * aka HaveVirtHostExt(), in allowing HCR_E2H to be set.
+ */
+ mask = el ? HCR_E2H : HCR_E2H | HCR_TGE;
+ if ((env->cp15.hcr_el2 & mask) != mask) {
+ return false;
+ }
+
+ /* TGE and/or E2H set: double check those bits are currently legal. */
+ return arm_is_el2_enabled(env) && arm_el_is_aa64(env, 2);
+}
+
static void hcrx_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{
--
2.25.1
- [PULL 49/55] target/arm: Export sve contiguous ldst support functions, (continued)
- [PULL 49/55] target/arm: Export sve contiguous ldst support functions, Peter Maydell, 2022/06/09
- [PULL 51/55] target/arm: Use expand_pred_b in mve_helper.c, Peter Maydell, 2022/06/09
- [PULL 53/55] target/arm: Export bfdotadd from vec_helper.c, Peter Maydell, 2022/06/09
- [PULL 55/55] target/arm: Add ID_AA64SMFR0_EL1, Peter Maydell, 2022/06/09
- [PULL 54/55] target/arm: Add isar_feature_aa64_sme, Peter Maydell, 2022/06/09
- [PULL 39/55] target/arm: Remove fp checks from sve_exception_el, Peter Maydell, 2022/06/09
- [PULL 45/55] target/arm: Merge aarch64_sve_zcr_get_valid_len into caller, Peter Maydell, 2022/06/09
- [PULL 47/55] target/arm: Rename sve_zcr_len_for_el to sve_vqm1_for_el, Peter Maydell, 2022/06/09
- [PULL 48/55] target/arm: Split out load/store primitives to sve_ldst_internal.h, Peter Maydell, 2022/06/09
- [PULL 52/55] target/arm: Move expand_pred_h to vec_internal.h, Peter Maydell, 2022/06/09
- [PULL 40/55] target/arm: Add el_is_in_host,
Peter Maydell <=
- [PULL 37/55] linux-user/aarch64: Introduce sve_vq, Peter Maydell, 2022/06/09
- [PULL 50/55] target/arm: Move expand_pred_b to vec_internal.h, Peter Maydell, 2022/06/09
- Re: [PULL 00/55] target-arm queue, Richard Henderson, 2022/06/09