[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/12] arm/arm-powerctl: rebuild hflags after setting CP15 bits in
From: |
Peter Maydell |
Subject: |
[PULL 12/12] arm/arm-powerctl: rebuild hflags after setting CP15 bits in arm_set_cpu_on() |
Date: |
Fri, 20 Dec 2019 14:26:44 +0000 |
From: Niek Linnenbank <address@hidden>
After setting CP15 bits in arm_set_cpu_on() the cached hflags must
be rebuild to reflect the changed processor state. Without rebuilding,
the cached hflags would be inconsistent until the next call to
arm_rebuild_hflags(). When QEMU is compiled with debugging enabled
(--enable-debug), this problem is captured shortly after the first
call to arm_set_cpu_on() for CPUs running in ARM 32-bit non-secure mode:
qemu-system-arm: target/arm/helper.c:11359: cpu_get_tb_cpu_state:
Assertion `flags == rebuild_hflags_internal(env)' failed.
Aborted (core dumped)
Fixes: 0c7f8c43daf65
Cc: address@hidden
Signed-off-by: Niek Linnenbank <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
target/arm/arm-powerctl.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/target/arm/arm-powerctl.c b/target/arm/arm-powerctl.c
index b064513d44a..b75f813b403 100644
--- a/target/arm/arm-powerctl.c
+++ b/target/arm/arm-powerctl.c
@@ -127,6 +127,9 @@ static void arm_set_cpu_on_async_work(CPUState
*target_cpu_state,
target_cpu->env.regs[0] = info->context_id;
}
+ /* CP15 update requires rebuilding hflags */
+ arm_rebuild_hflags(&target_cpu->env);
+
/* Start the new CPU at the requested address */
cpu_set_pc(target_cpu_state, info->entry);
--
2.20.1
- [PULL 02/12] target/arm: Abstract the generic timer frequency, (continued)
- [PULL 02/12] target/arm: Abstract the generic timer frequency, Peter Maydell, 2019/12/20
- [PULL 03/12] target/arm: Prepare generic timer for per-platform CNTFRQ, Peter Maydell, 2019/12/20
- [PULL 04/12] ast2600: Configure CNTFRQ at 1125MHz, Peter Maydell, 2019/12/20
- [PULL 05/12] hw/arm/smmuv3: Apply address mask to linear strtab base address, Peter Maydell, 2019/12/20
- [PULL 06/12] hw/arm/smmuv3: Correct SMMU_BASE_ADDR_MASK value, Peter Maydell, 2019/12/20
- [PULL 07/12] hw/arm/smmuv3: Check stream IDs against actual table LOG2SIZE, Peter Maydell, 2019/12/20
- [PULL 08/12] hw/arm/smmuv3: Align stream table base address to table size, Peter Maydell, 2019/12/20
- [PULL 09/12] hw/arm/smmuv3: Use correct bit positions in EVT_SET_ADDR2 macro, Peter Maydell, 2019/12/20
- [PULL 10/12] hw/arm/smmuv3: Report F_STE_FETCH fault address in correct word position, Peter Maydell, 2019/12/20
- [PULL 11/12] target/arm: Display helpful message when hflags mismatch, Peter Maydell, 2019/12/20
- [PULL 12/12] arm/arm-powerctl: rebuild hflags after setting CP15 bits in arm_set_cpu_on(),
Peter Maydell <=