[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 23/26] target-arm: make VBAR banked
From: |
Greg Bellows |
Subject: |
[Qemu-devel] [PATCH v11 23/26] target-arm: make VBAR banked |
Date: |
Mon, 17 Nov 2014 10:47:55 -0600 |
When EL3 is running in Aarch32 (or ARMv7 with Security Extensions)
VBAR has a secure and a non-secure instance, which are mapped to
VBAR_EL1 and VBAR_EL3.
Signed-off-by: Fabian Aggeler <address@hidden>
Signed-off-by: Greg Bellows <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
v8 -> v9
- Revert unnecessary CPreg definition changes
v5 -> v6
- Changed _el field variants to be array based
- Merged VBAR and VBAR_EL1 reginfo entries
v3 -> v4
- Fix vbar union/structure definition
- Revert back to array-based vbar definition combined with v7 naming
---
target-arm/cpu.h | 10 +++++++++-
target-arm/helper.c | 5 +++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 2f8d607..fc64497 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -297,7 +297,15 @@ typedef struct CPUARMState {
uint32_t c9_pmuserenr; /* perf monitor user enable */
uint32_t c9_pminten; /* perf monitor interrupt enables */
uint64_t mair_el1;
- uint64_t vbar_el[4]; /* vector base address register */
+ union { /* vector base address register */
+ struct {
+ uint64_t _unused_vbar;
+ uint64_t vbar_ns;
+ uint64_t hvbar;
+ uint64_t vbar_s;
+ };
+ uint64_t vbar_el[4];
+ };
uint32_t mvbar; /* (monitor) vector base address register */
uint32_t c13_fcse; /* FCSE PID. */
uint64_t contextidr_el1; /* Context ID. */
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 081c00e..69f2e68 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -911,7 +911,8 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
{ .name = "VBAR", .state = ARM_CP_STATE_BOTH,
.opc0 = 3, .crn = 12, .crm = 0, .opc1 = 0, .opc2 = 0,
.access = PL1_RW, .writefn = vbar_write,
- .fieldoffset = offsetof(CPUARMState, cp15.vbar_el[1]),
+ .bank_fieldoffsets = { offsetof(CPUARMState, cp15.vbar_s),
+ offsetof(CPUARMState, cp15.vbar_ns) },
.resetvalue = 0 },
{ .name = "CCSIDR", .state = ARM_CP_STATE_BOTH,
.opc0 = 3, .crn = 0, .crm = 0, .opc1 = 1, .opc2 = 0,
@@ -4401,7 +4402,7 @@ void arm_cpu_do_interrupt(CPUState *cs)
* 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];
+ addr += A32_BANKED_CURRENT_REG_GET(env, vbar);
}
if ((env->uncached_cpsr & CPSR_M) == ARM_CPU_MODE_MON) {
--
1.8.3.2
- [Qemu-devel] [PATCH v11 12/26] target-arm: add MVBAR support, (continued)
- [Qemu-devel] [PATCH v11 12/26] target-arm: add MVBAR support, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 14/26] target-arm: respect SCR.FW, SCR.AW and SCTLR.NMFI, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 13/26] target-arm: add SCTLR_EL3 and make SCTLR banked, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 15/26] target-arm: make CSSELR banked, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 16/26] target-arm: make TTBR0/1 banked, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 17/26] target-arm: make TTBCR banked, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 18/26] target-arm: make DACR banked, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 19/26] target-arm: make IFSR banked, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 20/26] target-arm: make DFSR banked, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 21/26] target-arm: make IFAR/DFAR banked, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 23/26] target-arm: make VBAR banked,
Greg Bellows <=
- [Qemu-devel] [PATCH v11 24/26] target-arm: make c13 cp regs banked (FCSEIDR, ...), Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 22/26] target-arm: make PAR banked, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 26/26] target-arm: add cpu feature EL3 to CPUs with Security Extensions, Greg Bellows, 2014/11/17
- [Qemu-devel] [PATCH v11 25/26] target-arm: make MAIR0/1 banked, Greg Bellows, 2014/11/17
- Re: [Qemu-devel] [PATCH v11 00/26] target-arm: add Security Extensions for CPUs, Peter Maydell, 2014/11/25