On 3 September 2015 at 21:14, Edgar E. Iglesias
<edgar.igles...@gmail.com> wrote:
> From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com>
>
> Stage-2 translations, EL2 and EL3 regimes don't have the
> EPD control.
>
> Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
> ---
> target-arm/helper.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index 66b3fed..a53d713 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -6323,7 +6323,7 @@ static bool get_phys_addr_lpae(CPUARMState *env,
> target_ulong address,
> /* Read an LPAE long-descriptor translation table. */
> MMUFaultType fault_type = translation_fault;
> uint32_t level = 1;
> - uint32_t epd;
> + uint32_t epd = 0;
> int32_t tsz;
> uint32_t tg;
> uint64_t ttbr;
> @@ -6420,7 +6420,9 @@ static bool get_phys_addr_lpae(CPUARMState *env,
> target_ulong address,
> */
> if (ttbr_select == 0) {
> ttbr = regime_ttbr(env, mmu_idx, 0);
> - epd = extract32(tcr->raw_tcr, 7, 1);
> + if (el < 2 && mmu_idx != ARMMMUIdx_S2NS) {
> + epd = extract32(tcr->raw_tcr, 7, 1);
> + }
Just "if (el < 2)" is sufficient.
Also typo in subject again.
thanks
-- PMM
