ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

armv7m: Forward init-svtor property to CPU object 

Create an "init-svtor" property on the armv7m container
object which we can forward to the CPU object.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20180220180325.29818-8-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-03-02 10:45:37 +00:00
parent 38e2a77c9d
commit 60d75d81b5
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/arm/armv7m.c
View File

@ -170,6 +170,14 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
return; return;
} }
} }
if (object_property_find(OBJECT(s->cpu), "init-svtor", NULL)) {
object_property_set_uint(OBJECT(s->cpu), s->init_svtor,
"init-svtor", &err);
if (err != NULL) {
error_propagate(errp, err);
return;
}
}
object_property_set_bool(OBJECT(s->cpu), true, "realized", &err); object_property_set_bool(OBJECT(s->cpu), true, "realized", &err);
if (err != NULL) { if (err != NULL) {
error_propagate(errp, err); error_propagate(errp, err);
@ -226,6 +234,7 @@ static Property armv7m_properties[] = {
DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION, DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION,
MemoryRegion *), MemoryRegion *),
DEFINE_PROP_LINK("idau", ARMv7MState, idau, TYPE_IDAU_INTERFACE, Object *), DEFINE_PROP_LINK("idau", ARMv7MState, idau, TYPE_IDAU_INTERFACE, Object *),
DEFINE_PROP_UINT32("init-svtor", ARMv7MState, init_svtor, 0),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

2
include/hw/arm/armv7m.h
View File

@ -42,6 +42,7 @@ typedef struct {
* that CPU accesses see. (The NVIC, bitbanding and other CPU-internal * that CPU accesses see. (The NVIC, bitbanding and other CPU-internal
* devices will be automatically layered on top of this view.) * devices will be automatically layered on top of this view.)
* + Property "idau": IDAU interface (forwarded to CPU object) * + Property "idau": IDAU interface (forwarded to CPU object)
* + Property "init-svtor": secure VTOR reset value (forwarded to CPU object)
*/ */
typedef struct ARMv7MState { typedef struct ARMv7MState {
/*< private >*/ /*< private >*/
@ -61,6 +62,7 @@ typedef struct ARMv7MState {
/* MemoryRegion the board provides to us (with its devices, RAM, etc) */ /* MemoryRegion the board provides to us (with its devices, RAM, etc) */
MemoryRegion *board_memory; MemoryRegion *board_memory;
Object *idau; Object *idau;
uint32_t init_svtor;
} ARMv7MState; } ARMv7MState;
#endif #endif