[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/19] armv7m: Forward init-svtor property to CPU ob
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 07/19] armv7m: Forward init-svtor property to CPU object |
Date: |
Tue, 20 Feb 2018 18:03:13 +0000 |
Create an "init-svtor" property on the armv7m container
object which we can forward to the CPU object.
Signed-off-by: Peter Maydell <address@hidden>
---
include/hw/arm/armv7m.h | 2 ++
hw/arm/armv7m.c | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h
index 5c3f406ccc..78308d1484 100644
--- a/include/hw/arm/armv7m.h
+++ b/include/hw/arm/armv7m.h
@@ -42,6 +42,7 @@ typedef struct {
* that CPU accesses see. (The NVIC, bitbanding and other CPU-internal
* devices will be automatically layered on top of this view.)
* + Property "idau": IDAU interface (forwarded to CPU object)
+ * + Property "init-svtor": secure VTOR reset value (forwarded to CPU object)
*/
typedef struct ARMv7MState {
/*< private >*/
@@ -61,6 +62,7 @@ typedef struct ARMv7MState {
/* MemoryRegion the board provides to us (with its devices, RAM, etc) */
MemoryRegion *board_memory;
Object *idau;
+ uint32_t init_svtor;
} ARMv7MState;
#endif
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 189066812c..149aa07cd5 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -168,6 +168,11 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
error_propagate(errp, err);
return;
}
+ 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);
if (err != NULL) {
error_propagate(errp, err);
@@ -224,6 +229,7 @@ static Property armv7m_properties[] = {
DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION,
MemoryRegion *),
DEFINE_PROP_LINK("idau", ARMv7MState, idau, TYPE_IDAU_INTERFACE, Object *),
+ DEFINE_PROP_UINT32("init-svtor", ARMv7MState, init_svtor, 0),
DEFINE_PROP_END_OF_LIST(),
};
--
2.16.1
- [Qemu-devel] [PATCH 06/19] target/arm: Define init-svtor property for the reset secure VTOR value, (continued)
- [Qemu-devel] [PATCH 06/19] target/arm: Define init-svtor property for the reset secure VTOR value, Peter Maydell, 2018/02/20
- [Qemu-devel] [PATCH 14/19] hw/misc/tz-ppc: Model TrustZone peripheral protection controller, Peter Maydell, 2018/02/20
- [Qemu-devel] [PATCH 16/19] hw/misc/iotkit-secctl: Add handling for PPCs, Peter Maydell, 2018/02/20
- [Qemu-devel] [PATCH 02/19] hw/arm/boot: Honour CPU's address space for image loads, Peter Maydell, 2018/02/20
- [Qemu-devel] [PATCH 04/19] target/arm: Define an IDAU interface, Peter Maydell, 2018/02/20
- [Qemu-devel] [PATCH 07/19] armv7m: Forward init-svtor property to CPU object,
Peter Maydell <=
- [Qemu-devel] [PATCH 12/19] hw/core/split-irq: Device that splits IRQ lines, Peter Maydell, 2018/02/20
- [Qemu-devel] [PATCH 19/19] mps2-an505: New board model: MPS2 with AN505 Cortex-M33 FPGA image, Peter Maydell, 2018/02/20
- [Qemu-devel] [PATCH 18/19] hw/arm/iotkit: Model Arm IOT Kit, Peter Maydell, 2018/02/20
- Re: [Qemu-devel] [PATCH 00/19] Add Cortex-M33 and mps2-an505 board model, no-reply, 2018/02/22