[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 19/32] target-arm: add MVBAR support
From: |
Greg Bellows |
Subject: |
[Qemu-devel] [PATCH v6 19/32] target-arm: add MVBAR support |
Date: |
Fri, 10 Oct 2014 11:03:30 -0500 |
From: Fabian Aggeler <address@hidden>
Use MVBAR register as exception vector base address for
exceptions taken to CPU monitor mode.
Signed-off-by: Sergey Fedorov <address@hidden>
Signed-off-by: Fabian Aggeler <address@hidden>
Signed-off-by: Greg Bellows <address@hidden>
---
target-arm/cpu.h | 1 +
target-arm/helper.c | 15 +++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 64208bc..7f314ba 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -211,6 +211,7 @@ typedef struct CPUARMState {
uint32_t c9_pminten; /* perf monitor interrupt enables */
uint64_t mair_el1;
uint64_t vbar_el[4]; /* vector base address register */
+ uint64_t mvbar; /* (monitor) vector base address register */
uint32_t c13_fcse; /* FCSE PID. */
uint64_t contextidr_el1; /* Context ID. */
uint64_t tpidr_el0; /* User RW Thread register. */
diff --git a/target-arm/helper.c b/target-arm/helper.c
index d08e4b7..12bf7e4 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -2416,6 +2416,9 @@ static const ARMCPRegInfo v7_el3_cp_reginfo[] = {
.access = PL3_RW | PL1_R, .resetvalue = 0,
.writefn = nsacr_write, .readfn = nsacr_read,
.fieldoffset = offsetof(CPUARMState, cp15.c1_nsacr) },
+ { .name = "MVBAR", .cp = 15, .crn = 12, .crm = 0, .opc1 = 0, .opc2 = 1,
+ .access = PL3_RW, .writefn = vbar_write, .resetvalue = 0,
+ .fieldoffset = offsetof(CPUARMState, cp15.mvbar) },
REGINFO_SENTINEL
};
@@ -4363,16 +4366,16 @@ void arm_cpu_do_interrupt(CPUState *cs)
cpu_abort(cs, "Unhandled exception 0x%x\n", cs->exception_index);
return; /* Never happens. Keep compiler happy. */
}
- /* High vectors. */
- if (env->cp15.c1_sys & SCTLR_V) {
- /* when enabled, base address cannot be remapped. */
+
+ if (new_mode == ARM_CPU_MODE_MON) {
+ addr += env->cp15.mvbar;
+ } else if (env->cp15.c1_sys & SCTLR_V) {
+ /* High vectors. When enabled, base address cannot be remapped. */
addr += 0xffff0000;
} else {
/* ARM v7 architectures provide a vector base address register to remap
* the interrupt vector table.
- * This register is only followed in non-monitor mode, and has a secure
- * and un-secure copy. Since the cpu is always in a un-secure operation
- * and is never in monitor mode this feature is always active.
+ * This register is only followed in non-monitor mode, and is banked.
* Note: only bits 31:5 are valid.
*/
addr += env->cp15.vbar_el[1];
--
1.8.3.2
- Re: [Qemu-devel] [PATCH v6 11/32] target-arm: add CPREG secure state support, (continued)
- [Qemu-devel] [PATCH v6 13/32] target-arm: insert AArch32 cpregs twice into hashtable, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 14/32] target-arm: move AArch32 SCR into security reglist, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 12/32] target-arm: add secure state bit to CPREG hash, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 15/32] target-arm: implement IRQ/FIQ routing to Monitor mode, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 16/32] target-arm: respect SCR.FW, SCR.AW and SCTLR.NMFI, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 18/32] target-arm: add SDER definition, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 17/32] target-arm: add NSACR register, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 20/32] target-arm: add SCTLR_EL3 and make SCTLR banked, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 19/32] target-arm: add MVBAR support,
Greg Bellows <=
- [Qemu-devel] [PATCH v6 21/32] target-arm: make CSSELR banked, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 23/32] target-arm: add TCR_EL3 and make TTBCR banked, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 22/32] target-arm: add TTBR0_EL3 and make TTBR0/1 banked, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 24/32] target-arm: make c2_mask and c2_base_mask banked, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 25/32] target-arm: make DACR banked, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 26/32] target-arm: make IFSR banked, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 27/32] target-arm: make DFSR banked, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 28/32] target-arm: make IFAR/DFAR banked, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 29/32] target-arm: make PAR banked, Greg Bellows, 2014/10/10
- [Qemu-devel] [PATCH v6 31/32] target-arm: make MAIR0/1 banked, Greg Bellows, 2014/10/10