[41/44] hw/arm/mps2-tz: Make initsvtor0 setting board-specific

Commit Message

Peter Maydell Feb. 19, 2021, 2:46 p.m. UTC

The AN547 configures the SSE-300 with a different initsvtor0
setting from its default; make this a board-specific setting.

Signed-off-by: Peter Maydell <[e-mail]>
---
 hw/arm/mps2-tz.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Philippe Mathieu-Daudé March 4, 2021, 8:17 p.m. UTC | #1

On 2/19/21 3:46 PM, Peter Maydell wrote:
> The AN547 configures the SSE-300 with a different initsvtor0
> setting from its default; make this a board-specific setting.
> 
> Signed-off-by: Peter Maydell <[e-mail]>
> ---
>  hw/arm/mps2-tz.c | 5 +++++
>  1 file changed, 5 insertions(+)

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>

Richard Henderson March 5, 2021, 1:05 a.m. UTC | #2

On 2/19/21 6:46 AM, Peter Maydell wrote:
> The AN547 configures the SSE-300 with a different initsvtor0
> setting from its default; make this a board-specific setting.
> 
> Signed-off-by: Peter Maydell<[e-mail]>
> ---

Reviewed-by: Richard Henderson <[e-mail]>

r~

Patch

diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 47215f1b97c..bb72f78fb55 100644
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -114,6 +114,7 @@  struct MPS2TZMachineClass {
     bool fpgaio_has_dbgctrl; /* Does FPGAIO have DBGCTRL register? */
     int numirq; /* Number of external interrupts */
     int uart_overflow_irq; /* number of the combined UART overflow IRQ */
+    uint32_t init_svtor; /* init-svtor setting for SSE */
     const RAMInfo *raminfo;
     const char *armsse_type;
 };
@@ -690,6 +691,7 @@  static void mps2tz_common_init(MachineState *machine)
     object_property_set_link(OBJECT(&mms->iotkit), "memory",
                              OBJECT(system_memory), &error_abort);
     qdev_prop_set_uint32(iotkitdev, "EXP_NUMIRQ", mmc->numirq);
+    qdev_prop_set_uint32(iotkitdev, "init-svtor", mmc->init_svtor);
     qdev_connect_clock_in(iotkitdev, "MAINCLK", mms->sysclk);
     qdev_connect_clock_in(iotkitdev, "S32KCLK", mms->s32kclk);
     sysbus_realize(SYS_BUS_DEVICE(&mms->iotkit), &error_fatal);
@@ -1043,6 +1045,7 @@  static void mps2tz_an505_class_init(ObjectClass *oc, void *data)
     mmc->fpgaio_has_dbgctrl = false;
     mmc->numirq = 92;
     mmc->uart_overflow_irq = 47;
+    mmc->init_svtor = 0x10000000;
     mmc->raminfo = an505_raminfo;
     mmc->armsse_type = TYPE_IOTKIT;
     mps2tz_set_default_ram_info(mmc);
@@ -1069,6 +1072,7 @@  static void mps2tz_an521_class_init(ObjectClass *oc, void *data)
     mmc->fpgaio_has_dbgctrl = false;
     mmc->numirq = 92;
     mmc->uart_overflow_irq = 47;
+    mmc->init_svtor = 0x10000000;
     mmc->raminfo = an505_raminfo; /* AN521 is the same as AN505 here */
     mmc->armsse_type = TYPE_SSE200;
     mps2tz_set_default_ram_info(mmc);
@@ -1095,6 +1099,7 @@  static void mps3tz_an524_class_init(ObjectClass *oc, void *data)
     mmc->fpgaio_has_dbgctrl = false;
     mmc->numirq = 95;
     mmc->uart_overflow_irq = 47;
+    mmc->init_svtor = 0x10000000;
     mmc->raminfo = an524_raminfo;
     mmc->armsse_type = TYPE_SSE200;
     mps2tz_set_default_ram_info(mmc);