[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-4.2 17/24] target/arm: Update arm_mmu_idx fo
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH for-4.2 17/24] target/arm: Update arm_mmu_idx for VHE |
Date: |
Thu, 25 Jul 2019 17:01:28 +0100 |
User-agent: |
mu4e 1.3.3; emacs 27.0.50 |
Richard Henderson <address@hidden> writes:
> This covers initial generation in arm_mmu_idx, and reconstruction
> in core_to_arm_mmu_idx. As a conseqeuence, we also need a bit in
> TBFLAGS in order to make the latter reliable.
>
> Signed-off-by: Richard Henderson <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
> ---
> target/arm/cpu.h | 2 ++
> target/arm/helper.c | 42 +++++++++++++++++++++++++++++++-----------
> 2 files changed, 33 insertions(+), 11 deletions(-)
>
> diff --git a/target/arm/cpu.h b/target/arm/cpu.h
> index 4b537c4613..7310adfd9b 100644
> --- a/target/arm/cpu.h
> +++ b/target/arm/cpu.h
> @@ -3158,6 +3158,8 @@ FIELD(TBFLAG_ANY, PSTATE_SS, 26, 1)
> /* Target EL if we take a floating-point-disabled exception */
> FIELD(TBFLAG_ANY, FPEXC_EL, 24, 2)
> FIELD(TBFLAG_ANY, BE_DATA, 23, 1)
> +/* For A profile only, if EL2 is AA64 and HCR_EL2.E2H is set. */
> +FIELD(TBFLAG_ANY, E2H, 22, 1)
>
> /* Bit usage when in AArch32 state: */
> FIELD(TBFLAG_A32, THUMB, 0, 1)
> diff --git a/target/arm/helper.c b/target/arm/helper.c
> index 2d5658f9e3..54c328b844 100644
> --- a/target/arm/helper.c
> +++ b/target/arm/helper.c
> @@ -11250,21 +11250,29 @@ int fp_exception_el(CPUARMState *env, int cur_el)
>
> ARMMMUIdx core_to_arm_mmu_idx(CPUARMState *env, int mmu_idx)
> {
> + bool e2h;
> +
> if (arm_feature(env, ARM_FEATURE_M)) {
> return mmu_idx | ARM_MMU_IDX_M;
> }
>
> mmu_idx |= ARM_MMU_IDX_A;
> + if (mmu_idx & ARM_MMU_IDX_S) {
> + return mmu_idx;
> + }
> +
> + e2h = (env->cp15.hcr_el2 & HCR_E2H) != 0;
> + if (!arm_el_is_aa64(env, 2)) {
> + e2h = false;
> + }
> +
> switch (mmu_idx) {
> case ARMMMUIdx_E0:
> - return ARMMMUIdx_EL10_0;
> + return e2h ? ARMMMUIdx_EL20_0 : ARMMMUIdx_EL10_0;
> case ARMMMUIdx_E1:
> return ARMMMUIdx_EL10_1;
> case ARMMMUIdx_E2:
> - case ARMMMUIdx_SE0:
> - case ARMMMUIdx_SE1:
> - case ARMMMUIdx_SE3:
> - return mmu_idx;
> + return e2h ? ARMMMUIdx_EL20_2 : ARMMMUIdx_E2;
> default:
> g_assert_not_reached();
> }
> @@ -11292,24 +11300,28 @@ ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState
> *env, bool secstate)
>
> ARMMMUIdx arm_mmu_idx(CPUARMState *env)
> {
> + bool e2h, sec;
> int el;
>
> if (arm_feature(env, ARM_FEATURE_M)) {
> return arm_v7m_mmu_idx_for_secstate(env, env->v7m.secure);
> }
>
> + sec = arm_is_secure_below_el3(env);
> + e2h = (env->cp15.hcr_el2 & HCR_E2H) != 0;
> + if (!arm_el_is_aa64(env, 2)) {
> + e2h = false;
> + }
> +
> el = arm_current_el(env);
> switch (el) {
> case 0:
> - /* TODO: ARMv8.1-VHE */
> + return sec ? ARMMMUIdx_SE0 : e2h ? ARMMMUIdx_EL20_0 :
> ARMMMUIdx_EL10_0;
> case 1:
> - return (arm_is_secure_below_el3(env)
> - ? ARMMMUIdx_SE0 + el
> - : ARMMMUIdx_EL10_0 + el);
> + return sec ? ARMMMUIdx_SE1 : ARMMMUIdx_EL10_1;
> case 2:
> - /* TODO: ARMv8.1-VHE */
> /* TODO: ARMv8.4-SecEL2 */
> - return ARMMMUIdx_E2;
> + return e2h ? ARMMMUIdx_EL20_2 : ARMMMUIdx_E2;
> case 3:
> return ARMMMUIdx_SE3;
> default:
> @@ -11421,6 +11433,14 @@ void cpu_get_tb_cpu_state(CPUARMState *env,
> target_ulong *pc,
>
> flags = FIELD_DP32(flags, TBFLAG_ANY, MMUIDX,
> arm_to_core_mmu_idx(mmu_idx));
>
> + /*
> + * Include E2H in TBFLAGS so that core_to_arm_mmu_idx can
> + * reliably determine E1&0 vs E2&0 regimes.
> + */
> + if (arm_el_is_aa64(env, 2) && (env->cp15.hcr_el2 & HCR_E2H)) {
> + flags = FIELD_DP32(flags, TBFLAG_ANY, E2H, 1);
> + }
> +
> /* The SS_ACTIVE and PSTATE_SS bits correspond to the state machine
> * states defined in the ARM ARM for software singlestep:
> * SS_ACTIVE PSTATE.SS State
--
Alex Bennée
- Re: [Qemu-devel] [PATCH for-4.2 04/24] target/arm: Install ASIDs for short-form from EL1, (continued)
- [Qemu-devel] [PATCH for-4.2 05/24] target/arm: Install ASIDs for EL2, Richard Henderson, 2019/07/19
- [Qemu-devel] [PATCH for-4.2 11/24] target/arm: Add the hypervisor virtual counter, Richard Henderson, 2019/07/19
- [Qemu-devel] [PATCH for-4.2 14/24] target/arm: Simplify tlb_force_broadcast alternatives, Richard Henderson, 2019/07/19
- [Qemu-devel] [PATCH for-4.2 18/24] target/arm: Update arm_sctlr for VHE, Richard Henderson, 2019/07/19
- [Qemu-devel] [PATCH for-4.2 17/24] target/arm: Update arm_mmu_idx for VHE, Richard Henderson, 2019/07/19
- Re: [Qemu-devel] [PATCH for-4.2 17/24] target/arm: Update arm_mmu_idx for VHE,
Alex Bennée <=
- [Qemu-devel] [PATCH for-4.2 13/24] target/arm: Split out vae1_tlbmask, vmalle1_tlbmask, Richard Henderson, 2019/07/19
- [Qemu-devel] [PATCH for-4.2 10/24] target/arm: Update CNTVCT_EL0 for VHE, Richard Henderson, 2019/07/19
- [Qemu-devel] [PATCH for-4.2 21/24] target/arm: Update arm_phys_excp_target_el for TGE, Richard Henderson, 2019/07/19
- [Qemu-devel] [PATCH for-4.2 09/24] target/arm: Add TTBR1_EL2, Richard Henderson, 2019/07/19
- [Qemu-devel] [PATCH for-4.2 12/24] target/arm: Add VHE system register redirection and aliasing, Richard Henderson, 2019/07/19