mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-arm: Suppress EPD for S2, EL2 and EL3 translations

Browse Source 
Stage-2 translations, EL2 and EL3 regimes don't have the
EPD control.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1442135278-25281-6-git-send-email-edgar.iglesias@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Edgar E. Iglesias 2015-09-14 14:39:50 +01:00 committed by Peter Maydell
parent 1edee4708a
commit 0c5fbf3b4c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target-arm/helper.c
View File

@ -6344,7 +6344,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
/* Read an LPAE long-descriptor translation table. */ /* Read an LPAE long-descriptor translation table. */
MMUFaultType fault_type = translation_fault; MMUFaultType fault_type = translation_fault;
uint32_t level = 1; uint32_t level = 1;
uint32_t epd; uint32_t epd = 0;
int32_t tsz; int32_t tsz;
uint32_t tg; uint32_t tg;
uint64_t ttbr; uint64_t ttbr;
@ -6438,7 +6438,9 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
*/ */
if (ttbr_select == 0) { if (ttbr_select == 0) {
ttbr = regime_ttbr(env, mmu_idx, 0); ttbr = regime_ttbr(env, mmu_idx, 0);
epd = extract32(tcr->raw_tcr, 7, 1); if (el < 2) {
epd = extract32(tcr->raw_tcr, 7, 1);
}
tsz = t0sz; tsz = t0sz;
tg = extract32(tcr->raw_tcr, 14, 2); tg = extract32(tcr->raw_tcr, 14, 2);