OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/misc/iotkit-sysctl: Correct typo in INITSVTOR0 register name 

The iotkit-sysctl device has a register it names INITSVRTOR0.
This is actually a typo present in the IoTKit documentation
and also in part of the SSE-200 documentation:  it should be
INITSVTOR0 because it is specifying the initial value of the
Secure VTOR register in the CPU. Correct the typo.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190219125808.25174-6-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2019-02-28 10:55:16 +00:00
parent ea824b9742
commit 394e10d2bb
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/misc/iotkit-sysctl.c
View File

@ -33,7 +33,7 @@ REG32(RESET_MASK, 0x104)
REG32(SWRESET, 0x108) REG32(SWRESET, 0x108)
FIELD(SWRESET, SWRESETREQ, 9, 1) FIELD(SWRESET, SWRESETREQ, 9, 1)
REG32(GRETREG, 0x10c) REG32(GRETREG, 0x10c)
REG32(INITSVRTOR0, 0x110) REG32(INITSVTOR0, 0x110)
REG32(CPUWAIT, 0x118) REG32(CPUWAIT, 0x118)
REG32(BUSWAIT, 0x11c) REG32(BUSWAIT, 0x11c)
REG32(WICCTRL, 0x120) REG32(WICCTRL, 0x120)
@ -76,8 +76,8 @@ static uint64_t iotkit_sysctl_read(void *opaque, hwaddr offset,
case A_GRETREG: case A_GRETREG:
r = s->gretreg; r = s->gretreg;
break; break;
case A_INITSVRTOR0: case A_INITSVTOR0:
r = s->initsvrtor0; r = s->initsvtor0;
break; break;
case A_CPUWAIT: case A_CPUWAIT:
r = s->cpuwait; r = s->cpuwait;
@ -145,9 +145,9 @@ static void iotkit_sysctl_write(void *opaque, hwaddr offset,
*/ */
s->gretreg = value; s->gretreg = value;
break; break;
case A_INITSVRTOR0: case A_INITSVTOR0:
qemu_log_mask(LOG_UNIMP, "IoTKit SysCtl INITSVRTOR0 unimplemented\n"); qemu_log_mask(LOG_UNIMP, "IoTKit SysCtl INITSVTOR0 unimplemented\n");
s->initsvrtor0 = value; s->initsvtor0 = value;
break; break;
case A_CPUWAIT: case A_CPUWAIT:
qemu_log_mask(LOG_UNIMP, "IoTKit SysCtl CPUWAIT unimplemented\n"); qemu_log_mask(LOG_UNIMP, "IoTKit SysCtl CPUWAIT unimplemented\n");
@ -206,7 +206,7 @@ static void iotkit_sysctl_reset(DeviceState *dev)
s->reset_syndrome = 1; s->reset_syndrome = 1;
s->reset_mask = 0; s->reset_mask = 0;
s->gretreg = 0; s->gretreg = 0;
s->initsvrtor0 = 0x10000000; s->initsvtor0 = 0x10000000;
s->cpuwait = 0; s->cpuwait = 0;
s->wicctrl = 0; s->wicctrl = 0;
} }
@ -230,7 +230,7 @@ static const VMStateDescription iotkit_sysctl_vmstate = {
VMSTATE_UINT32(reset_syndrome, IoTKitSysCtl), VMSTATE_UINT32(reset_syndrome, IoTKitSysCtl),
VMSTATE_UINT32(reset_mask, IoTKitSysCtl), VMSTATE_UINT32(reset_mask, IoTKitSysCtl),
VMSTATE_UINT32(gretreg, IoTKitSysCtl), VMSTATE_UINT32(gretreg, IoTKitSysCtl),
VMSTATE_UINT32(initsvrtor0, IoTKitSysCtl), VMSTATE_UINT32(initsvtor0, IoTKitSysCtl),
VMSTATE_UINT32(cpuwait, IoTKitSysCtl), VMSTATE_UINT32(cpuwait, IoTKitSysCtl),
VMSTATE_UINT32(wicctrl, IoTKitSysCtl), VMSTATE_UINT32(wicctrl, IoTKitSysCtl),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()

2
include/hw/misc/iotkit-sysctl.h
View File

@ -41,7 +41,7 @@ typedef struct IoTKitSysCtl {
uint32_t reset_syndrome; uint32_t reset_syndrome;
uint32_t reset_mask; uint32_t reset_mask;
uint32_t gretreg; uint32_t gretreg;
uint32_t initsvrtor0; uint32_t initsvtor0;
uint32_t cpuwait; uint32_t cpuwait;
uint32_t wicctrl; uint32_t wicctrl;
} IoTKitSysCtl; } IoTKitSysCtl;