From 446587a914cfa57c2ce529056a9ca2215bde7111 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 19 Feb 2021 14:45:43 +0000 Subject: hw/misc/iotkit-sysinfo.c: Implement SYS_CONFIG1 and IIDR For SSE-300, the SYSINFO register block has two new registers: * SYS_CONFIG1 indicates the config for a potential CPU2 and CPU3; since the SSE-300 can only be configured with a single CPU it is always zero * IIDR is the subsystem implementation identity register; its value is set by the SoC integrator, so we plumb this in from the armsse.c code as we do with SYS_VERSION and SYS_CONFIG Signed-off-by: Peter Maydell Tested-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20210219144617.4782-11-peter.maydell@linaro.org --- hw/misc/iotkit-sysinfo.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'hw/misc') diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c index 4bd3fd4c8f..aaa9305b2e 100644 --- a/hw/misc/iotkit-sysinfo.c +++ b/hw/misc/iotkit-sysinfo.c @@ -30,6 +30,8 @@ REG32(SYS_VERSION, 0x0) REG32(SYS_CONFIG, 0x4) +REG32(SYS_CONFIG1, 0x8) +REG32(IIDR, 0xfc8) REG32(PID4, 0xfd0) REG32(PID5, 0xfd4) REG32(PID6, 0xfd8) @@ -70,6 +72,24 @@ static uint64_t iotkit_sysinfo_read(void *opaque, hwaddr offset, case A_SYS_CONFIG: r = s->sys_config; break; + case A_SYS_CONFIG1: + switch (s->sse_version) { + case ARMSSE_SSE300: + return 0; + break; + default: + goto bad_read; + } + break; + case A_IIDR: + switch (s->sse_version) { + case ARMSSE_SSE300: + return s->iidr; + break; + default: + goto bad_read; + } + break; case A_PID4 ... A_CID3: switch (s->sse_version) { case ARMSSE_SSE300: @@ -81,6 +101,7 @@ static uint64_t iotkit_sysinfo_read(void *opaque, hwaddr offset, } break; default: + bad_read: qemu_log_mask(LOG_GUEST_ERROR, "IoTKit SysInfo read: bad offset %x\n", (int)offset); r = 0; @@ -114,6 +135,7 @@ static Property iotkit_sysinfo_props[] = { DEFINE_PROP_UINT32("SYS_VERSION", IoTKitSysInfo, sys_version, 0), DEFINE_PROP_UINT32("SYS_CONFIG", IoTKitSysInfo, sys_config, 0), DEFINE_PROP_UINT32("sse-version", IoTKitSysInfo, sse_version, 0), + DEFINE_PROP_UINT32("IIDR", IoTKitSysInfo, iidr, 0), DEFINE_PROP_END_OF_LIST() }; -- cgit v1.2.3-55-g7522 >
path: root/hw/arm/omap_sx1.c
diff options
context:
space:
mode:
authorKevin Wolf2020-10-20 13:27:22 +0200
committerKevin Wolf2021-03-19 10:17:14 +0100
commit9151e59a8b6e854eb733553c6772351049ca6ab6 (patch)
tree7732e240fff253f03be6ad9bb9239d37a04b456f /hw/arm/omap_sx1.c
parentqapi/qom: Add ObjectOptions for x-remote-object (diff)
downloadqemu-9151e59a8b6e854eb733553c6772351049ca6ab6.tar.gz
qemu-9151e59a8b6e854eb733553c6772351049ca6ab6.tar.xz
qemu-9151e59a8b6e854eb733553c6772351049ca6ab6.zip
qapi/qom: QAPIfy object-add