haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

target/arm: Make MPU_RBAR, MPU_RLAR banked for v8M

Browse source 
Make the MPU registers MPU_MAIR0 and MPU_MAIR1 banked if v8M security
extensions are enabled.

We can freely add more items to vmstate_m_security without
breaking migration compatibility, because no CPU currently
has the ARM_FEATURE_M_SECURITY bit enabled and so this
subsection is not yet used by anything.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 1503414539-28762-14-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2017-09-07 13:54:53 +01:00
parent 4125e6feb7
commit 62c58ee0b2
5 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hw/intc/armv7m_nvic.c
View file

@ -564,7 +564,7 @@ static uint32_t nvic_readl(NVICState *s, uint32_t offset, MemTxAttrs attrs)
if (region >= cpu->pmsav7_dregion) { if (region >= cpu->pmsav7_dregion) {
return 0; return 0;
} }
return cpu->env.pmsav8.rbar[region]; return cpu->env.pmsav8.rbar[attrs.secure][region];
} }
if (region >= cpu->pmsav7_dregion) { if (region >= cpu->pmsav7_dregion) {
@ -591,7 +591,7 @@ static uint32_t nvic_readl(NVICState *s, uint32_t offset, MemTxAttrs attrs)
if (region >= cpu->pmsav7_dregion) { if (region >= cpu->pmsav7_dregion) {
return 0; return 0;
} }
return cpu->env.pmsav8.rlar[region]; return cpu->env.pmsav8.rlar[attrs.secure][region];
} }
if (region >= cpu->pmsav7_dregion) { if (region >= cpu->pmsav7_dregion) {
@ -756,7 +756,7 @@ static void nvic_writel(NVICState *s, uint32_t offset, uint32_t value,
if (region >= cpu->pmsav7_dregion) { if (region >= cpu->pmsav7_dregion) {
return; return;
} }
cpu->env.pmsav8.rbar[region] = value; cpu->env.pmsav8.rbar[attrs.secure][region] = value;
tlb_flush(CPU(cpu)); tlb_flush(CPU(cpu));
return; return;
} }
@ -806,7 +806,7 @@ static void nvic_writel(NVICState *s, uint32_t offset, uint32_t value,
if (region >= cpu->pmsav7_dregion) { if (region >= cpu->pmsav7_dregion) {
return; return;
} }
cpu->env.pmsav8.rlar[region] = value; cpu->env.pmsav8.rlar[attrs.secure][region] = value;
tlb_flush(CPU(cpu)); tlb_flush(CPU(cpu));
return; return;
} }

26
target/arm/cpu.c
View file

