[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/17] hw/arm/stellaris: Correct handling of GPTM TAR
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 16/17] hw/arm/stellaris: Correct handling of GPTM TAR register |
Date: |
Tue, 13 May 2014 16:31:38 +0100 |
We don't implement very much of the GPTM TAR register, and what we
do is wrong. The "are we in RT mode?" field is in s->config, not
s->control. Correct this, use LOG_UNIMP rather than hw_error()
for the cases we don't support, and avoid an unlabelled fallthrough
that makes Coverity complain.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
---
hw/arm/stellaris.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index c7de9cf..a2095c0 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -185,12 +185,19 @@ static uint64_t gptm_read(void *opaque, hwaddr offset,
case 0x44: /* TBPMR */
return s->match_prescale[1];
case 0x48: /* TAR */
- if (s->control == 1)
+ if (s->config == 1) {
return s->rtc;
+ }
+ qemu_log_mask(LOG_UNIMP,
+ "GPTM: read of TAR but timer read not supported");
+ return 0;
case 0x4c: /* TBR */
- hw_error("TODO: Timer value read\n");
+ qemu_log_mask(LOG_UNIMP,
+ "GPTM: read of TBR but timer read not supported");
+ return 0;
default:
- hw_error("gptm_read: Bad offset 0x%x\n", (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "GPTM: read at bad offset 0x%x\n", (int)offset);
return 0;
}
}
--
1.9.2
- [Qemu-devel] [PULL 00/17] target-arm queue, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 17/17] hw/arm/omap_gpmc: Avoid buffer overrun filling prefetch FIFO, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 12/17] hw/net/cadence_gem: Remove dead code, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 09/17] hw/net/stellaris_enet: Convert to vmstate, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 15/17] hw/timer/exynos4210_mct: Avoid overflow in exynos4210_ltick_recalc_count, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 03/17] hw/net/stellaris_enet: Restructure tx_fifo code to avoid buffer overrun, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 14/17] hw/dma/omap_dma: Add (uint32_t) casts when shifting uint16_t by 16, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 16/17] hw/arm/stellaris: Correct handling of GPTM TAR register,
Peter Maydell <=
- [Qemu-devel] [PULL 10/17] target-arm/helper.c: Don't flush the TLB if SCTLR is rewritten unchanged, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 13/17] hw/arm/omap1: Avoid unintended sign extension writing omap_rtc YEARS_REG, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 11/17] hw/intc/allwinner-a10-pic: Add missing 'break', Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 06/17] hw/net/stellaris_enet: Correctly implement the TR and THR registers, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 05/17] hw/net/stellaris_enet: Rewrite tx fifo handling code, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 08/17] hw/net/stellaris_enet: Get rid of rx_fifo pointer, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 04/17] hw/net/stellaris_enet: Correct handling of packet padding, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 07/17] hw/net/stellaris_enet: Fix debug format strings, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 01/17] disas/libvixl: Update to libvixl 1.4, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 02/17] savevm: Remove all the unneeded version_minimum_id_old (arm), Peter Maydell, 2014/05/13