Re: [Qemu-devel] [PATCH 09/22] hw/misc/iotkit-sysinfo: Implement IoTKit system information block

[Philippe Mathieu-Daudé]

On 08/20/2018 11:11 AM, Peter Maydell wrote:
> Implement the IoTKit system control element's system information
> block; this is just a pair of read-only version/config registers,
> plus the usual PID/CID ID registers.
> 
> Signed-off-by: Peter Maydell <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  hw/misc/Makefile.objs            |   1 +
>  include/hw/misc/iotkit-sysinfo.h |  37 +++++++++
>  hw/misc/iotkit-sysinfo.c         | 128 +++++++++++++++++++++++++++++++
>  MAINTAINERS                      |   2 +
>  default-configs/arm-softmmu.mak  |   1 +
>  5 files changed, 169 insertions(+)
>  create mode 100644 include/hw/misc/iotkit-sysinfo.h
>  create mode 100644 hw/misc/iotkit-sysinfo.c
> 
> diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
> index ac1f3bc030c..af2b503824e 100644
> --- a/hw/misc/Makefile.objs
> +++ b/hw/misc/Makefile.objs
> @@ -67,6 +67,7 @@ obj-$(CONFIG_TZ_MPC) += tz-mpc.o
>  obj-$(CONFIG_TZ_PPC) += tz-ppc.o
>  obj-$(CONFIG_IOTKIT_SECCTL) += iotkit-secctl.o
>  obj-$(CONFIG_IOTKIT_SYSCTL) += iotkit-sysctl.o
> +obj-$(CONFIG_IOTKIT_SYSINFO) += iotkit-sysinfo.o
>  
>  obj-$(CONFIG_PVPANIC) += pvpanic.o
>  obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o
> diff --git a/include/hw/misc/iotkit-sysinfo.h 
> b/include/hw/misc/iotkit-sysinfo.h
> new file mode 100644
> index 00000000000..7b2e1a5e48b
> --- /dev/null
> +++ b/include/hw/misc/iotkit-sysinfo.h
> @@ -0,0 +1,37 @@
> +/*
> + * ARM IoTKit system information block
> + *
> + * Copyright (c) 2018 Linaro Limited
> + * Written by Peter Maydell
> + *
> + *  This program is free software; you can redistribute it and/or modify
> + *  it under the terms of the GNU General Public License version 2 or
> + *  (at your option) any later version.
> + */
> +
> +/*
> + * This is a model of the "system information block" which is part of the
> + * Arm IoTKit and documented in
> + * 
> http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ecm0601256/index.html
> + * QEMU interface:
> + *  + sysbus MMIO region 0: the system information register bank
> + */
> +
> +#ifndef HW_MISC_IOTKIT_SYSINFO_H
> +#define HW_MISC_IOTKIT_SYSINFO_H
> +
> +#include "hw/sysbus.h"
> +
> +#define TYPE_IOTKIT_SYSINFO "iotkit-sysinfo"
> +#define IOTKIT_SYSINFO(obj) OBJECT_CHECK(IoTKitSysInfo, (obj), \
> +                                        TYPE_IOTKIT_SYSINFO)
> +
> +typedef struct IoTKitSysInfo {
> +    /*< private >*/
> +    SysBusDevice parent_obj;
> +
> +    /*< public >*/
> +    MemoryRegion iomem;
> +} IoTKitSysInfo;
> +
> +#endif
> diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c
> new file mode 100644
> index 00000000000..78955bc45f5
> --- /dev/null
> +++ b/hw/misc/iotkit-sysinfo.c
> @@ -0,0 +1,128 @@
> +/*
> + * ARM IoTKit system information block
> + *
> + * Copyright (c) 2018 Linaro Limited
> + * Written by Peter Maydell
> + *
> + *  This program is free software; you can redistribute it and/or modify
> + *  it under the terms of the GNU General Public License version 2 or
> + *  (at your option) any later version.
> + */
> +
> +/*
> + * This is a model of the "system information block" which is part of the
> + * Arm IoTKit and documented in
> + * 
> http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ecm0601256/index.html
> + * It consists of 2 read-only version/config registers, plus the
> + * usual ID registers.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu/log.h"
> +#include "trace.h"
> +#include "qapi/error.h"
> +#include "sysemu/sysemu.h"
> +#include "hw/sysbus.h"
> +#include "hw/registerfields.h"
> +#include "hw/misc/iotkit-sysinfo.h"
> +
> +REG32(SYS_VERSION, 0x0)
> +REG32(SYS_CONFIG, 0x4)
> +REG32(PID4, 0xfd0)
> +REG32(PID5, 0xfd4)
> +REG32(PID6, 0xfd8)
> +REG32(PID7, 0xfdc)
> +REG32(PID0, 0xfe0)
> +REG32(PID1, 0xfe4)
> +REG32(PID2, 0xfe8)
> +REG32(PID3, 0xfec)
> +REG32(CID0, 0xff0)
> +REG32(CID1, 0xff4)
> +REG32(CID2, 0xff8)
> +REG32(CID3, 0xffc)
> +
> +/* PID/CID values */
> +static const int sysinfo_id[] = {
> +    0x04, 0x00, 0x00, 0x00, /* PID4..PID7 */
> +    0x58, 0xb8, 0x0b, 0x00, /* PID0..PID3 */
> +    0x0d, 0xf0, 0x05, 0xb1, /* CID0..CID3 */
> +};
> +
> +static uint64_t iotkit_sysinfo_read(void *opaque, hwaddr offset,
> +                                    unsigned size)
> +{
> +    uint64_t r;
> +
> +    switch (offset) {
> +    case A_SYS_VERSION:
> +        r = 0x41743;
> +        break;
> +
> +    case A_SYS_CONFIG:
> +        r = 0x31;
> +        break;
> +    case A_PID4 ... A_CID3:
> +        r = sysinfo_id[(offset - A_PID4) / 4];
> +        break;
> +    default:
> +        qemu_log_mask(LOG_GUEST_ERROR,
> +                      "IoTKit SysInfo read: bad offset %x\n", (int)offset);
> +        r = 0;
> +        break;
> +    }
> +    trace_iotkit_sysinfo_read(offset, r, size);
> +    return r;
> +}
> +
> +static void iotkit_sysinfo_write(void *opaque, hwaddr offset,
> +                                 uint64_t value, unsigned size)
> +{
> +    trace_iotkit_sysinfo_write(offset, value, size);
> +
> +    qemu_log_mask(LOG_GUEST_ERROR,
> +                  "IoTKit SysInfo: write to RO offset 0x%x\n", (int)offset);
> +}
> +
> +static const MemoryRegionOps iotkit_sysinfo_ops = {
> +    .read = iotkit_sysinfo_read,
> +    .write = iotkit_sysinfo_write,
> +    .endianness = DEVICE_LITTLE_ENDIAN,
> +    /* byte/halfword accesses are just zero-padded on reads and writes */
> +    .impl.min_access_size = 4,
> +    .impl.max_access_size = 4,
> +    .valid.min_access_size = 1,
> +    .valid.max_access_size = 4,
> +};
> +
> +static void iotkit_sysinfo_init(Object *obj)
> +{
> +    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
> +    IoTKitSysInfo *s = IOTKIT_SYSINFO(obj);
> +
> +    memory_region_init_io(&s->iomem, obj, &iotkit_sysinfo_ops,
> +                          s, "iotkit-sysinfo", 0x1000);
> +    sysbus_init_mmio(sbd, &s->iomem);
> +}
> +
> +static void iotkit_sysinfo_class_init(ObjectClass *klass, void *data)
> +{
> +    /*
> +     * This device has no guest-modifiable state and so it
> +     * does not need a reset function or VMState.
> +     */
> +}
> +
> +static const TypeInfo iotkit_sysinfo_info = {
> +    .name = TYPE_IOTKIT_SYSINFO,
> +    .parent = TYPE_SYS_BUS_DEVICE,
> +    .instance_size = sizeof(IoTKitSysInfo),
> +    .instance_init = iotkit_sysinfo_init,
> +    .class_init = iotkit_sysinfo_class_init,
> +};
> +
> +static void iotkit_sysinfo_register_types(void)
> +{
> +    type_register_static(&iotkit_sysinfo_info);
> +}
> +
> +type_init(iotkit_sysinfo_register_types);
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ea35aa2cca5..cb780f463cb 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -541,6 +541,8 @@ F: hw/arm/iotkit.c
>  F: include/hw/arm/iotkit.h
>  F: hw/misc/iotkit-sysctl.c
>  F: include/hw/misc/iotkit-sysctl.h
> +F: hw/misc/iotkit-sysinfo.c
> +F: include/hw/misc/iotkit-sysinfo.h
>  
>  Musicpal
>  M: Jan Kiszka <address@hidden>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 79aac7702a9..ebbdcb29f38 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -115,6 +115,7 @@ CONFIG_TZ_PPC=y
>  CONFIG_IOTKIT=y
>  CONFIG_IOTKIT_SECCTL=y
>  CONFIG_IOTKIT_SYSCTL=y
> +CONFIG_IOTKIT_SYSINFO=y
>  
>  CONFIG_VERSATILE=y
>  CONFIG_VERSATILE_PCI=y
>