@ -235,10 +235,20 @@ static void arm_cpu_reset(CPUState *s)
if (arm_feature(env, ARM_FEATURE_PMSA)) { if (arm_feature(env, ARM_FEATURE_PMSA)) {
if (cpu->pmsav7_dregion > 0) { if (cpu->pmsav7_dregion > 0) {
if (arm_feature(env, ARM_FEATURE_V8)) { if (arm_feature(env, ARM_FEATURE_V8)) {
memset(env->pmsav8.rbar, 0, memset(env->pmsav8.rbar[M_REG_NS], 0,
sizeof(*env->pmsav8.rbar) * cpu->pmsav7_dregion); sizeof(*env->pmsav8.rbar[M_REG_NS])
memset(env->pmsav8.rlar, 0, * cpu->pmsav7_dregion);
sizeof(*env->pmsav8.rlar) * cpu->pmsav7_dregion); memset(env->pmsav8.rlar[M_REG_NS], 0,
sizeof(*env->pmsav8.rlar[M_REG_NS])
* cpu->pmsav7_dregion);
if (arm_feature(env, ARM_FEATURE_M_SECURITY)) {
memset(env->pmsav8.rbar[M_REG_S], 0,
sizeof(*env->pmsav8.rbar[M_REG_S])
* cpu->pmsav7_dregion);
memset(env->pmsav8.rlar[M_REG_S], 0,
sizeof(*env->pmsav8.rlar[M_REG_S])
* cpu->pmsav7_dregion);
}
} else if (arm_feature(env, ARM_FEATURE_V7)) { } else if (arm_feature(env, ARM_FEATURE_V7)) {
memset(env->pmsav7.drbar, 0, memset(env->pmsav7.drbar, 0,
sizeof(*env->pmsav7.drbar) * cpu->pmsav7_dregion); sizeof(*env->pmsav7.drbar) * cpu->pmsav7_dregion);
@ -825,8 +835,12 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
if (nr) { if (nr) {
if (arm_feature(env, ARM_FEATURE_V8)) { if (arm_feature(env, ARM_FEATURE_V8)) {
/* PMSAv8 */ /* PMSAv8 */
env->pmsav8.rbar = g_new0(uint32_t, nr); env->pmsav8.rbar[M_REG_NS] = g_new0(uint32_t, nr);
env->pmsav8.rlar = g_new0(uint32_t, nr); env->pmsav8.rlar[M_REG_NS] = g_new0(uint32_t, nr);
if (arm_feature(env, ARM_FEATURE_M_SECURITY)) {
env->pmsav8.rbar[M_REG_S] = g_new0(uint32_t, nr);
env->pmsav8.rlar[M_REG_S] = g_new0(uint32_t, nr);
}
} else { } else {
env->pmsav7.drbar = g_new0(uint32_t, nr); env->pmsav7.drbar = g_new0(uint32_t, nr);
env->pmsav7.drsr = g_new0(uint32_t, nr); env->pmsav7.drsr = g_new0(uint32_t, nr);

4
target/arm/cpu.h
View file

@ -543,8 +543,8 @@ typedef struct CPUARMState {
* pmsav7.rnr (region number register) * pmsav7.rnr (region number register)
* pmsav7_dregion (number of configured regions) * pmsav7_dregion (number of configured regions)
*/ */
uint32_t *rbar; uint32_t *rbar[2];
uint32_t *rlar; uint32_t *rlar[2];
uint32_t mair0[2]; uint32_t mair0[2];
uint32_t mair1[2]; uint32_t mair1[2];
} pmsav8; } pmsav8;

11
target/arm/helper.c
View file

@ -8437,6 +8437,7 @@ static bool get_phys_addr_pmsav8(CPUARMState *env, uint32_t address,
{ {
ARMCPU *cpu = arm_env_get_cpu(env); ARMCPU *cpu = arm_env_get_cpu(env);
bool is_user = regime_is_user(env, mmu_idx); bool is_user = regime_is_user(env, mmu_idx);
uint32_t secure = regime_is_secure(env, mmu_idx);
int n; int n;
int matchregion = -1; int matchregion = -1;
bool hit = false; bool hit = false;
@ -8463,10 +8464,10 @@ static bool get_phys_addr_pmsav8(CPUARMState *env, uint32_t address,
* with bits [4:0] all zeroes, but the limit address is bits * with bits [4:0] all zeroes, but the limit address is bits
* [31:5] from the register with bits [4:0] all ones. * [31:5] from the register with bits [4:0] all ones.
*/ */
uint32_t base = env->pmsav8.rbar[n] & ~0x1f; uint32_t base = env->pmsav8.rbar[secure][n] & ~0x1f;
uint32_t limit = env->pmsav8.rlar[n] | 0x1f; uint32_t limit = env->pmsav8.rlar[secure][n] | 0x1f;
if (!(env->pmsav8.rlar[n] & 0x1)) { if (!(env->pmsav8.rlar[secure][n] & 0x1)) {
/* Region disabled */ /* Region disabled */
continue; continue;
} }
@ -8515,8 +8516,8 @@ static bool get_phys_addr_pmsav8(CPUARMState *env, uint32_t address,
/* hit using the background region */ /* hit using the background region */
get_phys_addr_pmsav7_default(env, mmu_idx, address, prot); get_phys_addr_pmsav7_default(env, mmu_idx, address, prot);
} else { } else {
uint32_t ap = extract32(env->pmsav8.rbar[matchregion], 1, 2); uint32_t ap = extract32(env->pmsav8.rbar[secure][matchregion], 1, 2);
uint32_t xn = extract32(env->pmsav8.rbar[matchregion], 0, 1); uint32_t xn = extract32(env->pmsav8.rbar[secure][matchregion], 0, 1);
if (m_is_system_region(env, address)) { if (m_is_system_region(env, address)) {
/* System space is always execute never */ /* System space is always execute never */

12
target/arm/machine.c
View file

@ -225,10 +225,10 @@ static const VMStateDescription vmstate_pmsav8 = {
.minimum_version_id = 1, .minimum_version_id = 1,
.needed = pmsav8_needed, .needed = pmsav8_needed,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_VARRAY_UINT32(env.pmsav8.rbar, ARMCPU, pmsav7_dregion, 0, VMSTATE_VARRAY_UINT32(env.pmsav8.rbar[M_REG_NS], ARMCPU, pmsav7_dregion,
vmstate_info_uint32, uint32_t), 0, vmstate_info_uint32, uint32_t),
VMSTATE_VARRAY_UINT32(env.pmsav8.rlar, ARMCPU, pmsav7_dregion, 0, VMSTATE_VARRAY_UINT32(env.pmsav8.rlar[M_REG_NS], ARMCPU, pmsav7_dregion,
vmstate_info_uint32, uint32_t), 0, vmstate_info_uint32, uint32_t),
VMSTATE_UINT32(env.pmsav8.mair0[M_REG_NS], ARMCPU), VMSTATE_UINT32(env.pmsav8.mair0[M_REG_NS], ARMCPU),
VMSTATE_UINT32(env.pmsav8.mair1[M_REG_NS], ARMCPU), VMSTATE_UINT32(env.pmsav8.mair1[M_REG_NS], ARMCPU),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
@ -257,6 +257,10 @@ static const VMStateDescription vmstate_m_security = {
VMSTATE_UINT32(env.v7m.vecbase[M_REG_S], ARMCPU), VMSTATE_UINT32(env.v7m.vecbase[M_REG_S], ARMCPU),
VMSTATE_UINT32(env.pmsav8.mair0[M_REG_S], ARMCPU), VMSTATE_UINT32(env.pmsav8.mair0[M_REG_S], ARMCPU),
VMSTATE_UINT32(env.pmsav8.mair1[M_REG_S], ARMCPU), VMSTATE_UINT32(env.pmsav8.mair1[M_REG_S], ARMCPU),
VMSTATE_VARRAY_UINT32(env.pmsav8.rbar[M_REG_S], ARMCPU, pmsav7_dregion,
0, vmstate_info_uint32, uint32_t),
VMSTATE_VARRAY_UINT32(env.pmsav8.rlar[M_REG_S], ARMCPU, pmsav7_dregion,
0, vmstate_info_uint32, uint32_t),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };