summaryrefslogtreecommitdiffstats
path: root/include/hw/misc
diff options
context:
space:
mode:
authorPeter Maydell2019-02-28 11:55:16 +0100
committerPeter Maydell2019-02-28 12:03:04 +0100
commitaab7a3786f085cb4c6842c3c8ea0c86e2c835248 (patch)
tree7092ff3025bb665a92832a83a3d313c6f9089a8f /include/hw/misc
parenthw/arm/iotkit-sysctl: Implement CPUWAIT and INITSVTOR* (diff)
downloadqemu-aab7a3786f085cb4c6842c3c8ea0c86e2c835248.tar.gz
qemu-aab7a3786f085cb4c6842c3c8ea0c86e2c835248.tar.xz
qemu-aab7a3786f085cb4c6842c3c8ea0c86e2c835248.zip
hw/arm/armsse: Unify init-svtor and cpuwait handling
At the moment the handling of init-svtor and cpuwait initial values is split between armsse.c and iotkit-sysctl.c: the code in armsse.c sets the initial state of the CPU object by setting the init-svtor and start-powered-off properties, but the iotkit-sysctl.c code has its own code setting the reset values of its registers (which are then used when updating the CPU when the guest makes runtime changes). Clean this up by making the armsse.c code set properties on the iotkit-sysctl object to define the initial values of the registers, so they always match the initial CPU state, and update the comments in armsse.c accordingly. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20190219125808.25174-9-peter.maydell@linaro.org
Diffstat (limited to 'include/hw/misc')
-rw-r--r--include/hw/misc/iotkit-sysctl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/misc/iotkit-sysctl.h b/include/hw/misc/iotkit-sysctl.h
index 9c2f23ecd2..601c8ecc0d 100644
--- a/include/hw/misc/iotkit-sysctl.h
+++ b/include/hw/misc/iotkit-sysctl.h
@@ -62,6 +62,9 @@ typedef struct IoTKitSysCtl {
/* Properties */
uint32_t sys_version;
+ uint32_t cpuwait_rst;
+ uint32_t initsvtor0_rst;
+ uint32_t initsvtor1_rst;
bool is_sse200;
} IoTKitSysCtl;