Message ID | 20180820141116.9118-5-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show |
Series | MPS devices: FPGAIO, timer, watchdogs, MSC, DMA, SPI | expand |
On 08/20/2018 11:10 AM, Peter Maydell wrote: > 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> > --- > include/hw/arm/iotkit.h | 3 ++- > hw/arm/iotkit.c | 8 +++++--- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/include/hw/arm/iotkit.h b/include/hw/arm/iotkit.h > index 2cddde55dd1..3e6d806e352 100644 > --- a/include/hw/arm/iotkit.h > +++ b/include/hw/arm/iotkit.h > @@ -56,6 +56,7 @@ > #include "hw/misc/tz-ppc.h" > #include "hw/misc/tz-mpc.h" > #include "hw/timer/cmsdk-apb-timer.h" > +#include "hw/timer/cmsdk-apb-dualtimer.h" > #include "hw/misc/unimp.h" > #include "hw/or-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]; > qemu_or_irq mpc_irq_orgate; > > - UnimplementedDeviceState dualtimer; > + CMSDKAPBDualTimer dualtimer; > UnimplementedDeviceState s32ktimer; > > MemoryRegion container; > diff --git a/hw/arm/iotkit.c b/hw/arm/iotkit.c > index 8cadc8b1608..130d013909e 100644 > --- a/hw/arm/iotkit.c > +++ b/hw/arm/iotkit.c > @@ -139,7 +139,7 @@ static void iotkit_init(Object *obj) > sysbus_init_child_obj(obj, "timer1", &s->timer1, sizeof(s->timer1), > TYPE_CMSDK_APB_TIMER); > 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, > sizeof(s->ppc_irq_orgate), TYPE_OR_IRQ, > &error_abort, NULL); > @@ -390,13 +390,15 @@ static void iotkit_realize(DeviceState *dev, Error **errp) > 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); > if (err) { > error_propagate(errp, err); > 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); > object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]", &err); > if (err) { >
On 08/20/2018 07:10 AM, Peter Maydell wrote: > 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> > --- > include/hw/arm/iotkit.h | 3 ++- > hw/arm/iotkit.c | 8 +++++--- > 2 files changed, 7 insertions(+), 4 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/include/hw/arm/iotkit.h b/include/hw/arm/iotkit.h index 2cddde55dd1..3e6d806e352 100644 --- a/include/hw/arm/iotkit.h +++ b/include/hw/arm/iotkit.h @@ -56,6 +56,7 @@ #include "hw/misc/tz-ppc.h" #include "hw/misc/tz-mpc.h" #include "hw/timer/cmsdk-apb-timer.h" +#include "hw/timer/cmsdk-apb-dualtimer.h" #include "hw/misc/unimp.h" #include "hw/or-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]; qemu_or_irq mpc_irq_orgate; - UnimplementedDeviceState dualtimer; + CMSDKAPBDualTimer dualtimer; UnimplementedDeviceState s32ktimer; MemoryRegion container; diff --git a/hw/arm/iotkit.c b/hw/arm/iotkit.c index 8cadc8b1608..130d013909e 100644 --- a/hw/arm/iotkit.c +++ b/hw/arm/iotkit.c @@ -139,7 +139,7 @@ static void iotkit_init(Object *obj) sysbus_init_child_obj(obj, "timer1", &s->timer1, sizeof(s->timer1), TYPE_CMSDK_APB_TIMER); 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, sizeof(s->ppc_irq_orgate), TYPE_OR_IRQ, &error_abort, NULL); @@ -390,13 +390,15 @@ static void iotkit_realize(DeviceState *dev, Error **errp) 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); if (err) { error_propagate(errp, err); 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); object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[2]", &err); if (err) {
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> --- include/hw/arm/iotkit.h | 3 ++- hw/arm/iotkit.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-)