diff options
| author | Peter Crosthwaite <crosthwaitepeter@gmail.com> | 2015-10-16 11:14:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-16 13:13:47 +0100 |
| commit | c209b0537203c58a051e5d837320335cea23e494 (patch) | |
| tree | f6c199fc6c527547b062164b15c00da1cb45e529 | |
| parent | b64d64de1a5b88de88146e3ad36e7b09b97837eb (diff) | |
| download | qemu-c209b0537203c58a051e5d837320335cea23e494.zip qemu-c209b0537203c58a051e5d837320335cea23e494.tar.gz qemu-c209b0537203c58a051e5d837320335cea23e494.tar.bz2 | |
misc: zynq_slcr: Fix MMIO writes
The /4 for offset calculation in MMIO writes was happening twice giving
wrong write offsets. Fix.
While touching the code, change the if-else to be a short returning if
and convert the debug message to a GUEST_ERROR, which is more accurate
for this condition.
Cc: qemu-stable@nongnu.org
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/misc/zynq_slcr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index 964f253..3d78708 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -393,12 +393,12 @@ static void zynq_slcr_write(void *opaque, hwaddr offset, return; } - if (!s->regs[LOCKSTA]) { - s->regs[offset / 4] = val; - } else { - DB_PRINT("SCLR registers are locked. Unlock them first\n"); + if (s->regs[LOCKSTA]) { + qemu_log_mask(LOG_GUEST_ERROR, + "SCLR registers are locked. Unlock them first\n"); return; } + s->regs[offset] = val; switch (offset) { case PSS_RST_CTRL: |