[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/8] target-arm: Suppress EPD for S2, EL2 and EL3
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-devel] [PATCH v2 5/8] target-arm: Suppress EPD for S2, EL2 and EL3 translations |
Date: |
Sun, 13 Sep 2015 11:07:55 +0200 |
From: "Edgar E. Iglesias" <address@hidden>
Stage-2 translations, EL2 and EL3 regimes don't have the
EPD control.
Signed-off-by: Edgar E. Iglesias <address@hidden>
---
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 9977062..6c67ce2 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -6344,7 +6344,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;
@@ -6438,7 +6438,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) {
+ epd = extract32(tcr->raw_tcr, 7, 1);
+ }
tsz = t0sz;
tg = extract32(tcr->raw_tcr, 14, 2);
--
1.9.1
- [Qemu-devel] [PATCH v2 0/8] arm: Steps towards EL2 support round 4, Edgar E. Iglesias, 2015/09/13
- [Qemu-devel] [PATCH v2 1/8] hw/cpu/{a15mpcore, a9mpcore}: Handle missing has_el3 CPU props gracefully, Edgar E. Iglesias, 2015/09/13
- [Qemu-devel] [PATCH v2 2/8] target-arm: Add VTCR_EL2, Edgar E. Iglesias, 2015/09/13
- [Qemu-devel] [PATCH v2 3/8] target-arm: Add VTTBR_EL2, Edgar E. Iglesias, 2015/09/13
- [Qemu-devel] [PATCH v2 4/8] target-arm: Suppress TBI for S2 translations, Edgar E. Iglesias, 2015/09/13
- [Qemu-devel] [PATCH v2 5/8] target-arm: Suppress EPD for S2, EL2 and EL3 translations,
Edgar E. Iglesias <=
- [Qemu-devel] [PATCH v2 6/8] target-arm: Add VPIDR_EL2, Edgar E. Iglesias, 2015/09/13
- [Qemu-devel] [PATCH v2 7/8] target-arm: Break out mpidr_read_val(), Edgar E. Iglesias, 2015/09/13
- [Qemu-devel] [PATCH v2 8/8] target-arm: Add VMPIDR_EL2, Edgar E. Iglesias, 2015/09/13
- Re: [Qemu-devel] [PATCH v2 0/8] arm: Steps towards EL2 support round 4, Peter Maydell, 2015/09/14