[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 13/29] target/arm: Move regime_using_lpae_format into internal
From: |
Fabiano Rosas |
Subject: |
[PATCH v6 13/29] target/arm: Move regime_using_lpae_format into internal.h |
Date: |
Fri, 17 Feb 2023 17:11:34 -0300 |
This function is needed by common code (ptw.c), so move it along with
the other regime_* functions in internal.h. When we enable the build
without TCG, the tlb_helper.c file will not be present.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/arm/internals.h | 21 ++++++++++++++++++---
target/arm/tcg/tlb_helper.c | 18 ------------------
2 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 22a0451157..6ebe59959e 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -614,9 +614,6 @@ ARMMMUIdx arm_v7m_mmu_idx_for_secstate_and_priv(CPUARMState
*env,
/* Return the MMU index for a v7M CPU in the specified security state */
ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate);
-/* Return true if the translation regime is using LPAE format page tables */
-bool regime_using_lpae_format(CPUARMState *env, ARMMMUIdx mmu_idx);
-
/*
* Return true if the stage 1 translation regime is using LPAE
* format page tables
@@ -781,6 +778,24 @@ static inline uint64_t regime_tcr(CPUARMState *env,
ARMMMUIdx mmu_idx)
return env->cp15.tcr_el[regime_el(env, mmu_idx)];
}
+/* Return true if the translation regime is using LPAE format page tables */
+static inline bool regime_using_lpae_format(CPUARMState *env, ARMMMUIdx
mmu_idx)
+{
+ int el = regime_el(env, mmu_idx);
+ if (el == 2 || arm_el_is_aa64(env, el)) {
+ return true;
+ }
+ if (arm_feature(env, ARM_FEATURE_PMSA) &&
+ arm_feature(env, ARM_FEATURE_V8)) {
+ return true;
+ }
+ if (arm_feature(env, ARM_FEATURE_LPAE)
+ && (regime_tcr(env, mmu_idx) & TTBCR_EAE)) {
+ return true;
+ }
+ return false;
+}
+
/**
* arm_num_brps: Return number of implemented breakpoints.
* Note that the ID register BRPS field is "number of bps - 1",
diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c
index 60abcbebe6..31eb77f7df 100644
--- a/target/arm/tcg/tlb_helper.c
+++ b/target/arm/tcg/tlb_helper.c
@@ -12,24 +12,6 @@
#include "exec/helper-proto.h"
-/* Return true if the translation regime is using LPAE format page tables */
-bool regime_using_lpae_format(CPUARMState *env, ARMMMUIdx mmu_idx)
-{
- int el = regime_el(env, mmu_idx);
- if (el == 2 || arm_el_is_aa64(env, el)) {
- return true;
- }
- if (arm_feature(env, ARM_FEATURE_PMSA) &&
- arm_feature(env, ARM_FEATURE_V8)) {
- return true;
- }
- if (arm_feature(env, ARM_FEATURE_LPAE)
- && (regime_tcr(env, mmu_idx) & TTBCR_EAE)) {
- return true;
- }
- return false;
-}
-
/*
* Returns true if the stage 1 translation regime is using LPAE format page
* tables. Used when raising alignment exceptions, whose FSR changes depending
--
2.35.3
- [PATCH v6 06/29] target/arm: Wrap breakpoint/watchpoint updates with tcg_enabled, (continued)
- [PATCH v6 06/29] target/arm: Wrap breakpoint/watchpoint updates with tcg_enabled, Fabiano Rosas, 2023/02/17
- [PATCH v6 07/29] target/arm: Wrap TCG-only code in debug_helper.c, Fabiano Rosas, 2023/02/17
- [PATCH v6 08/29] target/arm: move translate modules to tcg/, Fabiano Rosas, 2023/02/17
- [PATCH v6 09/29] target/arm: move helpers to tcg/, Fabiano Rosas, 2023/02/17
- [PATCH v6 10/29] target/arm: Move psci.c into the tcg directory, Fabiano Rosas, 2023/02/17
- [PATCH v6 11/29] target/arm: Wrap arm_rebuild_hflags calls with tcg_enabled, Fabiano Rosas, 2023/02/17
- [PATCH v6 12/29] target/arm: Move hflags code into the tcg directory, Fabiano Rosas, 2023/02/17
- [PATCH v6 14/29] target/arm: Don't access TCG code when debugging with KVM, Fabiano Rosas, 2023/02/17
- [PATCH v6 13/29] target/arm: Move regime_using_lpae_format into internal.h,
Fabiano Rosas <=
- [PATCH v6 15/29] cpu-defs.h: Expose CPUTLBEntryFull to non-TCG code, Fabiano Rosas, 2023/02/17
- [PATCH v6 16/29] target/arm: Move cortex sysregs into cpu64.c, Fabiano Rosas, 2023/02/17
- [PATCH v6 17/29] tests/avocado: Skip tests that require a missing accelerator, Fabiano Rosas, 2023/02/17
- [PATCH v6 18/29] tests/avocado: Tag TCG tests with accel:tcg, Fabiano Rosas, 2023/02/17
- [PATCH v6 19/29] target/arm: Move 64-bit TCG CPUs into tcg/, Fabiano Rosas, 2023/02/17
- [PATCH v6 21/29] target/arm: Use "max" as default cpu for the virt machine with KVM, Fabiano Rosas, 2023/02/17
- [PATCH v6 25/29] tests/avocado: add machine:none tag to version.py, Fabiano Rosas, 2023/02/17