When wiring struct IMXEPITState to the clock control module, it is currently necessary to reach into its private data. Moreover, when forgetting to wire the clock control module, QEMU will crash after the guest has already started. Fix both by letting struct IMXEPITState expose a link property which is checked at realize time.
Inspired-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Bernhard Beschow <[email protected]> --- hw/arm/fsl-imx25.c | 3 ++- hw/arm/fsl-imx31.c | 3 ++- hw/arm/fsl-imx6.c | 3 ++- hw/arm/fsl-imx6ul.c | 3 ++- hw/timer/imx_epit.c | 14 ++++++++++++++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 0840c2d86a..a8745d5d1a 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -160,7 +160,8 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) { FSL_IMX25_EPIT2_ADDR, FSL_IMX25_EPIT2_IRQ } }; - s->epit[i].ccm = IMX_CCM(&s->ccm); + object_property_set_link(OBJECT(&s->epit[i]), "clock-control-module", + OBJECT(&s->ccm), &error_abort); if (!sysbus_realize(SYS_BUS_DEVICE(&s->epit[i]), errp)) { return; diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index b440ad6e28..79e2f7f795 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -126,7 +126,8 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) { FSL_IMX31_EPIT2_ADDR, FSL_IMX31_EPIT2_IRQ }, }; - s->epit[i].ccm = IMX_CCM(&s->ccm); + object_property_set_link(OBJECT(&s->epit[i]), "clock-control-module", + OBJECT(&s->ccm), &error_abort); if (!sysbus_realize(SYS_BUS_DEVICE(&s->epit[i]), errp)) { return; diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 22deb72496..5bb828fbb6 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -225,7 +225,8 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) { FSL_IMX6_EPIT2_ADDR, FSL_IMX6_EPIT2_IRQ }, }; - s->epit[i].ccm = IMX_CCM(&s->ccm); + object_property_set_link(OBJECT(&s->epit[i]), "clock-control-module", + OBJECT(&s->ccm), &error_abort); if (!sysbus_realize(SYS_BUS_DEVICE(&s->epit[i]), errp)) { return; diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index 2786889bda..f72121e23d 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -270,7 +270,8 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_EPIT2_IRQ, }; - s->epit[i].ccm = IMX_CCM(&s->ccm); + object_property_set_link(OBJECT(&s->epit[i]), "clock-control-module", + OBJECT(&s->ccm), &error_abort); sysbus_realize(SYS_BUS_DEVICE(&s->epit[i]), &error_abort); sysbus_mmio_map(SYS_BUS_DEVICE(&s->epit[i]), 0, diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index 374ec7d324..e1050b51d8 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -17,7 +17,9 @@ #include "hw/timer/imx_epit.h" #include "migration/vmstate.h" #include "hw/core/irq.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/imx_ccm.h" +#include "qapi/error.h" #include "qemu/module.h" #include "qemu/log.h" #include "trace.h" @@ -386,6 +388,12 @@ static void imx_epit_realize(DeviceState *dev, Error **errp) IMXEPITState *s = IMX_EPIT(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + if (!s->ccm) { + error_setg(errp, "%s 'clock-control-module' link property not set", + dev->canonical_path); + return; + } + sysbus_init_irq(sbd, &s->irq); memory_region_init_io(&s->iomem, OBJECT(s), &imx_epit_ops, s, TYPE_IMX_EPIT, 0x00001000); @@ -412,12 +420,18 @@ static void imx_epit_dev_reset(DeviceState *dev) imx_epit_reset(s, true); } +static const Property imx_timer_epit_properties[] = { + DEFINE_PROP_LINK("clock-control-module", IMXEPITState, ccm, TYPE_IMX_CCM, + IMXCCMState *), +}; + static void imx_epit_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = imx_epit_realize; device_class_set_legacy_reset(dc, imx_epit_dev_reset); + device_class_set_props(dc, imx_timer_epit_properties); dc->vmsd = &vmstate_imx_timer_epit; dc->desc = "i.MX periodic timer"; } -- 2.55.0
