haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hw/arm/mps2-tz: Make the OSCCLK settings be configurable per-board

Browse source 
The AN505 and AN511 happen to share the same OSCCLK values, but the
AN524 will have a different set (and more of them), so split the
settings out to be per-board.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210215115138.20465-5-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-02-15 11:51:18 +00:00
parent 9f9107e887
commit f7c71b21f2
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
hw/arm/mps2-tz.c
View file

@ -77,6 +77,8 @@ struct MPS2TZMachineClass {
MPS2TZFPGAType fpga_type; MPS2TZFPGAType fpga_type;
uint32_t scc_id; uint32_t scc_id;
uint32_t sysclk_frq; /* Main SYSCLK frequency in Hz */ uint32_t sysclk_frq; /* Main SYSCLK frequency in Hz */
uint32_t len_oscclk;
const uint32_t *oscclk;
const char *armsse_type; const char *armsse_type;
}; };
@ -115,6 +117,12 @@ OBJECT_DECLARE_TYPE(MPS2TZMachineState, MPS2TZMachineClass, MPS2TZ_MACHINE)
/* Slow 32Khz S32KCLK frequency in Hz */ /* Slow 32Khz S32KCLK frequency in Hz */
#define S32KCLK_FRQ (32 * 1000) #define S32KCLK_FRQ (32 * 1000)
static const uint32_t an505_oscclk[] = {
40000000,
24580000,
25000000,
};
/* Create an alias of an entire original MemoryRegion @orig /* Create an alias of an entire original MemoryRegion @orig
* located at @base in the memory map. * located at @base in the memory map.
*/ */
@ -213,17 +221,18 @@ static MemoryRegion *make_scc(MPS2TZMachineState *mms, void *opaque,
MPS2SCC *scc = opaque; MPS2SCC *scc = opaque;
DeviceState *sccdev; DeviceState *sccdev;
MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_GET_CLASS(mms); MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_GET_CLASS(mms);
uint32_t i;
object_initialize_child(OBJECT(mms), "scc", scc, TYPE_MPS2_SCC); object_initialize_child(OBJECT(mms), "scc", scc, TYPE_MPS2_SCC);
sccdev = DEVICE(scc); sccdev = DEVICE(scc);
qdev_prop_set_uint32(sccdev, "scc-cfg4", 0x2); qdev_prop_set_uint32(sccdev, "scc-cfg4", 0x2);
qdev_prop_set_uint32(sccdev, "scc-aid", 0x00200008); qdev_prop_set_uint32(sccdev, "scc-aid", 0x00200008);
qdev_prop_set_uint32(sccdev, "scc-id", mmc->scc_id); qdev_prop_set_uint32(sccdev, "scc-id", mmc->scc_id);
/* This will need to be per-FPGA image eventually */ qdev_prop_set_uint32(sccdev, "len-oscclk", mmc->len_oscclk);
qdev_prop_set_uint32(sccdev, "len-oscclk", 3); for (i = 0; i < mmc->len_oscclk; i++) {
qdev_prop_set_uint32(sccdev, "oscclk[0]", 40000000); g_autofree char *propname = g_strdup_printf("oscclk[%u]", i);
qdev_prop_set_uint32(sccdev, "oscclk[1]", 24580000); qdev_prop_set_uint32(sccdev, propname, mmc->oscclk[i]);
qdev_prop_set_uint32(sccdev, "oscclk[2]", 25000000); }
sysbus_realize(SYS_BUS_DEVICE(scc), &error_fatal); sysbus_realize(SYS_BUS_DEVICE(scc), &error_fatal);
return sysbus_mmio_get_region(SYS_BUS_DEVICE(sccdev), 0); return sysbus_mmio_get_region(SYS_BUS_DEVICE(sccdev), 0);
} }
@ -676,6 +685,8 @@ static void mps2tz_an505_class_init(ObjectClass *oc, void *data)
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33"); mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33");
mmc->scc_id = 0x41045050; mmc->scc_id = 0x41045050;
mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */ mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */
mmc->oscclk = an505_oscclk;
mmc->len_oscclk = ARRAY_SIZE(an505_oscclk);
mmc->armsse_type = TYPE_IOTKIT; mmc->armsse_type = TYPE_IOTKIT;
} }
@ -692,6 +703,8 @@ static void mps2tz_an521_class_init(ObjectClass *oc, void *data)
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33"); mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33");
mmc->scc_id = 0x41045210; mmc->scc_id = 0x41045210;
mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */ mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */
mmc->oscclk = an505_oscclk; /* AN521 is the same as AN505 here */
mmc->len_oscclk = ARRAY_SIZE(an505_oscclk);
mmc->armsse_type = TYPE_SSE200; mmc->armsse_type = TYPE_SSE200;
} }