hw/arm/armsse: Add unimplemented-device stubs for MHUs
The SSE-200 has two Message Handling Units (MHUs), which sit behind the APB PPC0. Wire up some unimplemented-device stubs for these, since we don't yet implement a real model of this device. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20190121185118.18550-16-peter.maydell@linaro.org
This commit is contained in:
parent
dde0c49103
commit
f8574705f6
|
@ -30,6 +30,7 @@ struct ARMSSEInfo {
|
|||
int num_cpus;
|
||||
uint32_t sys_version;
|
||||
SysConfigFormat sys_config_format;
|
||||
bool has_mhus;
|
||||
};
|
||||
|
||||
static const ARMSSEInfo armsse_variants[] = {
|
||||
|
@ -39,6 +40,7 @@ static const ARMSSEInfo armsse_variants[] = {
|
|||
.num_cpus = 1,
|
||||
.sys_version = 0x41743,
|
||||
.sys_config_format = IoTKitFormat,
|
||||
.has_mhus = false,
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -257,6 +259,12 @@ static void armsse_init(Object *obj)
|
|||
sizeof(s->sysctl), TYPE_IOTKIT_SYSCTL);
|
||||
sysbus_init_child_obj(obj, "armsse-sysinfo", &s->sysinfo,
|
||||
sizeof(s->sysinfo), TYPE_IOTKIT_SYSINFO);
|
||||
if (info->has_mhus) {
|
||||
sysbus_init_child_obj(obj, "mhu0", &s->mhu[0], sizeof(s->mhu[0]),
|
||||
TYPE_UNIMPLEMENTED_DEVICE);
|
||||
sysbus_init_child_obj(obj, "mhu1", &s->mhu[1], sizeof(s->mhu[1]),
|
||||
TYPE_UNIMPLEMENTED_DEVICE);
|
||||
}
|
||||
object_initialize_child(obj, "nmi-orgate", &s->nmi_orgate,
|
||||
sizeof(s->nmi_orgate), TYPE_OR_IRQ,
|
||||
&error_abort, NULL);
|
||||
|
@ -616,6 +624,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
|
|||
* 0x40000000: timer0
|
||||
* 0x40001000: timer1
|
||||
* 0x40002000: dual timer
|
||||
* 0x40003000: MHU0 (SSE-200 only)
|
||||
* 0x40004000: MHU1 (SSE-200 only)
|
||||
* We must configure and realize each downstream device and connect
|
||||
* it to the appropriate PPC port; then we can realize the PPC and
|
||||
* map its upstream ends to the right place in the container.
|
||||
|
@ -666,6 +676,31 @@ static void armsse_realize(DeviceState *dev, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
if (info->has_mhus) {
|
||||
for (i = 0; i < ARRAY_SIZE(s->mhu); i++) {
|
||||
char *name = g_strdup_printf("MHU%d", i);
|
||||
char *port = g_strdup_printf("port[%d]", i + 3);
|
||||
|
||||
qdev_prop_set_string(DEVICE(&s->mhu[i]), "name", name);
|
||||
qdev_prop_set_uint64(DEVICE(&s->mhu[i]), "size", 0x1000);
|
||||
object_property_set_bool(OBJECT(&s->mhu[i]), true,
|
||||
"realized", &err);
|
||||
if (err) {
|
||||
error_propagate(errp, err);
|
||||
return;
|
||||
}
|
||||
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->mhu[i]), 0);
|
||||
object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr),
|
||||
port, &err);
|
||||
if (err) {
|
||||
error_propagate(errp, err);
|
||||
return;
|
||||
}
|
||||
g_free(name);
|
||||
g_free(port);
|
||||
}
|
||||
}
|
||||
|
||||
object_property_set_bool(OBJECT(&s->apb_ppc0), true, "realized", &err);
|
||||
if (err) {
|
||||
error_propagate(errp, err);
|
||||
|
@ -681,6 +716,12 @@ static void armsse_realize(DeviceState *dev, Error **errp)
|
|||
memory_region_add_subregion(&s->container, 0x40001000, mr);
|
||||
mr = sysbus_mmio_get_region(sbd_apb_ppc0, 2);
|
||||
memory_region_add_subregion(&s->container, 0x40002000, mr);
|
||||
if (info->has_mhus) {
|
||||
mr = sysbus_mmio_get_region(sbd_apb_ppc0, 3);
|
||||
memory_region_add_subregion(&s->container, 0x40003000, mr);
|
||||
mr = sysbus_mmio_get_region(sbd_apb_ppc0, 4);
|
||||
memory_region_add_subregion(&s->container, 0x40004000, mr);
|
||||
}
|
||||
for (i = 0; i < IOTS_APB_PPC0_NUM_PORTS; i++) {
|
||||
qdev_connect_gpio_out_named(dev_secctl, "apb_ppc0_nonsec", i,
|
||||
qdev_get_gpio_in_named(dev_apb_ppc0,
|
||||
|
|
|
@ -78,6 +78,7 @@
|
|||
#include "hw/watchdog/cmsdk-apb-watchdog.h"
|
||||
#include "hw/misc/iotkit-sysctl.h"
|
||||
#include "hw/misc/iotkit-sysinfo.h"
|
||||
#include "hw/misc/unimp.h"
|
||||
#include "hw/or-irq.h"
|
||||
#include "hw/core/split-irq.h"
|
||||
#include "hw/cpu/cluster.h"
|
||||
|
@ -137,6 +138,8 @@ typedef struct ARMSSE {
|
|||
IoTKitSysCtl sysctl;
|
||||
IoTKitSysCtl sysinfo;
|
||||
|
||||
UnimplementedDeviceState mhu[2];
|
||||
|
||||
/*
|
||||
* 'container' holds all devices seen by all CPUs.
|
||||
* 'cpu_container[i]' is the view that CPU i has: this has the
|
||||
|
|
Loading…
Reference in a new issue