On 08/20/2018 11:11 AM, Peter Maydell wrote:
> Wire up the system control element's register banks
> (sysctl and sysinfo).
>
> This is the last of the previously completely unimplemented
> components in the IoTKit.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> include/hw/arm/iotkit.h | 6 +++++-
> hw/arm/iotkit.c | 26 ++++++++++++++++++--------
> 2 files changed, 23 insertions(+), 9 deletions(-)
>
> diff --git a/include/hw/arm/iotkit.h b/include/hw/arm/iotkit.h
> index 0f5c5101708..426dc326a0d 100644
> --- a/include/hw/arm/iotkit.h
> +++ b/include/hw/arm/iotkit.h
> @@ -58,7 +58,8 @@
> #include "hw/timer/cmsdk-apb-timer.h"
> #include "hw/timer/cmsdk-apb-dualtimer.h"
> #include "hw/watchdog/cmsdk-apb-watchdog.h"
> -#include "hw/misc/unimp.h"
> +#include "hw/misc/iotkit-sysctl.h"
> +#include "hw/misc/iotkit-sysinfo.h"
> #include "hw/or-irq.h"
> #include "hw/core/split-irq.h"
>
> @@ -97,6 +98,9 @@ typedef struct IoTKit {
> CMSDKAPBWatchdog nswatchdog;
> CMSDKAPBWatchdog swatchdog;
>
> + IoTKitSysCtl sysctl;
> + IoTKitSysCtl sysinfo;
> +
> MemoryRegion container;
> MemoryRegion alias1;
> MemoryRegion alias2;
> diff --git a/hw/arm/iotkit.c b/hw/arm/iotkit.c
> index cb0ec456f39..f8276b5425c 100644
> --- a/hw/arm/iotkit.c
> +++ b/hw/arm/iotkit.c
> @@ -16,7 +16,6 @@
> #include "hw/sysbus.h"
> #include "hw/registerfields.h"
> #include "hw/arm/iotkit.h"
> -#include "hw/misc/unimp.h"
> #include "hw/arm/arm.h"
>
> /* Clock frequency in HZ of the 32KHz "slow clock" */
> @@ -151,6 +150,10 @@ static void iotkit_init(Object *obj)
> sizeof(s->nswatchdog), TYPE_CMSDK_APB_WATCHDOG);
> sysbus_init_child_obj(obj, "swatchdog", &s->swatchdog,
> sizeof(s->swatchdog), TYPE_CMSDK_APB_WATCHDOG);
> + sysbus_init_child_obj(obj, "iotkit-sysctl", &s->sysctl,
> + sizeof(s->sysctl), TYPE_IOTKIT_SYSCTL);
> + sysbus_init_child_obj(obj, "iotkit-sysinfo", &s->sysinfo,
> + sizeof(s->sysinfo), TYPE_IOTKIT_SYSINFO);
> object_initialize_child(obj, "nmi-orgate", &s->nmi_orgate,
> sizeof(s->nmi_orgate), TYPE_OR_IRQ,
> &error_abort, NULL);
> @@ -516,13 +519,20 @@ static void iotkit_realize(DeviceState *dev, Error
> **errp)
> qdev_get_gpio_in_named(dev_apb_ppc1,
> "cfg_sec_resp", 0));
>
> - /* Using create_unimplemented_device() maps the stub into the
> - * system address space rather than into our container, but the
> - * overall effect to the guest is the same.
> - */
> - create_unimplemented_device("SYSINFO", 0x40020000, 0x1000);
> -
> - create_unimplemented_device("SYSCONTROL", 0x50021000, 0x1000);
> + object_property_set_bool(OBJECT(&s->sysinfo), true, "realized", &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> + }
> + /* System information registers */
> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysinfo), 0, 0x40020000);
> + /* System control registers */
> + object_property_set_bool(OBJECT(&s->sysctl), true, "realized", &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> + }
> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysctl), 0, 0x50021000);
>
> /* This OR gate wires together outputs from the secure watchdogs to NMI
> */
> object_property_set_int(OBJECT(&s->nmi_orgate), 2, "num-lines", &err);
>
