mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/iotkit: Wire up the dualtimer

Browse Source 
Now we have a model of the CMSDK dual timer, we can wire it
up in the IoTKit.

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: 20180820141116.9118-5-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-08-24 13:17:41 +01:00
parent 4f4c6206ca
commit 017d069d20
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/arm/iotkit.c
View File

@ -139,7 +139,7 @@ static void iotkit_init(Object *obj)
sysbus_init_child_obj(obj, "timer1", &s->timer1, sizeof(s->timer1), sysbus_init_child_obj(obj, "timer1", &s->timer1, sizeof(s->timer1),
TYPE_CMSDK_APB_TIMER); TYPE_CMSDK_APB_TIMER);
sysbus_init_child_obj(obj, "dualtimer", &s->dualtimer, sizeof(s->dualtimer), sysbus_init_child_obj(obj, "dualtimer", &s->dualtimer, sizeof(s->dualtimer),
TYPE_UNIMPLEMENTED_DEVICE); TYPE_CMSDK_APB_DUALTIMER);
object_initialize_child(obj, "ppc-irq-orgate", &s->ppc_irq_orgate, object_initialize_child(obj, "ppc-irq-orgate", &s->ppc_irq_orgate,
sizeof(s->ppc_irq_orgate), TYPE_OR_IRQ, sizeof(s->ppc_irq_orgate), TYPE_OR_IRQ,
&error_abort, NULL); &error_abort, NULL);
@ -390,13 +390,15 @@ static void iotkit_realize(DeviceState *dev, Error **errp)
return; return;
} }
qdev_prop_set_string(DEVICE(&s->dualtimer), "name", "Dual timer");
qdev_prop_set_uint64(DEVICE(&s->dualtimer), "size", 0x1000); qdev_prop_set_uint32(DEVICE(&s->dualtimer), "pclk-frq", s->mainclk_frq);
object_property_set_bool(OBJECT(&s->dualtimer), true, "realized", &err); object_property_set_bool(OBJECT(&s->dualtimer), true, "realized", &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
return; return;
} }
sysbus_connect_irq(SYS_BUS_DEVICE(&s->dualtimer), 0,
qdev_get_gpio_in(DEVICE(&s->armv7m), 5));
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dualtimer), 0); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dualtimer), 0);
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]", &err); object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]", &err);
if (err) { if (err) {

3
include/hw/arm/iotkit.h
View File

@ -56,6 +56,7 @@
#include "hw/misc/tz-ppc.h" #include "hw/misc/tz-ppc.h"
#include "hw/misc/tz-mpc.h" #include "hw/misc/tz-mpc.h"
#include "hw/timer/cmsdk-apb-timer.h" #include "hw/timer/cmsdk-apb-timer.h"
#include "hw/timer/cmsdk-apb-dualtimer.h"
#include "hw/misc/unimp.h" #include "hw/misc/unimp.h"
#include "hw/or-irq.h" #include "hw/or-irq.h"
#include "hw/core/split-irq.h" #include "hw/core/split-irq.h"
@ -87,7 +88,7 @@ typedef struct IoTKit {
SplitIRQ mpc_irq_splitter[IOTS_NUM_EXP_MPC + IOTS_NUM_MPC]; SplitIRQ mpc_irq_splitter[IOTS_NUM_EXP_MPC + IOTS_NUM_MPC];
qemu_or_irq mpc_irq_orgate; qemu_or_irq mpc_irq_orgate;
UnimplementedDeviceState dualtimer; CMSDKAPBDualTimer dualtimer;
UnimplementedDeviceState s32ktimer; UnimplementedDeviceState s32ktimer;
MemoryRegion container; MemoryRegion container;