[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/16] target/arm: Remove workaround for small SAU re
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 01/16] target/arm: Remove workaround for small SAU regions |
Date: |
Mon, 12 Nov 2018 17:08:01 +0000 |
Before we supported direct execution from MMIO regions, we
implemented workarounds in commit 720424359917887c926a33d2
which let us avoid doing so, even if the SAU or MPU region
was less than page-sized.
Once we implemented execute-from-MMIO, we removed part
of those workarounds in commit d4b6275df320cee76; but
we forgot the one in get_phys_addr_pmsav8() which
suppressed use of small SAU regions in executable regions.
Remove that workaround now.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden
---
target/arm/helper.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 96301930cc8..ec56becc394 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10560,18 +10560,6 @@ static bool get_phys_addr_pmsav8(CPUARMState *env,
uint32_t address,
ret = pmsav8_mpu_lookup(env, address, access_type, mmu_idx, phys_ptr,
txattrs, prot, &mpu_is_subpage, fi, NULL);
- /*
- * TODO: this is a temporary hack to ignore the fact that the SAU region
- * is smaller than a page if this is an executable region. We never
- * supported small MPU regions, but we did (accidentally) allow small
- * SAU regions, and if we now made small SAU regions not be executable
- * then this would break previously working guest code. We can't
- * remove this until/unless we implement support for execution from
- * small regions.
- */
- if (*prot & PAGE_EXEC) {
- sattrs.subpage = false;
- }
*page_size = sattrs.subpage || mpu_is_subpage ? 1 : TARGET_PAGE_SIZE;
return ret;
}
--
2.19.1
- [Qemu-devel] [PULL 13/16] target/arm: Track the state of our irq lines from the GIC explicitly, (continued)
- [Qemu-devel] [PULL 13/16] target/arm: Track the state of our irq lines from the GIC explicitly, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 11/16] arm: fix aa64_generate_debug_exceptions to work with EL2, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 09/16] tests/guest-debug: fix scoping of failcount, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 07/16] target/arm64: hold BQL when calling do_interrupt(), Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 08/16] target/arm64: kvm debug set target_el when passing exception to guest, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 06/16] target/arm64: properly handle DBGVR RESS bits, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 05/16] target/arm: Fix typo in tlbi_aa64_vmalle1_write, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 04/16] hw/arm/sysbus-fdt: Only call match_fn callback if the type matches, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 03/16] MAINTAINERS: Add an entry for the 'collie' machine, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 02/16] target/arm: Remove antique TODO comment, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 01/16] target/arm: Remove workaround for small SAU regions,
Peter Maydell <=
- [Qemu-devel] [PULL 00/16] target-arm queue, Peter Maydell, 2018/11/13